Skip to contentSkip to conversation

Simplify PCIe native ownership detection logic

PATCH Superseded [email protected] 2 participants 7 messages Jun 26, 2020 – Jul 11, 2020

Subsystems (3)

v6 of 13 Superseded Latest is v13 →

lore
Share & tools
lore
#0 lore raw

v6 cover Simplify PCIe native ownership detection logic

From: Kuppuswamy Sathyanarayanan <[email protected]>

Currently, PCIe capabilities ownership status is detected by verifying the status of pcie_ports_native, pcie_ports_dpc_native and _OSC negotiated results (cached in struct pci_host_bridge ->native_* members). But this logic can be simplified, and we can use only struct pci_host_bridge ->native_* members to detect it.

This patchset removes the distributed checks for pcie_ports_native, pcie_ports_dpc_native parameters.

Changes since v5:
* Rebased on top of v5.8-rc1

Changes since v4:
* Changed the patch set title (Original link: https://lkml.org/lkml/2020/5/26/1710)
* Added AER/DPC dependency logic cleanup fixes.

Kuppuswamy Sathyanarayanan (4):
ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set. ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native
is set.
PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable
logic
PCI/DPC: Move AER/DPC dependency checks out of DPC driver

 drivers/acpi/pci_root.c           | 28 ++++++++++++++++------------
 drivers/pci/hotplug/pciehp_core.c |  2 +-
 drivers/pci/pci-acpi.c            |  3 ---
 drivers/pci/pcie/aer.c            |  2 +-
 drivers/pci/pcie/dpc.c            |  4 +---
 drivers/pci/pcie/portdrv.h        |  2 --
 drivers/pci/pcie/portdrv_core.c   | 13 +++++--------
 drivers/pci/probe.c               |  5 +++--
 include/linux/pci.h               |  2 ++
 9 files changed, 29 insertions(+), 32 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v6 1/4 ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.

From: Kuppuswamy Sathyanarayanan <[email protected]>

pcie_ports_native is set only if user requests native handling of PCIe capabilities via pcie_port_setup command line option. User input takes precedence over _OSC based control negotiation result. So consider the _OSC negotiated result only if pcie_ports_native is unset.

Also, since struct pci_host_bridge ->native_* members caches the ownership status of various PCIe capabilities, use them instead of distributed checks for pcie_ports_native.

---
 drivers/acpi/pci_root.c           | 26 ++++++++++++++------------
 drivers/pci/hotplug/pciehp_core.c |  2 +-
 drivers/pci/pci-acpi.c            |  3 ---
 drivers/pci/pcie/aer.c            |  2 +-
 drivers/pci/pcie/portdrv_core.c   |  9 +++------
 drivers/pci/probe.c               |  5 +++--
 6 files changed, 22 insertions(+), 25 deletions(-)
drivers/acpi/pci_root.c +14 -12
index f90e841c59f5..02fab8b0118e 100644
@@ -914,18 +914,20 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
 		goto out_release_info;
 
 	host_bridge = to_pci_host_bridge(bus->bridge);
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
-		host_bridge->native_pcie_hotplug = 0;
-	if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
-		host_bridge->native_shpc_hotplug = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
-		host_bridge->native_aer = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
-		host_bridge->native_pme = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
-		host_bridge->native_ltr = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
-		host_bridge->native_dpc = 0;
+	if (!pcie_ports_native) {
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
+			host_bridge->native_pcie_hotplug = 0;
+		if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
+			host_bridge->native_shpc_hotplug = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
+			host_bridge->native_aer = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
+			host_bridge->native_pme = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
+			host_bridge->native_ltr = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
+			host_bridge->native_dpc = 0;
+	}
 
 	/*
 	 * Evaluate the "PCI Boot Configuration" _DSM Function.  If it
drivers/pci/hotplug/pciehp_core.c +1 -1
index bf779f291f15..5fc999bf6f1b 100644
@@ -255,7 +255,7 @@ static bool pme_is_native(struct pcie_device *dev)
 	const struct pci_host_bridge *host;
 
 	host = pci_find_host_bridge(dev->port->bus);
-	return pcie_ports_native || host->native_pme;
+	return host->native_pme;
 }
 
 static void pciehp_disable_interrupt(struct pcie_device *dev)
drivers/pci/pci-acpi.c +0 -3
index 7224b1e5f2a8..e09589571a9d 100644
@@ -800,9 +800,6 @@ bool pciehp_is_native(struct pci_dev *bridge)
 	if (!(slot_cap & PCI_EXP_SLTCAP_HPC))
 		return false;
 
-	if (pcie_ports_native)
-		return true;
-
 	host = pci_find_host_bridge(bridge->bus);
 	return host->native_pcie_hotplug;
 }
drivers/pci/pcie/aer.c +1 -1
index 3acf56683915..d663bd9c7257 100644
@@ -219,7 +219,7 @@ int pcie_aer_is_native(struct pci_dev *dev)
 	if (!dev->aer_cap)
 		return 0;
 
-	return pcie_ports_native || host->native_aer;
+	return host->native_aer;
 }
 
 int pci_enable_pcie_error_reporting(struct pci_dev *dev)
drivers/pci/pcie/portdrv_core.c +3 -6
index 50a9522ab07d..ccd5e0ce5605 100644
@@ -208,8 +208,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
 	int services = 0;
 
-	if (dev->is_hotplug_bridge &&
-	    (pcie_ports_native || host->native_pcie_hotplug)) {
+	if (dev->is_hotplug_bridge && host->native_pcie_hotplug) {
 		services |= PCIE_PORT_SERVICE_HP;
 
 		/*
@@ -221,8 +220,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	}
 
 #ifdef CONFIG_PCIEAER
-	if (dev->aer_cap && pci_aer_available() &&
-	    (pcie_ports_native || host->native_aer)) {
+	if (dev->aer_cap && pci_aer_available() && host->native_aer) {
 		services |= PCIE_PORT_SERVICE_AER;
 
 		/*
@@ -238,8 +236,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	 * Event Collectors can also generate PMEs, but we don't handle
 	 * those yet.
 	 */
-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&
-	    (pcie_ports_native || host->native_pme)) {
+	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && host->native_pme) {
 		services |= PCIE_PORT_SERVICE_PME;
 
 		/*
drivers/pci/probe.c +3 -2
index 2f66988cea25..5fb90bb9b4e3 100644
@@ -588,13 +588,14 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge)
 	 * may implement its own AER handling and use _OSC to prevent the
 	 * OS from interfering.
 	 */
+#ifdef CONFIG_PCIEPORTBUS
 	bridge->native_aer = 1;
 	bridge->native_pcie_hotplug = 1;
-	bridge->native_shpc_hotplug = 1;
 	bridge->native_pme = 1;
 	bridge->native_ltr = 1;
 	bridge->native_dpc = 1;
-
+#endif
+	bridge->native_shpc_hotplug = 1;
 	device_initialize(&bridge->dev);
 }
 
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH v6 1/4] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.

