On 11/18/26 02:40, Lukas Wunner wrote:
> Downstream Port Containment does not mandate presence of an Advanced Error
> Reporting capability, so a Downstream Port may support DPC, but not AER
> (PCIe r7.1 sec 6.2.11.2).
> 
> In February 2019, commit 9f08a5d896ce ("PCI/DPC: Fix print AER status in
> DPC event handling") amended the DPC driver to access the AER capability
> without checking for its presence.
> 
> This did not cause actual problems because in March 2018, commit
> 4e5fad429bd1 ("PCI/DPC: Do not enable DPC if AER control is not allowed by
> the BIOS") had seemingly inadvertently prevented instantiation of a DPC
> port service on AER-incapable ports.
> 
> However in October 2019, commit 35a0b2378c19 ("PCI/DPC: Add
> "pcie_ports=dpc-native" to allow DPC without AER control") made it
> possible to override this:  The DPC driver may access a non-existent AER
> capability if "pcie_ports=dpc-native" is passed on the command line.
> 
> Fix it by making the DPC driver cope with AER-unsupporting Downstream
> Ports.
> 
> There are two places where the AER capability is accessed:
> 
> - dpc_get_aer_uncorrect_severity() uses it to discern whether a Fatal or
>   Non-Fatal Error triggered DPC.  Access the Device Status Register
>   instead, in accordance with PCIe r7.1 sec 6.2.5.
> 
> - dpc_is_surprise_removal() uses it to detect whether a Surprise Down
>   Error triggered DPC.  Return false on AER-unsupporting devices.  The
>   function works around an AMD-specific quirk and it seems reasonable to
>   assume that all affected products are AER-supporting.  In any case the
>   detection is not possible without AER capability.
> 
> Insert a temporary check for an AER capability after the call to
> aer_get_device_error_info() because the function currently returns false
> for AER-unsupporting devices.  The check will become obsolete and will be
> removed with the imminent baseline capability error reporting.
> 
> Fixes: 35a0b2378c19 ("PCI/DPC: Add "pcie_ports=dpc-native" to allow DPC 
> without AER control")
> Signed-off-by: Lukas Wunner <[email protected]>
> Cc: [email protected] # v5.5+
> ---

Looks good to me.

Reviewed-by: Kuppuswamy Sathyanarayanan 
<[email protected]>


> Changes v1 -> v2:
>   * On AER-capable devices, infer severity from AER Extended Capability
>     instead of Device Status register because the latter also logs masked
>     errors (Sathya).
>   * Fix storytelling in commit message because 4e5fad429bd1 changed
>     behavior, not 708b20003624 (Sathya).
>  
>  drivers/pci/pcie/dpc.c | 45 ++++++++++++++++++++++++++++++------------
>  1 file changed, 32 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
> index 2b779bd1d861..d02cbbbe3143 100644
> --- a/drivers/pci/pcie/dpc.c
> +++ b/drivers/pci/pcie/dpc.c
> @@ -238,19 +238,35 @@ static int dpc_get_aer_uncorrect_severity(struct 
> pci_dev *dev,
>  {
>       int pos = dev->aer_cap;
>       u32 status, mask, sev;
> +     u16 devsta;
>  
> -     pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, &status);
> -     pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_MASK, &mask);
> -     status &= ~mask;
> -     if (!status)
> -             return 0;
> -
> -     pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, &sev);
> -     status &= sev;
> -     if (status)
> -             info->severity = AER_FATAL;
> -     else
> -             info->severity = AER_NONFATAL;
> +     /*
> +      * Infer severity from AER Extended Capability if present, else from
> +      * Device Status register.  The latter cannot be used on AER-capable
> +      * ports because it also logs masked errors (PCIe r7.1 sec 7.5.3.5).
> +      */
> +     if (pos) {
> +             pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, &status);
> +             pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_MASK, &mask);
> +             status &= ~mask;
> +             if (!status)
> +                     return 0;
> +
> +             pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, &sev);
> +             status &= sev;
> +             if (status)
> +                     info->severity = AER_FATAL;
> +             else
> +                     info->severity = AER_NONFATAL;
> +     } else {
> +             pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &devsta);
> +             if (devsta & PCI_EXP_DEVSTA_FED)
> +                     info->severity = AER_FATAL;
> +             else if (devsta & PCI_EXP_DEVSTA_NFED)
> +                     info->severity = AER_NONFATAL;
> +             else
> +                     return 0;
> +     }
>  
>       info->level = KERN_ERR;
>  
> @@ -275,7 +291,7 @@ void dpc_process_error(struct pci_dev *pdev)
>               pci_warn(pdev, "containment event, status:%#06x: unmasked 
> uncorrectable error detected\n",
>                        status);
>               if (dpc_get_aer_uncorrect_severity(pdev, &info) &&
> -                 aer_get_device_error_info(&info, 0)) {
> +                 (aer_get_device_error_info(&info, 0) || !pdev->aer_cap)) {
>                       aer_print_error(&info, 0);
>                       pci_aer_clear_nonfatal_status(pdev);
>                       pci_aer_clear_fatal_status(pdev);
> @@ -353,6 +369,9 @@ static bool dpc_is_surprise_removal(struct pci_dev *pdev)
>       if (!pdev->is_hotplug_bridge)
>               return false;
>  
> +     if (!pdev->aer_cap)
> +             return false;
> +
>       if (pci_read_config_word(pdev, pdev->aer_cap + PCI_ERR_UNCOR_STATUS,
>                                &status))
>               return false;

-- 
Sathyanarayanan Kuppuswamy
Linux Kernel Developer


Reply via email to