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 0D5CBA0518 for ; Fri, 24 Jul 2020 14:09:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 05C0C1C1DB; Fri, 24 Jul 2020 14:09:13 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 92E1A1C1E3 for ; Fri, 24 Jul 2020 14:09:11 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id r4so5130261wrx.9 for ; Fri, 24 Jul 2020 05:09:11 -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=xlmuUIokMW9epiMJ3eQcd8Y/aokoOsqY2QlsVhAA7bA=; b=gEdB2fCd5zDnSXp1n3VFG74k98qTEArumD84iLEpQalY5nIwJvltjS+Ro5D/vP0ZCv MbKxFteWRA2kSxgUsoktaBWWBUTrpjdlm5w3qrj4V06thoMSy6rhE1y/y2cdSQxFwbks oQ7FXVpwjZR61rSAsvOI4/FCnRqng2dTzhGVEfYCFyij4+RHO59vSgZbYjeq3EMvbxEv E2hiQ833VYtDqUu/n2t3fuXPGLv9hbAI1VSSJU/F2AXyh4IxDd7mUOFNAn6/76uxrH8C dL6vPLwYXA/bK1LRsGEipOeUSzDXoVOs9WfhQ9v1Lduu0bVWdNoaq/mwzIzQAL7b0d44 hiDQ== 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=xlmuUIokMW9epiMJ3eQcd8Y/aokoOsqY2QlsVhAA7bA=; b=IwswtjoDCedc0Kaz8O85OWkQuIUZ7moFp0VBMusvcufG+mE/kOq1AfQRW3u8UyG2uL E1ct2FwLc0UqIjRxejS97ne6dt8zJ6IL9nVbwGqovIDgBuXDY2qmrrkrxwKfBQhsmiPR AcPF09yByqMIz+aghm2B9VUS7cWFDp0+kPmQQl8bIc6ouK/VKIXl8xFpEphEIjSbo3Wp RU26hrlwtwX5hlAN0+hm0mL5o2kwxld6Zpo8oPqYyva2tabiwLUFgkntG9jZSu1IZ2Ao 1/3ANmSAfzXCeqKmEZeJVc2r9wVcRuu8CS0hCfpTh+TySV3IsMULePAxsGQmBv2dOZ3a DZHQ== X-Gm-Message-State: AOAM533F+zcZHnQYnpWaPT4dHymWU5u4ulsqq2a65hO8hOq5y2IIbx6u abrsaZF2kyd4J5Z1u8fVZ6U= X-Google-Smtp-Source: ABdhPJx9k21fCV1AE90WfmttEsfWLD4tnEWnRt3t1OJqPccbYe1CHHOU7pSGfkSxITz60z1QYY1rjQ== X-Received: by 2002:a05:6000:1141:: with SMTP id d1mr9020410wrx.229.1595592551325; Fri, 24 Jul 2020 05:09:11 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o2sm1170100wrj.21.2020.07.24.05.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Nipun Gupta Cc: Akhil Goyal , Hemant Agrawal , dpdk stable Date: Fri, 24 Jul 2020 12:59:28 +0100 Message-Id: <20200724120030.1863487-130-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 'bus/fslmc: fix getting FD error' 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 2f92210432eb5bf7613ffafbb32679aaafd291c1 Mon Sep 17 00:00:00 2001 From: Nipun Gupta Date: Tue, 7 Jul 2020 14:52:16 +0530 Subject: [PATCH] bus/fslmc: fix getting FD error [ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ] Fix the incorrect register for getting error Fixes: 03e36408b9fb ("bus/fslmc: add macros required by QDMA for FLE and FD") Signed-off-by: Nipun Gupta Acked-by: Akhil Goyal Acked-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index ab2b213f8..00ef4ee53 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -289,7 +289,7 @@ enum qbman_fd_format { #define DPAA2_GET_FD_FRC(fd) ((fd)->simple.frc) #define DPAA2_GET_FD_FLC(fd) \ (((uint64_t)((fd)->simple.flc_hi) << 32) + (fd)->simple.flc_lo) -#define DPAA2_GET_FD_ERR(fd) ((fd)->simple.bpid_offset & 0x000000FF) +#define DPAA2_GET_FD_ERR(fd) ((fd)->simple.ctrl & 0x000000FF) #define DPAA2_GET_FLE_OFFSET(fle) (((fle)->fin_bpid_offset & 0x0FFF0000) >> 16) #define DPAA2_SET_FLE_SG_EXT(fle) ((fle)->fin_bpid_offset |= (uint64_t)1 << 29) #define DPAA2_IS_SET_FLE_SG_EXT(fle) \ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.540143424 +0100 +++ 0130-bus-fslmc-fix-getting-FD-error.patch 2020-07-24 12:53:48.427009068 +0100 @@ -1,12 +1,13 @@ -From 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b Mon Sep 17 00:00:00 2001 +From 2f92210432eb5bf7613ffafbb32679aaafd291c1 Mon Sep 17 00:00:00 2001 From: Nipun Gupta Date: Tue, 7 Jul 2020 14:52:16 +0530 Subject: [PATCH] bus/fslmc: fix getting FD error +[ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ] + Fix the incorrect register for getting error Fixes: 03e36408b9fb ("bus/fslmc: add macros required by QDMA for FLE and FD") -Cc: stable@dpdk.org Signed-off-by: Nipun Gupta Acked-by: Akhil Goyal @@ -16,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h -index 4682a5299..f1c70251a 100644 +index ab2b213f8..00ef4ee53 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h -@@ -286,7 +286,7 @@ enum qbman_fd_format { +@@ -289,7 +289,7 @@ enum qbman_fd_format { #define DPAA2_GET_FD_FRC(fd) ((fd)->simple.frc) #define DPAA2_GET_FD_FLC(fd) \ (((uint64_t)((fd)->simple.flc_hi) << 32) + (fd)->simple.flc_lo)