Quoted 46 lines · On Fri, Jun 26, 2020 at 11:32:33AM -0700…

From: Kuppuswamy Sathyanarayanan <[email protected]>

pcie_ports_native is set only if user requests native handling of PCIe capabilities via pcie_port_setup command line option. User input takes precedence over _OSC based control negotiation result. So consider the _OSC negotiated result only if pcie_ports_native is unset.

Also, since struct pci_host_bridge ->native_* members caches the ownership status of various PCIe capabilities, use them instead of distributed checks for pcie_ports_native.

---
 drivers/acpi/pci_root.c           | 26 ++++++++++++++------------
 drivers/pci/hotplug/pciehp_core.c |  2 +-
 drivers/pci/pci-acpi.c            |  3 ---
 drivers/pci/pcie/aer.c            |  2 +-
 drivers/pci/pcie/portdrv_core.c   |  9 +++------
 drivers/pci/probe.c               |  5 +++--
 6 files changed, 22 insertions(+), 25 deletions(-)
drivers/acpi/pci_root.c +4 -12
index f90e841c59f5..02fab8b0118e 100644
@@ -914,18 +914,20 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
 		goto out_release_info;
 
 	host_bridge = to_pci_host_bridge(bus->bridge);
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
-		host_bridge->native_pcie_hotplug = 0;
-	if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
-		host_bridge->native_shpc_hotplug = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
-		host_bridge->native_aer = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
-		host_bridge->native_pme = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
-		host_bridge->native_ltr = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
-		host_bridge->native_dpc = 0;
+	if (!pcie_ports_native) {
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
+			host_bridge->native_pcie_hotplug = 0;
+		if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))

