LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
       [not found] ` <fa.wuwhrqFp6CufvpAJxShHqIaOPdI@ifi.uio.no>
@ 2008-02-16  5:52   ` Robert Hancock
  2008-02-16  6:09     ` Yinghai Lu
  2008-02-18 11:31     ` Andi Kleen
  0 siblings, 2 replies; 11+ messages in thread
From: Robert Hancock @ 2008-02-16  5:52 UTC (permalink / raw)
  To: Andi Kleen
  Cc: Yinghai Lu, Ingo Molnar, Andrew Morton, Greg KH,
	Linux Kernel Mailing List

Andi Kleen wrote:
> Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
>> [akpm@linux-foundation.org: many fixes and cleanups]
>> Signed-off-by: Robert Hancock <hancockr@shaw.ca>
>> Signed-off-by: Andi Kleen <ak@suse.de>
>> Tested-by: Andi Kleen <ak@suse.de>
> 
> iirc it really was 
> Tested-and-didnt-pass-test-by: Andi Kleen 
> unfortunately. I have not rechecked recently, but on the one Intel
> box the original patch and the other mcfg heuristics removed didn't work.

With just this patch you will have this problem. You need either the 
patch to disable decode during BAR sizing, or the patch to use MMCONFIG 
for extended config space only, if you don't have them already.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-16  5:52   ` [PATCH 1/5] x86: validate against acpi motherboard resources Robert Hancock
@ 2008-02-16  6:09     ` Yinghai Lu
  2008-02-17 16:42       ` Ingo Molnar
  2008-02-18 11:31     ` Andi Kleen
  1 sibling, 1 reply; 11+ messages in thread
From: Yinghai Lu @ 2008-02-16  6:09 UTC (permalink / raw)
  To: Robert Hancock
  Cc: Andi Kleen, Ingo Molnar, Andrew Morton, Greg KH,
	Linux Kernel Mailing List

On Fri, Feb 15, 2008 at 9:52 PM, Robert Hancock <hancockr@shaw.ca> wrote:
> Andi Kleen wrote:
>
> > Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
>  >> [akpm@linux-foundation.org: many fixes and cleanups]
>  >> Signed-off-by: Robert Hancock <hancockr@shaw.ca>
>  >> Signed-off-by: Andi Kleen <ak@suse.de>
>  >> Tested-by: Andi Kleen <ak@suse.de>
>  >
>  > iirc it really was
>  > Tested-and-didnt-pass-test-by: Andi Kleen
>  > unfortunately. I have not rechecked recently, but on the one Intel
>  > box the original patch and the other mcfg heuristics removed didn't work.
>
>  With just this patch you will have this problem. You need either the
>  patch to disable decode during BAR sizing, or the patch to use MMCONFIG
>  for extended config space only, if you don't have them already.

linus already apply the the patch to "use MMCONFIG for extended config
space only" to mainline. the last two near 2.6.25-rc1.

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a0ca9909609470ad779b9b9cc68ce96e975afff7
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=b6ce068a1285a24185b01be8a49021827516b3e1

Andi,
can you double check this patch with your test system?

YH

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-16  6:09     ` Yinghai Lu
@ 2008-02-17 16:42       ` Ingo Molnar
  0 siblings, 0 replies; 11+ messages in thread
From: Ingo Molnar @ 2008-02-17 16:42 UTC (permalink / raw)
  To: Yinghai Lu
  Cc: Robert Hancock, Andi Kleen, Andrew Morton, Greg KH,
	Linux Kernel Mailing List


* Yinghai Lu <yhlu.kernel@gmail.com> wrote:

> linus already apply the the patch to "use MMCONFIG for extended config 
> space only" to mainline. the last two near 2.6.25-rc1.
> 
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a0ca9909609470ad779b9b9cc68ce96e975afff7
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=b6ce068a1285a24185b01be8a49021827516b3e1

FYI, we've applied your patches to x86.git, they certainly look 
sensible.

	Ingo

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-16  5:52   ` [PATCH 1/5] x86: validate against acpi motherboard resources Robert Hancock
  2008-02-16  6:09     ` Yinghai Lu
@ 2008-02-18 11:31     ` Andi Kleen
  2008-02-18 20:26       ` Robert Hancock
  1 sibling, 1 reply; 11+ messages in thread
From: Andi Kleen @ 2008-02-18 11:31 UTC (permalink / raw)
  To: Robert Hancock
  Cc: Andi Kleen, Yinghai Lu, Ingo Molnar, Andrew Morton, Greg KH,
	Linux Kernel Mailing List

On Fri, Feb 15, 2008 at 11:52:14PM -0600, Robert Hancock wrote:
> Andi Kleen wrote:
> >Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
> >>[akpm@linux-foundation.org: many fixes and cleanups]
> >>Signed-off-by: Robert Hancock <hancockr@shaw.ca>
> >>Signed-off-by: Andi Kleen <ak@suse.de>
> >>Tested-by: Andi Kleen <ak@suse.de>
> >
> >iirc it really was 
> >Tested-and-didnt-pass-test-by: Andi Kleen 
> >unfortunately. I have not rechecked recently, but on the one Intel
> >box the original patch and the other mcfg heuristics removed didn't work.
> 
> With just this patch you will have this problem. You need either the 
> patch to disable decode during BAR sizing,

Isn't that one already merged?

I remember the BAR decoding patch did help with at least one
of the original failures (there were multiple ones iirc0) 

If someone points me to all the patches needed or a tree who 
has them all applied I can give it a quick spin on the boxes I have here.
One of the systems where it originally failed I don't have anymore
though.

> or the patch to use MMCONFIG 
> for extended config space only, if you don't have them already.

That would mean it would boot, but anything that uses extended config
space would fail. While not as catastrophic as before I'm not sure
it's that great either. At least there would be still breakage,
but much more subtle ones.

-Andi

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-18 11:31     ` Andi Kleen
@ 2008-02-18 20:26       ` Robert Hancock
  0 siblings, 0 replies; 11+ messages in thread
From: Robert Hancock @ 2008-02-18 20:26 UTC (permalink / raw)
  To: Andi Kleen
  Cc: Yinghai Lu, Ingo Molnar, Andrew Morton, Greg KH,
	Linux Kernel Mailing List

Andi Kleen wrote:
>> With just this patch you will have this problem. You need either the 
>> patch to disable decode during BAR sizing,
> 
> Isn't that one already merged?
> 
> I remember the BAR decoding patch did help with at least one
> of the original failures (there were multiple ones iirc0) 

I believe that one's been dropped as it's not needed if we don't use 
MMCONFIG for non-extended accesses (like we use during BAR sizing). 
(Though, there may still be a case where it's needed, see below.)

> 
> If someone points me to all the patches needed or a tree who 
> has them all applied I can give it a quick spin on the boxes I have here.
> One of the systems where it originally failed I don't have anymore
> though.
> 
>> or the patch to use MMCONFIG 
>> for extended config space only, if you don't have them already.
> 
> That would mean it would boot, but anything that uses extended config
> space would fail. While not as catastrophic as before I'm not sure
> it's that great either. At least there would be still breakage,
> but much more subtle ones.

The only issue on those boards is that since certain device BARs will 
overlap the MMCONFIG area during BAR sizing, if you use MMCONFIG to do 
the accesses used during BAR sizing itself, it'll fail. If you use conf1 
to do the BAR sizing then that problem doesn't happen.

However, I suppose there could be an issue if you hotplugged a device 
(causing BAR sizing) once you'd booted, while extended config space was 
in use on another device. The BAR sizing wouldn't fail, but the guy 
using extended config space would since he's actually reading 
from/writing into the BAR of the device being sized instead of the 
MMCONFIG area. That wouldn't be good. The disable-decode-during-sizing 
patch would avoid that problem.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-15  9:27 Yinghai Lu
  2008-02-15 11:11 ` Andi Kleen
