From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id EE8A4A0524;
Tue, 13 Apr 2021 07:03:32 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D862E160AA9;
Tue, 13 Apr 2021 07:03:13 +0200 (CEST)
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by mails.dpdk.org (Postfix) with ESMTP id 47F66160A94
for <dev@dpdk.org>; Tue, 13 Apr 2021 07:03:09 +0200 (CEST)
IronPort-SDR: 6RMs6dF6r/kmbOEIJeiytmutAq9k789+/JRRZiLwSX3boB61/UKg1TeLc8Oa7CnlB/Sb8jJD6p
IqlbaAXs/Zgw==
X-IronPort-AV: E=McAfee;i="6200,9189,9952"; a="279641909"
X-IronPort-AV: E=Sophos;i="5.82,218,1613462400"; d="scan'208";a="279641909"
Received: from fmsmga008.fm.intel.com ([10.253.24.58])
by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
12 Apr 2021 22:03:08 -0700
IronPort-SDR: ajUGQnl97GOtI3i5uR7I95Q9LnwkgoYAWI8HgSddVr4444yEglUT5LH7LF9Jx95cAH7afKKy6Y
Vvl/AVD7XXBw==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.82,218,1613462400"; d="scan'208";a="417704646"
Received: from dpdk51.sh.intel.com ([10.67.111.142])
by fmsmga008.fm.intel.com with ESMTP; 12 Apr 2021 22:03:07 -0700
From: Qi Zhang <qi.z.zhang@intel.com>
To: qiming.yang@intel.com
Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,
Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Tue, 13 Apr 2021 13:06:30 +0800
Message-Id: <20210413050640.2586033-5-qi.z.zhang@intel.com>
X-Mailer: git-send-email 2.26.2
In-Reply-To: <20210413050640.2586033-1-qi.z.zhang@intel.com>
References: <20210329141411.2395069-1-qi.z.zhang@intel.com>
<20210413050640.2586033-1-qi.z.zhang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2 04/14] net/ice/base: remove unused ptype field
in PTT definition
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Remove the unused ptype entry, and use the gcc extension for
ranged initializers in arrays for Linux, and explicitly target
each table entry by index when initializing under Linux.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/ice/base/ice_lan_tx_rx.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/base/ice_lan_tx_rx.h b/drivers/net/ice/base/ice_lan_tx_rx.h
index e24a1bb767..696c6a30ae 100644
--- a/drivers/net/ice/base/ice_lan_tx_rx.h
+++ b/drivers/net/ice/base/ice_lan_tx_rx.h
@@ -296,7 +296,6 @@ enum ice_rx_l2_ptype {
};
struct ice_rx_ptype_decoded {
- u32 ptype:10;
u32 known:1;
u32 outer_ip:1;
u32 outer_ip_ver:2;
@@ -1217,8 +1216,7 @@ struct ice_tx_drbell_q_ctx {
/* macro to make the table lines short */
#define ICE_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\
- { PTYPE, \
- 1, \
+ { 1, \
ICE_RX_PTYPE_OUTER_##OUTER_IP, \
ICE_RX_PTYPE_OUTER_##OUTER_IP_VER, \
ICE_RX_PTYPE_##OUTER_FRAG, \
@@ -1228,14 +1226,14 @@ struct ice_tx_drbell_q_ctx {
ICE_RX_PTYPE_INNER_PROT_##I, \
ICE_RX_PTYPE_PAYLOAD_LAYER_##PL }
-#define ICE_PTT_UNUSED_ENTRY(PTYPE) { PTYPE, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+#define ICE_PTT_UNUSED_ENTRY(PTYPE) { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
/* shorter macros makes the table fit but are terse */
#define ICE_RX_PTYPE_NOF ICE_RX_PTYPE_NOT_FRAG
#define ICE_RX_PTYPE_FRG ICE_RX_PTYPE_FRAG
-/* Lookup table mapping the HW PTYPE to the bit field for decoding */
-static const struct ice_rx_ptype_decoded ice_ptype_lkup[] = {
+/* Lookup table mapping the 10-bit HW PTYPE to the bit field for decoding */
+static const struct ice_rx_ptype_decoded ice_ptype_lkup[1024] = {
/* L2 Packet types */
ICE_PTT_UNUSED_ENTRY(0),
ICE_PTT(1, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
--
2.26.2