xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sun: use pci_status_get_and_clear_errors

Browse Source 
Use new helper pci_status_get_and_clear_errors() to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit
2020-02-29 23:26:49 +01:00
committed by David S. Miller
parent 2864a883f9
commit 0800d88e2c
2 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/sun/cassini.c
View File

@@ -1716,34 +1716,26 @@ static int cas_pci_interrupt(struct net_device *dev, struct cas *cp,
pr_cont("\n"); pr_cont("\n");
if (stat & PCI_ERR_OTHER) { if (stat & PCI_ERR_OTHER) {
u16 cfg; int pci_errs;
/* Interrogate PCI config space for the /* Interrogate PCI config space for the
* true cause. * true cause.
*/ */
pci_read_config_word(cp->pdev, PCI_STATUS, &cfg); pci_errs = pci_status_get_and_clear_errors(cp->pdev);
netdev_err(dev, "Read PCI cfg space status [%04x]\n", cfg);
if (cfg & PCI_STATUS_PARITY)
netdev_err(dev, "PCI parity error detected\n");
if (cfg & PCI_STATUS_SIG_TARGET_ABORT)
netdev_err(dev, "PCI target abort\n");
if (cfg & PCI_STATUS_REC_TARGET_ABORT)
netdev_err(dev, "PCI master acks target abort\n");
if (cfg & PCI_STATUS_REC_MASTER_ABORT)
netdev_err(dev, "PCI master abort\n");
if (cfg & PCI_STATUS_SIG_SYSTEM_ERROR)
netdev_err(dev, "PCI system error SERR#\n");
if (cfg & PCI_STATUS_DETECTED_PARITY)
netdev_err(dev, "PCI parity error\n");
/* Write the error bits back to clear them. */ netdev_err(dev, "PCI status errors[%04x]\n", pci_errs);
cfg &= (PCI_STATUS_PARITY | if (pci_errs & PCI_STATUS_PARITY)
PCI_STATUS_SIG_TARGET_ABORT | netdev_err(dev, "PCI parity error detected\n");
PCI_STATUS_REC_TARGET_ABORT | if (pci_errs & PCI_STATUS_SIG_TARGET_ABORT)
PCI_STATUS_REC_MASTER_ABORT | netdev_err(dev, "PCI target abort\n");
PCI_STATUS_SIG_SYSTEM_ERROR | if (pci_errs & PCI_STATUS_REC_TARGET_ABORT)
PCI_STATUS_DETECTED_PARITY); netdev_err(dev, "PCI master acks target abort\n");
pci_write_config_word(cp->pdev, PCI_STATUS, cfg); if (pci_errs & PCI_STATUS_REC_MASTER_ABORT)
netdev_err(dev, "PCI master abort\n");
if (pci_errs & PCI_STATUS_SIG_SYSTEM_ERROR)
netdev_err(dev, "PCI system error SERR#\n");
if (pci_errs & PCI_STATUS_DETECTED_PARITY)
netdev_err(dev, "PCI parity error\n");
} }
/* For all PCI errors, we should reset the chip. */ /* For all PCI errors, we should reset the chip. */

30
drivers/net/ethernet/sun/sungem.c
View File

@@ -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) { if (pci_estat & GREG_PCIESTAT_OTHER) {
u16 pci_cfg_stat; int pci_errs;
/* Interrogate PCI config space for the /* Interrogate PCI config space for the
* true cause. * true cause.
*/ */
pci_read_config_word(gp->pdev, PCI_STATUS, pci_errs = pci_status_get_and_clear_errors(gp->pdev);
&pci_cfg_stat); netdev_err(dev, "PCI status errors[%04x]\n", pci_errs);
netdev_err(dev, "Read PCI cfg space status [%04x]\n", if (pci_errs & PCI_STATUS_PARITY)
pci_cfg_stat);
if (pci_cfg_stat & PCI_STATUS_PARITY)
netdev_err(dev, "PCI parity error detected\n"); 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"); 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"); 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"); 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"); 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"); 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. */ /* For all PCI errors, we should reset the chip. */