net/sfc/base: simplify loopback type checking

Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_phy.c b/drivers/net/sfc/base/ef10_phy.c
index 4b2aa76..e47ca22 100644 (file)
--- a/drivers/net/sfc/base/ef10_phy.c
+++ b/drivers/net/sfc/base/ef10_phy.c
@@ -212,26 +212,10 @@ ef10_phy_get_link(
                            &elsp->els_link_mode, &elsp->els_fcntl);
 
 #if EFSYS_OPT_LOOPBACK
-       /* Assert the MC_CMD_LOOPBACK and EFX_LOOPBACK namespace agree */
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_NONE == EFX_LOOPBACK_OFF);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_DATA == EFX_LOOPBACK_DATA);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMAC == EFX_LOOPBACK_GMAC);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGMII == EFX_LOOPBACK_XGMII);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGXS == EFX_LOOPBACK_XGXS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI == EFX_LOOPBACK_XAUI);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMII == EFX_LOOPBACK_GMII);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SGMII == EFX_LOOPBACK_SGMII);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGBR == EFX_LOOPBACK_XGBR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XFI == EFX_LOOPBACK_XFI);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI_FAR == EFX_LOOPBACK_XAUI_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMII_FAR == EFX_LOOPBACK_GMII_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SGMII_FAR == EFX_LOOPBACK_SGMII_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XFI_FAR == EFX_LOOPBACK_XFI_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GPHY == EFX_LOOPBACK_GPHY);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PHYXS == EFX_LOOPBACK_PHY_XS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PCS == EFX_LOOPBACK_PCS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PMAPMD == EFX_LOOPBACK_PMA_PMD);
-
+       /*
+        * MC_CMD_LOOPBACK and EFX_LOOPBACK names are equivalent, so use the
+        * MCDI value directly. Agreement is checked in efx_loopback_mask().
+        */
        elsp->els_loopback = MCDI_OUT_DWORD(req, GET_LINK_OUT_LOOPBACK_MODE);
 #endif /* EFSYS_OPT_LOOPBACK */
 

diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c
index bce0def..dc53071 100644 (file)
--- a/drivers/net/sfc/base/efx_nic.c
+++ b/drivers/net/sfc/base/efx_nic.c
@@ -654,48 +654,46 @@ efx_loopback_mask(
        EFSYS_ASSERT3U(loopback_kind, <, EFX_LOOPBACK_NKINDS);
        EFSYS_ASSERT(maskp != NULL);
 
-       /* Assert the MC_CMD_LOOPBACK and EFX_LOOPBACK namespace agree */
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_NONE == EFX_LOOPBACK_OFF);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_DATA == EFX_LOOPBACK_DATA);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMAC == EFX_LOOPBACK_GMAC);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGMII == EFX_LOOPBACK_XGMII);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGXS == EFX_LOOPBACK_XGXS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI == EFX_LOOPBACK_XAUI);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMII == EFX_LOOPBACK_GMII);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SGMII == EFX_LOOPBACK_SGMII);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGBR == EFX_LOOPBACK_XGBR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XFI == EFX_LOOPBACK_XFI);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI_FAR == EFX_LOOPBACK_XAUI_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMII_FAR == EFX_LOOPBACK_GMII_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SGMII_FAR == EFX_LOOPBACK_SGMII_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XFI_FAR == EFX_LOOPBACK_XFI_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GPHY == EFX_LOOPBACK_GPHY);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PHYXS == EFX_LOOPBACK_PHY_XS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PCS == EFX_LOOPBACK_PCS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PMAPMD == EFX_LOOPBACK_PMA_PMD);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XPORT == EFX_LOOPBACK_XPORT);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XGMII_WS == EFX_LOOPBACK_XGMII_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI_WS == EFX_LOOPBACK_XAUI_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI_WS_FAR ==
-           EFX_LOOPBACK_XAUI_WS_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XAUI_WS_NEAR ==
-           EFX_LOOPBACK_XAUI_WS_NEAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_GMII_WS == EFX_LOOPBACK_GMII_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XFI_WS == EFX_LOOPBACK_XFI_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_XFI_WS_FAR ==
-           EFX_LOOPBACK_XFI_WS_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PHYXS_WS == EFX_LOOPBACK_PHYXS_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PMA_INT == EFX_LOOPBACK_PMA_INT);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SD_NEAR == EFX_LOOPBACK_SD_NEAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SD_FAR == EFX_LOOPBACK_SD_FAR);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_PMA_INT_WS ==
-           EFX_LOOPBACK_PMA_INT_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SD_FEP2_WS ==
-           EFX_LOOPBACK_SD_FEP2_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SD_FEP1_5_WS ==
-           EFX_LOOPBACK_SD_FEP1_5_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SD_FEP_WS == EFX_LOOPBACK_SD_FEP_WS);
-       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_SD_FES_WS == EFX_LOOPBACK_SD_FES_WS);
+       /* Assert the MC_CMD_LOOPBACK and EFX_LOOPBACK namespaces agree */
+#define        LOOPBACK_CHECK(_mcdi, _efx) \
+       EFX_STATIC_ASSERT(MC_CMD_LOOPBACK_##_mcdi == EFX_LOOPBACK_##_efx)
+
+       LOOPBACK_CHECK(NONE, OFF);
+       LOOPBACK_CHECK(DATA, DATA);
+       LOOPBACK_CHECK(GMAC, GMAC);
+       LOOPBACK_CHECK(XGMII, XGMII);
+       LOOPBACK_CHECK(XGXS, XGXS);
+       LOOPBACK_CHECK(XAUI, XAUI);
+       LOOPBACK_CHECK(GMII, GMII);
+       LOOPBACK_CHECK(SGMII, SGMII);
+       LOOPBACK_CHECK(XGBR, XGBR);
+       LOOPBACK_CHECK(XFI, XFI);
+       LOOPBACK_CHECK(XAUI_FAR, XAUI_FAR);
+       LOOPBACK_CHECK(GMII_FAR, GMII_FAR);
+       LOOPBACK_CHECK(SGMII_FAR, SGMII_FAR);
+       LOOPBACK_CHECK(XFI_FAR, XFI_FAR);
+       LOOPBACK_CHECK(GPHY, GPHY);
+       LOOPBACK_CHECK(PHYXS, PHY_XS);
+       LOOPBACK_CHECK(PCS, PCS);
+       LOOPBACK_CHECK(PMAPMD, PMA_PMD);
+       LOOPBACK_CHECK(XPORT, XPORT);
+       LOOPBACK_CHECK(XGMII_WS, XGMII_WS);
+       LOOPBACK_CHECK(XAUI_WS, XAUI_WS);
+       LOOPBACK_CHECK(XAUI_WS_FAR, XAUI_WS_FAR);
+       LOOPBACK_CHECK(XAUI_WS_NEAR, XAUI_WS_NEAR);
+       LOOPBACK_CHECK(GMII_WS, GMII_WS);
+       LOOPBACK_CHECK(XFI_WS, XFI_WS);
+       LOOPBACK_CHECK(XFI_WS_FAR, XFI_WS_FAR);
+       LOOPBACK_CHECK(PHYXS_WS, PHYXS_WS);
+       LOOPBACK_CHECK(PMA_INT, PMA_INT);
+       LOOPBACK_CHECK(SD_NEAR, SD_NEAR);
+       LOOPBACK_CHECK(SD_FAR, SD_FAR);
+       LOOPBACK_CHECK(PMA_INT_WS, PMA_INT_WS);
+       LOOPBACK_CHECK(SD_FEP2_WS, SD_FEP2_WS);
+       LOOPBACK_CHECK(SD_FEP1_5_WS, SD_FEP1_5_WS);
+       LOOPBACK_CHECK(SD_FEP_WS, SD_FEP_WS);
+       LOOPBACK_CHECK(SD_FES_WS, SD_FES_WS);
+#undef LOOPBACK_CHECK
 
        /* Build bitmask of possible loopback types */
        EFX_ZERO_QWORD(mask);