drivers/acpi/pci_root.c struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, · line 930

Quoted 10 lines
drivers/acpi/pci_root.c +10 -0
+			host_bridge->native_shpc_hotplug = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
+			host_bridge->native_aer = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
+			host_bridge->native_pme = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
+			host_bridge->native_ltr = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
+			host_bridge->native_dpc = 0;
+	}

When the user boots with "pcie_ports=native", should we evaluate _OSC at all? It seems confusing to say "OK, Mr. Firmware, here are the features we want to use", and then turn around and use them all regardless of what the platform said. Why not just ignore the firmware completely and go ahead and use everything?

I can't remember if there's a reason we need to call negotiate_os_control() so early and then hang on to the results until we get here:

  acpi_pci_root_add
    negotiate_os_control                      <--- eval _OSC
    pci_acpi_scan_root
      acpi_pci_root_create
        pci_create_root_bus
        if (!(root->osc_control_set & ...))   <--- use results
          host_bridge->native_... = 0;

I think it would be a lot simpler if we could do the _OSC negotiation right here where we need most of the results. It would be even better if we could update the host_bridge->native_... items directly inside negotiate_os_control() so we wouldn't have to hang onto the osc_control_set mask.

Quoted 67 lines
drivers/acpi/pci_root.c +0 -0
 	/*
 	 * Evaluate the "PCI Boot Configuration" _DSM Function.  If it
drivers/pci/hotplug/pciehp_core.c +1 -1
index bf779f291f15..5fc999bf6f1b 100644
@@ -255,7 +255,7 @@ static bool pme_is_native(struct pcie_device *dev)
 	const struct pci_host_bridge *host;
 
 	host = pci_find_host_bridge(dev->port->bus);
-	return pcie_ports_native || host->native_pme;
+	return host->native_pme;
 }
 
 static void pciehp_disable_interrupt(struct pcie_device *dev)
drivers/pci/pci-acpi.c +0 -3
index 7224b1e5f2a8..e09589571a9d 100644
@@ -800,9 +800,6 @@ bool pciehp_is_native(struct pci_dev *bridge)
 	if (!(slot_cap & PCI_EXP_SLTCAP_HPC))
 		return false;
 
-	if (pcie_ports_native)
-		return true;
-
 	host = pci_find_host_bridge(bridge->bus);
 	return host->native_pcie_hotplug;
 }
drivers/pci/pcie/aer.c +1 -1
index 3acf56683915..d663bd9c7257 100644
@@ -219,7 +219,7 @@ int pcie_aer_is_native(struct pci_dev *dev)
 	if (!dev->aer_cap)
 		return 0;
 
-	return pcie_ports_native || host->native_aer;
+	return host->native_aer;
 }
 
 int pci_enable_pcie_error_reporting(struct pci_dev *dev)
drivers/pci/pcie/portdrv_core.c +2 -4
index 50a9522ab07d..ccd5e0ce5605 100644
@@ -208,8 +208,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
 	int services = 0;
 
-	if (dev->is_hotplug_bridge &&
-	    (pcie_ports_native || host->native_pcie_hotplug)) {
+	if (dev->is_hotplug_bridge && host->native_pcie_hotplug) {
 		services |= PCIE_PORT_SERVICE_HP;
 
 		/*
@@ -221,8 +220,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	}
 
 #ifdef CONFIG_PCIEAER
-	if (dev->aer_cap && pci_aer_available() &&
-	    (pcie_ports_native || host->native_aer)) {
+	if (dev->aer_cap && pci_aer_available() && host->native_aer) {
 		services |= PCIE_PORT_SERVICE_AER;
 
 		/*

drivers/pci/pcie/portdrv_core.c static int get_port_device_capability(struct pci_dev *dev) · line 240

Quoted 7 lines
drivers/pci/pcie/portdrv_core.c +1 -2
@@ -238,8 +236,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	 * Event Collectors can also generate PMEs, but we don't handle
 	 * those yet.
 	 */
