[dpdk-dev] [PATCH 27/37] ixgbe/base: use mvals array for CIA*_BY_MAC values

[Wenzhuo Lu]

Use the mvals array to hold differing values use for CIAA and
CIAD symbols.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu at intel.com>
---
 drivers/net/ixgbe/base/ixgbe_type.h | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index ac9909e..d4a91d8 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -1057,14 +1057,18 @@ struct ixgbe_dmac_config {
 #define IXGBE_PHYDAT_82599     0x11044
 #define IXGBE_PHYCTL_82599     0x11048
 #define IXGBE_PBACLR_82599     0x11068
-#define IXGBE_CIAA_82599       0x11088
-#define IXGBE_CIAD_82599       0x1108C
+#define IXGBE_CIAA             0x11088
+#define IXGBE_CIAD             0x1108C
+#define IXGBE_CIAA_82599       IXGBE_CIAA
+#define IXGBE_CIAD_82599       IXGBE_CIAD
+#define IXGBE_CIAA_X540                IXGBE_CIAA
+#define IXGBE_CIAD_X540                IXGBE_CIAD
 #define IXGBE_CIAA_X550                0x11508
 #define IXGBE_CIAD_X550                0x11510
-#define IXGBE_CIAA_BY_MAC(_hw) ((((_hw)->mac.type >= ixgbe_mac_X550) ? \
-                                IXGBE_CIAA_X550 : IXGBE_CIAA_82599))
-#define IXGBE_CIAD_BY_MAC(_hw) ((((_hw)->mac.type >= ixgbe_mac_X550) ? \
-                                IXGBE_CIAD_X550 : IXGBE_CIAD_82599))
+#define IXGBE_CIAA_X550EM_x    IXGBE_CIAA_X550
+#define IXGBE_CIAD_X550EM_x    IXGBE_CIAD_X550
+#define IXGBE_CIAA_BY_MAC(_hw) IXGBE_BY_MAC((_hw), CIAA)
+#define IXGBE_CIAD_BY_MAC(_hw) IXGBE_BY_MAC((_hw), CIAD)
 #define IXGBE_PICAUSE          0x110B0
 #define IXGBE_PIENA            0x110B8
 #define IXGBE_CDQ_MBR_82599    0x110B4
@@ -3294,6 +3298,8 @@ union ixgbe_atr_hash_dword {
        IXGBE_CAT(EICR_GPI_SDP0, m),    \
        IXGBE_CAT(EICR_GPI_SDP1, m),    \
        IXGBE_CAT(EICR_GPI_SDP2, m),    \
+       IXGBE_CAT(CIAA, m),             \
+       IXGBE_CAT(CIAD, m),             \
        IXGBE_CAT(I2C_CLK_IN, m),       \
        IXGBE_CAT(I2C_CLK_OUT, m),      \
        IXGBE_CAT(I2C_DATA_IN, m),      \
-- 
1.9.3