Skip to contentSkip to conversation

mmconfig: Some additional chipset register values validation.

PATCH In review Olivier Galibert 2 participants 3 messages May 2, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmconfig: Some additional chipset register values validation.

On i945, a mmconfig range hitting the f0000000-ffffffff zone conflicts with the APIC registers and others. Consider it invalid.

On E7520, values 0000 and f000 for the window register are defined invalid in the documentation.

---

I haven't seen a bios use these values, but who trusts biosen these days?

 arch/i386/pci/mmconfig-shared.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
arch/i386/pci/mmconfig-shared.c +17 -8
index 747d8c6..c7cabee 100644
@@ -60,14 +60,19 @@ static const char __init *pci_mmcfg_e7520(void)
 	u32 win;
 	pci_conf1_read(0, 0, PCI_DEVFN(0,0), 0xce, 2, &win);
 
-	pci_mmcfg_config_num = 1;
-	pci_mmcfg_config = kzalloc(sizeof(pci_mmcfg_config[0]), GFP_KERNEL);
-	if (!pci_mmcfg_config)
-		return NULL;
-	pci_mmcfg_config[0].address = (win & 0xf000) << 16;
-	pci_mmcfg_config[0].pci_segment = 0;
-	pci_mmcfg_config[0].start_bus_number = 0;
-	pci_mmcfg_config[0].end_bus_number = 255;
+	win = win & 0xf000;
+	if(win == 0x0000 || win == 0xf000)
+		pci_mmcfg_config_num = 0;
+	else {
+		pci_mmcfg_config_num = 1;
+		pci_mmcfg_config = kzalloc(sizeof(pci_mmcfg_config[0]), GFP_KERNEL);
+		if (!pci_mmcfg_config)
+			return NULL;
+		pci_mmcfg_config[0].address = win << 16;
+		pci_mmcfg_config[0].pci_segment = 0;
+		pci_mmcfg_config[0].start_bus_number = 0;
+		pci_mmcfg_config[0].end_bus_number = 255;
+	}
 
 	return "Intel Corporation E7520 Memory Controller Hub";
 }
@@ -108,6 +113,10 @@ static const char __init *pci_mmcfg_intel_945(void)
 	if ((pciexbar & mask) & 0x0fffffffU)
 		pci_mmcfg_config_num = 0;
 
+	/* Don't hit the APIC registers and their friends */
+	if ((pciexbar & mask) >= 0xf0000000U)
+		pci_mmcfg_config_num = 0;
+
 	if (pci_mmcfg_config_num) {
 		pci_mmcfg_config = kzalloc(sizeof(pci_mmcfg_config[0]), GFP_KERNEL);
 		if (!pci_mmcfg_config)
Signature · 1 line
1.5.1.81.gee969
#1 lore raw
Quoted 5 lines · On Wednesday 02 May 2007 02:50:11 Olivier Galibert wrote:

On i945, a mmconfig range hitting the f0000000-ffffffff zone conflicts with the APIC registers and others. Consider it invalid.

On E7520, values 0000 and f000 for the window register are defined invalid in the documentation.

Added thanks

-Andi

#2 lore raw
Quoted 8 lines · Andi Kleen
Quoted 5 lines · On Wednesday 02 May 2007 02:50:11 Olivier Galibert wrote:

On i945, a mmconfig range hitting the f0000000-ffffffff zone conflicts with the APIC registers and others. Consider it invalid.

On E7520, values 0000 and f000 for the window register are defined invalid in the documentation.

Added thanks

Oh, feel free to add the:

I forgot in the original mail.

OG.