x86, pci: Fix all early PCI scans to check the vendor ID first v2
PATCH 1/1 x86, pci: Fix all early PCI scans to check the vendor ID first v2
From: Andi Kleen <[email protected]>
According to the Intel PCI experts it's not safe to check any other field than vendor ID for 0xffff when doing PCI scans to see if the device exists.
Several of the early PCI scans violated this. I changed them all to always check the vendor ID first.
v2: Change some continues to breaks and cleanup Calgary (Betty Dall)
Cc Betty Dall <[email protected]>
Signed-off-by Andi Kleen <[email protected]>
--- arch/x86/kernel/aperture_64.c | 5 +++++ arch/x86/kernel/early-quirks.c | 3 +++ arch/x86/kernel/pci-calgary_64.c | 13 +++++++------ arch/x86/pci/early.c | 3 +++ drivers/firewire/init_ohci1394_dma.c | 3 +++ 5 files changed, 21 insertions(+), 6 deletions(-)
arch/x86/kernel/aperture_64.c +5 -0
@@ -206,6 +206,11 @@ static u32 __init search_agp_bridge(u32 *order, int *valid_agp)for (func =0 ; func <8 ; func++) {u32 class, cap;u8 type; + +if (read_pci_config_16 (bus, slot, func,PCI_VENDOR_ID ) + ==0xffff ) +break ; + class =read_pci_config (bus, slot, func,PCI_CLASS_REVISION );if (class ==0xffffffff )
arch/x86/kernel/early-quirks.c +3 -0
@@ -250,6 +250,9 @@ static int __init check_dev_quirk(int num, int slot, int func) vendor =read_pci_config_16 (num, slot, func,PCI_VENDOR_ID ); +if (vendor ==0xffff ) +return -1 ; + device =read_pci_config_16 (num, slot, func,PCI_DEVICE_ID );for (i =0 ; early_qrk[i].f !=NULL ; i++) {
arch/x86/kernel/pci-calgary_64.c +7 -6
@@ -1322,10 +1322,10 @@ static void __init get_tce_space_from_tar(void)for (bus =0 ; bus <MAX_PHB_BUS_NUM ; bus++) {struct calgary_bus_info *info = &bus_info[bus];unsigned short pci_device; -u32 val; - val =read_pci_config (bus,0 ,0 ,0 ); - pci_device = (val &0xFFFF0000 ) >>16 ; +if (read_pci_config_16 (bus,0 ,0 ,PCI_VENDOR_ID ) ==0xffff ) +continue ; + pci_device =read_pci_config_16 (bus,0 ,0 ,PCI_DEVICE_ID );if (!is_cal_pci_dev (pci_device))continue ;
@@ -1424,10 +1424,11 @@ int __init detect_calgary(void)for (bus =0 ; bus <MAX_PHB_BUS_NUM ; bus++) {struct calgary_bus_info *info = &bus_info[bus];unsigned short pci_device; -u32 val; - val =read_pci_config (bus,0 ,0 ,0 ); - pci_device = (val &0xFFFF0000 ) >>16 ; +if (read_pci_config_16 (bus,0 ,0 ,PCI_VENDOR_ID ) ==0xffff ) +continue ; + + pci_device =read_pci_config_16 (bus,0 ,0 ,PCI_DEVICE_ID );if (!is_cal_pci_dev (pci_device))continue ;
arch/x86/pci/early.c +3 -0
@@ -91,6 +91,9 @@ void early_dump_pci_devices(void)u32 class;u8 type; +if (read_pci_config_16 (bus, slot, func,PCI_VENDOR_ID ) ==0xffff ) +break ; + class =read_pci_config (bus, slot, func,PCI_CLASS_REVISION );if (class ==0xffffffff )
drivers/firewire/init_ohci1394_dma.c +3 -0
@@ -279,6 +279,9 @@ void __init init_ohci1394_dma_on_all_controllers(void)for (num =0 ; num <32 ; num++) {for (slot =0 ; slot <32 ; slot++) {for (func =0 ; func <8 ; func++) { +if (read_pci_config_16 (num, slot, func,PCI_VENDOR_ID ) ==0xffff ) +break ; + class =read_pci_config (num, slot, func,PCI_CLASS_REVISION );if (class ==0xffffffff )
Signature · 1 line
1.7.7.6