From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Sujith Pandel , Narendra K , Bjorn Helgaas , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 057/293] PCI: Add domain number check to find_smbios_instance_string() Date: Mon, 9 Apr 2018 00:23:35 +0000 Message-ID: <20180409002239.163177-57-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Sujith Pandel [ 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 Suggested-by: Shai Fultheim Tested-by: Shai Fultheim Signed-off-by: Sujith Pandel Signed-off-by: Narendra K Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- 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 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; =20 + domain_nr =3D pci_domain_nr(pdev->bus); bus =3D pdev->bus->number; devfn =3D pdev->devfn; =20 @@ -53,8 +55,9 @@ static size_t find_smbios_instance_string(struct pci_dev = *pdev, char *buf, while ((dmi =3D dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD, NULL, dmi)) !=3D NULL) { donboard =3D dmi->device_data; - if (donboard && donboard->bus =3D=3D bus && - donboard->devfn =3D=3D devfn) { + if (donboard && donboard->segment =3D=3D domain_nr && + donboard->bus =3D=3D bus && + donboard->devfn =3D=3D devfn) { if (buf) { if (attribute =3D=3D SMBIOS_ATTR_INSTANCE_SHOW) return scnprintf(buf, PAGE_SIZE, --=20 2.15.1