-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&
-	    (pcie_ports_native || host->native_pme)) {
+	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && host->native_pme) {
 		services |= PCIE_PORT_SERVICE_PME;

I *love* that you removed pcie_ports_native from all these places.

Quoted 9 lines
drivers/pci/pcie/portdrv_core.c +0 -0
 		/*
drivers/pci/probe.c +0 -0
index 2f66988cea25..5fb90bb9b4e3 100644
@@ -588,13 +588,14 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge)
 	 * may implement its own AER handling and use _OSC to prevent the
 	 * OS from interfering.
 	 */

drivers/pci/probe.c static void pci_init_host_bridge(struct pci_host_bridge *bridge) · line 598

Quoted 10 lines
drivers/pci/probe.c +3 -2
+#ifdef CONFIG_PCIEPORTBUS
 	bridge->native_aer = 1;
 	bridge->native_pcie_hotplug = 1;
-	bridge->native_shpc_hotplug = 1;
 	bridge->native_pme = 1;
 	bridge->native_ltr = 1;
 	bridge->native_dpc = 1;
-
+#endif
+	bridge->native_shpc_hotplug = 1;

This looks like a bugfix that should be its own patch.

Quoted 6 lines
drivers/pci/probe.c +0 -0
 	device_initialize(&bridge->dev);
 }
 
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH v6 1/4] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.

Hi Bjorn,

Quoted 52 lines · Bjorn Helgaas
Quoted 51 lines · On Fri, Jun 26, 2020 at 11:32:33AM -0700…

From: Kuppuswamy Sathyanarayanan <[email protected]>

pcie_ports_native is set only if user requests native handling of PCIe capabilities via pcie_port_setup command line option. User input takes precedence over _OSC based control negotiation result. So consider the _OSC negotiated result only if pcie_ports_native is unset.

Also, since struct pci_host_bridge ->native_* members caches the ownership status of various PCIe capabilities, use them instead of distributed checks for pcie_ports_native.

---
  drivers/acpi/pci_root.c           | 26 ++++++++++++++------------
  drivers/pci/hotplug/pciehp_core.c |  2 +-
  drivers/pci/pci-acpi.c            |  3 ---
  drivers/pci/pcie/aer.c            |  2 +-
  drivers/pci/pcie/portdrv_core.c   |  9 +++------
  drivers/pci/probe.c               |  5 +++--
  6 files changed, 22 insertions(+), 25 deletions(-)
drivers/acpi/pci_root.c +9 -12
index f90e841c59f5..02fab8b0118e 100644
@@ -914,18 +914,20 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
  		goto out_release_info;
 
  	host_bridge = to_pci_host_bridge(bus->bridge);
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
-		host_bridge->native_pcie_hotplug = 0;
-	if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
-		host_bridge->native_shpc_hotplug = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
-		host_bridge->native_aer = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
-		host_bridge->native_pme = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
-		host_bridge->native_ltr = 0;
-	if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
-		host_bridge->native_dpc = 0;
+	if (!pcie_ports_native) {
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
+			host_bridge->native_pcie_hotplug = 0;
+		if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
+			host_bridge->native_shpc_hotplug = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
+			host_bridge->native_aer = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
+			host_bridge->native_pme = 0;
Quoted 8 lines

drivers/acpi/pci_root.c struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, · line 930

Quoted 5 lines
drivers/acpi/pci_root.c +5 -0
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
+			host_bridge->native_ltr = 0;
+		if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
+			host_bridge->native_dpc = 0;
+	}