@ 2008-02-17 14:06 ` Thomas Gleixner
  1 sibling, 0 replies; 11+ messages in thread
From: Thomas Gleixner @ 2008-02-17 14:06 UTC (permalink / raw)
  To: Yinghai Lu; +Cc: Ingo Molnar, Andrew Morton, Greg KH, Linux Kernel Mailing List

On Fri, 15 Feb 2008, Yinghai Lu wrote:
> From: Robert Hancock <hancockr@shaw.ca>
> 
> This path adds validation of the MMCONFIG table against the ACPI reserved
> motherboard resources.  If the MMCONFIG table is found to be reserved in
> ACPI, we don't bother checking the E820 table.  The PCI Express firmware
> spec apparently tells BIOS developers that reservation in ACPI is required
> and E820 reservation is optional, so checking against ACPI first makes
> sense.  Many BIOSes don't reserve the MMCONFIG region in E820 even though
> it is perfectly functional, the existing check needlessly disables MMCONFIG
> in these cases.
> 
> In order to do this, MMCONFIG setup has been split into two phases.  If PCI
> configuration type 1 is not available then MMCONFIG is enabled early as
> before.  Otherwise, it is enabled later after the ACPI interpreter is
> enabled, since we need to be able to execute control methods in order to
> check the ACPI reserved resources.  Presently this is just triggered off
> the end of ACPI interpreter initialization.
> 
> There are a few other behavioral changes here:
> 
> - Validate all MMCONFIG configurations provided, not just the first one.
> 
> - Validate the entire required length of each configuration according to
>   the provided ending bus number is reserved, not just the minimum required
>   allocation.
> 
> - Validate that the area is reserved even if we read it from the chipset
>   directly and not from the MCFG table.  This catches the case where the
>   BIOS didn't set the location properly in the chipset and has mapped it
>   over other things it shouldn't have.
> 
> This also cleans up the MMCONFIG initialization functions so that they
> simply do nothing if MMCONFIG is not compiled in.
> 
> Based on an original patch by Rajesh Shah from Intel.

Applied. Thanks,

	 tglx

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-15 22:11   ` Yinghai Lu
@ 2008-02-15 22:16     ` Yinghai Lu
  0 siblings, 0 replies; 11+ messages in thread
From: Yinghai Lu @ 2008-02-15 22:16 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Ingo Molnar, Andrew Morton, Greg KH, Linux Kernel Mailing List

On Fri, Feb 15, 2008 at 2:11 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> On Fri, Feb 15, 2008 at 3:11 AM, Andi Kleen <andi@firstfloor.org> wrote:
>  > Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
>  >  >
>  >  > [akpm@linux-foundation.org: many fixes and cleanups]
>  >  > Signed-off-by: Robert Hancock <hancockr@shaw.ca>
>  >  > Signed-off-by: Andi Kleen <ak@suse.de>
>  >  > Tested-by: Andi Kleen <ak@suse.de>
>  >
>  >  iirc it really was
>  >  Tested-and-didnt-pass-test-by: Andi Kleen
>  >  unfortunately. I have not rechecked recently, but on the one Intel
>  >  box the original patch and the other mcfg heuristics removed didn't work.

hope this could refresh your memory:

http://lkml.org/lkml/2008/1/8/197

YH

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-15 11:11 ` Andi Kleen
  2008-02-15 18:46   ` Yinghai Lu
@ 2008-02-15 22:11   ` Yinghai Lu
  2008-02-15 22:16     ` Yinghai Lu
  1 sibling, 1 reply; 11+ messages in thread
From: Yinghai Lu @ 2008-02-15 22:11 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Ingo Molnar, Andrew Morton, Greg KH, Linux Kernel Mailing List

On Fri, Feb 15, 2008 at 3:11 AM, Andi Kleen <andi@firstfloor.org> wrote:
> Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
>  >
>  > [akpm@linux-foundation.org: many fixes and cleanups]
>  > Signed-off-by: Robert Hancock <hancockr@shaw.ca>
>  > Signed-off-by: Andi Kleen <ak@suse.de>
>  > Tested-by: Andi Kleen <ak@suse.de>
>
>  iirc it really was
>  Tested-and-didnt-pass-test-by: Andi Kleen
>  unfortunately. I have not rechecked recently, but on the one Intel
>  box the original patch and the other mcfg heuristics removed didn't work.

it seems some intel system with old bios need

PATCH: Fix boot-time hang on G31/G33 PC

but greg decided not to use it, and user need to update BIOS or use pci=nommconf

but this one
x86: validate against acpi motherboard resources

should be different. it just reveres the BIOS bug.

Ingo,
Can you remove the line regarding Andi, and put them into x86 mm?

Andi could use pci=nommconf with that system with buggy BIOS or update the BIOS

YH

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-15 11:11 ` Andi Kleen
@ 2008-02-15 18:46   ` Yinghai Lu
  2008-02-15 22:11   ` Yinghai Lu
  1 sibling, 0 replies; 11+ messages in thread
