start queue with missing pci mmconfig fix pointed out by Andy Gospodarek

diff --git a/queue-2.6.17/pci-fix-issues-with-extended-conf-space-when-mmconfig-disabled-because-of-e820.patch b/queue-2.6.17/pci-fix-issues-with-extended-conf-space-when-mmconfig-disabled-because-of-e820.patch
new file mode 100644 (file)
index 0000000..0ef4c2e
--- /dev/null
+++ b/queue-2.6.17/pci-fix-issues-with-extended-conf-space-when-mmconfig-disabled-because-of-e820.patch
@@ -0,0 +1,107 @@
+From ead2bfeb7f739d2ad6e09dc1343f0da51feb7f51 Mon Sep 17 00:00:00 2001
+From: Chuck Ebbert <76306.1226@compuserve.com>
+Date: Thu, 15 Jun 2006 04:41:52 -0400
+Subject: PCI: fix issues with extended conf space when MMCONFIG disabled because of e820
+
+On 15 Jun 2006 03:45:10 +0200, Andi Kleen wrote:
+
+> Anyways I would say that if the BIOS can't get MCFG right then
+> it's likely not been validated on that board and shouldn't be used.
+
+According to Petr Vandrovec:
+
+ ... "What is important (and checked) is address of MMCONFIG reported by MCFG
+ table...  Unfortunately code does not bother with printing that address :-(
+
+ "Another problem is that code has hardcoded that MMCONFIG area is 256MB large.
+ Unfortunately for the code PCI specification allows any power of two between 2MB
+ and 256MB if vendor knows that such amount of busses (from 2 to 128) will be
+ sufficient for system.  With notebook it is quite possible that not full 8 bits
+ are implemented for MMCONFIG bus number."
+
+So here is a patch.  Unfortunately my system still fails the test because
+it doesn't reserve any part of the MMCONFIG area, but this may fix others.
+
+Booted on x86_64, only compiled on i386.  x86_64 still remaps the max area
+(256MB) even though only 2MB is checked... but 2.6.16 had no check at all
+so it is still better.
+
+PCI: reduce size of x86 MMCONFIG reserved area check
+
+1.  Print the address of the MMCONFIG area when the test for that area
+    being reserved fails.
+
+2.  Only check if the first 2MB is reserved, as that is the minimum.
+
+Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
+Acked-by: Arjan van de Ven <arjan@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ arch/i386/pci/mmconfig.c   |    9 ++++++---
+ arch/x86_64/pci/mmconfig.c |   13 +++++++++----
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+--- linux-2.6.17.7.orig/arch/i386/pci/mmconfig.c
++++ linux-2.6.17.7/arch/i386/pci/mmconfig.c
+@@ -15,7 +15,9 @@
+ #include <asm/e820.h>
+ #include "pci.h"
+ 
+-#define MMCONFIG_APER_SIZE (256*1024*1024)
++/* aperture is up to 256MB but BIOS may reserve less */
++#define MMCONFIG_APER_MIN     (2 * 1024*1024)
++#define MMCONFIG_APER_MAX     (256 * 1024*1024)
+ 
+ /* Assume systems with more busses have correct MCFG */
+ #define MAX_CHECK_BUS 16
+@@ -197,9 +199,10 @@ void __init pci_mmcfg_init(void)
+               return;
+ 
+       if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
+-                      pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,
++                      pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
+                       E820_RESERVED)) {
+-              printk(KERN_ERR "PCI: BIOS Bug: MCFG area is not E820-reserved\n");
++              printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
++                              pci_mmcfg_config[0].base_address);
+               printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+               return;
+       }
+--- linux-2.6.17.7.orig/arch/x86_64/pci/mmconfig.c
++++ linux-2.6.17.7/arch/x86_64/pci/mmconfig.c
+@@ -13,7 +13,10 @@
+ 
+ #include "pci.h"
+ 
+-#define MMCONFIG_APER_SIZE (256*1024*1024)
++/* aperture is up to 256MB but BIOS may reserve less */
++#define MMCONFIG_APER_MIN     (2 * 1024*1024)
++#define MMCONFIG_APER_MAX     (256 * 1024*1024)
++
+ /* Verify the first 16 busses. We assume that systems with more busses
+    get MCFG right. */
+ #define MAX_CHECK_BUS 16
+@@ -175,9 +178,10 @@ void __init pci_mmcfg_init(void)
+               return;
+ 
+       if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
+-                      pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,
++                      pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
+                       E820_RESERVED)) {
+-              printk(KERN_ERR "PCI: BIOS Bug: MCFG area is not E820-reserved\n");
++              printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
++                              pci_mmcfg_config[0].base_address);
+               printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+               return;
+       }
+@@ -190,7 +194,8 @@ void __init pci_mmcfg_init(void)
+       }
+       for (i = 0; i < pci_mmcfg_config_num; ++i) {
+               pci_mmcfg_virt[i].cfg = &pci_mmcfg_config[i];
+-              pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address, MMCONFIG_APER_SIZE);
++              pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address,
++                                                       MMCONFIG_APER_MAX);
+               if (!pci_mmcfg_virt[i].virt) {
+                       printk("PCI: Cannot map mmconfig aperture for segment %d\n",
+                              pci_mmcfg_config[i].pci_segment_group_number);

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
new file mode 100644 (file)
index 0000000..ccf71dc
--- /dev/null
+++ b/queue-2.6.17/series
@@ -0,0 +1 @@
+pci-fix-issues-with-extended-conf-space-when-mmconfig-disabled-because-of-e820.patch