Populate subsystem vendor and device IDs for PCI-Bridges
PATCH 1/1 Populate subsystem vendor and device IDs for PCI-Bridges
Change to populate the subsystem vendor and subsytem device IDs for PCI-PCI bridges that implement the PCI Subsystem Vendor ID capability. Previously bridges left subsystem vendor IDs unpopulated.
--- drivers/pci/probe.c | 6 ++++++ include/linux/pci_regs.h | 5 +++++ 2 files changed, 11 insertions(+), 0 deletions(-)
drivers/pci/probe.c +6 -0
@@ -731,6 +731,7 @@ int pci_setup_device(struct pci_dev *dev)u32 class;u8 hdr_type;struct pci_slot *slot; +int pos =0 ;if (pci_read_config_byte (dev,PCI_HEADER_TYPE , &hdr_type))return -EIO ;
@@ -822,6 +823,11 @@ int pci_setup_device(struct pci_dev *dev) dev->transparent = ((dev->class &0xff ) ==1 );pci_read_bases (dev,2 ,PCI_ROM_ADDRESS1 );set_pcie_hotplug_bridge (dev); + pos =pci_find_capability (dev,PCI_CAP_ID_SSVID ); +if (pos) { +pci_read_config_word (dev, pos +PCI_SSVID_VENDOR_ID , &dev->subsystem_vendor); +pci_read_config_word (dev, pos +PCI_SSVID_DEVICE_ID , &dev->subsystem_device); + }break ;case PCI_HEADER_TYPE_CARDBUS :/* CardBus bridge header */
include/linux/pci_regs.h +5 -0
@@ -365,6 +365,11 @@#define PCI_X_STATUS_266MHZ 0x40000000/* 266 MHz capable */ #define PCI_X_STATUS_533MHZ 0x80000000/* 533 MHz capable */ +/* PCI Bridge Subsystem ID registers */ + +#define PCI_SSVID_VENDOR_ID 4/* PCI-Bridge subsystem vendor id register */ +#define PCI_SSVID_DEVICE_ID 6/* PCI-Bridge subsystem device id register */ +/* PCI Express capability registers */ #define PCI_EXP_FLAGS 2/* Capabilities register */
Signature · 1 line
1.6.0.4
Quoted 40 lines · On Tue, 6 Oct 2009 10:45:19 -0500 Gabe Black <[email protected]> wrote:
Change to populate the subsystem vendor and subsytem device IDs for PCI-PCI bridges that implement the PCI Subsystem Vendor ID capability. Previously bridges left subsystem vendor IDs unpopulated.
Signed-off-by Gabe Black <[email protected]>--- drivers/pci/probe.c | 6 ++++++ include/linux/pci_regs.h | 5 +++++ 2 files changed, 11 insertions(+), 0 deletions(-)drivers/pci/probe.c +6
-0@@ -731,6 +731,7 @@ int pci_setup_device(struct pci_dev *dev)u32 class;u8 hdr_type;struct pci_slot *slot; +int pos =0 ;if (pci_read_config_byte (dev,PCI_HEADER_TYPE , &hdr_type))return -EIO ;@@ -822,6 +823,11 @@ int pci_setup_device(struct pci_dev *dev) dev->transparent = ((dev->class &0xff ) ==1 );pci_read_bases (dev,2 ,PCI_ROM_ADDRESS1 );set_pcie_hotplug_bridge (dev); + pos =pci_find_capability (dev,PCI_CAP_ID_SSVID ); +if (pos) { +pci_read_config_word (dev, pos +PCI_SSVID_VENDOR_ID , &dev->subsystem_vendor); +pci_read_config_word (dev, pos +PCI_SSVID_DEVICE_ID , &dev->subsystem_device); + }break ;case PCI_HEADER_TYPE_CARDBUS :/* CardBus bridge header */ include/linux/pci_regs.h +0
-0@@ -365,6 +365,11 @@#define PCI_X_STATUS_266MHZ 0x40000000/* 266 MHz capable */
include/linux/pci_regs.h line 375
Quoted 10 lines
include/linux/pci_regs.h +5
-0#define PCI_X_STATUS_533MHZ 0x80000000/* 533 MHz capable */ +/* PCI Bridge Subsystem ID registers */ + +#define PCI_SSVID_VENDOR_ID 4/* PCI-Bridge subsystem vendor id register */ +#define PCI_SSVID_DEVICE_ID 6/* PCI-Bridge subsystem device id register */ +/* PCI Express capability registers */ #define PCI_EXP_FLAGS 2/* Capabilities register */
What is the reason for making this change?
Jesse Barnes
AppliedQuoted 5 lines · On Tue, 6 Oct 2009 10:45:19 -0500 Gabe Black <[email protected]> wrote:
Change to populate the subsystem vendor and subsytem device IDs for PCI-PCI bridges that implement the PCI Subsystem Vendor ID capability. Previously bridges left subsystem vendor IDs unpopulated.
Signed-off-by Gabe Black <[email protected]>
Applied to my linux-next branch, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center