When the user boots with "pcie_ports=native", should we evaluate _OSC at all?

Since pcie_ports="native" does not override OSC_PCI_SHPC_NATIVE_HP_CONTROL, I think we should still evaluate _OSC. Also firmware might still wants to know about supported features during
_OSC call.

It seems confusing to say "OK, Mr. Firmware, here are the

Quoted 3 lines

features we want to use", and then turn around and use them all regardless of what the platform said. Why not just ignore the firmware completely and go ahead and use everything?|

AFAIK, for PCIe features, It should functionally make no difference (evaluating _OSC vs not). But, IMO, its useful if we print some warnings if firmware denies some of the PCIe feature control.

Quoted 13 lines

I can't remember if there's a reason we need to call negotiate_os_control() so early and then hang on to the results until we get here:

   acpi_pci_root_add
     negotiate_os_control                      <--- eval _OSC
     pci_acpi_scan_root
       acpi_pci_root_create
         pci_create_root_bus
         if (!(root->osc_control_set & ...))   <--- use results
           host_bridge->native_... = 0;
Quoted 5 lines

I think it would be a lot simpler if we could do the _OSC negotiation right here where we need most of the results. It would be even better if we could update the host_bridge->native_... items directly inside negotiate_os_control() so we wouldn't have to hang onto the osc_control_set mask.

Makes sense. I also don't see any one use _OSC negotiated results until pci_create_root_bus(). But I think this should be a seperate patch.

Quoted 91 lines
Quoted 68 lines
drivers/acpi/pci_root.c +0 -0
  	/*
  	 * Evaluate the "PCI Boot Configuration" _DSM Function.  If it
drivers/pci/hotplug/pciehp_core.c +1 -1
index bf779f291f15..5fc999bf6f1b 100644
@@ -255,7 +255,7 @@ static bool pme_is_native(struct pcie_device *dev)
  	const struct pci_host_bridge *host;
 
  	host = pci_find_host_bridge(dev->port->bus);
-	return pcie_ports_native || host->native_pme;
+	return host->native_pme;
  }
 
  static void pciehp_disable_interrupt(struct pcie_device *dev)
drivers/pci/pci-acpi.c +0 -3
index 7224b1e5f2a8..e09589571a9d 100644
@@ -800,9 +800,6 @@ bool pciehp_is_native(struct pci_dev *bridge)
  	if (!(slot_cap & PCI_EXP_SLTCAP_HPC))
  		return false;
 
-	if (pcie_ports_native)
-		return true;
-
  	host = pci_find_host_bridge(bridge->bus);
  	return host->native_pcie_hotplug;
  }
drivers/pci/pcie/aer.c +1 -1
index 3acf56683915..d663bd9c7257 100644
@@ -219,7 +219,7 @@ int pcie_aer_is_native(struct pci_dev *dev)
  	if (!dev->aer_cap)
  		return 0;
 
-	return pcie_ports_native || host->native_aer;
+	return host->native_aer;
  }
 
  int pci_enable_pcie_error_reporting(struct pci_dev *dev)
drivers/pci/pcie/portdrv_core.c +2 -4
index 50a9522ab07d..ccd5e0ce5605 100644
@@ -208,8 +208,7 @@ static int get_port_device_capability(struct pci_dev *dev)
  	struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
  	int services = 0;
 
-	if (dev->is_hotplug_bridge &&
-	    (pcie_ports_native || host->native_pcie_hotplug)) {
+	if (dev->is_hotplug_bridge && host->native_pcie_hotplug) {
  		services |= PCIE_PORT_SERVICE_HP;
 
  		/*
@@ -221,8 +220,7 @@ static int get_port_device_capability(struct pci_dev *dev)
  	}
 
  #ifdef CONFIG_PCIEAER
-	if (dev->aer_cap && pci_aer_available() &&
-	    (pcie_ports_native || host->native_aer)) {
+	if (dev->aer_cap && pci_aer_available() && host->native_aer) {
  		services |= PCIE_PORT_SERVICE_AER;
 
  		/*

drivers/pci/pcie/portdrv_core.c static int get_port_device_capability(struct pci_dev *dev) · line 240

Quoted 7 lines
drivers/pci/pcie/portdrv_core.c +1 -2
@@ -238,8 +236,7 @@ static int get_port_device_capability(struct pci_dev *dev)
  	 * Event Collectors can also generate PMEs, but we don't handle
  	 * those yet.
  	 */
