Commit e7c29885 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch... 


Merge branch 'PCI-Add-and-use-constant-PCI_STATUS_ERROR_BITS-and-helper-pci_status_get_and_clear_errors'

Heiner Kallweit says:

====================
PCI: Add and use constant PCI_STATUS_ERROR_BITS and helper pci_status_get_and_clear_errors

Several drivers have own definitions for this constant, so move it
to the PCI core. In addition in multiple places the following code
sequence is used:
1. Read PCI_STATUS
2. Mask out non-error bits
3. Action based on set error bits
4. Write back set error bits to clear them

As this is a repeated pattern, add a helper to the PCI core.

Most affected drivers are network drivers. But as it's about core
PCI functionality, I suppose the series should go through the PCI
tree.

v2:
- fix formal issue with cover letter
v3:
- fix dumb typo in patch 7
v4:
- add patches 1-3
- move new constant PCI_STATUS_ERROR_BITS to include/linux/pci.h
- small improvements in commit messages
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a1c63f1 ec46bf92

drivers/net/ethernet/marvell/skge.h

+0 −6
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 
#define  PCI_VPD_ROM_SZ	7L<<14	/* VPD ROM size 0=256, 1=512, ... */

#define  PCI_REV_DESC	1<<2	/* Reverse Descriptor bytes */



#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \

			       PCI_STATUS_SIG_SYSTEM_ERROR | \

			       PCI_STATUS_REC_MASTER_ABORT | \

			       PCI_STATUS_REC_TARGET_ABORT | \

			       PCI_STATUS_PARITY)



enum csr_regs {

	B0_RAP	= 0x0000,

	B0_CTST	= 0x0004,

drivers/net/ethernet/marvell/sky2.h

+0 −6
Original line number Diff line number Diff line
@@ -252,12 +252,6 @@ enum { 
};





#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \

			       PCI_STATUS_SIG_SYSTEM_ERROR | \

			       PCI_STATUS_REC_MASTER_ABORT | \

			       PCI_STATUS_REC_TARGET_ABORT | \

			       PCI_STATUS_PARITY)



enum csr_regs {

	B0_RAP		= 0x0000,

	B0_CTST		= 0x0004,

drivers/net/ethernet/realtek/r8169_main.c

+6 −9
Original line number Diff line number Diff line
@@ -4357,13 +4357,15 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) 
{

	struct rtl8169_private *tp = netdev_priv(dev);

	struct pci_dev *pdev = tp->pci_dev;

	u16 pci_status, pci_cmd;

	int pci_status_errs;

	u16 pci_cmd;



	pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd);

	pci_read_config_word(pdev, PCI_STATUS, &pci_status);



	netif_err(tp, intr, dev, "PCI error (cmd = 0x%04x, status = 0x%04x)\n",

		  pci_cmd, pci_status);

	pci_status_errs = pci_status_get_and_clear_errors(pdev);



	netif_err(tp, intr, dev, "PCI error (cmd = 0x%04x, status_errs = 0x%04x)\n",

		  pci_cmd, pci_status_errs);



	/*

	 * The recovery sequence below admits a very elaborated explanation:
@@ -4380,11 +4382,6 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) 


	pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);



	pci_write_config_word(pdev, PCI_STATUS,

		pci_status & (PCI_STATUS_DETECTED_PARITY |

		PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_REC_MASTER_ABORT |

		PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT));



	rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);

}

drivers/net/ethernet/sun/cassini.c

+10 −18
Original line number Diff line number Diff line
@@ -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. */

drivers/net/ethernet/sun/sungem.c

+9 −21
Original line number Diff line number Diff line
@@ -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. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE