diff mbox series

[04/60] common/sfc_efx/base: add efsys option for Riverhead

Message ID	1600764594-14752-5-git-send-email-arybchenko@solarflare.com (mailing list archive)
State	Superseded, archived
Delegated to:	Ferruh Yigit
Headers	From: Andrew Rybchenko <arybchenko@solarflare.com> To: <dev@dpdk.org> Date: Tue, 22 Sep 2020 09:48:58 +0100 Message-ID: <1600764594-14752-5-git-send-email-arybchenko@solarflare.com> In-Reply-To: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com> References: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [dpdk-dev] [PATCH 04/60] common/sfc_efx/base: add efsys option for Riverhead Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	common/sfc_efx: support Riverhead NIC family \| [00/60] common/sfc_efx: support Riverhead NIC family [01/60] common/sfc_efx/base: add EF100 registers definitions [02/60] common/sfc_efx/base: update MCDI headers [03/60] common/sfc_efx/base: add event queue operation to do polling [04/60] common/sfc_efx/base: add efsys option for Riverhead [05/60] common/sfc_efx/base: add Riverhead NIC family [06/60] common/sfc_efx/base: update registers check for Riverhead [07/60] common/sfc_efx/base: use EF10 MCDI methods for Riverhead [08/60] common/sfc_efx/base: use EF10 PHY methods for Riverhead [09/60] common/sfc_efx/base: move 14b prefix check out of caps get [10/60] common/sfc_efx/base: remove PF count get from caps get [11/60] common/sfc_efx/base: factor out helper to get board config [12/60] common/sfc_efx/base: set NIC features in generic place [13/60] common/sfc_efx/base: factor out MCDI entity reset helper [14/60] common/sfc_efx/base: add Riverhead support to NIC module [15/60] common/sfc_efx/base: use dummy tunnel ops for Riverhead [16/60] common/sfc_efx/base: use EF10 filter methods for Riverhead [17/60] common/sfc_efx/base: use EF10 MAC methods for Riverhead [18/60] common/sfc_efx/base: add interrupts module for Riverhead [19/60] common/sfc_efx/base: move EvQ init/fini wrappers to generic [20/60] common/sfc_efx/base: move EvQ create generic checks [21/60] common/sfc_efx/base: prepare to merge EvQ init functions [22/60] common/sfc_efx/base: merge versions of init EvQ wrappers [23/60] common/sfc_efx/base: add event queue module for Riverhead [24/60] common/sfc_efx/base: complete EvQ creation on Riverhead [25/60] common/sfc_efx/base: handle MCDI events on Riverhead [26/60] common/sfc_efx/base: move RxQ init/fini wrappers to generic [27/60] common/sfc_efx/base: move TxQ init/fini wrappers to generic [28/60] common/sfc_efx/base: switch TxQ init to extended version [29/60] common/sfc_efx/base: maintain RxQ counter in generic code [30/60] common/sfc_efx/base: free Rx queue structure in generic code [31/60] common/sfc_efx/base: move Rx index check to generic code [32/60] common/sfc_efx/base: implement Rx control path for Riverhead [33/60] common/sfc_efx/base: implement Tx control path for Riverhead [34/60] common/sfc_efx/base: fix Tx descriptor DMA sync on Riverhead [35/60] common/sfc_efx/base: handle Rx events for Riverhead [36/60] common/sfc_efx/base: handle Tx complete on Riverhead [37/60] common/sfc_efx/base: indicate support for TSO version 3 [38/60] common/sfc_efx/base: report restrictions for TSO version 3 [39/60] common/sfc_efx: do not include libefx headers from efsys.h [40/60] common/sfc_efx/base: add API to get Rx prefix information [41/60] common/sfc_efx/base: group RxQ parameters into a structure [42/60] common/sfc_efx/base: choose smallest Rx prefix on Riverhead [43/60] common/sfc_efx/base: add function control window concept [44/60] common/sfc_efx/base: add function control window lookup API [45/60] common/sfc_efx/base: add efsys API to find a memory BAR [46/60] common/sfc_efx/base: add Xilinx capabilities table lookup [47/60] common/sfc_efx/base: add NIC magic check on BAR lookup [48/60] common/sfc_efx/base: introduce UDP tunnel destruct operation [49/60] common/sfc_efx/base: introduce states for UDP tunnel entries [50/60] common/sfc_efx/base: support UDP tunnel operations for EF100 [51/60] common/sfc_efx/base: replace PCI efsys macros with functions [52/60] common/sfc_efx/base: use EF10 EVB methods for Riverhead [53/60] common/sfc_efx/base: allocate vAdaptor on Riverhead [54/60] common/sfc_efx/base: add option for extended width events [55/60] common/sfc_efx/base: add 256bit type [56/60] common/sfc_efx/base: support creation of extended width EvQ [57/60] common/sfc_efx/base: poll extended width event queues [58/60] common/sfc_efx/base: handle normal events in extended width [59/60] common/sfc_efx/base: add option for descriptor proxy queues [60/60] common/sfc_efx/base: handle descriptor proxy queue events

