Add PCI domain number check to find_smbios_instance_string
PATCH 1/1 Add PCI domain number check to find_smbios_instance_string
The function 'find_smbios_instance_string' does not consider the PCI domain number. As a result, SMBIOS type 41 device type instance would be exported to sysfs for all the PCI domains which have a PCI device with same bus/device/function, though PCI bus/device/func from a specific PCI domain has SMBIOS type 41 device type instance defined.
Address the issue by making 'find_smbios_instance_string' function check PCI domain number as well.
--- drivers/pci/pci-label.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/pci-label.c +5 -2
@@ -43,9 +43,11 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf, {const struct dmi_device *dmi;struct dmi_dev_onboard *donboard; +int domain_nr;int bus;int devfn; + domain_nr =pci_domain_nr (pdev->bus); bus = pdev->bus->number; devfn = pdev->devfn;
@@ -53,8 +55,9 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf,while ((dmi =dmi_find_device (DMI_DEV_TYPE_DEV_ONBOARD ,NULL , dmi)) !=NULL ) { donboard = dmi->device_data; -if (donboard && donboard->bus == bus && - donboard->devfn == devfn) { +if (donboard && donboard->segment == domain_nr && + donboard->bus == bus && + donboard->devfn == devfn) {if (buf) {if (attribute ==SMBIOS_ATTR_INSTANCE_SHOW ) return scnprintf(buf, PAGE_SIZE,
Signature · 1 line
1.8.3.1
Bjorn Helgaas
AppliedQuoted 9 lines · Sujith Pandel
The function '
find_smbios_instance_string' does not consider the PCI domain number. As a result, SMBIOS type 41 device type instance would be exported to sysfs for all the PCI domains which have a PCI device with same bus/device/function, though PCI bus/device/func from a specific PCI domain has SMBIOS type 41 device type instance defined.
Address the issue by making 'find_smbios_instance_string' function check PCI domain number as well.
Quoted 5 lines
Reported-by Shai Fultheim <[email protected]>Suggested-by Shai Fultheim <[email protected]>Signed-off-by Sujith Pandel <[email protected]>Signed-off-by Narendra K <[email protected]>Tested-by Shai Fultheim <[email protected]>
Applied to pci/misc for v4.13, thanks!
Quoted 35 lines
--- drivers/pci/pci-label.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/pci/pci-label.c +5
-2@@ -43,9 +43,11 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf, {const struct dmi_device *dmi;struct dmi_dev_onboard *donboard; +int domain_nr;int bus;int devfn; + domain_nr =pci_domain_nr (pdev->bus); bus = pdev->bus->number; devfn = pdev->devfn;@@ -53,8 +55,9 @@ static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf,while ((dmi =dmi_find_device (DMI_DEV_TYPE_DEV_ONBOARD ,NULL , dmi)) !=NULL ) { donboard = dmi->device_data; -if (donboard && donboard->bus == bus && - donboard->devfn == devfn) { +if (donboard && donboard->segment == domain_nr && + donboard->bus == bus && + donboard->devfn == devfn) {if (buf) {if (attribute ==SMBIOS_ATTR_INSTANCE_SHOW ) return scnprintf(buf, PAGE_SIZE,Signature · 1 line
1.8.3.1