hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc
kernel/arch/m68k/hp300/time.c
....@@ -8,6 +8,7 @@
88 */
99
1010 #include <asm/ptrace.h>
11
+#include <linux/clocksource.h>
1112 #include <linux/types.h>
1213 #include <linux/init.h>
1314 #include <linux/sched.h>
....@@ -19,6 +20,18 @@
1920 #include <asm/traps.h>
2021 #include <asm/blinken.h>
2122
23
+static u64 hp300_read_clk(struct clocksource *cs);
24
+
25
+static struct clocksource hp300_clk = {
26
+ .name = "timer",
27
+ .rating = 250,
28
+ .read = hp300_read_clk,
29
+ .mask = CLOCKSOURCE_MASK(32),
30
+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
31
+};
32
+
33
+static u32 clk_total, clk_offset;
34
+
2235 /* Clock hardware definitions */
2336
2437 #define CLOCKBASE 0xf05f8000
....@@ -28,13 +41,17 @@
2841 #define CLKCR3 CLKCR1
2942 #define CLKSR CLKCR2
3043 #define CLKMSB1 0x5
44
+#define CLKLSB1 0x7
3145 #define CLKMSB2 0x9
3246 #define CLKMSB3 0xD
3347
34
-/* This is for machines which generate the exact clock. */
35
-#define USECS_PER_JIFFY (1000000/HZ)
48
+#define CLKSR_INT1 BIT(0)
3649
37
-#define INTVAL ((10000 / 4) - 1)
50
+/* This is for machines which generate the exact clock. */
51
+
52
+#define HP300_TIMER_CLOCK_FREQ 250000
53
+#define HP300_TIMER_CYCLES (HP300_TIMER_CLOCK_FREQ / HZ)
54
+#define INTVAL (HP300_TIMER_CYCLES - 1)
3855
3956 static irqreturn_t hp300_tick(int irq, void *dev_id)
4057 {
....@@ -45,6 +62,8 @@
4562 local_irq_save(flags);
4663 in_8(CLOCKBASE + CLKSR);
4764 asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE));
65
+ clk_total += INTVAL;
66
+ clk_offset = 0;
4867 timer_routine(0, NULL);
4968 local_irq_restore(flags);
5069
....@@ -53,20 +72,30 @@
5372 return IRQ_HANDLED;
5473 }
5574
56
-u32 hp300_gettimeoffset(void)
75
+static u64 hp300_read_clk(struct clocksource *cs)
5776 {
58
- /* Read current timer 1 value */
59
- unsigned char lsb, msb1, msb2;
60
- unsigned short ticks;
77
+ unsigned long flags;
78
+ unsigned char lsb, msb, msb_new;
79
+ u32 ticks;
6180
62
- msb1 = in_8(CLOCKBASE + 5);
63
- lsb = in_8(CLOCKBASE + 7);
64
- msb2 = in_8(CLOCKBASE + 5);
65
- if (msb1 != msb2)
66
- /* A carry happened while we were reading. Read it again */
67
- lsb = in_8(CLOCKBASE + 7);
68
- ticks = INTVAL - ((msb2 << 8) | lsb);
69
- return ((USECS_PER_JIFFY * ticks) / INTVAL) * 1000;
81
+ local_irq_save(flags);
82
+ /* Read current timer 1 value */
83
+ msb = in_8(CLOCKBASE + CLKMSB1);
84
+again:
85
+ if ((in_8(CLOCKBASE + CLKSR) & CLKSR_INT1) && msb > 0)
86
+ clk_offset = INTVAL;
87
+ lsb = in_8(CLOCKBASE + CLKLSB1);
88
+ msb_new = in_8(CLOCKBASE + CLKMSB1);
89
+ if (msb_new != msb) {
90
+ msb = msb_new;
91
+ goto again;
92
+ }
93
+
94
+ ticks = INTVAL - ((msb << 8) | lsb);
95
+ ticks += clk_offset + clk_total;
96
+ local_irq_restore(flags);
97
+
98
+ return ticks;
7099 }
71100
72101 void __init hp300_sched_init(irq_handler_t vector)
....@@ -76,9 +105,11 @@
76105
77106 asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
78107
79
- if (request_irq(IRQ_AUTO_6, hp300_tick, 0, "timer tick", vector))
108
+ if (request_irq(IRQ_AUTO_6, hp300_tick, IRQF_TIMER, "timer tick", vector))
80109 pr_err("Couldn't register timer interrupt\n");
81110
82111 out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
83112 out_8(CLOCKBASE + CLKCR1, 0x40); /* enable irq */
113
+
114
+ clocksource_register_hz(&hp300_clk, HP300_TIMER_CLOCK_FREQ);
84115 }