Checks

Context	Check	Description
ci/checkpatch	warning	coding style issues

Commit Message

Andrew Rybchenko Sept. 22, 2020, 8:48 a.m. UTC

  Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
Reviewed-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>
---
 drivers/common/sfc_efx/base/efx_check.h | 44 ++++++++++++-------------
 drivers/common/sfc_efx/efsys.h          |  3 ++
 2 files changed, 25 insertions(+), 22 deletions(-)

diff mbox series

Patch

diff --git a/drivers/common/sfc_efx/base/efx_check.h b/drivers/common/sfc_efx/base/efx_check.h
index 5a04a69e5f..978321cf67 100644
--- a/drivers/common/sfc_efx/base/efx_check.h
+++ b/drivers/common/sfc_efx/base/efx_check.h
@@ -47,8 +47,8 @@ 
 
 #if EFSYS_OPT_CHECK_REG
 /* Verify chip implements accessed registers */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "CHECK_REG requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "CHECK_REG requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_CHECK_REG */
 
@@ -79,21 +79,21 @@ 
 
 #if EFSYS_OPT_FILTER
 /* Support hardware packet filters */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "FILTER requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "FILTER requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_FILTER */
 
-#if EFX_OPTS_EF10()
+#if EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10()
 # if !EFSYS_OPT_FILTER
-#  error "EF10 arch requires FILTER"
+#  error "RIVERHEAD or EF10 arch requires FILTER"
 # endif
 #endif /* EFX_OPTS_EF10() */
 
 #if EFSYS_OPT_LOOPBACK
 /* Support hardware loopback modes */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "LOOPBACK requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "LOOPBACK requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_LOOPBACK */
 
@@ -107,21 +107,21 @@ 
 
 #if EFSYS_OPT_MAC_STATS
 /* Support MAC statistics */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "MAC_STATS requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "MAC_STATS requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_MAC_STATS */
 
 #if EFSYS_OPT_MCDI
 /* Support management controller messages */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "MCDI requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "MCDI requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_MCDI */
 
-#if (EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#if (EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
 # if !EFSYS_OPT_MCDI
-#  error "EF10 arch or SIENA requires MCDI"
+#  error "RIVERHEAD or EF10 arch or SIENA requires MCDI"
 # endif
 #endif
 
@@ -288,15 +288,15 @@ 
 
 #if EFSYS_OPT_RX_SCALE
 /* Support receive scaling (RSS) */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "RX_SCALE requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "RX_SCALE requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_RX_SCALE */
 
 #if EFSYS_OPT_RX_SCATTER
 /* Support receive scatter DMA */
-# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
-#  error "RX_SCATTER requires EF10 arch or SIENA"
+# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA)
+#  error "RX_SCATTER requires RIVERHEAD or EF10 arch or SIENA"
 # endif
 #endif /* EFSYS_OPT_RX_SCATTER */
 
@@ -338,8 +338,8 @@ 
 
 #if EFSYS_OPT_ALLOW_UNCONFIGURED_NIC
 /* Support adapters with missing static config (for factory use only) */
-# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "ALLOW_UNCONFIGURED_NIC requires MEDFORD or MEDFORD2"
+# if !(EFSYS_OPT_RIVERHEAD || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+#  error "ALLOW_UNCONFIGURED_NIC requires RIVERHEAD or MEDFORD or MEDFORD2"
 # endif
 #endif /* EFSYS_OPT_ALLOW_UNCONFIGURED_NIC */
 
@@ -359,8 +359,8 @@ 
 
 /* Support hardware assistance for tunnels */
 #if EFSYS_OPT_TUNNEL
-# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
-#  error "TUNNEL requires MEDFORD or MEDFORD2"
+# if !(EFSYS_OPT_RIVERHEAD || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)
+#  error "TUNNEL requires RIVERHEAD or MEDFORD or MEDFORD2"
 # endif
 #endif /* EFSYS_OPT_TUNNEL */
 
diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h
index 46b08f9789..1567d91588 100644
--- a/drivers/common/sfc_efx/efsys.h
+++ b/drivers/common/sfc_efx/efsys.h
@@ -105,6 +105,9 @@  prefetch_read_once(const volatile void *addr)
 #define EFSYS_OPT_MEDFORD 1
 /* Enable SFN2xxx support */
 #define EFSYS_OPT_MEDFORD2 1
+/* Disable Riverhead support */
+#define EFSYS_OPT_RIVERHEAD 0
+
 #ifdef RTE_LIBRTE_SFC_EFX_DEBUG
 #define EFSYS_OPT_CHECK_REG 1
 #else