According to the documentation, "pcie_ports=native", linux should use
native AER and DPC services. While that is true for the _OSC method
parsing, this is not the only place that is checked. Should the HEST
table list PCIe ports as firmware-first, linux will not use native
services.

This happens because aer_acpi_firmware_first() doesn't take
'pcie_ports' into account. This is wrong. DPC uses the same logic when
it decides whether to load or not, so fixing this also fixes DPC not
loading.

Signed-off-by: Alexandru Gagniuc <mr.nuke...@gmail.com>
---
 drivers/pci/pcie/aer/aerdrv_acpi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c 
b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 08c87de13cb8..4b491851a781 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -101,7 +101,7 @@ static void aer_set_firmware_first(struct pci_dev *pci_dev)
 
        rc = apei_hest_parse(aer_hest_parse, &info);
 
-       if (rc)
+       if (rc || pcie_ports_native)
                pci_dev->__aer_firmware_first = 0;
        else
                pci_dev->__aer_firmware_first = info.firmware_first;
@@ -135,6 +135,8 @@ bool aer_acpi_firmware_first(void)
                apei_hest_parse(aer_hest_parse, &info);
                aer_firmware_first = info.firmware_first;
                parsed = true;
+               if (pcie_ports_native)
+                       aer_firmware_first = 0;
        }
        return aer_firmware_first;
 }
-- 
2.14.3

Reply via email to