LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Balaji Rao <balajirrao@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: "Yinghai Lu" <yhlu.kernel@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: hpet_late_init hang
Date: Thu, 17 Jan 2008 21:42:41 +0530	[thread overview]
Message-ID: <200801172142.41787.balajirrao@gmail.com> (raw)
In-Reply-To: <86802c440801161339h4e3e983co67e05a231666d050@mail.gmail.com>

On Thursday 17 January 2008 03:09:42 am Yinghai Lu wrote:
> > 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.
> >
> > Yinghai, could you please apply this on top of my patch and check ?
> >
> > ---
> > Index: linux-2.6/arch/x86/kernel/hpet.c
> > ===================================================================
> > --- linux-2.6.orig/arch/x86/kernel/hpet.c
> ...
> >
> 
> it works
> 
Cool!

Ingo, here's the patch with the SOB. Please apply.

regards,
balaji rao

Check if there's an IRQ assigned to the timer before assigning one.

Signed-off-by: Balaji Rao <balajirrao@gmail.com>

Index: linux-2.6/arch/x86/kernel/hpet.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/hpet.c
+++ linux-2.6/arch/x86/kernel/hpet.c
@@ -116,7 +116,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;
@@ -134,10 +135,9 @@ static void hpet_reserve_platform_timers
        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
Index: linux-2.6/drivers/char/hpet.c
===================================================================
--- linux-2.6.orig/drivers/char/hpet.c
+++ linux-2.6/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;

  reply	other threads:[~2008-01-17 15:59 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-16  3:32 Yinghai Lu
2008-01-16  6:51 ` Ingo Molnar
2008-01-16  8:34   ` Balaji Rao
2008-01-16 21:39     ` Yinghai Lu
2008-01-17 16:12       ` Balaji Rao [this message]
2008-01-18 12:41         ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200801172142.41787.balajirrao@gmail.com \
    --to=balajirrao@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=yhlu.kernel@gmail.com \
    --subject='Re: hpet_late_init hang' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).