From: Yinghai Lu @ 2008-02-15 18:46 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Ingo Molnar, Andrew Morton, Greg KH, Linux Kernel Mailing List

On Friday 15 February 2008 03:11:57 am Andi Kleen wrote:
> Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
> >
> > [akpm@linux-foundation.org: many fixes and cleanups]
> > Signed-off-by: Robert Hancock <hancockr@shaw.ca>
> > Signed-off-by: Andi Kleen <ak@suse.de>
> > Tested-by: Andi Kleen <ak@suse.de>
> 
> iirc it really was 
> Tested-and-didnt-pass-test-by: Andi Kleen 
> unfortunately. I have not rechecked recently, but on the one Intel
> box the original patch and the other mcfg heuristics removed didn't work.

i can not find the one that disable MMIO for BAR probing...

YH


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/5] x86: validate against acpi motherboard resources
  2008-02-15  9:27 Yinghai Lu
@ 2008-02-15 11:11 ` Andi Kleen
  2008-02-15 18:46   ` Yinghai Lu
  2008-02-15 22:11   ` Yinghai Lu
  2008-02-17 14:06 ` Thomas Gleixner
  1 sibling, 2 replies; 11+ messages in thread
From: Andi Kleen @ 2008-02-15 11:11 UTC (permalink / raw)
  To: Yinghai Lu; +Cc: Ingo Molnar, Andrew Morton, Greg KH, Linux Kernel Mailing List

