From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A668BA0A0E for ; Mon, 10 May 2021 18:04:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A08064003E; Mon, 10 May 2021 18:04:31 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750053.outbound.protection.outlook.com [40.107.75.53]) by mails.dpdk.org (Postfix) with ESMTP id C606C4003E for ; Mon, 10 May 2021 18:04:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZULNAM7CbVWjZSqKydy4qPzVDv8ROZe0+7LEdWATLVbjlOCjSo94zIFlielm7bcqOqoE0NYMFpdnn5U8FOLnJgCRiTFnTky4SqdVXY/0ozmRv6h/0Gmm4QlsJDnW7aoc3sUO29iNP03ns/bEj9NfpGiLfCQES3sKChR+QU1H1rKbhGkpmEkO6gDcsXHS805YHKthf0BAikM8xDCpMCVWITfS2cLPoB6OfCCCq33mlkAtX1QXdMPYS4B2XR+qQdiSi1FxJF8ch1kZ5wCSMZWVYgzp6SLKsfQIl36mNpRgCefEVEL/RiqUBQB3IysCePIaisIiHNNo0mRD3FcRcR/zBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/FuQ7R8gAwmqD4HJMi7gwIqKDKXhmlLXi4pJqD0ZbDI=; b=oQiQWU/GVQq6SuEvcYnPkEqvAiChEGcDawt4Ufoi50x1H1PCBbn5UX8PxOHDPL9piRer8FGc8cLQb2cUieqlm0l8Aeg8apfRMRvd+NXD8dx68dt1Sm24eRpvcRaemaxG7eLC0/Tv5j+IF5XSP0UOTh7wGYxMcIRt8ZYxLfIjGTFcL6OZc+VIgj2RMTokuQcgvTkgmUmWWvsUcsjgTbTZKjhQkUpclhRbGWdx/QmikavvBaREn9N48QIQ+2kJtdOgDqNwfLINhIkvDQvJr+foi+g31DryQ4rJJeZwDO4Uo9l+j7HwahSuCfvlWgKeeFg+0YVM+Zr3z0FNt71XTGGHtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=nxp.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/FuQ7R8gAwmqD4HJMi7gwIqKDKXhmlLXi4pJqD0ZbDI=; b=tuY0wOvYLXsQWF/rvo8gtky4vG6+4PkS8G/ql6ZF9nECwxJ/LfIxlGvpdgxxH3WAynmq1pfzdqQM9gmWVt8ub48nVd1XMt90Ob6k/Mkr/rZfJudYOk4WdFARD897Q7s4QExdI8V2EUrXQNn8rhk2Dzb3DWMZrO+hP7NWyIkcyZsF2EWAIPF0eZjze2tTXVWBm+CxFGdc9ge+6opXwFc7R7zbHKVLuu9/OnfQ1ruxrgcwV+OiESIPhVvXCvGW35LZVbmw8cTK9tugi/0TuUkM3FNA1ETzgMwuwJVi2BgeoTFneL33QI1WqtbX72+Dhe3H2OLhYqb9KTs/iWVQljUKwg== Received: from BN9PR03CA0943.namprd03.prod.outlook.com (2603:10b6:408:108::18) by BN6PR1201MB2496.namprd12.prod.outlook.com (2603:10b6:404:a7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:04:28 +0000 Received: from BN8NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:408:108:cafe::f9) by BN9PR03CA0943.outlook.office365.com (2603:10b6:408:108::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:04:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT026.mail.protection.outlook.com (10.13.177.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:04:28 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:04:25 +0000 From: Xueming Li To: Youri Querry CC: Luca Boccassi , Hemant Agrawal , dpdk stable Date: Mon, 10 May 2021 23:59:20 +0800 Message-ID: <20210510160258.30982-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 288041cc-9735-43f9-d646-08d913cd4a39 X-MS-TrafficTypeDiagnostic: BN6PR1201MB2496: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PgC3JsxD0WnX8j18zm/ynhzvXkvDrwbjolmO37hWUqUNRMamcsgiAc40qI2v2hhY39VupdmQ6iyeJa/G0wn7n0AkgXhD1W+tNoq4KUvIKLlkMKO28ZiGTry1r/Q4N2B28q2L775R2/igvMpufUgkPs1Nnxvp6H7FVVPj6zaoJ0wmtQcvaWU4/nhj0d1z9OX1whkOnqIeqJtL5Uy1ZXotAvPStx49pV1acjJsWH65mrSwHJE/A/f0vm68db0XzNSyO652Pkb+JpCRzaKDvDsR8g591SLCbzLl2QE02XSmvS0z7z1ijt9VAZG0D4q1FlASK1sjU20g8SzEewrdoUWGg7yPVsoK6QJMPPG9gZMwLi/Fnflj9OBYLGdVJGa7gF+iR58BzBSYR1PbhXK6MIg5P39Njs/yKsf2AW57Lg/YfUF20IzhjtBlmuBZiwdDdggXWVajN8GGaimwUQypfv609rD8JF2d7huX3clFcPYYp68HCnLdmg4MiVa/zH43ENaKFiFGaK8v2ZC/gZ9iUCDuQwqSS0eH9rtRBaVXifuskghACMfMmWDxbRLW+3s9v4RZIEAJXTHoiGnVfzn+bKX74FUZkV6GsQovgtuOgn/Nccvwa8UM5k5BltYVqgASy5GoLY9QGH31NRCkw5FPV7P/XQbNgcqxvCpQgS6EZVN2Ji5iur97pLNxez5oZYRMoE/CQiRJtKsxdwCdJ9Zapb4XCWWGLmXD25ibTw6RNIf2pUg3UMxUCdB3JBVcaau6Xa3oHbfgg1cooPfFCl4p+3ziCg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(136003)(396003)(39860400002)(346002)(36840700001)(46966006)(53546011)(2906002)(6286002)(6666004)(36756003)(966005)(70206006)(47076005)(8936002)(6916009)(83380400001)(7696005)(16526019)(70586007)(186003)(336012)(5660300002)(86362001)(26005)(82740400003)(36860700001)(356005)(1076003)(7636003)(426003)(2616005)(82310400003)(478600001)(54906003)(36906005)(4326008)(55016002)(8676002)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:04:28.2454 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 288041cc-9735-43f9-d646-08d913cd4a39 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB2496 Subject: [dpdk-stable] patch 'bus/fslmc: fix random portal hangs with qbman 5.0' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/1965f4ee95941d134ce4f5751ee16fb37bfd9198 Thanks. Xueming Li --- >From 1965f4ee95941d134ce4f5751ee16fb37bfd9198 Mon Sep 17 00:00:00 2001 From: Youri Querry Date: Wed, 24 Feb 2021 18:12:49 +0530 Subject: [PATCH] bus/fslmc: fix random portal hangs with qbman 5.0 Cc: Luca Boccassi [ upstream commit a675f35d784115bb2a746daa94b6b5ab6305298f ] Random portal hangs observed on device with QBMAN 5.0 This fixes few random packet hang issues in event mode. Few things fixed it. 1. Generally, pi == ci, no need for extra checks. 2. The proper initializations in init with ci Fixes: 1b49352f41be ("bus/fslmc: rename portal pi index to consumer index") Signed-off-by: Youri Querry Acked-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_portal.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c index 77c9d508c4..aedcad9258 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -339,17 +339,9 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d) eqcr_pi = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI); p->eqcr.pi = eqcr_pi & p->eqcr.pi_ci_mask; p->eqcr.pi_vb = eqcr_pi & QB_VALID_BIT; - if ((p->desc.qman_version & QMAN_REV_MASK) >= QMAN_REV_5000 - && (d->cena_access_mode == qman_cena_fastest_access)) - p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI) - & p->eqcr.pi_ci_mask; - else - p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_CI) - & p->eqcr.pi_ci_mask; - p->eqcr.available = p->eqcr.pi_ring_size - - qm_cyc_diff(p->eqcr.pi_ring_size, - p->eqcr.ci & (p->eqcr.pi_ci_mask<<1), - p->eqcr.pi & (p->eqcr.pi_ci_mask<<1)); + p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_CI) + & p->eqcr.pi_ci_mask; + p->eqcr.available = p->eqcr.pi_ring_size; portal_idx_map[p->desc.idx] = p; return p; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.013875500 +0800 +++ 0012-bus-fslmc-fix-random-portal-hangs-with-qbman-5.0.patch 2021-05-10 23:59:26.320000000 +0800 @@ -1 +1 @@ -From a675f35d784115bb2a746daa94b6b5ab6305298f Mon Sep 17 00:00:00 2001 +From 1965f4ee95941d134ce4f5751ee16fb37bfd9198 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit a675f35d784115bb2a746daa94b6b5ab6305298f ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org