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 v10:
* Addressed format issue reported by lkp test.
Changes since v9:
* Rebased on top of v5.10-rc1
Changes since v8:
* Simplified setting _OSC ownwership logic
* Moved bridge->native_ltr out of #ifdef CONFIG_PCIEPORTBUS.
Changes since v7:
* Fixed "fix array_size.cocci warnings".
Changes since v6:
* Created new patch for CONFIG_PCIEPORTBUS check in
pci_init_host_bridge().
* Added warning message for a case when pcie_ports_native
overrides _OSC negotiation result.
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 (5):
PCI: Conditionally initialize host bridge native_* members
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 | 39 +++++++++++++++++++++++--------
drivers/pci/hotplug/pciehp_core.c | 2 +-
drivers/pci/pci-acpi.c | 3 ---
drivers/pci/pcie/aer.c | 2 +-
drivers/pci/pcie/dpc.c | 3 ---
drivers/pci/pcie/portdrv.h | 2 --
drivers/pci/pcie/portdrv_core.c | 13 ++++-------
drivers/pci/probe.c | 6 +++--
include/linux/acpi.h | 2 ++
include/linux/pci.h | 2 ++
10 files changed, 44 insertions(+), 30 deletions(-)
--
2.17.1
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.
Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
---
drivers/pci/pcie/portdrv_core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 2c0278f0fdcc..e257a2ca3595 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -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;
--
2.17.1
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.
Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
---
drivers/acpi/pci_root.c | 8 ++++++--
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, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index a9e6b782622d..2e2bc80c42fe 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -933,8 +933,12 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
host_bridge->native_pme);
OSC_OWNER(ctrl, OSC_PCI_EXPRESS_LTR_CONTROL,
host_bridge->native_ltr);
- OSC_OWNER(ctrl, OSC_PCI_EXPRESS_DPC_CONTROL,
- host_bridge->native_dpc);
+ if (pcie_ports_dpc_native)
+ dev_warn(&bus->dev, "OS forcibly taking over DPC\n");
+ else
+ OSC_OWNER(ctrl, OSC_PCI_EXPRESS_DPC_CONTROL,
+ host_bridge->native_dpc);
+
}
if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
index e05aba86a317..21f77420632b 100644
--- a/drivers/pci/pcie/dpc.c
+++ b/drivers/pci/pcie/dpc.c
@@ -283,11 +283,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,
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index af7cf237432a..0ac20feef24e 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -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);
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index ccd5e0ce5605..2c0278f0fdcc 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -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 ||
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 22207a79762c..388121ec88b5 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1559,9 +1559,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)
--
2.17.1
On Tue, Oct 27, 2020 at 10:00 PM Kuppuswamy Sathyanarayanan
<[email protected]> wrote:
>
> In DPC service enable logic, check for
> services & PCIE_PORT_SERVICE_AER implies pci_aer_available()
How about PCIE_PORT_SERVICE_AER is not configured, but
pcie_aer_disable == 0 ？
> 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.
>
> Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
> ---
> drivers/pci/pcie/portdrv_core.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
> index 2c0278f0fdcc..e257a2ca3595 100644
> --- a/drivers/pci/pcie/portdrv_core.c
> +++ b/drivers/pci/pcie/portdrv_core.c
> @@ -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;
>
> --
> 2.17.1
>
On 10/27/20 11:00 PM, Ethan Zhao wrote:
> On Tue, Oct 27, 2020 at 10:00 PM Kuppuswamy Sathyanarayanan
> <[email protected]> wrote:
>>
>> In DPC service enable logic, check for
>> services & PCIE_PORT_SERVICE_AER implies pci_aer_available()
> How about PCIE_PORT_SERVICE_AER is not configured, but
> pcie_aer_disable == 0 ？
Its not possible in current code flow. DPC service is configured
following AER service configuration.
>> 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.
>>
>> Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
>> ---
>> drivers/pci/pcie/portdrv_core.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
>> index 2c0278f0fdcc..e257a2ca3595 100644
>> --- a/drivers/pci/pcie/portdrv_core.c
>> +++ b/drivers/pci/pcie/portdrv_core.c
>> @@ -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;
>>
>> --
>> 2.17.1
>>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
The current logic is
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
pci_aer_available() &&
(pcie_ports_dpc_native || (services & PCIE_PORT_SERVICE_AER)))
services |= PCIE_PORT_SERVICE_DPC;
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
pci_aer_available() &&
(pcie_ports_dpc_native))
services |= PCIE_PORT_SERVICE_DPC;
or
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
pci_aer_available() &&(services & PCIE_PORT_SERVICE_AER)）
services |= PCIE_PORT_SERVICE_DPC;
do you mean one of the possible is
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
(pcie_ports_dpc_native))
services |= PCIE_PORT_SERVICE_DPC;
after your patch ? nothing about AER ?
Thanks,
Ethan
On Thu, Oct 29, 2020 at 1:14 AM Kuppuswamy, Sathyanarayanan
<[email protected]> wrote:
>
>
>
> On 10/27/20 11:00 PM, Ethan Zhao wrote:
> > On Tue, Oct 27, 2020 at 10:00 PM Kuppuswamy Sathyanarayanan
> > <[email protected]> wrote:
> >>
> >> In DPC service enable logic, check for
> >> services & PCIE_PORT_SERVICE_AER implies pci_aer_available()
> > How about PCIE_PORT_SERVICE_AER is not configured, but
> > pcie_aer_disable == 0 ？
> Its not possible in current code flow. DPC service is configured
> following AER service configuration.
> >> 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.
> >>
> >> Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
> >> ---
> >> drivers/pci/pcie/portdrv_core.c | 1 -
> >> 1 file changed, 1 deletion(-)
> >>
> >> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
> >> index 2c0278f0fdcc..e257a2ca3595 100644
> >> --- a/drivers/pci/pcie/portdrv_core.c
> >> +++ b/drivers/pci/pcie/portdrv_core.c
> >> @@ -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;
> >>
> >> --
> >> 2.17.1
> >>
>
> --
> Sathyanarayanan Kuppuswamy
> Linux Kernel Developer
Hi Bjorn,
On 10/26/20 7:57 PM, Kuppuswamy Sathyanarayanan wrote:
> 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.
Any comments on this series?
>
> Changes since v10:
> * Addressed format issue reported by lkp test.
>
> Changes since v9:
> * Rebased on top of v5.10-rc1
>
> Changes since v8:
> * Simplified setting _OSC ownwership logic
> * Moved bridge->native_ltr out of #ifdef CONFIG_PCIEPORTBUS.
>
> Changes since v7:
> * Fixed "fix array_size.cocci warnings".
>
> Changes since v6:
> * Created new patch for CONFIG_PCIEPORTBUS check in
> pci_init_host_bridge().
> * Added warning message for a case when pcie_ports_native
> overrides _OSC negotiation result.
>
> 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 (5):
> PCI: Conditionally initialize host bridge native_* members
> 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 | 39 +++++++++++++++++++++++--------
> drivers/pci/hotplug/pciehp_core.c | 2 +-
> drivers/pci/pci-acpi.c | 3 ---
> drivers/pci/pcie/aer.c | 2 +-
> drivers/pci/pcie/dpc.c | 3 ---
> drivers/pci/pcie/portdrv.h | 2 --
> drivers/pci/pcie/portdrv_core.c | 13 ++++-------
> drivers/pci/probe.c | 6 +++--
> include/linux/acpi.h | 2 ++
> include/linux/pci.h | 2 ++
> 10 files changed, 44 insertions(+), 30 deletions(-)
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
On Mon, Oct 26, 2020 at 07:57:06PM -0700, Kuppuswamy Sathyanarayanan wrote:
> 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.
>
> Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
> ---
> drivers/acpi/pci_root.c | 8 ++++++--
> 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, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
> index a9e6b782622d..2e2bc80c42fe 100644
> --- a/drivers/acpi/pci_root.c
> +++ b/drivers/acpi/pci_root.c
> @@ -933,8 +933,12 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
> host_bridge->native_pme);
> OSC_OWNER(ctrl, OSC_PCI_EXPRESS_LTR_CONTROL,
> host_bridge->native_ltr);
> - OSC_OWNER(ctrl, OSC_PCI_EXPRESS_DPC_CONTROL,
> - host_bridge->native_dpc);
> + if (pcie_ports_dpc_native)
> + dev_warn(&bus->dev, "OS forcibly taking over DPC\n");
> + else
> + OSC_OWNER(ctrl, OSC_PCI_EXPRESS_DPC_CONTROL,
> + host_bridge->native_dpc);
> +
> }
>
> if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
> diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
> index e05aba86a317..21f77420632b 100644
> --- a/drivers/pci/pcie/dpc.c
> +++ b/drivers/pci/pcie/dpc.c
> @@ -283,11 +283,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;
Wow, I don't even know what those negations mean and I don't want to
take ten minutes to figure it out. Not your fault, obviously; it was
that way before.
"If AER is not native and DPC is not native, return -ENOTSUPP"?
In other words, "if not (AER is native OR DPC is native), return
-ENOTSUPP"? Or "if (AER is native OR DPC is native), keep going"?
I guess this is tied up with 35a0b2378c19 ("PCI/DPC: Add
"pcie_ports=dpc-native" to allow DPC without AER control")
But we still ought to be able to consolidate some of this testing in
acpi_pci_root_create() so we only have to look at host->native_dpc
here (and maybe dev->aer_cap).
> status = devm_request_threaded_irq(device, dev->irq, dpc_irq,
> diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
> index af7cf237432a..0ac20feef24e 100644
> --- a/drivers/pci/pcie/portdrv.h
> +++ b/drivers/pci/pcie/portdrv.h
> @@ -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);
> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
> index ccd5e0ce5605..2c0278f0fdcc 100644
> --- a/drivers/pci/pcie/portdrv_core.c
> +++ b/drivers/pci/pcie/portdrv_core.c
> @@ -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 ||
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 22207a79762c..388121ec88b5 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1559,9 +1559,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)
> --
> 2.17.1
>