PCI/AER: Honor "pcie_ports=native" even if HEST sets FIRMWARE_FIRST

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
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.me@gmail.com>
[bhelgaas: return "false" from bool function (from kbuild robot)]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 47c67de1ccf15dd5eb8adb09e3b367dc2237872b..766687094706114d5d954ad8330003396b3e5f3f 100644 (file)
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -322,6 +322,9 @@ int pcie_aer_get_firmware_first(struct pci_dev *dev)
        if (!pci_is_pcie(dev))
                return 0;
 
+       if (pcie_ports_native)
+               return 0;
+
        if (!dev->__aer_firmware_first_valid)
                aer_set_firmware_first(dev);
        return dev->__aer_firmware_first;
@@ -342,6 +345,9 @@ bool aer_acpi_firmware_first(void)
                .firmware_first = 0,
        };
 
+       if (pcie_ports_native)
+               return false;
+
        if (!parsed) {
                apei_hest_parse(aer_hest_parse, &info);
                aer_firmware_first = info.firmware_first;