-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&
-	    (pcie_ports_native || host->native_pme)) {
+	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && host->native_pme) {
  		services |= PCIE_PORT_SERVICE_PME;

I *love* that you removed pcie_ports_native from all these places.

Quoted 13 lines
drivers/pci/pcie/portdrv_core.c +0 -0
  		/*
drivers/pci/probe.c +1 -1
index 2f66988cea25..5fb90bb9b4e3 100644
@@ -588,13 +588,14 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge)
  	 * may implement its own AER handling and use _OSC to prevent the
  	 * OS from interfering.
  	 */
+#ifdef CONFIG_PCIEPORTBUS
  	bridge->native_aer = 1;
  	bridge->native_pcie_hotplug = 1;
-	bridge->native_shpc_hotplug = 1;
Quoted 8 lines

drivers/pci/probe.c static void pci_init_host_bridge(struct pci_host_bridge *bridge) · line 598

Quoted 6 lines
drivers/pci/probe.c +2 -1
  	bridge->native_pme = 1;
  	bridge->native_ltr = 1;
  	bridge->native_dpc = 1;
-
+#endif
+	bridge->native_shpc_hotplug = 1;

This looks like a bugfix that should be its own patch.

Agreed. I will split it in next version.

Quoted 7 lines
Quoted 7 lines
drivers/pci/probe.c +0 -0
  	device_initialize(&bridge->dev);
  }
 
Signature · 1 line
2.17.1
Signature · 2 lines
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
#4 lore raw

PATCH v6 2/4 ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native is set.

In reply to [email protected]

From: Kuppuswamy Sathyanarayanan <[email protected]>

pcie_ports_dpc_native is set only if user requests native handling of PCIe DPC capability via pcie_port_setup command line option. User input takes precedence over _OSC based control negotiation result. So consider the _OSC negotiated result for DPC ownership only if pcie_ports_dpc_native is unset.

---
 drivers/acpi/pci_root.c         | 2 ++
 drivers/pci/pcie/dpc.c          | 3 ++-
 drivers/pci/pcie/portdrv.h      | 2 --
 drivers/pci/pcie/portdrv_core.c | 2 +-
 include/linux/pci.h             | 2 ++
 5 files changed, 7 insertions(+), 4 deletions(-)
drivers/acpi/pci_root.c +2 -0
index 02fab8b0118e..93a26a35aad1 100644
@@ -925,6 +925,8 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
 			host_bridge->native_pme = 0;
 		if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
 			host_bridge->native_ltr = 0;
+	}
+	if (!pcie_ports_native && !pcie_ports_dpc_native) {
 		if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
 			host_bridge->native_dpc = 0;
 	}
