From: Matej Vido <vido@cesnet.cz>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 5/5] net/szedata2: add more supported firmwares
Date: Fri, 26 May 2017 20:05:56 +0200 [thread overview]
Message-ID: <1495821956-5050-5-git-send-email-vido@cesnet.cz> (raw)
In-Reply-To: <1495821956-5050-1-git-send-email-vido@cesnet.cz>
Add IBUF and OBUF offsets definitions for new firmwares.
Signed-off-by: Matej Vido <vido@cesnet.cz>
---
config/common_base | 8 +--
doc/guides/nics/szedata2.rst | 32 ++++++--
drivers/net/szedata2/szedata2_iobuf.c | 148 +++++++++++++++++++++++++++++++--
3 files changed, 168 insertions(+), 20 deletions(-)
diff --git a/config/common_base b/config/common_base
index 67ef2ec..25df77a 100644
--- a/config/common_base
+++ b/config/common_base
@@ -279,12 +279,8 @@ CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n
CONFIG_RTE_LIBRTE_PMD_SZEDATA2=n
#
# Defines firmware type address space.
-# RTE_LIBRTE_PMD_SZEDATA2_AS can be:
-# 0 - for firmwares:
-# NIC_100G1_LR4
-# HANIC_100G1_LR4
-# HANIC_100G1_SR10
-# Other values raise compile time error
+# See documentation for supported values.
+# Other values raise compile time error.
CONFIG_RTE_LIBRTE_PMD_SZEDATA2_AS=0
#
diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst
index 60080a9..cb4d965 100644
--- a/doc/guides/nics/szedata2.rst
+++ b/doc/guides/nics/szedata2.rst
@@ -91,14 +91,34 @@ These configuration options can be modified before compilation in the
* ``CONFIG_RTE_LIBRTE_PMD_SZEDATA2_AS`` default value: **0**
- This option defines type of firmware address space.
- Currently supported value is:
+ This option defines type of firmware address space and must be set
+ according to the used card and mode.
+ Currently supported values are:
- * **0** for firmwares:
+ * **0** - for cards (modes):
- * NIC_100G1_LR4
- * HANIC_100G1_LR4
- * HANIC_100G1_SR10
+ * NFB-100G1 (100G1)
+
+ * **1** - for cards (modes):
+
+ * NFB-100G2Q (100G1)
+
+ * **2** - for cards (modes):
+
+ * NFB-40G2 (40G2)
+ * NFB-100G2C (100G2)
+ * NFB-100G2Q (40G2)
+ * NFB-200G2QL (100G2, 40G2)
+
+ * **3** - for cards (modes):
+
+ * NFB-40G2 (10G8)
+ * NFB-100G2Q (10G8)
+ * NFB-200G2QL (10G8)
+
+ * **4** - for cards (modes):
+
+ * NFB-100G1 (10G10)
Using the SZEDATA2 PMD
----------------------
diff --git a/drivers/net/szedata2/szedata2_iobuf.c b/drivers/net/szedata2/szedata2_iobuf.c
index 2d25e65..821fe78 100644
--- a/drivers/net/szedata2/szedata2_iobuf.c
+++ b/drivers/net/szedata2/szedata2_iobuf.c
@@ -39,21 +39,41 @@
/*
* IBUFs and OBUFs can generally be located at different offsets in different
- * firmwares.
- * This part defines base offsets of IBUFs and OBUFs through various firmwares.
- * Currently one firmware type is supported.
- * Type of firmware is set through configuration option
+ * firmwares (modes).
+ * This part defines base offsets of IBUFs and OBUFs for various cards
+ * and firmwares (modes).
+ * Type of firmware (mode) is set through configuration option
* CONFIG_RTE_LIBRTE_PMD_SZEDATA2_AS.
* Possible values are:
- * 0 - for firmwares:
- * NIC_100G1_LR4
- * HANIC_100G1_LR4
- * HANIC_100G1_SR10
+ * 0 - for cards (modes):
+ * NFB-100G1 (100G1)
+ *
+ * 1 - for cards (modes):
+ * NFB-100G2Q (100G1)
+ *
+ * 2 - for cards (modes):
+ * NFB-40G2 (40G2)
+ * NFB-100G2C (100G2)
+ * NFB-100G2Q (40G2)
+ * NFB-200G2QL (100G2, 40G2)
+ *
+ * 3 - for cards (modes):
+ * NFB-40G2 (10G8)
+ * NFB-100G2Q (10G8)
+ * NFB-200G2QL (10G8)
+ *
+ * 4 - for cards (modes):
+ * NFB-100G1 (10G10)
*/
#if !defined(RTE_LIBRTE_PMD_SZEDATA2_AS)
#error "RTE_LIBRTE_PMD_SZEDATA2_AS has to be defined"
#elif RTE_LIBRTE_PMD_SZEDATA2_AS == 0
+/*
+ * Cards (modes):
+ * NFB-100G1 (100G1)
+ */
+
const uint32_t szedata2_ibuf_base_table[] = {
0x8000
};
@@ -61,6 +81,118 @@
0x9000
};
+#elif RTE_LIBRTE_PMD_SZEDATA2_AS == 1
+
+/*
+ * Cards (modes):
+ * NFB-100G2Q (100G1)
+ */
+
+const uint32_t szedata2_ibuf_base_table[] = {
+ 0x8800
+};
+const uint32_t szedata2_obuf_base_table[] = {
+ 0x9800
+};
+
+#elif RTE_LIBRTE_PMD_SZEDATA2_AS == 2
+
+/*
+ * Cards (modes):
+ * NFB-40G2 (40G2)
+ * NFB-100G2C (100G2)
+ * NFB-100G2Q (40G2)
+ * NFB-200G2QL (100G2, 40G2)
+ */
+
+const uint32_t szedata2_ibuf_base_table[] = {
+ 0x8000,
+ 0x8800
+};
+const uint32_t szedata2_obuf_base_table[] = {
+ 0x9000,
+ 0x9800
+};
+
+#elif RTE_LIBRTE_PMD_SZEDATA2_AS == 3
+
+/*
+ * Cards (modes):
+ * NFB-40G2 (10G8)
+ * NFB-100G2Q (10G8)
+ * NFB-200G2QL (10G8)
+ */
+
+const uint32_t szedata2_ibuf_base_table[] = {
+ 0x8000,
+ 0x8200,
+ 0x8400,
+ 0x8600,
+ 0x8800,
+ 0x8A00,
+ 0x8C00,
+ 0x8E00
+};
+const uint32_t szedata2_obuf_base_table[] = {
+ 0x9000,
+ 0x9200,
+ 0x9400,
+ 0x9600,
+ 0x9800,
+ 0x9A00,
+ 0x9C00,
+ 0x9E00
+};
+
+#elif RTE_LIBRTE_PMD_SZEDATA2_AS == 4
+
+/*
+ * Cards (modes):
+ * NFB-100G1 (10G10)
+ */
+
+const uint32_t szedata2_ibuf_base_table[] = {
+ 0x8000,
+ 0x8200,
+ 0x8400,
+ 0x8600,
+ 0x8800,
+ 0x8A00,
+ 0x8C00,
+ 0x8E00,
+ 0x9000,
+ 0x9200
+};
+const uint32_t szedata2_obuf_base_table[] = {
+ 0xA000,
+ 0xA200,
+ 0xA400,
+ 0xA600,
+ 0xA800,
+ 0xAA00,
+ 0xAC00,
+ 0xAE00,
+ 0xB000,
+ 0xB200
+};
+
+#elif RTE_LIBRTE_PMD_SZEDATA2_AS == 5
+
+const uint32_t szedata2_ibuf_base_table[] = {
+ 0x8000,
+ 0x8200,
+ 0x8400,
+ 0x8600,
+ 0x8800
+};
+const uint32_t szedata2_obuf_base_table[] = {
+ 0x9000,
+ 0x9200,
+ 0x9400,
+ 0x9600,
+ 0x9800
+};
+
#else
#error "RTE_LIBRTE_PMD_SZEDATA2_AS has wrong value, see comments in config file"
#endif
--
1.7.1
next prev parent reply other threads:[~2017-05-26 18:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 18:05 [dpdk-dev] [PATCH 1/5] net/szedata2: refactor ibuf and obuf names Matej Vido
2017-05-26 18:05 ` [dpdk-dev] [PATCH 2/5] net/szedata2: refactor ibuf and obuf read and write Matej Vido
2017-05-26 18:05 ` [dpdk-dev] [PATCH 3/5] net/szedata2: refactor ibuf and obuf address definition Matej Vido
2017-05-29 12:41 ` Ferruh Yigit
2017-05-31 8:33 ` Matej Vido
2017-05-31 9:12 ` Ferruh Yigit
2017-05-26 18:05 ` [dpdk-dev] [PATCH 4/5] net/szedata2: move ibuf and obuf to specific header Matej Vido
2017-05-26 18:05 ` Matej Vido [this message]
2017-05-29 12:42 ` [dpdk-dev] [PATCH 5/5] net/szedata2: add more supported firmwares Ferruh Yigit
2017-05-31 8:34 ` Matej Vido
2017-05-31 9:11 ` Ferruh Yigit
2017-05-29 12:40 ` [dpdk-dev] [PATCH 1/5] net/szedata2: refactor ibuf and obuf names Ferruh Yigit
2017-05-31 8:32 ` Matej Vido
2017-06-12 12:03 ` [dpdk-dev] [PATCH v2 " Matej Vido
2017-06-12 12:03 ` [dpdk-dev] [PATCH v2 2/5] net/szedata2: refactor ibuf and obuf read and write Matej Vido
2017-06-12 12:03 ` [dpdk-dev] [PATCH v2 3/5] net/szedata2: refactor ibuf and obuf address definition Matej Vido
2017-06-12 12:03 ` [dpdk-dev] [PATCH v2 4/5] net/szedata2: move ibuf and obuf to specific header Matej Vido
2017-06-12 12:03 ` [dpdk-dev] [PATCH v2 5/5] net/szedata2: add more supported firmwares Matej Vido
2017-06-12 14:35 ` [dpdk-dev] [PATCH v2 1/5] net/szedata2: refactor ibuf and obuf names Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1495821956-5050-5-git-send-email-vido@cesnet.cz \
--to=vido@cesnet.cz \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).