summaryrefslogtreecommitdiff
path: root/drivers/pci/pci-label.c
diff options
context:
space:
mode:
authorSujith Pandel <sujithpshankar@gmail.com>2017-05-02 13:55:40 +0300
committerBjorn Helgaas <bhelgaas@google.com>2017-06-13 19:44:23 +0300
commit6c51c82c60991bdbfb937f3bf0cdbe68d042073d (patch)
tree346437b150663647f4708e400a5c5b4daf7953a4 /drivers/pci/pci-label.c
parent2b2154f9391f3ca03b4f5ba599b2ee7a3a80f781 (diff)
downloadlinux-6c51c82c60991bdbfb937f3bf0cdbe68d042073d.tar.xz
PCI: Add 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() check PCI domain number as well. Reported-by: Shai Fultheim <Shai@ScaleMP.com> Suggested-by: Shai Fultheim <Shai@ScaleMP.com> Tested-by: Shai Fultheim <Shai@ScaleMP.com> Signed-off-by: Sujith Pandel <sujithpshankar@gmail.com> Signed-off-by: Narendra K <Narendra_K@Dell.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci-label.c')
-rw-r--r--drivers/pci/pci-label.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 51357377efbc..1d828a614ac0 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -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,