[PATCH AUTOSEL for 3.18 025/101] PCI: Add domain number check to find_smbios_instance_string()

[Sasha Levin]

From: Sujith Pandel <sujithpshan...@gmail.com>

[ Upstream commit 6c51c82c60991bdbfb937f3bf0cdbe68d042073d ]

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 <s...@scalemp.com>
Suggested-by: Shai Fultheim <s...@scalemp.com>
Tested-by: Shai Fultheim <s...@scalemp.com>
Signed-off-by: Sujith Pandel <sujithpshan...@gmail.com>
Signed-off-by: Narendra K <narendr...@dell.com>
Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 drivers/pci/pci-label.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 2ab1b47c7651..2ded1394b51e 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -45,9 +45,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;
 
@@ -55,8 +57,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,
-- 
2.15.1