PCI/AER: Extract bus/dev/fn in aer_print_port_info() with PCI_BUS_NUM(), etc
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 22 May 2025 23:21:11 +0000 (18:21 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 23 May 2025 16:00:27 +0000 (11:00 -0500)
Use PCI_BUS_NUM(), PCI_SLOT(), PCI_FUNC() to extract the bus number,
device, and function number directly from the Error Source ID.  There's no
need to shift and mask it explicitly.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://patch.msgid.link/20250522232339.1525671-6-helgaas@kernel.org
drivers/pci/pcie/aer.c

index fe6d323306a0df2030df923e152e2d1da7f458b4..18005615d37629b02bf7104fda04d61596ec68bc 100644 (file)
@@ -736,14 +736,14 @@ out:
 static void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info,
                                bool found)
 {
-       u8 bus = info->id >> 8;
-       u8 devfn = info->id & 0xff;
+       u16 source = info->id;
 
        pci_info(dev, "%s%s error message received from %04x:%02x:%02x.%d%s\n",
                 info->multi_error_valid ? "Multiple " : "",
                 aer_error_severity_string[info->severity],
-                pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn),
-                PCI_FUNC(devfn), found ? "" : " (no details found");
+                pci_domain_nr(dev->bus), PCI_BUS_NUM(source),
+                PCI_SLOT(source), PCI_FUNC(source),
+                found ? "" : " (no details found");
 }
 
 #ifdef CONFIG_ACPI_APEI_PCIEAER