X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fbase%2Fefx_check.h;h=06983dc593002991fd4be4a62d5cef15daac2ec4;hb=168c59cfe42b;hp=52b0c7979a47e437d4d85c7ee19fadf457d6a0dd;hpb=c857ca7abf8c1af444bc319a5b141cf2e4e01c56;p=dpdk.git

diff --git a/drivers/net/sfc/base/efx_check.h b/drivers/net/sfc/base/efx_check.h
index 52b0c7979a..06983dc593 100644
--- a/drivers/net/sfc/base/efx_check.h
+++ b/drivers/net/sfc/base/efx_check.h
@@ -17,6 +17,10 @@
  * from client code (and do not reappear in merges from other branches).
  */
 
+/* Check family options for EF10 architecture controllers. */
+#define	EFX_OPTS_EF10()	\
+	(EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+
 #ifdef EFSYS_OPT_FALCON
 # error "FALCON is obsolete and is not supported."
 #endif
@@ -30,9 +34,8 @@
 
 #if EFSYS_OPT_CHECK_REG
 /* Verify chip implements accessed registers */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "CHECK_REG requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "CHECK_REG requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_CHECK_REG */
 
@@ -45,17 +48,15 @@
 
 #if EFSYS_OPT_DIAG
 /* Support diagnostic hardware tests */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "DIAG requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "DIAG requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_DIAG */
 
 #if EFSYS_OPT_EV_PREFETCH
 /* Support optimized EVQ data access */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "EV_PREFETCH requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "EV_PREFETCH requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_EV_PREFETCH */
 
@@ -65,23 +66,21 @@
 
 #if EFSYS_OPT_FILTER
 /* Support hardware packet filters */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "FILTER requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "FILTER requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_FILTER */
 
-#if (EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+#if EFX_OPTS_EF10()
 # if !EFSYS_OPT_FILTER
-#  error "HUNTINGTON or MEDFORD or MEDFORD2 requires FILTER"
+#  error "EF10 arch requires FILTER"
 # endif
-#endif /* EFSYS_OPT_HUNTINGTON */
+#endif /* EFX_OPTS_EF10() */
 
 #if EFSYS_OPT_LOOPBACK
 /* Support hardware loopback modes */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "LOOPBACK requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "LOOPBACK requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_LOOPBACK */
 
@@ -95,24 +94,21 @@
 
 #if EFSYS_OPT_MAC_STATS
 /* Support MAC statistics */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "MAC_STATS requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "MAC_STATS requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_MAC_STATS */
 
 #if EFSYS_OPT_MCDI
 /* Support management controller messages */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "MCDI requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "MCDI requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_MCDI */
 
-#if (EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+#if (EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
 # if !EFSYS_OPT_MCDI
-#  error "SIENA or HUNTINGTON or MEDFORD or MEDFORD2 requires MCDI"
+#  error "EF10 arch or SIENA requires MCDI"
 # endif
 #endif
 
@@ -123,8 +119,15 @@
 # endif
 #endif /* EFSYS_OPT_MCDI_LOGGING */
 
+#if EFSYS_OPT_MCDI_PROXY_AUTH_SERVER
+/* Support MCDI proxy authorization (server) */
+# if !EFSYS_OPT_MCDI_PROXY_AUTH
+#  error "MCDI_PROXY_AUTH_SERVER requires MCDI_PROXY_AUTH"
+# endif
+#endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */
+
 #if EFSYS_OPT_MCDI_PROXY_AUTH
-/* Support MCDI proxy authorization */
+/* Support MCDI proxy authorization (client) */
 # if !EFSYS_OPT_MCDI
 #  error "MCDI_PROXY_AUTH requires MCDI"
 # endif
@@ -152,17 +155,15 @@
 
 #if EFSYS_OPT_MON_STATS
 /* Support monitor statistics (voltage/temperature) */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "MON_STATS requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "MON_STATS requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_MON_STATS */
 
 #if EFSYS_OPT_MON_MCDI
 /* Support Monitor via mcdi */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "MON_MCDI requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "MON_MCDI requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_MON_MCDI*/
 
@@ -176,9 +177,8 @@
 
 #if EFSYS_OPT_NVRAM
 /* Support non volatile configuration */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "NVRAM requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "NVRAM requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_NVRAM */
 
@@ -218,9 +218,8 @@
 
 #if EFSYS_OPT_PHY_LED_CONTROL
 /* Support for PHY LED control */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "PHY_LED_CONTROL requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "PHY_LED_CONTROL requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_PHY_LED_CONTROL */
 
@@ -265,9 +264,8 @@
 
 #if EFSYS_OPT_QSTATS
 /* Support EVQ/RXQ/TXQ statistics */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "QSTATS requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "QSTATS requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_QSTATS */
 
@@ -277,17 +275,15 @@
 
 #if EFSYS_OPT_RX_SCALE
 /* Support receive scaling (RSS) */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "RX_SCALE requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "RX_SCALE requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_RX_SCALE */
 
 #if EFSYS_OPT_RX_SCATTER
 /* Support receive scatter DMA */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "RX_SCATTER requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "RX_SCATTER requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_RX_SCATTER */
 
@@ -297,9 +293,8 @@
 
 #if EFSYS_OPT_VPD
 /* Support PCI Vital Product Data (VPD) */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "VPD requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "VPD requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_VPD */
 
@@ -313,9 +308,8 @@
 
 #if EFSYS_OPT_BIST
 /* Support BIST */
-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \
-	EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "BIST requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2"
+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "BIST requires EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_BIST */
 
@@ -338,8 +332,15 @@
 
 #if EFSYS_OPT_RX_PACKED_STREAM
 /* Support packed stream mode */
-# if !(EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "PACKED_STREAM requires HUNTINGTON or MEDFORD or MEDFORD2"
+# if !EFX_OPTS_EF10()
+#  error "PACKED_STREAM requires EF10 arch"
+# endif
+#endif
+
+#if EFSYS_OPT_RX_ES_SUPER_BUFFER
+/* Support equal stride super-buffer mode */
+# if !(EFSYS_OPT_MEDFORD2)
+#  error "ES_SUPER_BUFFER requires MEDFORD2"
 # endif
 #endif
 
@@ -357,4 +358,11 @@
 # endif
 #endif
 
+#if EFSYS_OPT_EVB
+/* Support enterprise virtual bridging */
+# if !(EFX_OPTS_EF10())
+#  error "EVB requires EF10 arch"
+# endif
+#endif /* EFSYS_OPT_EVB */
+
 #endif /* _SYS_EFX_CHECK_H */