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 41515A04AF for ; Thu, 20 Aug 2020 17:34:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3910D1C0BF; Thu, 20 Aug 2020 17:34:46 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 670AC1C0B0 for ; Thu, 20 Aug 2020 17:34:44 +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=19pHgNl2mound9VgDkC+QcR2A/0Sa9icNhmCxUxJSdY=; b=ILYN4cpMmQWyrVz/BnFX3Yzu2wcCLV0C1wRvUGKfwa8aRFp5QoAe2ny/vv+Z8De1GRVBdA K+QiIwDIe6JXb5+HhqE/+tyMz/2TvoWVm7AX5bDTUiKHNfeoI8FOBeu1kBI6T3SHz8CgKT l8US4qstb4zqX78ASwxzbwEYgQvrdaY= 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-362-LxPQQPOqNSWj8XjbUSlnGQ-1; Thu, 20 Aug 2020 11:34:41 -0400 X-MC-Unique: LxPQQPOqNSWj8XjbUSlnGQ-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 04ED28030C4; Thu, 20 Aug 2020 15:34:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB917101417C; Thu, 20 Aug 2020 15:34:37 +0000 (UTC) From: Kevin Traynor To: Nipun Gupta Cc: Akhil Goyal , Hemant Agrawal , dpdk stable Date: Thu, 20 Aug 2020 16:33:28 +0100 Message-Id: <20200820153341.171927-23-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 'bus/fslmc: fix getting FD error' 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/5ab31105f3f630d897d8dbd5397cda0317334458 Thanks. Kevin. --- >From 5ab31105f3f630d897d8dbd5397cda0317334458 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 0a59f9d84f..9609f359fa 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -253,5 +253,5 @@ enum qbman_fd_format { #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) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.674631298 +0100 +++ 0023-bus-fslmc-fix-getting-FD-error.patch 2020-08-20 16:26:15.808324179 +0100 @@ -1 +1 @@ -From 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b Mon Sep 17 00:00:00 2001 +From 5ab31105f3f630d897d8dbd5397cda0317334458 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 4682a52998..f1c70251aa 100644 +index 0a59f9d84f..9609f359fa 100644 @@ -22 +23 @@ -@@ -287,5 +287,5 @@ enum qbman_fd_format { +@@ -253,5 +253,5 @@ enum qbman_fd_format {