From: "Yinghai Lu" <yinghai.lu@amd.com>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: "Tobias Diedrich" <ranma+kernel@tdiedrich.de>,
"Linus Torvalds" <torvalds@osdl.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Andi Kleen" <ak@suse.de>, "Andrew Morton" <akpm@osdl.org>
Subject: Re: IO-APIC + timer doesn't work
Date: Tue, 19 Dec 2006 00:00:27 -0800 [thread overview]
Message-ID: <86802c440612190000k7eb5e68et9c0a776ef85b5177@mail.gmail.com> (raw)
In-Reply-To: <m1tzztqkev.fsf@ebiederm.dsl.xmission.com>
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
On 12/18/06, Eric W. Biederman <ebiederm@xmission.com> wrote:
> Thanks. The bug is simply that the new code doesn't setup the
> ioapic for the cases it intends to test. But it does clear out
> the original programming. So if the normal good case doesn't work the
> code is going to have problems.
Please check the patch.
[-- Attachment #2: timers_12182006.patch --]
[-- Type: text/x-patch, Size: 4598 bytes --]
[PATCH] x86_64: check_timer with io apic setup before try_apic_pin
add io apic setup before try_apic_pin
cc: Andi Kleen <ak@suse.de>
cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Yinghai Lu <yinghai.lu@amd.com>
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 2a1dcd5..06982b4 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -273,10 +273,17 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin)
struct irq_pin_list *entry = irq_2_pin + irq;
BUG_ON(irq >= NR_IRQS);
- while (entry->next)
+ while (entry->next) {
+ if (entry->apic == apic && entry->pin == pin)
+ return;
+ if (entry->pin == -1)
+ break;
entry = irq_2_pin + entry->next;
+ }
if (entry->pin != -1) {
+ if (entry->apic == apic && entry->pin == pin)
+ return;
entry->next = first_free_entry;
entry = irq_2_pin + entry->next;
if (++first_free_entry >= PIN_MAP_SIZE)
@@ -286,6 +293,24 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin)
entry->pin = pin;
}
+static void remove_pin_to_irq(unsigned int irq, int apic, int pin)
+{
+ struct irq_pin_list *entry = irq_2_pin + irq;
+
+ BUG_ON(irq >= NR_IRQS);
+
+ while (entry) {
+ if (entry->apic == apic && entry->pin == pin) {
+ entry->apic = -1;
+ entry->pin = -1;
+ break;
+ }
+ if (entry->next)
+ entry = irq_2_pin + entry->next;
+ }
+
+}
+
#define DO_ACTION(name,R,ACTION, FINAL) \
\
@@ -1570,6 +1630,21 @@ static inline void unlock_ExtINT_logic(void)
* fanatically on his truly buggy board.
*/
+static int set_try_apic_pin(int apic, int pin, int irq)
+{
+ int idx;
+ int ret = -1;
+ idx = find_irq_entry(apic,pin,mp_INT);
+
+ if(idx != -1) {
+ add_pin_to_irq(irq, apic, pin);
+ setup_IO_APIC_irq(apic, pin, idx, irq);
+ ret = 0;
+ }
+
+ return ret;
+}
+
static int try_apic_pin(int apic, int pin, char *msg)
{
apic_printk(APIC_VERBOSE, KERN_INFO
@@ -1588,7 +1663,7 @@ static int try_apic_pin(int apic, int pin, char *msg)
}
return 1;
}
- clear_IO_APIC_pin(apic, pin);
+
apic_printk(APIC_QUIET, KERN_ERR " .. failed\n");
return 0;
}
@@ -1599,12 +1674,12 @@ static void check_timer(void)
int apic1, pin1, apic2, pin2;
int vector;
cpumask_t mask;
+ int i;
/*
* get/set the timer IRQ vector:
*/
disable_8259A_irq(0);
- vector = assign_irq_vector(0, TARGET_CPUS, &mask);
/*
* Subtle, code in do_timer_interrupt() expects an AEOI
@@ -1622,32 +1697,49 @@ static void check_timer(void)
apic2 = ioapic_i8259.apic;
/* Do this first, otherwise we get double interrupts on ATI boards */
- if ((pin1 != -1) && try_apic_pin(apic1, pin1,"with 8259 IRQ0 disabled"))
- return;
+ if (pin1 != -1) {
+ /* set_try_apic_pin will call disable_8259A_irq */
+ set_try_apic_pin(apic1, pin1, 0);
+ unmask_IO_APIC_irq(0);
+ if (try_apic_pin(apic1, pin1,"with 8259 IRQ0 disabled"))
+ return;
- /* Now try again with IRQ0 8259A enabled.
- Assumes timer is on IO-APIC 0 ?!? */
- enable_8259A_irq(0);
- unmask_IO_APIC_irq(0);
- if (try_apic_pin(apic1, pin1, "with 8259 IRQ0 enabled"))
- return;
- disable_8259A_irq(0);
+ /* Now try again with IRQ0 8259A enabled.
+ Assumes timer is on IO-APIC 0 ?!? */
+ enable_8259A_irq(0);
+ if (try_apic_pin(apic1, pin1, "with 8259 IRQ0 enabled"))
+ return;
+ disable_8259A_irq(0);
+
+ clear_IO_APIC_pin(apic1, pin1);
+ remove_pin_to_irq(0, apic1, pin1);
+ }
/* Always try pin0 and pin2 on APIC 0 to handle buggy timer overrides
on Nvidia boards */
- if (!(apic1 == 0 && pin1 == 0) &&
- try_apic_pin(0, 0, "fallback with 8259 IRQ0 disabled"))
- return;
- if (!(apic1 == 0 && pin1 == 2) &&
- try_apic_pin(0, 2, "fallback with 8259 IRQ0 disabled"))
- return;
+ for (i = 0; i <= 2; i += 2)
+ if (!(apic1 == 0 && pin1 == i)) {
+ /* set_try_apic_pin will call disable_8259A_irq */
+ if (!set_try_apic_pin(0, i, 0) ) {
+ unmask_IO_APIC_irq(0);
+ if (try_apic_pin(0, i, "fallback with 8259 IRQ0 disabled"))
+ return;
+ clear_IO_APIC_pin(0, i);
+ remove_pin_to_irq(0, 0, i);
+ }
+ }
+
+ vector = assign_irq_vector(0, TARGET_CPUS, &mask);
/* Then try pure 8259A routing on the 8259 as reported by BIOS*/
- enable_8259A_irq(0);
if (pin2 != -1) {
setup_ExtINT_IRQ0_pin(apic2, pin2, vector);
+ add_pin_to_irq(0, apic2, pin2);
+ enable_8259A_irq(0);
if (try_apic_pin(apic2,pin2,"8259A broadcast ExtINT from BIOS"))
return;
+ clear_IO_APIC_pin(apic2, pin2);
+ remove_pin_to_irq(0, apic2, pin2);
}
/* Tried all possibilities to go through the IO-APIC. Now come the
next prev parent reply other threads:[~2006-12-19 8:00 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-14 2:06 Linux 2.6.20-rc1 Linus Torvalds
2006-12-14 2:46 ` Gene Heskett
2006-12-14 3:32 ` Linus Torvalds
2006-12-14 5:36 ` Gene Heskett
2006-12-14 17:48 ` ieee1394 in 2.6.20-rc1 (was Re: Linux 2.6.20-rc1) Stefan Richter
2006-12-14 19:08 ` Stefan Richter
2006-12-15 3:17 ` Gene Heskett
2006-12-17 18:11 ` Gene Heskett
2006-12-17 18:31 ` Stefan Richter
2006-12-17 19:04 ` Gene Heskett
2006-12-17 20:21 ` Stefan Richter
2006-12-17 23:34 ` Gene Heskett
2006-12-18 1:05 ` Stefan Richter
2006-12-18 4:29 ` Gene Heskett
2006-12-18 15:45 ` Stefan Richter
2006-12-18 15:54 ` Gene Heskett
2006-12-14 13:59 ` Linux 2.6.20-rc1 Alessandro Suardi
2006-12-14 14:18 ` Steve WIse
2006-12-14 15:48 ` Alan
2006-12-14 19:30 ` Alistair John Strachan
2006-12-14 19:57 ` Linus Torvalds
2006-12-14 20:05 ` Jeff Garzik
2006-12-14 20:26 ` [PATCH] support HDIO_GET_IDENTITY in libata Erik Andersen
2006-12-14 20:31 ` Jeff Garzik
2006-12-14 20:40 ` Erik Andersen
2006-12-16 16:34 ` Jeff Garzik
2006-12-15 18:45 ` Alexey Dobriyan
2006-12-16 16:34 ` Jeff Garzik
2006-12-14 20:16 ` Linux 2.6.20-rc1 Alistair John Strachan
2006-12-14 20:28 ` Jens Axboe
2006-12-14 20:33 ` Jeff Garzik
2006-12-14 20:36 ` Jens Axboe
2006-12-14 20:48 ` Jens Axboe
2006-12-14 21:13 ` Alistair John Strachan
2006-12-14 21:20 ` Jens Axboe
2006-12-15 0:48 ` Alistair John Strachan
2006-12-15 1:41 ` Alistair John Strachan
2006-12-16 21:36 ` Linus Torvalds
2006-12-16 22:28 ` Alistair John Strachan
2006-12-16 22:31 ` Jeff Garzik
2006-12-16 23:00 ` Alistair John Strachan
2006-12-18 18:32 ` Jens Axboe
2006-12-18 18:41 ` Jens Axboe
2006-12-14 21:33 ` Jeff Garzik
2006-12-14 21:44 ` Alistair John Strachan
2006-12-14 21:50 ` Jeff Garzik
2006-12-14 22:33 ` Alistair John Strachan
2006-12-19 12:41 ` Jens Axboe
2006-12-19 14:32 ` Robert Hancock
2006-12-19 14:38 ` Jens Axboe
2006-12-19 14:50 ` Jens Axboe
2006-12-19 17:49 ` Linus Torvalds
2006-12-14 21:53 ` Jeff Garzik
2006-12-14 20:32 ` Nicolas Mailhot
2006-12-14 23:22 ` Jeff Garzik
2006-12-14 23:33 ` Nicolas Mailhot
2006-12-15 16:50 ` Bill Davidsen
2006-12-15 17:28 ` Alan
2006-12-18 21:57 ` Bill Davidsen
[not found] ` <20061216174536.GA2753@melchior.yamamaya.is-a-geek.org>
2006-12-16 18:06 ` IO-APIC + timer doesn't work (was: Linux 2.6.20-rc1) Linus Torvalds
[not found] ` <20061216225338.GA2616@melchior.yamamaya.is-a-geek.org>
[not found] ` <20061216230605.GA2789@melchior.yamamaya.is-a-geek.org>
2006-12-16 23:36 ` Linus Torvalds
[not found] ` <20061216235513.GA2424@melchior.yamamaya.is-a-geek.org>
2006-12-17 0:04 ` IO-APIC + timer doesn't work Linus Torvalds
2006-12-17 5:16 ` Eric W. Biederman
2006-12-17 5:22 ` Eric W. Biederman
2006-12-18 6:16 ` Len Brown
2006-12-17 13:10 ` Tobias Diedrich
2006-12-17 17:26 ` Linus Torvalds
2006-12-17 14:57 ` IO-APIC + timer doesn't work (was: Linux 2.6.20-rc1) Tobias Diedrich
2006-12-18 13:14 ` Eric W. Biederman
2006-12-18 15:23 ` Tobias Diedrich
2006-12-18 15:34 ` Tobias Diedrich
2006-12-18 15:43 ` IO-APIC + timer doesn't work Eric W. Biederman
2006-12-19 8:00 ` Yinghai Lu [this message]
2006-12-19 11:27 ` Eric W. Biederman
2006-12-20 6:50 ` Yinghai Lu
2006-12-21 19:15 ` Tobias Diedrich
2006-12-21 20:46 ` Eric W. Biederman
2006-12-31 8:29 ` Yinghai Lu
2006-12-21 21:24 Lu, Yinghai
2006-12-21 21:40 ` Eric W. Biederman
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=86802c440612190000k7eb5e68et9c0a776ef85b5177@mail.gmail.com \
--to=yinghai.lu@amd.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ranma+kernel@tdiedrich.de \
--cc=torvalds@osdl.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®