| Message ID | alpine.DEB.2.20.1609061155390.5647@nanos |
|---|---|
| State | Superseded |
| Headers | show |
Hi Thomas, On 06/09/2016:11:58:08 AM, Thomas Gleixner wrote: > On Tue, 16 Aug 2016, Pratyush Anand wrote: > > That's a lot of churn to fix that simple problem. The two liner below > should fix that as well, right? Thanks a lot for your reply. Yes, that should fix. I was n't sure if "setting HPET_TN_ENABLE before IRQ is registered" would be a right step. I can give it a try, however it is pretty obvious that these two liners should be able to solve the issue. So, if this solution will not have any side effect then, it is fine for me as well. ~Pratyush > > Thanks, > > tglx > > diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c > index 43745cac0141..cb8dfc3ee012 100644 > --- a/drivers/rtc/rtc-cmos.c > +++ b/drivers/rtc/rtc-cmos.c > @@ -707,6 +707,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) > goto cleanup1; > } > > + hpet_rtc_timer_init(); > if (is_valid_irq(rtc_irq)) { > irq_handler_t rtc_cmos_int_handler; > > @@ -714,6 +715,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) > rtc_cmos_int_handler = hpet_rtc_interrupt; > retval = hpet_register_irq_handler(cmos_interrupt); > if (retval) { > + hpet_mask_rtc_irq_bit(RTC_IRQMASK); > dev_warn(dev, "hpet_register_irq_handler " > " failed in rtc_init()."); > goto cleanup1; > @@ -729,7 +731,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) > goto cleanup1; > } > } > - hpet_rtc_timer_init(); > > /* export at least the first block of NVRAM */ > nvram.size = address_space - NVRAM_OFFSET; >
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 43745cac0141..cb8dfc3ee012 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -707,6 +707,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) goto cleanup1; } + hpet_rtc_timer_init(); if (is_valid_irq(rtc_irq)) { irq_handler_t rtc_cmos_int_handler; @@ -714,6 +715,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) rtc_cmos_int_handler = hpet_rtc_interrupt; retval = hpet_register_irq_handler(cmos_interrupt); if (retval) { + hpet_mask_rtc_irq_bit(RTC_IRQMASK); dev_warn(dev, "hpet_register_irq_handler " " failed in rtc_init()."); goto cleanup1; @@ -729,7 +731,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) goto cleanup1; } } - hpet_rtc_timer_init(); /* export at least the first block of NVRAM */ nvram.size = address_space - NVRAM_OFFSET;