lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 473/545] PCI/AER: Write AER Capability only when we control it
    Date
    From: Sean V Kelley <sean.v.kelley@intel.com>

    [ Upstream commit 50cc18fcd3053fb46a09db5a39e6516e9560f765 ]

    If an OS has not been granted AER control via _OSC, it should not make
    changes to PCI_ERR_ROOT_COMMAND and PCI_ERR_ROOT_STATUS related registers.
    Per section 4.5.1 of the System Firmware Intermediary (SFI) _OSC and DPC
    Updates ECN [1], this bit also covers these aspects of the PCI Express
    Advanced Error Reporting. Based on the above and earlier discussion [2],
    make the following changes:

    Add a check for the native case (i.e., AER control via _OSC)

    Note that the previous "clear, reset, enable" order suggests that the reset
    might cause errors that we should ignore. After this commit, those errors
    (if any) will remain logged in the PCI_ERR_ROOT_STATUS register.

    [1] System Firmware Intermediary (SFI) _OSC and DPC Updates ECN, Feb 24,
    2020, affecting PCI Firmware Specification, Rev. 3.2
    https://members.pcisig.com/wg/PCI-SIG/document/14076
    [2] https://lore.kernel.org/linux-pci/20201020162820.GA370938@bjorn-Precision-5520/

    Link: https://lore.kernel.org/r/20201121001036.8560-2-sean.v.kelley@intel.com
    Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> # non-native/no RCEC
    Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/pcie/aer.c | 29 ++++++++++++++++-------------
    1 file changed, 16 insertions(+), 13 deletions(-)

    diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
    index c40546eeecb3..61f78b20b0cf 100644
    --- a/drivers/pci/pcie/aer.c
    +++ b/drivers/pci/pcie/aer.c
    @@ -1366,23 +1366,26 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
    u32 reg32;
    int rc;

    -
    - /* Disable Root's interrupt in response to error messages */
    - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
    - reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
    - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32);
    + if (pcie_aer_is_native(dev)) {
    + /* Disable Root's interrupt in response to error messages */
    + pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
    + reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
    + pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32);
    + }

    rc = pci_bus_error_reset(dev);
    - pci_info(dev, "Root Port link has been reset\n");
    + pci_info(dev, "Root Port link has been reset (%d)\n", rc);

    - /* Clear Root Error Status */
    - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, &reg32);
    - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, reg32);
    + if (pcie_aer_is_native(dev)) {
    + /* Clear Root Error Status */
    + pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, &reg32);
    + pci_write_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, reg32);

    - /* Enable Root Port's interrupt in response to error messages */
    - pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
    - reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
    - pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32);
    + /* Enable Root Port's interrupt in response to error messages */
    + pci_read_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
    + reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
    + pci_write_config_dword(dev, aer + PCI_ERR_ROOT_COMMAND, reg32);
    + }

    return rc ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:47    [W:4.076 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site