From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 976E9A04B5; Mon, 26 Oct 2020 06:23:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7E75F37B4; Mon, 26 Oct 2020 06:21:44 +0100 (CET) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 77AD92C55 for ; Mon, 26 Oct 2020 06:21:37 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 2B7105C010B; Mon, 26 Oct 2020 01:21:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 26 Oct 2020 01:21:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=8TZOq5b62vOfe Lzzm+gqzQN5RKy/cHWuqOqbBomkQhE=; b=ZFohUziksDZQbVlr6eLeEuS7Vq/w5 jzQNqJcLLKRxNaZCUko9c4LhvqSjz0l20RYpUo+El+LZgS+HSfrJ++v4+4kw2pfK nClVuWgSzH9kgBPFwYP1dMpTj+vL258o7D6aESLVKdNm7wF2BwsDikdb5VkdPBLl PyJK1MVwbTkAQXqB8dhcpzrdwLwpC6tucpM3LreeaMhGapv6pqZMGFyeQhTVEqE7 hv+S5n6rugukkJm1vjgfwvuUPulg9KapBLq1xg77Dps7SWO7+x0FvAeaCdSBkBow fxdqkUxhMbyuDA3OfngMHxb+tPZ2j9HLxF1gA+q/eAynAN4w9GFBCNgGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=8TZOq5b62vOfeLzzm+gqzQN5RKy/cHWuqOqbBomkQhE=; b=SUl6eYh6 /bNBAYkC1jKDcICB3yCx5zCAKvifgCCRxJG5L3WgvkVTNhSo9IKOF61lwbi5YTN7 k+3vEjoxWA7TctTDIKK+TPxLlJycpxLeFJm9QlZX3UA2n6bXg7bY8a5t6y5S6JYO TuYX/SOObnQOVbrdZA9gjhauIAre/4HzpqKm36Qkpb9F+J/Rj0fz1zbkp/m4r3MA iDdMxQ7kVP+3dTX5GAzs9G8p1cTlsAmzf0up7r+ppE/TpzC8dW5QeNe2r/9zR8M7 yBby2YfNF10k7hH00PTpjk/Fw7jWUf5bobdVEzqHQKC/wmrUIqPuUeNUQ+5IwM5Z ljM3iLE4c/dBeg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkeehgdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih iivgepheenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho nhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id DAFC9306467E; Mon, 26 Oct 2020 01:21:34 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: ferruh.yigit@intel.com, david.marchand@redhat.com, bruce.richardson@intel.com, olivier.matz@6wind.com, andrew.rybchenko@oktetlabs.ru, akhil.goyal@nxp.com, Shepard Siegel , Ed Czeck , John Miller Date: Mon, 26 Oct 2020 06:20:57 +0100 Message-Id: <20201026052105.1561859-8-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026052105.1561859-1-thomas@monjalon.net> References: <20201026052105.1561859-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 07/15] net/ark: ignore user data X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Archived-At: List-Archive: The second field of metadata is reserved for user data which is a deprecated mbuf field. The usage of mbuf udata64 is removed and the corresponding ark metadata field is annotated as ignored. Signed-off-by: Thomas Monjalon --- drivers/net/ark/ark_ddm.h | 2 +- drivers/net/ark/ark_ethdev_rx.c | 1 - drivers/net/ark/ark_ethdev_tx.c | 1 - drivers/net/ark/ark_udm.h | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ark/ark_ddm.h b/drivers/net/ark/ark_ddm.h index 5456b4b5cc..99eded8524 100644 --- a/drivers/net/ark/ark_ddm.h +++ b/drivers/net/ark/ark_ddm.h @@ -19,7 +19,7 @@ /* struct defining Tx meta data -- fixed in FPGA -- 16 bytes */ struct ark_tx_meta { uint64_t physaddr; - uint32_t user1; + uint32_t user1; /* ignored */ uint16_t data_len; /* of this MBUF */ #define ARK_DDM_EOP 0x01 #define ARK_DDM_SOP 0x02 diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 2f8d05099c..5ead67e6b8 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -272,7 +272,6 @@ eth_ark_recv_pkts(void *rx_queue, mbuf->pkt_len = meta->pkt_len; mbuf->data_len = meta->pkt_len; mbuf->timestamp = meta->timestamp; - mbuf->udata64 = meta->user_data; if (ARK_DEBUG_CORE) { /* debug sanity checks */ if ((meta->pkt_len > (1024 * 16)) || diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index a0e35af880..8a0a9381f7 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -70,7 +70,6 @@ eth_ark_tx_meta_from_mbuf(struct ark_tx_meta *meta, uint8_t flags) { meta->physaddr = rte_mbuf_data_iova(mbuf); - meta->user1 = (uint32_t)mbuf->udata64; meta->data_len = rte_pktmbuf_data_len(mbuf); meta->flags = flags; } diff --git a/drivers/net/ark/ark_udm.h b/drivers/net/ark/ark_udm.h index 5846c825b8..ba436ee25b 100644 --- a/drivers/net/ark/ark_udm.h +++ b/drivers/net/ark/ark_udm.h @@ -18,7 +18,7 @@ /* Meta data structure apssed from FPGA, must match layout in FPGA */ struct ark_rx_meta { uint64_t timestamp; - uint64_t user_data; + uint64_t user_data; /* ignored */ uint8_t port; uint8_t dst_queue; uint16_t pkt_len; -- 2.28.0