lkml.org 
[lkml]   [2020]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v4 07/10] net: sun: use pci_status_get_and_clear_errors
    From
    Date
    Use new helper pci_status_get_and_clear_errors() to simplify the code.

    Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
    ---
    drivers/net/ethernet/sun/cassini.c | 28 ++++++++++------------------
    drivers/net/ethernet/sun/sungem.c | 30 +++++++++---------------------
    2 files changed, 19 insertions(+), 39 deletions(-)

    diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
    index 6ec9163e2..e6d1aa882 100644
    --- a/drivers/net/ethernet/sun/cassini.c
    +++ b/drivers/net/ethernet/sun/cassini.c
    @@ -1716,34 +1716,26 @@ static int cas_pci_interrupt(struct net_device *dev, struct cas *cp,
    pr_cont("\n");

    if (stat & PCI_ERR_OTHER) {
    - u16 cfg;
    + int pci_errs;

    /* Interrogate PCI config space for the
    * true cause.
    */
    - pci_read_config_word(cp->pdev, PCI_STATUS, &cfg);
    - netdev_err(dev, "Read PCI cfg space status [%04x]\n", cfg);
    - if (cfg & PCI_STATUS_PARITY)
    + pci_errs = pci_status_get_and_clear_errors(cp->pdev);
    +
    + netdev_err(dev, "PCI status errors[%04x]\n", pci_errs);
    + if (pci_errs & PCI_STATUS_PARITY)
    netdev_err(dev, "PCI parity error detected\n");
    - if (cfg & PCI_STATUS_SIG_TARGET_ABORT)
    + if (pci_errs & PCI_STATUS_SIG_TARGET_ABORT)
    netdev_err(dev, "PCI target abort\n");
    - if (cfg & PCI_STATUS_REC_TARGET_ABORT)
    + if (pci_errs & PCI_STATUS_REC_TARGET_ABORT)
    netdev_err(dev, "PCI master acks target abort\n");
    - if (cfg & PCI_STATUS_REC_MASTER_ABORT)
    + if (pci_errs & PCI_STATUS_REC_MASTER_ABORT)
    netdev_err(dev, "PCI master abort\n");
    - if (cfg & PCI_STATUS_SIG_SYSTEM_ERROR)
    + if (pci_errs & PCI_STATUS_SIG_SYSTEM_ERROR)
    netdev_err(dev, "PCI system error SERR#\n");
    - if (cfg & PCI_STATUS_DETECTED_PARITY)
    + if (pci_errs & PCI_STATUS_DETECTED_PARITY)
    netdev_err(dev, "PCI parity error\n");
    -
    - /* Write the error bits back to clear them. */
    - cfg &= (PCI_STATUS_PARITY |
    - PCI_STATUS_SIG_TARGET_ABORT |
    - PCI_STATUS_REC_TARGET_ABORT |
    - PCI_STATUS_REC_MASTER_ABORT |
    - PCI_STATUS_SIG_SYSTEM_ERROR |
    - PCI_STATUS_DETECTED_PARITY);
    - pci_write_config_word(cp->pdev, PCI_STATUS, cfg);
    }

    /* For all PCI errors, we should reset the chip. */
    diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
    index 8358064fb..2d392a7b1 100644
    --- a/drivers/net/ethernet/sun/sungem.c
    +++ b/drivers/net/ethernet/sun/sungem.c
    @@ -545,37 +545,25 @@ static int gem_pci_interrupt(struct net_device *dev, struct gem *gp, u32 gem_sta
    }

    if (pci_estat & GREG_PCIESTAT_OTHER) {
    - u16 pci_cfg_stat;
    + int pci_errs;

    /* Interrogate PCI config space for the
    * true cause.
    */
    - pci_read_config_word(gp->pdev, PCI_STATUS,
    - &pci_cfg_stat);
    - netdev_err(dev, "Read PCI cfg space status [%04x]\n",
    - pci_cfg_stat);
    - if (pci_cfg_stat & PCI_STATUS_PARITY)
    + pci_errs = pci_status_get_and_clear_errors(gp->pdev);
    + netdev_err(dev, "PCI status errors[%04x]\n", pci_errs);
    + if (pci_errs & PCI_STATUS_PARITY)
    netdev_err(dev, "PCI parity error detected\n");
    - if (pci_cfg_stat & PCI_STATUS_SIG_TARGET_ABORT)
    + if (pci_errs & PCI_STATUS_SIG_TARGET_ABORT)
    netdev_err(dev, "PCI target abort\n");
    - if (pci_cfg_stat & PCI_STATUS_REC_TARGET_ABORT)
    + if (pci_errs & PCI_STATUS_REC_TARGET_ABORT)
    netdev_err(dev, "PCI master acks target abort\n");
    - if (pci_cfg_stat & PCI_STATUS_REC_MASTER_ABORT)
    + if (pci_errs & PCI_STATUS_REC_MASTER_ABORT)
    netdev_err(dev, "PCI master abort\n");
    - if (pci_cfg_stat & PCI_STATUS_SIG_SYSTEM_ERROR)
    + if (pci_errs & PCI_STATUS_SIG_SYSTEM_ERROR)
    netdev_err(dev, "PCI system error SERR#\n");
    - if (pci_cfg_stat & PCI_STATUS_DETECTED_PARITY)
    + if (pci_errs & PCI_STATUS_DETECTED_PARITY)
    netdev_err(dev, "PCI parity error\n");
    -
    - /* Write the error bits back to clear them. */
    - pci_cfg_stat &= (PCI_STATUS_PARITY |
    - PCI_STATUS_SIG_TARGET_ABORT |
    - PCI_STATUS_REC_TARGET_ABORT |
    - PCI_STATUS_REC_MASTER_ABORT |
    - PCI_STATUS_SIG_SYSTEM_ERROR |
    - PCI_STATUS_DETECTED_PARITY);
    - pci_write_config_word(gp->pdev,
    - PCI_STATUS, pci_cfg_stat);
    }

    /* For all PCI errors, we should reset the chip. */
    --
    2.25.1

    \
     
     \ /
      Last update: 2020-02-29 23:30    [W:4.093 / U:0.800 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site