diff options
| author | Balaji Rao <balajirrao@gmail.com> | 2008-01-30 13:30:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:03 +0100 |
| commit | 37a47db8d7f0f38dac5acf5a13abbc8f401707fa (patch) | |
| tree | f3827e6b77a81680b2870f82a22bb86c4fefefee | |
| parent | e3f37a54f690d3e64995ea7ecea08c5ab3070faf (diff) | |
| download | op-kernel-dev-37a47db8d7f0f38dac5acf5a13abbc8f401707fa.zip op-kernel-dev-37a47db8d7f0f38dac5acf5a13abbc8f401707fa.tar.gz | |
x86: assign IRQs to HPET timers, fix
Looks like IRQ 31 is assigned to timer 3, even without the patch!
I wonder who wrote the number 31. But the manual says that it is
zero by default.
I think we should check whether the timer has been allocated an IRQ before
proceeding to assign one to it. Here is a patch that does this.
Signed-off-by: Balaji Rao <balajirrao@gmail.com>
Tested-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/hpet.c | 10 | ||||
| -rw-r--r-- | drivers/char/hpet.c | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 786aa22..a3c56c9 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -117,7 +117,8 @@ int is_hpet_enabled(void) static void hpet_reserve_platform_timers(unsigned long id) { struct hpet __iomem *hpet = hpet_virt_address; - unsigned int nrtimers; + struct hpet_timer __iomem *timer = &hpet->hpet_timers[2]; + unsigned int nrtimers, i; struct hpet_data hd; nrtimers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1; @@ -135,10 +136,9 @@ static void hpet_reserve_platform_timers(unsigned long id) hd.hd_irq[0] = HPET_LEGACY_8254; hd.hd_irq[1] = HPET_LEGACY_RTC; - /* - * IRQs for the other timers are assigned dynamically - * in hpet_alloc - */ + for (i = 2; i < nrtimers; timer++, i++) + hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >> + Tn_INT_ROUTE_CNF_SHIFT; hpet_alloc(&hd); } #else diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 593b32c..22f5fd0 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -852,6 +852,12 @@ int hpet_alloc(struct hpet_data *hdp) timer = &hpet->hpet_timers[devp - hpetp->hp_dev]; + /* Check if there's already an IRQ assigned to the timer */ + if (hdp->hd_irq[i]) { + hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i]; + continue; + } + hpet_config = readq(&timer->hpet_config); irq_bitmap = (hpet_config & Tn_INT_ROUTE_CAP_MASK) >> Tn_INT_ROUTE_CAP_SHIFT; |