Yinghai Lu <Yinghai.Lu@Sun.COM> writes:
>
> [akpm@linux-foundation.org: many fixes and cleanups]
> Signed-off-by: Robert Hancock <hancockr@shaw.ca>
> Signed-off-by: Andi Kleen <ak@suse.de>
> Tested-by: Andi Kleen <ak@suse.de>

iirc it really was 
Tested-and-didnt-pass-test-by: Andi Kleen 
unfortunately. I have not rechecked recently, but on the one Intel
box the original patch and the other mcfg heuristics removed didn't work.

-Andi

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/5] x86: validate against acpi motherboard resources
@ 2008-02-15  9:27 Yinghai Lu
  2008-02-15 11:11 ` Andi Kleen
  2008-02-17 14:06 ` Thomas Gleixner
  0 siblings, 2 replies; 11+ messages in thread
From: Yinghai Lu @ 2008-02-15  9:27 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: Andrew Morton, Greg KH, Linux Kernel Mailing List

From: Robert Hancock <hancockr@shaw.ca>

This path adds validation of the MMCONFIG table against the ACPI reserved
motherboard resources.  If the MMCONFIG table is found to be reserved in
ACPI, we don't bother checking the E820 table.  The PCI Express firmware
spec apparently tells BIOS developers that reservation in ACPI is required
and E820 reservation is optional, so checking against ACPI first makes
sense.  Many BIOSes don't reserve the MMCONFIG region in E820 even though
it is perfectly functional, the existing check needlessly disables MMCONFIG
in these cases.

In order to do this, MMCONFIG setup has been split into two phases.  If PCI
configuration type 1 is not available then MMCONFIG is enabled early as
before.  Otherwise, it is enabled later after the ACPI interpreter is
enabled, since we need to be able to execute control methods in order to
check the ACPI reserved resources.  Presently this is just triggered off
the end of ACPI interpreter initialization.

There are a few other behavioral changes here:

- Validate all MMCONFIG configurations provided, not just the first one.

- Validate the entire required length of each configuration according to
  the provided ending bus number is reserved, not just the minimum required
  allocation.

- Validate that the area is reserved even if we read it from the chipset
  directly and not from the MCFG table.  This catches the case where the
  BIOS didn't set the location properly in the chipset and has mapped it
  over other things it shouldn't have.

This also cleans up the MMCONFIG initialization functions so that they
simply do nothing if MMCONFIG is not compiled in.

Based on an original patch by Rajesh Shah from Intel.

[akpm@linux-foundation.org: many fixes and cleanups]
Signed-off-by: Robert Hancock <hancockr@shaw.ca>
Signed-off-by: Andi Kleen <ak@suse.de>
Tested-by: Andi Kleen <ak@suse.de>
Cc: Rajesh Shah <rajesh.shah@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andi Kleen <ak@suse.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/pci/init.c            |    4 
 arch/x86/pci/mmconfig-shared.c |  151 +++++++++++++++++++++++++++----
 arch/x86/pci/pci.h             |    1 
 drivers/acpi/bus.c             |    2 
 include/linux/pci.h            |    8 +
 5 files changed, 144 insertions(+), 22 deletions(-)

Index: linux-2.6/arch/x86/pci/init.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/init.c
+++ linux-2.6/arch/x86/pci/init.c
@@ -11,9 +11,7 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_DIRECT
 	type = pci_direct_probe();
 #endif
-#ifdef CONFIG_PCI_MMCONFIG
-	pci_mmcfg_init(type);
-#endif
+	pci_mmcfg_early_init(type);
 	if (raw_pci_ops)
 		return 0;
 #ifdef CONFIG_PCI_BIOS
