From: Simei Su <simei.su@intel.com>
To: jingjing.wu@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com
Cc: dev@dpdk.org, wenjun1.wu@intel.com, mingxia.liu@intel.com,
wenjing.qiao@intel.com, Simei Su <simei.su@intel.com>,
Pavan Kumar Linga <pavan.kumar.linga@intel.com>
Subject: [PATCH v5 10/11] common/idpf/base: remove unused Tx descriptor types
Date: Wed, 20 Sep 2023 14:22:35 +0800 [thread overview]
Message-ID: <20230920062236.375308-11-simei.su@intel.com> (raw)
In-Reply-To: <20230920062236.375308-1-simei.su@intel.com>
Remove the unused TX descriptor types and mark them as reserved.
Signed-off-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: Simei Su <simei.su@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
drivers/common/idpf/base/idpf_lan_txrx.h | 136 ++---------------------
1 file changed, 12 insertions(+), 124 deletions(-)
diff --git a/drivers/common/idpf/base/idpf_lan_txrx.h b/drivers/common/idpf/base/idpf_lan_txrx.h
index c39930654a..c9eaeb5d3f 100644
--- a/drivers/common/idpf/base/idpf_lan_txrx.h
+++ b/drivers/common/idpf/base/idpf_lan_txrx.h
@@ -119,19 +119,19 @@ enum idpf_rss_hash {
enum idpf_tx_desc_dtype_value {
IDPF_TX_DESC_DTYPE_DATA = 0,
IDPF_TX_DESC_DTYPE_CTX = 1,
- IDPF_TX_DESC_DTYPE_REINJECT_CTX = 2,
- IDPF_TX_DESC_DTYPE_FLEX_DATA = 3,
- IDPF_TX_DESC_DTYPE_FLEX_CTX = 4,
+ /* DTYPE 2 is reserved
+ * DTYPE 3 is free for future use
+ * DTYPE 4 is reserved
+ */
IDPF_TX_DESC_DTYPE_FLEX_TSO_CTX = 5,
- IDPF_TX_DESC_DTYPE_FLEX_TSYN_L2TAG1 = 6,
+ /* DTYPE 6 is reserved */
IDPF_TX_DESC_DTYPE_FLEX_L2TAG1_L2TAG2 = 7,
- IDPF_TX_DESC_DTYPE_FLEX_TSO_L2TAG2_PARSTAG_CTX = 8,
- IDPF_TX_DESC_DTYPE_FLEX_HOSTSPLIT_SA_TSO_CTX = 9,
- IDPF_TX_DESC_DTYPE_FLEX_HOSTSPLIT_SA_CTX = 10,
- IDPF_TX_DESC_DTYPE_FLEX_L2TAG2_CTX = 11,
+ /* DTYPE 8, 9 are free for future use
+ * DTYPE 10 is reserved
+ * DTYPE 11 is free for future use
+ */
IDPF_TX_DESC_DTYPE_FLEX_FLOW_SCHE = 12,
- IDPF_TX_DESC_DTYPE_FLEX_HOSTSPLIT_TSO_CTX = 13,
- IDPF_TX_DESC_DTYPE_FLEX_HOSTSPLIT_CTX = 14,
+ /* DTYPE 13, 14 are free for future use */
/* DESC_DONE - HW has completed write-back of descriptor */
IDPF_TX_DESC_DTYPE_DESC_DONE = 15,
};
@@ -225,28 +225,18 @@ enum idpf_tx_flex_desc_cmd_bits {
struct idpf_flex_tx_desc {
__le64 buf_addr; /* Packet buffer address */
struct {
- __le16 cmd_dtype;
#define IDPF_FLEX_TXD_QW1_DTYPE_S 0
#define IDPF_FLEX_TXD_QW1_DTYPE_M GENMASK(4, 0)
#define IDPF_FLEX_TXD_QW1_CMD_S 5
#define IDPF_FLEX_TXD_QW1_CMD_M GENMASK(15, 5)
+ __le16 cmd_dtype;
union {
- /* DTYPE = IDPF_TX_DESC_DTYPE_FLEX_DATA_(0x03) */
- u8 raw[4];
-
- /* DTYPE = IDPF_TX_DESC_DTYPE_FLEX_TSYN_L2TAG1 (0x06) */
- struct {
- __le16 l2tag1;
- u8 flex;
- u8 tsync;
- } tsync;
-
/* DTYPE=IDPF_TX_DESC_DTYPE_FLEX_L2TAG1_L2TAG2 (0x07) */
struct {
__le16 l2tag1;
__le16 l2tag2;
} l2tags;
- } flex;
+ };
__le16 buf_size;
} qw1;
};
@@ -296,16 +286,6 @@ struct idpf_flex_tx_tso_ctx_qw {
};
union idpf_flex_tx_ctx_desc {
- /* DTYPE = IDPF_TX_DESC_DTYPE_FLEX_CTX (0x04) */
- struct {
- u8 qw0_flex[8];
- struct {
- __le16 cmd_dtype;
- __le16 l2tag1;
- u8 qw1_flex[4];
- } qw1;
- } gen;
-
/* DTYPE = IDPF_TX_DESC_DTYPE_FLEX_TSO_CTX (0x05) */
struct {
struct idpf_flex_tx_tso_ctx_qw qw0;
@@ -314,98 +294,6 @@ union idpf_flex_tx_ctx_desc {
u8 flex[6];
} qw1;
} tso;
-
- /* DTYPE = IDPF_TX_DESC_DTYPE_FLEX_TSO_L2TAG2_PARSTAG_CTX (0x08) */
- struct {
- struct idpf_flex_tx_tso_ctx_qw qw0;
- struct {
- __le16 cmd_dtype;
- __le16 l2tag2;
- u8 flex0;
- u8 ptag;
- u8 flex1[2];
- } qw1;
- } tso_l2tag2_ptag;
-
- /* DTYPE = IDPF_TX_DESC_DTYPE_FLEX_L2TAG2_CTX (0x0B) */
- struct {
- u8 qw0_flex[8];
- struct {
- __le16 cmd_dtype;
- __le16 l2tag2;
- u8 flex[4];
- } qw1;
- } l2tag2;
-
- /* DTYPE = IDPF_TX_DESC_DTYPE_REINJECT_CTX (0x02) */
- struct {
- struct {
- __le32 sa_domain;
-#define IDPF_TXD_FLEX_CTX_SA_DOM_M 0xFFFF
-#define IDPF_TXD_FLEX_CTX_SA_DOM_VAL 0x10000
- __le32 sa_idx;
-#define IDPF_TXD_FLEX_CTX_SAIDX_M 0x1FFFFF
- } qw0;
- struct {
- __le16 cmd_dtype;
- __le16 txr2comp;
-#define IDPF_TXD_FLEX_CTX_TXR2COMP 0x1
- __le16 miss_txq_comp_tag;
- __le16 miss_txq_id;
- } qw1;
- } reinjection_pkt;
};
-/* Host Split Context Descriptors */
-struct idpf_flex_tx_hs_ctx_desc {
- union {
- struct {
- __le32 host_fnum_tlen;
-#define IDPF_TXD_FLEX_CTX_TLEN_S 0
-/* see IDPF_TXD_FLEX_CTX_TLEN_M for mask definition */
-#define IDPF_TXD_FLEX_CTX_FNUM_S 18
-#define IDPF_TXD_FLEX_CTX_FNUM_M 0x7FF
-#define IDPF_TXD_FLEX_CTX_HOST_S 29
-#define IDPF_TXD_FLEX_CTX_HOST_M 0x7
- __le16 ftype_mss_rt;
-#define IDPF_TXD_FLEX_CTX_MSS_RT_0 0
-#define IDPF_TXD_FLEX_CTX_MSS_RT_M 0x3FFF
-#define IDPF_TXD_FLEX_CTX_FTYPE_S 14
-#define IDPF_TXD_FLEX_CTX_FTYPE_VF 0
-#define IDPF_TXD_FLEX_CTX_FTYPE_VDEV BIT(14)
-#define IDPF_TXD_FLEX_CTX_FTYPE_PF BIT(15)
- u8 hdr_len;
- u8 ptag;
- } tso;
- struct {
- u8 flex0[2];
- __le16 host_fnum_ftype;
- u8 flex1[3];
- u8 ptag;
- } no_tso;
- } qw0;
-
- __le64 qw1_cmd_dtype;
-#define IDPF_TXD_FLEX_CTX_QW1_PASID_S 16
-#define IDPF_TXD_FLEX_CTX_QW1_PASID_M 0xFFFFF
-#define IDPF_TXD_FLEX_CTX_QW1_PASID_VALID_S 36
-#define IDPF_TXD_FLEX_CTX_QW1_PASID_VALID \
- BIT_ULL(IDPF_TXD_FLEX_CTX_QW1_PASID_VALID_S)
-#define IDPF_TXD_FLEX_CTX_QW1_TPH_S 37
-#define IDPF_TXD_FLEX_CTX_QW1_TPH \
- BIT_ULL(IDPF_TXD_FLEX_CTX_QW1_TPH_S)
-#define IDPF_TXD_FLEX_CTX_QW1_PFNUM_S 38
-#define IDPF_TXD_FLEX_CTX_QW1_PFNUM_M 0xF
-/* The following are only valid for DTYPE = 0x09 and DTYPE = 0x0A */
-#define IDPF_TXD_FLEX_CTX_QW1_SAIDX_S 42
-#define IDPF_TXD_FLEX_CTX_QW1_SAIDX_M 0x1FFFFF
-#define IDPF_TXD_FLEX_CTX_QW1_SAIDX_VAL_S 63
-#define IDPF_TXD_FLEX_CTX_QW1_SAIDX_VALID \
- BIT_ULL(IDPF_TXD_FLEX_CTX_QW1_SAIDX_VAL_S)
-/* The following are only valid for DTYPE = 0x0D and DTYPE = 0x0E */
-#define IDPF_TXD_FLEX_CTX_QW1_FLEX0_S 48
-#define IDPF_TXD_FLEX_CTX_QW1_FLEX0_M 0xFF
-#define IDPF_TXD_FLEX_CTX_QW1_FLEX1_S 56
-#define IDPF_TXD_FLEX_CTX_QW1_FLEX1_M 0xFF
-};
#endif /* _IDPF_LAN_TXRX_H_ */
--
2.25.1
next prev parent reply other threads:[~2023-09-20 6:23 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 1:32 [PATCH 00/14] update idpf base code Wenjing Qiao
2023-08-09 1:32 ` [PATCH 01/14] common/idpf/base: enable support for physical port stats Wenjing Qiao
2023-08-09 1:32 ` [PATCH 02/14] common/idpf/base: add miss completion capabilities Wenjing Qiao
2023-08-09 1:32 ` [PATCH 03/14] common/idpf/base: initial PTP support Wenjing Qiao
2023-08-09 2:22 ` Liu, Mingxia
2023-08-09 1:32 ` [PATCH 04/14] common/idpf/base: remove mailbox registers Wenjing Qiao
2023-08-09 1:32 ` [PATCH 05/14] common/idpf/base: add some adi specific fields Wenjing Qiao
2023-08-09 1:33 ` [PATCH 06/14] common/idpf/base: add necessary check Wenjing Qiao
2023-08-09 1:33 ` [PATCH 07/14] common/idpf/base: add union for SW cookie fields in ctlq msg Wenjing Qiao
2023-08-09 1:33 ` [PATCH 08/14] common/idpf/base: define non-flexible size structure for ADI Wenjing Qiao
2023-08-09 1:33 ` [PATCH 09/14] common/idpf/base: use local pointer before updating 'CQ out' Wenjing Qiao
2023-08-09 1:33 ` [PATCH 10/14] common/idpf/base: use 'void' return type Wenjing Qiao
2023-08-09 1:33 ` [PATCH 11/14] common/idpf/base: refactor descriptor 'ret val' stripping Wenjing Qiao
2023-08-09 1:33 ` [PATCH 12/14] common/idpf/base: refine comments and alignment Wenjing Qiao
2023-08-09 1:33 ` [PATCH 13/14] common/idpf/base: use GENMASK macro Wenjing Qiao
2023-08-09 1:33 ` [PATCH 14/14] common/idpf/base: use 'type functionname(args)' style Wenjing Qiao
2023-08-25 10:13 ` [PATCH v2 00/17] update idpf base code Simei Su
2023-08-25 10:13 ` [PATCH v2 01/17] common/idpf/base: enable support for physical port stats Simei Su
2023-08-25 10:13 ` [PATCH v2 02/17] common/idpf/base: add miss completion capabilities Simei Su
2023-08-25 10:13 ` [PATCH v2 03/17] common/idpf/base: initial PTP support Simei Su
2023-08-25 10:13 ` [PATCH v2 04/17] common/idpf/base: remove mailbox registers Simei Su
2023-08-25 10:13 ` [PATCH v2 05/17] common/idpf/base: add some adi specific fields Simei Su
2023-08-25 10:13 ` [PATCH v2 06/17] common/idpf/base: add necessary check Simei Su
2023-08-25 10:13 ` [PATCH v2 07/17] common/idpf/base: add union for SW cookie fields in ctlq msg Simei Su
2023-08-25 10:13 ` [PATCH v2 08/17] common/idpf/base: define non-flexible size structure for ADI Simei Su
2023-08-25 10:13 ` [PATCH v2 09/17] common/idpf/base: use local pointer before updating 'CQ out' Simei Su
2023-08-25 10:13 ` [PATCH v2 10/17] common/idpf/base: use 'void' return type Simei Su
2023-08-25 10:13 ` [PATCH v2 11/17] common/idpf/base: refactor descriptor 'ret val' stripping Simei Su
2023-08-25 10:13 ` [PATCH v2 12/17] common/idpf/base: refine comments and alignment Simei Su
2023-08-25 10:13 ` [PATCH v2 13/17] common/idpf/base: use GENMASK macro Simei Su
2023-08-25 10:13 ` [PATCH v2 14/17] common/idpf/base: use 'type functionname(args)' style Simei Su
2023-08-25 10:13 ` [PATCH v2 15/17] common/idpf/base: dont declare union with 'flex' Simei Su
2023-08-25 10:13 ` [PATCH v2 16/17] common/idpf/base: remove unused Tx descriptor types Simei Su
2023-08-25 10:13 ` [PATCH v2 17/17] common/idpf/base: update version Simei Su
2023-09-15 2:17 ` [PATCH v3 00/17] update idpf base code Simei Su
2023-09-15 2:17 ` [PATCH v3 01/17] common/idpf/base: enable support for physical port stats Simei Su
2023-09-15 2:17 ` [PATCH v3 02/17] common/idpf/base: add miss completion capabilities Simei Su
2023-09-15 2:17 ` [PATCH v3 03/17] common/idpf/base: initial PTP support Simei Su
2023-09-15 2:17 ` [PATCH v3 04/17] common/idpf/base: remove mailbox registers Simei Su
2023-09-15 2:17 ` [PATCH v3 05/17] common/idpf/base: add some adi specific fields Simei Su
2023-09-15 2:17 ` [PATCH v3 06/17] common/idpf/base: add necessary check Simei Su
2023-09-15 2:17 ` [PATCH v3 07/17] common/idpf/base: add union for SW cookie fields in ctlq msg Simei Su
2023-09-15 2:17 ` [PATCH v3 08/17] common/idpf/base: define non-flexible size structure for ADI Simei Su
2023-09-15 2:17 ` [PATCH v3 09/17] common/idpf/base: use local pointer before updating 'CQ out' Simei Su
2023-09-15 2:17 ` [PATCH v3 10/17] common/idpf/base: use 'void' return type Simei Su
2023-09-15 2:17 ` [PATCH v3 11/17] common/idpf/base: refactor descriptor 'ret val' stripping Simei Su
2023-09-15 2:17 ` [PATCH v3 12/17] common/idpf/base: refine comments and alignment Simei Su
2023-09-15 2:17 ` [PATCH v3 13/17] common/idpf/base: use GENMASK macro Simei Su
2023-09-15 2:17 ` [PATCH v3 14/17] common/idpf/base: use 'type functionname(args)' style Simei Su
2023-09-15 2:17 ` [PATCH v3 15/17] common/idpf/base: don't declare union with 'flex' Simei Su
2023-09-15 2:17 ` [PATCH v3 16/17] common/idpf/base: remove unused Tx descriptor types Simei Su
2023-09-15 2:17 ` [PATCH v3 17/17] common/idpf/base: update version Simei Su
2023-09-15 5:44 ` [PATCH v3 00/17] update idpf base code Xing, Beilei
2023-09-18 2:11 ` [PATCH v4 00/18] " Simei Su
2023-09-18 2:11 ` [PATCH v4 01/18] common/idpf: refactor single queue Tx data path Simei Su
2023-09-18 2:11 ` [PATCH v4 02/18] common/idpf/base: enable support for physical port stats Simei Su
2023-09-18 2:11 ` [PATCH v4 03/18] common/idpf/base: add miss completion capabilities Simei Su
2023-09-18 2:11 ` [PATCH v4 04/18] common/idpf/base: initial PTP support Simei Su
2023-09-18 2:11 ` [PATCH v4 05/18] common/idpf/base: remove mailbox registers Simei Su
2023-09-18 2:11 ` [PATCH v4 06/18] common/idpf/base: add some adi specific fields Simei Su
2023-09-18 2:11 ` [PATCH v4 07/18] common/idpf/base: add necessary check Simei Su
2023-09-18 2:11 ` [PATCH v4 08/18] common/idpf/base: add union for SW cookie fields in ctlq msg Simei Su
2023-09-18 2:11 ` [PATCH v4 09/18] common/idpf/base: define non-flexible size structure for ADI Simei Su
2023-09-18 2:11 ` [PATCH v4 10/18] common/idpf/base: use local pointer before updating 'CQ out' Simei Su
2023-09-18 2:11 ` [PATCH v4 11/18] common/idpf/base: use 'void' return type Simei Su
2023-09-18 2:11 ` [PATCH v4 12/18] common/idpf/base: refactor descriptor 'ret val' stripping Simei Su
2023-09-18 2:11 ` [PATCH v4 13/18] common/idpf/base: refine comments and alignment Simei Su
2023-09-18 2:11 ` [PATCH v4 14/18] common/idpf/base: use GENMASK macro Simei Su
2023-09-18 2:11 ` [PATCH v4 15/18] common/idpf/base: use 'type functionname(args)' style Simei Su
2023-09-18 2:11 ` [PATCH v4 16/18] common/idpf/base: don't declare union with 'flex' Simei Su
2023-09-18 2:11 ` [PATCH v4 17/18] common/idpf/base: remove unused Tx descriptor types Simei Su
2023-09-18 2:11 ` [PATCH v4 18/18] common/idpf/base: update version Simei Su
2023-09-20 6:22 ` [PATCH v5 00/11] update idpf base code Simei Su
2023-09-20 6:22 ` [PATCH v5 01/11] common/idpf: refactor single queue Tx data path Simei Su
2023-09-20 6:22 ` [PATCH v5 02/11] common/idpf/base: enable support for physical port stats Simei Su
2023-09-20 6:22 ` [PATCH v5 03/11] common/idpf/base: add miss completion capabilities Simei Su
2023-09-20 6:22 ` [PATCH v5 04/11] common/idpf/base: initialize PTP support Simei Su
2023-09-20 6:22 ` [PATCH v5 05/11] common/idpf/base: remove mailbox registers Simei Su
2023-09-20 6:22 ` [PATCH v5 06/11] common/idpf/base: refine structure and necessary check Simei Su
2023-09-20 6:22 ` [PATCH v5 07/11] common/idpf/base: add union for SW cookie fields Simei Su
2023-09-20 6:22 ` [PATCH v5 08/11] common/idpf/base: refine code and alignments Simei Su
2023-09-20 6:22 ` [PATCH v5 09/11] common/idpf/base: use GENMASK macro Simei Su
2023-09-20 6:22 ` Simei Su [this message]
2023-09-20 6:22 ` [PATCH v5 11/11] common/idpf/base: update version Simei Su
2023-09-21 1:21 ` [PATCH v5 00/11] update idpf base code Zhang, Qi Z
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=20230920062236.375308-11-simei.su@intel.com \
--to=simei.su@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=mingxia.liu@intel.com \
--cc=pavan.kumar.linga@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=wenjing.qiao@intel.com \
--cc=wenjun1.wu@intel.com \
/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).