On Sat, Feb 29, 2020 at 11:23:44PM +0100, Heiner Kallweit wrote:

This collection of PCI error bits is used in more than one driver, so move it to the PCI core.

Signed-off-by: Heiner Kallweit hkallweit1@gmail.com

Acked-by: Bjorn Helgaas bhelgaas@google.com

---

v4:

• move new constant to include/linux/pci.h
• improve commit description

---

drivers/net/ethernet/marvell/skge.h | 7 ------- drivers/net/ethernet/marvell/sky2.h | 7 ------- include/linux/pci.h | 7 +++++++ 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/marvell/skge.h b/drivers/net/ethernet/marvell/skge.h index e76c03c87..e149bdfe1 100644 --- a/drivers/net/ethernet/marvell/skge.h +++ b/drivers/net/ethernet/marvell/skge.h @@ -15,13 +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_SIG_TARGET_ABORT | \
  

• 	       PCI_STATUS_PARITY)
  

enum csr_regs { B0_RAP = 0x0000, B0_CTST = 0x0004, diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h index aee87f838..851d8ed34 100644 --- a/drivers/net/ethernet/marvell/sky2.h +++ b/drivers/net/ethernet/marvell/sky2.h @@ -252,13 +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_SIG_TARGET_ABORT | \
  

• 	       PCI_STATUS_PARITY)
  

enum csr_regs { B0_RAP = 0x0000, B0_CTST = 0x0004, diff --git a/include/linux/pci.h b/include/linux/pci.h index 3840a541a..101d71e0a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -42,6 +42,13 @@

#include <linux/pci_ids.h>

+#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_SIG_TARGET_ABORT | \
  

• 	       PCI_STATUS_PARITY)
  

/*

• The PCI interface treats multi-function devices as independent
• devices. The slot/function address of each device is encoded

-- 2.25.1