Index: linux-2.6/arch/x86/pci/mmconfig-shared.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/mmconfig-shared.c
+++ linux-2.6/arch/x86/pci/mmconfig-shared.c
@@ -173,9 +173,78 @@ static void __init pci_mmcfg_insert_reso
 	pci_mmcfg_resources_inserted = 1;
 }
 
-static void __init pci_mmcfg_reject_broken(int type)
+static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
+					      void *data)
+{
+	struct resource *mcfg_res = data;
+	struct acpi_resource_address64 address;
+	acpi_status status;
+
+	if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
+		struct acpi_resource_fixed_memory32 *fixmem32 =
+			&res->data.fixed_memory32;
+		if (!fixmem32)
+			return AE_OK;
+		if ((mcfg_res->start >= fixmem32->address) &&
+		    (mcfg_res->end < (fixmem32->address +
+				      fixmem32->address_length))) {
+			mcfg_res->flags = 1;
+			return AE_CTRL_TERMINATE;
+		}
+	}
+	if ((res->type != ACPI_RESOURCE_TYPE_ADDRESS32) &&
+	    (res->type != ACPI_RESOURCE_TYPE_ADDRESS64))
+		return AE_OK;
+
+	status = acpi_resource_to_address64(res, &address);
+	if (ACPI_FAILURE(status) ||
+	   (address.address_length <= 0) ||
+	   (address.resource_type != ACPI_MEMORY_RANGE))
+		return AE_OK;
+
+	if ((mcfg_res->start >= address.minimum) &&
+	    (mcfg_res->end < (address.minimum + address.address_length))) {
+		mcfg_res->flags = 1;
+		return AE_CTRL_TERMINATE;
+	}
+	return AE_OK;
+}
+
+static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,
+		void *context, void **rv)
+{
+	struct resource *mcfg_res = context;
+
+	acpi_walk_resources(handle, METHOD_NAME__CRS,
+			    check_mcfg_resource, context);
+
+	if (mcfg_res->flags)
+		return AE_CTRL_TERMINATE;
+
+	return AE_OK;
+}
+
+static int __init is_acpi_reserved(unsigned long start, unsigned long end)
+{
+	struct resource mcfg_res;
+
+	mcfg_res.start = start;
+	mcfg_res.end = end;
+	mcfg_res.flags = 0;
+
+	acpi_get_devices("PNP0C01", find_mboard_resource, &mcfg_res, NULL);
+
+	if (!mcfg_res.flags)
+		acpi_get_devices("PNP0C02", find_mboard_resource, &mcfg_res,
+				 NULL);
+
+	return mcfg_res.flags;
+}
+
+static void __init pci_mmcfg_reject_broken(void)
 {
 	typeof(pci_mmcfg_config[0]) *cfg;
+	int i;
 
 	if ((pci_mmcfg_config_num == 0) ||
 	    (pci_mmcfg_config == NULL) ||
@@ -196,17 +265,37 @@ static void __init pci_mmcfg_reject_brok
 		goto reject;
 	}
 
-	/*
-	 * Only do this check when type 1 works. If it doesn't work
-	 * assume we run on a Mac and always use MCFG
-	 */
-	if (type == 1 && !e820_all_mapped(cfg->address,
-					  cfg->address + MMCONFIG_APER_MIN,
-					  E820_RESERVED)) {
-		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
-		       " E820-reserved\n", cfg->address);
-		goto reject;
+	for (i = 0; i < pci_mmcfg_config_num; i++) {
+		u32 size = (cfg->end_bus_number + 1) << 20;
+		cfg = &pci_mmcfg_config[i];
+		printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lu "
+		       "segment %hu buses %u - %u\n",
+		       i, (unsigned long)cfg->address, cfg->pci_segment,
+		       (unsigned int)cfg->start_bus_number,
+		       (unsigned int)cfg->end_bus_number);
+		if (is_acpi_reserved(cfg->address, cfg->address + size - 1)) {
+			printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "
+			       "in ACPI motherboard resources\n",
+			       cfg->address);
+		} else {
+			printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
+			       " reserved in ACPI motherboard resources\n",
+			       cfg->address);
+			/* Don't try to do this check unless configuration
+			   type 1 is available. */
+			if ((pci_probe & PCI_PROBE_CONF1) &&
+			    e820_all_mapped(cfg->address,
+					    cfg->address + size - 1,
+					    E820_RESERVED))
+				printk(KERN_NOTICE
+				       "PCI: MCFG area at %Lx reserved in "
+				       "E820\n",
+				       cfg->address);
+			else
+				goto reject;
+		}
 	}
+
 	return;
 
 reject:
@@ -216,20 +305,46 @@ reject:
 	pci_mmcfg_config_num = 0;
 }
 
-void __init pci_mmcfg_init(int type)
+void __init pci_mmcfg_early_init(int type)
+{
+	if ((pci_probe & PCI_PROBE_MMCONF) == 0)
+		return;
+
+	/* If type 1 access is available, no need to enable MMCONFIG yet, we can
+	   defer until later when the ACPI interpreter is available to better
+	   validate things. */
+	if (type == 1)
+		return;
+
+	acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
+
+	if ((pci_mmcfg_config_num == 0) ||
+	    (pci_mmcfg_config == NULL) ||
+	    (pci_mmcfg_config[0].address == 0))
+		return;
+
+	if (pci_mmcfg_arch_init())
+		pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
+}
+
+void __init pci_mmcfg_late_init(void)
 {
 	int known_bridge = 0;
 
+	/* MMCONFIG disabled */
 	if ((pci_probe & PCI_PROBE_MMCONF) == 0)
 		return;
 
-	if (type == 1 && pci_mmcfg_check_hostbridge())
-		known_bridge = 1;
+	/* MMCONFIG already enabled */
+	if (!(pci_probe & PCI_PROBE_MASK & ~PCI_PROBE_MMCONF))
+		return;
 
-	if (!known_bridge) {
+	if ((pci_probe & PCI_PROBE_CONF1) && pci_mmcfg_check_hostbridge())
+		known_bridge = 1;
+	else
 		acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
-		pci_mmcfg_reject_broken(type);
-	}
+
+	pci_mmcfg_reject_broken();
 
 	if ((pci_mmcfg_config_num == 0) ||
 	    (pci_mmcfg_config == NULL) ||
Index: linux-2.6/arch/x86/pci/pci.h
===================================================================
--- linux-2.6.orig/arch/x86/pci/pci.h
+++ linux-2.6/arch/x86/pci/pci.h
@@ -100,7 +100,6 @@ extern struct pci_raw_ops pci_direct_con
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_mmcfg_init(int type);
 extern void pcibios_sort(void);
 
 /* pci-mmconfig.c */
Index: linux-2.6/drivers/acpi/bus.c
===================================================================
--- linux-2.6.orig/drivers/acpi/bus.c
+++ linux-2.6/drivers/acpi/bus.c
@@ -35,6 +35,7 @@
 #ifdef CONFIG_X86
 #include <asm/mpspec.h>
 #endif
+#include <linux/pci.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
@@ -783,6 +784,7 @@ static int __init acpi_init(void)
 	result = acpi_bus_init();
 
 	if (!result) {
+		pci_mmcfg_late_init();
 		if (!(pm_flags & PM_APM))
 			pm_flags |= PM_ACPI;
 		else {
Index: linux-2.6/include/linux/pci.h
===================================================================
--- linux-2.6.orig/include/linux/pci.h
+++ linux-2.6/include/linux/pci.h
@@ -1050,5 +1050,13 @@ extern unsigned long pci_cardbus_mem_siz
 
 extern int pcibios_add_platform_entries(struct pci_dev *dev);
 
+#ifdef CONFIG_PCI_MMCONFIG
+extern void __init pci_mmcfg_early_init(int type);
+extern void __init pci_mmcfg_late_init(void);
+#else
+static inline void pci_mmcfg_early_init(int type) { }
+static inline void pci_mmcfg_late_init(void) { }
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2008-02-18 20:26 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <fa.LKjQjbOw482S/QFVaQ9fSrM+IFw@ifi.uio.no>
     [not found] ` <fa.wuwhrqFp6CufvpAJxShHqIaOPdI@ifi.uio.no>
2008-02-16  5:52   ` [PATCH 1/5] x86: validate against acpi motherboard resources Robert Hancock
2008-02-16  6:09     ` Yinghai Lu
2008-02-17 16:42       ` Ingo Molnar
2008-02-18 11:31     ` Andi Kleen
2008-02-18 20:26       ` Robert Hancock
2008-02-15  9:27 Yinghai Lu
2008-02-15 11:11 ` Andi Kleen
2008-02-15 18:46   ` Yinghai Lu
2008-02-15 22:11   ` Yinghai Lu
2008-02-15 22:16     ` Yinghai Lu
2008-02-17 14:06 ` Thomas Gleixner

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).