* [PATCH] Add PCI domain number check to find_smbios_instance_string
@ 2017-05-02 10:55 Sujith Pandel
2017-05-23 19:56 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Sujith Pandel @ 2017-05-02 10:55 UTC (permalink / raw)
To: linux-pci; +Cc: Shai, sujithpshankar, Narendra_K
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.
Reported-by: Shai Fultheim <Shai@ScaleMP.com>
Suggested-by: Shai Fultheim <Shai@ScaleMP.com>
Signed-off-by: Sujith Pandel <sujithpshankar@gmail.com>
Signed-off-by: Narendra K <Narendra_K@Dell.com>
Tested-by: Shai Fultheim <Shai@ScaleMP.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 5135737..1d828a6 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,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Add PCI domain number check to find_smbios_instance_string
2017-05-02 10:55 [PATCH] Add PCI domain number check to find_smbios_instance_string Sujith Pandel
@ 2017-05-23 19:56 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2017-05-23 19:56 UTC (permalink / raw)
To: Sujith Pandel; +Cc: linux-pci, Shai, Narendra_K
On Tue, May 02, 2017 at 06:55:40AM -0400, Sujith Pandel wrote:
> 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.
>
> Reported-by: Shai Fultheim <Shai@ScaleMP.com>
> Suggested-by: Shai Fultheim <Shai@ScaleMP.com>
> Signed-off-by: Sujith Pandel <sujithpshankar@gmail.com>
> Signed-off-by: Narendra K <Narendra_K@Dell.com>
> Tested-by: Shai Fultheim <Shai@ScaleMP.com>
Applied to pci/misc for v4.13, thanks!
> ---
> 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 5135737..1d828a6 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,
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-23 19:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-02 10:55 [PATCH] Add PCI domain number check to find_smbios_instance_string Sujith Pandel
2017-05-23 19:56 ` Bjorn Helgaas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.