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 52C28A04AF for ; Thu, 20 Aug 2020 17:34:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 495931E2B; Thu, 20 Aug 2020 17:34:49 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 47D2E1C0BF for ; Thu, 20 Aug 2020 17:34:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OMUGaslZ2nxS1yqm+0GPn/QLWiuxZ/1IMhuQO8NAA98=; b=YNaEMI3nWBNi3tLdKSdesLREhyDg9dXwlRxpBMK3FAiN54TgLX3sBZ0UfD15DB54Bw5LtT VnKq6gbdmth6jUQNPT27+2U89fJTq70W2iAxpmuNzCW1E4GpS9dw01ZyP7O63g7/ReQQre 5/7B2SVWIaM2qYic/UCo5jWg4eALH1Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-LJUf1S7uOOK6vcWWkzCnqA-1; Thu, 20 Aug 2020 11:34:41 -0400 X-MC-Unique: LJUf1S7uOOK6vcWWkzCnqA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A5BFF1885D83; Thu, 20 Aug 2020 15:34:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B56F100AE53; Thu, 20 Aug 2020 15:34:39 +0000 (UTC) From: Kevin Traynor To: Nipun Gupta Cc: Akhil Goyal , Hemant Agrawal , dpdk stable Date: Thu, 20 Aug 2020 16:33:29 +0100 Message-Id: <20200820153341.171927-24-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/dpaa: fix FD offset data type' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Thanks. Kevin. --- >From 60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Mon Sep 17 00:00:00 2001 From: Nipun Gupta Date: Tue, 7 Jul 2020 14:52:17 +0530 Subject: [PATCH] net/dpaa: fix FD offset data type [ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ] On DPAA fd offset is 9 bits, but we are using uint8_t in the SG case. This patch fixes the same. Fixes: 8cffdcbe85aa ("net/dpaa: support scattered Rx") Signed-off-by: Nipun Gupta Acked-by: Akhil Goyal Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index ba01bd17e6..2089ed5f59 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -305,5 +305,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid) void *vaddr, *sg_vaddr; int i = 0; - uint8_t fd_offset = fd->offset; + uint16_t fd_offset = fd->offset; vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd)); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.701438452 +0100 +++ 0024-net-dpaa-fix-FD-offset-data-type.patch 2020-08-20 16:26:15.809324188 +0100 @@ -1 +1 @@ -From 287f4256f9af9291abd1e1f129144cd47eb2d206 Mon Sep 17 00:00:00 2001 +From 60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 5dba1db8b3..3aeecb7d2e 100644 +index ba01bd17e6..2089ed5f59 100644 @@ -23 +24 @@ -@@ -306,5 +306,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid) +@@ -305,5 +305,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)