From: Yinghai Lu <yinghai@kernel.org> To: dann frazier <dannf@hp.com>, Jesse Barnes <jbarnes@virtuousgeek.org>, Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org> Cc: James Bottomley <James.Bottomley@HansenPartnership.com>, linux-scsi@vger.kernel.org, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, linux-pci@vger.kernel.org Subject: [PATCH} x86/pci: insert ioapic resource before assign unassigned resource for pci Date: Thu, 09 Jul 2009 14:41:47 -0700 [thread overview] Message-ID: <4A56641B.9050204@kernel.org> (raw) In-Reply-To: <1247172044.3898.147.camel@mulgrave.site> Stephen reported that his DL585 G2 need noapic after 2.6.22 (?) Bann bisected -------------------------------------------------------------------- commit 30a18d6c3f1e774de656ebd8ff219d53e2ba4029 Date: Tue Feb 19 03:21:20 2008 -0800 x86: multi pci root bus with different io resource range, on 64-bit -------------------------------------------------------------------- cause the problem. it turns out that 1. that system have two HT chains. 2. BIOS doesn't allocate resource for BAR 6 under 8132 etc 3. that patches will try to split root resource to peer root resources according to pci conf of NB 4. pci assign unassign path, assign some range to pci-x bridge, but it is overlapping with ioapic addr of io4 and 8132. the reason is at that point ioapic address and BAR is not inserted yet. the BAR for io4 ioapic is not in regular position. the BAR for 8132 is sitting to func1, and pci-x bridge is func0. aka that patch is not the cause, and it just uncover other problems. solution is trying to insert ioapic_resource early a little bit. Reported-by: Stephen Frost <sfrost@snowman.net> Reported-by: dann frazier <dannf@hp.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/include/asm/io_apic.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 14 +++----------- arch/x86/pci/i386.c | 7 +++++++ 3 files changed, 12 insertions(+), 11 deletions(-) Index: linux-2.6/arch/x86/include/asm/io_apic.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/io_apic.h +++ linux-2.6/arch/x86/include/asm/io_apic.h @@ -161,6 +161,7 @@ extern int io_apic_set_pci_routing(struc struct io_apic_irq_attr *irq_attr); extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern void ioapic_init_mappings(void); +extern void ioapic_insert_resources(void); extern struct IO_APIC_route_entry **alloc_ioapic_entries(void); extern void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries); @@ -180,6 +181,7 @@ extern void ioapic_write_entry(int apic, #define io_apic_assign_pci_irqs 0 static const int timer_through_8259 = 0; static inline void ioapic_init_mappings(void) { } +static inline void ioapic_insert_resources(void) { } static inline void probe_nr_irqs_gsi(void) { } #endif Index: linux-2.6/arch/x86/kernel/apic/io_apic.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +++ linux-2.6/arch/x86/kernel/apic/io_apic.c @@ -4182,28 +4182,20 @@ fake_ioapic_page: } } -static int __init ioapic_insert_resources(void) +void __init ioapic_insert_resources(void) { int i; struct resource *r = ioapic_resources; if (!r) { - if (nr_ioapics > 0) { + if (nr_ioapics > 0) printk(KERN_ERR "IO APIC resources couldn't be allocated.\n"); - return -1; - } - return 0; + return; } for (i = 0; i < nr_ioapics; i++) { insert_resource(&iomem_resource, r); r++; } - - return 0; } - -/* Insert the IO APIC resources after PCI initialization has occured to handle - * IO APICS that are mapped in on a BAR in PCI space. */ -late_initcall(ioapic_insert_resources); Index: linux-2.6/arch/x86/pci/i386.c =================================================================== --- linux-2.6.orig/arch/x86/pci/i386.c +++ linux-2.6/arch/x86/pci/i386.c @@ -35,6 +35,7 @@ #include <asm/pat.h> #include <asm/e820.h> #include <asm/pci_x86.h> +#include <asm/io_apic.h> static int @@ -227,6 +228,12 @@ void __init pcibios_resource_survey(void pcibios_allocate_resources(1); e820_reserve_resources_late(); + /* + * Insert the IO APIC resources after PCI initialization has + * occured to handle IO APICS that are mapped in on a BAR in + * PCI space, but before we trying to assign unassigned pci res. + */ + ioapic_insert_resources(); } /**
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org> To: dann frazier <dannf@hp.com>, Jesse Barnes <jbarnes@virtuousgeek.org>, Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Andrew Cc: James Bottomley <James.Bottomley@HansenPartnership.com>, linux-scsi@vger.kernel.org, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, linux-pci@vger.kernel.org Subject: [PATCH} x86/pci: insert ioapic resource before assign unassigned resource for pci Date: Thu, 09 Jul 2009 14:41:47 -0700 [thread overview] Message-ID: <4A56641B.9050204@kernel.org> (raw) In-Reply-To: <1247172044.3898.147.camel@mulgrave.site> Stephen reported that his DL585 G2 need noapic after 2.6.22 (?) Bann bisected -------------------------------------------------------------------- commit 30a18d6c3f1e774de656ebd8ff219d53e2ba4029 Date: Tue Feb 19 03:21:20 2008 -0800 x86: multi pci root bus with different io resource range, on 64-bit -------------------------------------------------------------------- cause the problem. it turns out that 1. that system have two HT chains. 2. BIOS doesn't allocate resource for BAR 6 under 8132 etc 3. that patches will try to split root resource to peer root resources according to pci conf of NB 4. pci assign unassign path, assign some range to pci-x bridge, but it is overlapping with ioapic addr of io4 and 8132. the reason is at that point ioapic address and BAR is not inserted yet. the BAR for io4 ioapic is not in regular position. the BAR for 8132 is sitting to func1, and pci-x bridge is func0. aka that patch is not the cause, and it just uncover other problems. solution is trying to insert ioapic_resource early a little bit. Reported-by: Stephen Frost <sfrost@snowman.net> Reported-by: dann frazier <dannf@hp.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/include/asm/io_apic.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 14 +++----------- arch/x86/pci/i386.c | 7 +++++++ 3 files changed, 12 insertions(+), 11 deletions(-) Index: linux-2.6/arch/x86/include/asm/io_apic.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/io_apic.h +++ linux-2.6/arch/x86/include/asm/io_apic.h @@ -161,6 +161,7 @@ extern int io_apic_set_pci_routing(struc struct io_apic_irq_attr *irq_attr); extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern void ioapic_init_mappings(void); +extern void ioapic_insert_resources(void); extern struct IO_APIC_route_entry **alloc_ioapic_entries(void); extern void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries); @@ -180,6 +181,7 @@ extern void ioapic_write_entry(int apic, #define io_apic_assign_pci_irqs 0 static const int timer_through_8259 = 0; static inline void ioapic_init_mappings(void) { } +static inline void ioapic_insert_resources(void) { } static inline void probe_nr_irqs_gsi(void) { } #endif Index: linux-2.6/arch/x86/kernel/apic/io_apic.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c +++ linux-2.6/arch/x86/kernel/apic/io_apic.c @@ -4182,28 +4182,20 @@ fake_ioapic_page: } } -static int __init ioapic_insert_resources(void) +void __init ioapic_insert_resources(void) { int i; struct resource *r = ioapic_resources; if (!r) { - if (nr_ioapics > 0) { + if (nr_ioapics > 0) printk(KERN_ERR "IO APIC resources couldn't be allocated.\n"); - return -1; - } - return 0; + return; } for (i = 0; i < nr_ioapics; i++) { insert_resource(&iomem_resource, r); r++; } - - return 0; } - -/* Insert the IO APIC resources after PCI initialization has occured to handle - * IO APICS that are mapped in on a BAR in PCI space. */ -late_initcall(ioapic_insert_resources); Index: linux-2.6/arch/x86/pci/i386.c =================================================================== --- linux-2.6.orig/arch/x86/pci/i386.c +++ linux-2.6/arch/x86/pci/i386.c @@ -35,6 +35,7 @@ #include <asm/pat.h> #include <asm/e820.h> #include <asm/pci_x86.h> +#include <asm/io_apic.h> static int @@ -227,6 +228,12 @@ void __init pcibios_resource_survey(void pcibios_allocate_resources(1); e820_reserve_resources_late(); + /* + * Insert the IO APIC resources after PCI initialization has + * occured to handle IO APICS that are mapped in on a BAR in + * PCI space, but before we trying to assign unassigned pci res. + */ + ioapic_insert_resources(); } /**
next prev parent reply other threads:[~2009-07-09 21:43 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-06-30 18:03 mptsas, msi and the dl585 g2 dann frazier 2009-06-30 18:35 ` Yinghai Lu 2009-07-03 22:57 ` dann frazier 2009-07-04 19:30 ` Yinghai Lu 2009-07-06 16:57 ` dann frazier 2009-07-09 18:59 ` dann frazier 2009-07-09 19:17 ` Yinghai Lu 2009-07-09 19:34 ` Yinghai Lu 2009-07-09 19:48 ` Yinghai Lu 2009-07-09 20:40 ` James Bottomley 2009-07-09 21:12 ` Yinghai Lu 2009-07-09 21:41 ` Yinghai Lu [this message] 2009-07-09 21:41 ` [PATCH} x86/pci: insert ioapic resource before assign unassigned resource for pci Yinghai Lu 2009-07-09 22:01 ` dann frazier 2009-07-10 16:36 ` [PATCH] x86/pci: insert ioapic resource before assign unassigned resource for pci -v2 Yinghai Lu 2009-07-10 20:03 ` Jesse Barnes 2009-07-10 21:27 ` Linus Torvalds
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=4A56641B.9050204@kernel.org \ --to=yinghai@kernel.org \ --cc=James.Bottomley@HansenPartnership.com \ --cc=akpm@linux-foundation.org \ --cc=dannf@hp.com \ --cc=hpa@zytor.com \ --cc=jbarnes@virtuousgeek.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.