[PATCH] PCI/DPC: Honor "pcie_ports=native" when enabling DPC

[Guixin Liu <kanie@linux.alibaba.com>]

Commit 97ca178c899d ("PCI/DPC: Allow DPC on all Downstream Ports when
OS controls AER") replaced the AER service bit with host->native_aer
when deciding whether to create a DPC service device.  Unlike the AER
service bit, host->native_aer does not reflect the "pcie_ports=native"
command-line override.

Consequently, if firmware retains AER control, "pcie_ports=native" no
longer enables DPC on Root Ports that advertise both AER and DPC, even
though the option is documented to force native DPC handling.

Check pcie_ports_native explicitly so both command-line overrides
continue to work.

Fixes: 97ca178c899d ("PCI/DPC: Allow DPC on all Downstream Ports when OS controls AER")
Cc: stable@vger.kernel.org
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
 drivers/pci/pcie/portdrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/pcie/portdrv.c b/drivers/pci/pcie/portdrv.c
index a9cbfc1d2bc7..a05ee7980fb2 100644
--- a/drivers/pci/pcie/portdrv.c
+++ b/drivers/pci/pcie/portdrv.c
@@ -264,7 +264,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	 */
 	if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
 	    pci_aer_available() &&
-	    (pcie_ports_dpc_native || host->native_aer))
+	    (pcie_ports_native || pcie_ports_dpc_native || host->native_aer))
 		services |= PCIE_PORT_SERVICE_DPC;
 
 	/* Enable bandwidth control if more than one speed is supported. */
-- 
2.43.7