aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.18/0066-cevt.patch
blob: 01cb588cd99cf0db94cfb0fb2e682e1383b5bb81 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
--- a/arch/mips/ralink/cevt-rt3352.c
+++ b/arch/mips/ralink/cevt-rt3352.c
@@ -45,18 +45,33 @@ static void (*systick_freq_scaling)(stru
 static void systick_set_clock_mode(enum clock_event_mode mode,
 				struct clock_event_device *evt);

+static inline unsigned int read_count(struct systick_device *sdev)
+{
+	return ioread32(sdev->membase + SYSTICK_COUNT);
+}
+
+static inline unsigned int read_compare(struct systick_device *sdev)
+{
+	return ioread32(sdev->membase + SYSTICK_COMPARE);
+}
+
+static inline void write_compare(struct systick_device *sdev, unsigned int val)
+{
+	iowrite32(val, sdev->membase + SYSTICK_COMPARE);
+}
+
 static int systick_next_event(unsigned long delta,
 				struct clock_event_device *evt)
 {
 	struct systick_device *sdev;
-	u32 count;
+	int res;

 	sdev = container_of(evt, struct systick_device, dev);
-	count = ioread32(sdev->membase + SYSTICK_COUNT);
-	count = (count + delta) % SYSTICK_FREQ;
-	iowrite32(count, sdev->membase + SYSTICK_COMPARE);
+	delta += read_count(sdev);
+	write_compare(sdev, delta);
+	res = ((int)(read_count(sdev) - delta) >= 0) ? -ETIME : 0;

-	return 0;
+	return res;
 }

 static void systick_event_handler(struct clock_event_device *dev)
@@ -66,20 +81,25 @@ static void systick_event_handler(struct

 static irqreturn_t systick_interrupt(int irq, void *dev_id)
 {
-	struct clock_event_device *dev = (struct clock_event_device *) dev_id;
+	int ret = 0;
+	struct clock_event_device *cdev;
+	struct systick_device *sdev;

-	dev->event_handler(dev);
+	if (read_c0_cause() & STATUSF_IP7) {
+		cdev = (struct clock_event_device *) dev_id;
+		sdev = container_of(cdev, struct systick_device, dev);
+
+		/* Clear Count/Compare Interrupt */
+		write_compare(sdev, read_compare(sdev));
+		cdev->event_handler(cdev);
+		ret = 1;
+	}

-	return IRQ_HANDLED;
+	return IRQ_RETVAL(ret);
 }

 static struct systick_device systick = {
 	.dev = {
-		/*
-		 * cevt-r4k uses 300, make sure systick
-		 * gets used if available
-		 */
-		.rating		= 310,
 		.features	= CLOCK_EVT_FEAT_ONESHOT,
 		.set_next_event	= systick_next_event,
 		.set_mode	= systick_set_clock_mode,
@@ -126,13 +146,14 @@ static void systick_set_clock_mode(enum
 			systick_freq_scaling(sdev, 1);
 		break;

+	case CLOCK_EVT_MODE_UNUSED:
 	case CLOCK_EVT_MODE_SHUTDOWN:
 		if (systick_freq_scaling)
 			systick_freq_scaling(sdev, 0);
 		if (sdev->irq_requested)
-			free_irq(systick.dev.irq, &systick_irqaction);
+			remove_irq(systick.dev.irq, &systick_irqaction);
 		sdev->irq_requested = 0;
-		iowrite32(0, systick.membase + SYSTICK_CONFIG);
+		iowrite32(CFG_CNT_EN, systick.membase + SYSTICK_CONFIG);
 		break;

 	default:
@@ -142,38 +163,45 @@ static void systick_set_clock_mode(enum
 }

 static const struct of_device_id systick_match[] = {
-	{ .compatible = "ralink,mt7620-systick", .data = mt7620_freq_scaling},
+	{ .compatible = "ralink,mt7620a-systick", .data = mt7620_freq_scaling},
 	{},
 };

 static void __init ralink_systick_init(struct device_node *np)
 {
 	const struct of_device_id *match;
+	int rating = 200;

 	systick.membase = of_iomap(np, 0);
 	if (!systick.membase)
 		return;

 	match = of_match_node(systick_match, np);
-	if (match)
+	if (match) {
 		systick_freq_scaling = match->data;
+		/*
+		 * cevt-r4k uses 300, make sure systick
+		 * gets used if available
+		 */
+		rating = 310;
+	}

-	systick_irqaction.name = np->name;
-	systick.dev.name = np->name;
-	clockevents_calc_mult_shift(&systick.dev, SYSTICK_FREQ, 60);
-	systick.dev.max_delta_ns = clockevent_delta2ns(0x7fff, &systick.dev);
-	systick.dev.min_delta_ns = clockevent_delta2ns(0x3, &systick.dev);
+	/* enable counter than register clock source */
+	iowrite32(CFG_CNT_EN, systick.membase + SYSTICK_CONFIG);
+	clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name,
+			SYSTICK_FREQ, rating, 16, clocksource_mmio_readl_up);
+
+	/* register clock event */
 	systick.dev.irq = irq_of_parse_and_map(np, 0);
 	if (!systick.dev.irq) {
 		pr_err("%s: request_irq failed", np->name);
 		return;
 	}
-
-	clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name,
-			SYSTICK_FREQ, 301, 16, clocksource_mmio_readl_up);
-
-	clockevents_register_device(&systick.dev);
-
+	systick_irqaction.name = np->name;
+	systick.dev.name = np->name;
+	systick.dev.rating = rating;
+	systick.dev.cpumask = cpumask_of(0);
+	clockevents_config_and_register(&systick.dev, SYSTICK_FREQ, 0x3, 0x7fff);
 	pr_info("%s: running - mult: %d, shift: %d\n",
 			np->name, systick.dev.mult, systick.dev.shift);
 }