]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI: Replace cxl_error_is_native() with pcie_aer_is_native()
authorTerry Bowman <terry.bowman@amd.com>
Wed, 14 Jan 2026 18:20:27 +0000 (12:20 -0600)
committerDave Jiang <dave.jiang@intel.com>
Thu, 22 Jan 2026 21:57:42 +0000 (14:57 -0700)
The AER driver includes a CXL support function cxl_error_is_native(). This
function adds no additional value from pcie_aer_is_native().

Simplify the codebase by removing cxl_error_is_native() and replace
occurrences of cxl_error_is_native() with pcie_aer_is_native().

Signed-off-by: Terry Bowman <terry.bowman@amd.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20260114182055.46029-7-terry.bowman@amd.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
drivers/pci/pcie/aer.c

index e0bcaa896803c91e7451e57fed06a725c90c6114..c99ba2a1159c6a11fd0dedc6c764522b53c69db5 100644 (file)
@@ -1166,13 +1166,6 @@ static bool is_cxl_mem_dev(struct pci_dev *dev)
        return true;
 }
 
-static bool cxl_error_is_native(struct pci_dev *dev)
-{
-       struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
-
-       return (pcie_ports_native || host->native_aer);
-}
-
 static bool is_internal_error(struct aer_err_info *info)
 {
        if (info->severity == AER_CORRECTABLE)
@@ -1186,7 +1179,7 @@ static int cxl_rch_handle_error_iter(struct pci_dev *dev, void *data)
        struct aer_err_info *info = (struct aer_err_info *)data;
        const struct pci_error_handlers *err_handler;
 
-       if (!is_cxl_mem_dev(dev) || !cxl_error_is_native(dev))
+       if (!is_cxl_mem_dev(dev) || !pcie_aer_is_native(dev))
                return 0;
 
        /* Protect dev->driver */
@@ -1227,7 +1220,7 @@ static int handles_cxl_error_iter(struct pci_dev *dev, void *data)
        bool *handles_cxl = data;
 
        if (!*handles_cxl)
-               *handles_cxl = is_cxl_mem_dev(dev) && cxl_error_is_native(dev);
+               *handles_cxl = is_cxl_mem_dev(dev) && pcie_aer_is_native(dev);
 
        /* Non-zero terminates iteration */
        return *handles_cxl;