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 24D41A0518 for ; Fri, 24 Jul 2020 14:09:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1AAC31C1D0; Fri, 24 Jul 2020 14:09:24 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 8AA901C1D0 for ; Fri, 24 Jul 2020 14:09:22 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id f18so8115671wrs.0 for ; Fri, 24 Jul 2020 05:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/PCMFvXYKXjihcQqnrvxB2vVQcXHaQ/b+V15inDIY58=; b=NN6nZ3QbgH/NecRUxC9JaOK9dtx38OKxGs+xihriG7eRnlE7PubFDSTQ1sIgfTKcIw zVnjaju2HWYFt+zFl0+bn7iqT0l38C/lhIMZW+JY018kKEdXkddGuYExegRWaCOgbuOJ 6jK98kYy99vtMCY4QHjBv/ZHqLEeXBw0Yx70nzUk2cD55H599XfvMXkhny3pyfTHaxmo j8GR8DBfpSaBSZHhuA6sjV3eaCO5FM0hCkT8ufFe37wWtaBBGb6yd1497iYCE+Dd0gFN r0e4Zkppa0CopCgZl9A433Cam5AWpv5oscOT/N90MK5Hme4uyTAFabCsUxb60aCDhPof KC9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/PCMFvXYKXjihcQqnrvxB2vVQcXHaQ/b+V15inDIY58=; b=JnI5w9XDwWHqUk64SVEFCTffMwiqNgQ/WTYTay0oEpxpsk6ym+VWBC77EzoB8TroaK ql0pyNm3gTOedNbTe1NZSaynJ0DGR4Z2Hqu70XiQQ3TaGsSmdQUbr+oMBuezCbsD1liX cFgQ4Z74na9Eyno2NDtRj4fhDTS0cGnKqoWPQOiVQ08fi91f3UszOi/sWqtptlnzyOmi 4e5+iL+AmhyM4dSU4ghUeMsCvL+FOaoDPMPzsuz8D2untUAKiOTb7HEFzsF/6A8NbVMC aj6pRpdfO1qIAfwQXjGbGczWuXj3MWQ9k+TTctaYi160eU3mFXrbXtBw4c2BKvKy705o oRyg== X-Gm-Message-State: AOAM532b0FIyKSFlZ9d5pthFxlxStj1KDIiL6rh7P8yKZXDGeq2OE5t1 RI4qYWtjcChsxKaOc5bl5EY= X-Google-Smtp-Source: ABdhPJzv5VSvrC1J0nKf/vTwZHUWvT9beoVYC4wVNk0kF+uJIK2Xm7bOfDCYVd4BXqtcKQ4+ohOR3w== X-Received: by 2002:adf:e382:: with SMTP id e2mr6017749wrm.306.1595592562323; Fri, 24 Jul 2020 05:09:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w2sm1388641wre.5.2020.07.24.05.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Nipun Gupta Cc: Akhil Goyal , Hemant Agrawal , dpdk stable Date: Fri, 24 Jul 2020 12:59:29 +0100 Message-Id: <20200724120030.1863487-131-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/dpaa: fix FD offset data type' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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. Thanks. Luca Boccassi --- >From e240d2dd4f5f0038de94af18424bc4cce2eb1d3d 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 5dba1db8b..3aeecb7d2 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -305,7 +305,7 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid) struct qm_sg_entry *sgt, *sg_temp; 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)); if (!vaddr) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.578827580 +0100 +++ 0131-net-dpaa-fix-FD-offset-data-type.patch 2020-07-24 12:53:48.427009068 +0100 @@ -1,13 +1,14 @@ -From 287f4256f9af9291abd1e1f129144cd47eb2d206 Mon Sep 17 00:00:00 2001 +From e240d2dd4f5f0038de94af18424bc4cce2eb1d3d 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") -Cc: stable@dpdk.org Signed-off-by: Nipun Gupta Acked-by: Akhil Goyal