drivers/pci/pcie/dpc.c +2 -1
index daa9a4153776..5b1025a2994d 100644
@@ -280,11 +280,12 @@ void pci_dpc_init(struct pci_dev *pdev)
 static int dpc_probe(struct pcie_device *dev)
 {
 	struct pci_dev *pdev = dev->port;
+	struct pci_host_bridge *host = pci_find_host_bridge(pdev->bus);
 	struct device *device = &dev->device;
 	int status;
 	u16 ctl, cap;
 
-	if (!pcie_aer_is_native(pdev) && !pcie_ports_dpc_native)
+	if (!pcie_aer_is_native(pdev) && !host->native_dpc)
 		return -ENOTSUPP;
 
 	status = devm_request_threaded_irq(device, dev->irq, dpc_irq,
drivers/pci/pcie/portdrv.h +0 -2
index af7cf237432a..0ac20feef24e 100644
@@ -25,8 +25,6 @@
 
 #define PCIE_PORT_DEVICE_MAXSERVICES   5
 
-extern bool pcie_ports_dpc_native;
-
 #ifdef CONFIG_PCIEAER
 int pcie_aer_init(void);
 int pcie_aer_is_native(struct pci_dev *dev);
drivers/pci/pcie/portdrv_core.c +1 -1
index ccd5e0ce5605..2c0278f0fdcc 100644
@@ -253,7 +253,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 || (services & PCIE_PORT_SERVICE_AER)))
+	    (host->native_dpc || (services & PCIE_PORT_SERVICE_AER)))
 		services |= PCIE_PORT_SERVICE_DPC;
 
 	if (pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM ||
include/linux/pci.h +2 -0
index c79d83304e52..7513b1078cb1 100644
@@ -1556,9 +1556,11 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d,
 #ifdef CONFIG_PCIEPORTBUS
 extern bool pcie_ports_disabled;
 extern bool pcie_ports_native;
+extern bool pcie_ports_dpc_native;
 #else
 #define pcie_ports_disabled	true
 #define pcie_ports_native	false
+#define pcie_ports_dpc_native	false
 #endif
 
 #define PCIE_LINK_STATE_L0S		BIT(0)
Signature · 1 line
2.17.1
#5 lore raw

PATCH v6 3/4 PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable logic

In reply to [email protected]

From: Kuppuswamy Sathyanarayanan <[email protected]>

In DPC service enable logic, check for
services & PCIE_PORT_SERVICE_AER implies pci_aer_available() is true. So there is no need to explicitly check it again.

Also, passing pcie_ports=dpc-native in kernel command line implies DPC needs to be enabled in native mode irrespective of AER ownership status. So checking for pci_aer_available() without checking for pcie_ports status is incorrect.

---
 drivers/pci/pcie/portdrv_core.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pci/pcie/portdrv_core.c +0 -1
index 2c0278f0fdcc..e257a2ca3595 100644
@@ -252,7 +252,6 @@ static int get_port_device_capability(struct pci_dev *dev)
 	 * permission to use AER.
 	 */
 	if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
-	    pci_aer_available() &&
 	    (host->native_dpc || (services & PCIE_PORT_SERVICE_AER)))
 		services |= PCIE_PORT_SERVICE_DPC;
 
Signature · 1 line
2.17.1
#6 lore raw

PATCH v6 4/4 PCI/DPC: Move AER/DPC dependency checks out of DPC driver

In reply to [email protected]

From: Kuppuswamy Sathyanarayanan <[email protected]>

Currently, AER and DPC Capabilities dependency checks is distributed between DPC and portdrv service drivers. So move them out of DPC driver.

Also, since services & PCIE_PORT_SERVICE_AER check already ensures AER native ownership, no need to add additional pcie_aer_is_native() check.

---
 drivers/pci/pcie/dpc.c          | 3 ---
 drivers/pci/pcie/portdrv_core.c | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/pci/pcie/dpc.c +0 -3
index 5b1025a2994d..3efbe43764f3 100644
@@ -285,9 +285,6 @@ static int dpc_probe(struct pcie_device *dev)
 	int status;
 	u16 ctl, cap;
 
-	if (!pcie_aer_is_native(pdev) && !host->native_dpc)
-		return -ENOTSUPP;
-
 	status = devm_request_threaded_irq(device, dev->irq, dpc_irq,
 					   dpc_handler, IRQF_SHARED,
 					   "pcie-dpc", pdev);
drivers/pci/pcie/portdrv_core.c +1 -0
index e257a2ca3595..ffa1d9fc458e 100644
@@ -252,6 +252,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 	 * permission to use AER.
 	 */
 	if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
+	    host->native_dpc &&
 	    (host->native_dpc || (services & PCIE_PORT_SERVICE_AER)))
 		services |= PCIE_PORT_SERVICE_DPC;
 
Signature · 1 line
2.17.1