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 01E15A0C3F for ; Sat, 12 Jun 2021 01:21:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC1834003F; Sat, 12 Jun 2021 01:21:11 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2047.outbound.protection.outlook.com [40.107.100.47]) by mails.dpdk.org (Postfix) with ESMTP id E33CE4003F for ; Sat, 12 Jun 2021 01:21:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jm2u0vIlUJM5rtPYuuf71m/pERsPayCzGk58sh5smj0uhgLe2XN02BHLINWwq4ERavVK8e8+AX5bEt1cxbh0yjGQis8HLMb+WHbMtpjP03+ryHj//SKgYqhQAldukmAC0INYEI+Wm0LS7MwjgZhCgVIZYZpfB7I59aEMrA77vFkb25BD99kNJOao29KOCepngRpVGNJ3NBxWxEdtkbpg0s5S+yV40JNyzmD7WyC9pDtgvRtNAUU+pX7QC3wq/dUFQlgL1lnALl6lQ+cCQqNoFNKxvnWPvWhlcKq3YGUDnOFFUjsMyJePh9Uwqoixa/jPQGbIeL3CIv6M6ipRCnwIfg== 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=lcfbCBasXKS8EGTm4rOj9JI1EpBkelDeZH+YsSFU8/o=; b=Ubzsp4kg6ufZdaHPUvRsqZfBstWEbx46kx4z2BN5c571HPlh6qN7U3+MCT6RuN6c1kCWydMtoKcjsFb8ovEWaEoV8e7C0PYgm1YtM1ZmNYZ3Cce9xVy0yn+cwm9u5sQtr+MZzaMTaIAGnAzmIEWld+i1RPUWDELS6UOSZUz2smS4ZQ34CHv+516ld6rOVTe81jLhtjpu14WBwG8/OARZAEvvYFngs4BJ5vdreKH6Y7rLY/Ysx1cA8AGOjMffVLyKYLEwHMiTvIZlaAL0rlbVd8yxdKEQTmo2gvUmiEWFQ7B2EfkNFSYyLx9gN4j0wQy0WzCaK3tlZzAT2284ZizQpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.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=lcfbCBasXKS8EGTm4rOj9JI1EpBkelDeZH+YsSFU8/o=; b=YrIyfQjISc51WVrafa6X2jhRs74TiRECjp/A9wfnnQUn9gL9goWGnrZUZ/yb2ynw+jpkM9q1aBVBvtrDXFYxDHa9jjumkOj5HalgCqVFRrpt/+nxMZFs+wDtypQOrO8Kc2mlHpBUR8W/Kqe+Czy4qUCr3I7AoBU+c2Z6QCPcUPZFK4rtoE/yVKbo1PtILUaA+hK1JjT/y3wLW4ROl83Jl1pXlXVrXToD2iI1IngwH8fQ1g71gnxsyjtxRDhvxptNhI+8h6GcPNMIq/JGYNoeNt+PKmLC1VeNS206Rwwi2iOS5M8MYHOwjhKimTs7EjUY4TteEa2C7Izw6CO8XSAulA== Received: from DM6PR03CA0066.namprd03.prod.outlook.com (2603:10b6:5:100::43) by DM5PR12MB1387.namprd12.prod.outlook.com (2603:10b6:3:6c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20; Fri, 11 Jun 2021 23:21:09 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:100:cafe::87) by DM6PR03CA0066.outlook.office365.com (2603:10b6:5:100::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:21:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.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 DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:21:09 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:21:06 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:04:25 +0800 Message-ID: <20210611230433.8208-171-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2fa010ca-cc6c-42a5-a9c3-08d92d2f9848 X-MS-TrafficTypeDiagnostic: DM5PR12MB1387: 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: 6LhP/8r+DOf6bJ3royGqIbvMhr41TMuiJBFzgK5JquSqpDRP2opF1WE4bRJZLmSQaIC7fhdmtBFMGQsoeYsibOty6Ad8wIqGLpNcTGa3osxruCKBFTUI4BzDHnrv98VY8bgUnx3JC8yV6ObUgTeAvO6TSg1gFJuqGR2Wjjo6tSxIadaYl2sWS+srqmYOlvpEqgJLSe9eeQoDOR9anyVV1AG2H7HcJd5YC7p//Dwdraa4jjFgtmVTycta7TXmJxb7R6lF4M0Ccw25HBXmD5rJMAtHkAXr5b/TsW0n4rrXCWjUhV+4W/k3NqfjWUtD/g2j2MVIslt+NBfOvVGnt4skl1gBYN2uMEw9lHImWN57ApVWBE7lHNdmHSzH4HFh/CqwKYtZY5rpPwQCp9ovmbR9Aet0ta6B5fVTA2u+/aouk2pkwUu6XuHr1zRf4vFrp8kZPVDkpck2zNP2BSG5DL1CijGrlvY3xYUxBxVLFLgtr2L8NQQ9pD+p5pc5tT1jz5Pa/igQXEZ5Dn1b1LmnMmUojx5akUp/ndHH8s7iFne3h9dK0qYTmKPt7Kne+39SwcRou9M7qLEYbocfCHLqk5s6yLJUxqnD2zROUfU4N4Egmx+y8eY+lKH09lEauLwaQQIn4GeACRqt+lh//5ExjOdvm65PTVXsJeZxJPv5ciadmCx4IsQ7kezdm3kyfcW1k9oe5jRfsn0MwH4YLfi3aU8UlRkAA0CXVZLAFUUEWqEWOVIr3UorWJ9rK2dvbJ4+/1LyyLbm5/hCUqy4rSW8UrHT1fbyGGj7DY4F4XAzzm2SWFvRi6WKRSAS8PRvPCpJh/9n 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)(39860400002)(396003)(376002)(346002)(136003)(36840700001)(46966006)(82740400003)(6916009)(36756003)(2616005)(478600001)(966005)(16526019)(186003)(86362001)(7636003)(356005)(47076005)(336012)(426003)(55016002)(36860700001)(2906002)(82310400003)(4326008)(83380400001)(6286002)(8936002)(8676002)(5660300002)(53546011)(70206006)(70586007)(26005)(7696005)(1076003)(316002)(6666004)(36906005)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:21:09.0048 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2fa010ca-cc6c-42a5-a9c3-08d92d2f9848 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: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1387 Subject: [dpdk-stable] patch 'net/hns3: fix DCB reconfiguration' 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 06/14/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/f4a3f4a6b9111ab5ec3682e9cd8428a87040b1f4 Thanks. Xueming Li --- >From f4a3f4a6b9111ab5ec3682e9cd8428a87040b1f4 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 15 May 2021 08:52:37 +0800 Subject: [PATCH] net/hns3: fix DCB reconfiguration Cc: Luca Boccassi [ upstream commit b67bdfc8f6630934f3005ad531225c7203304661 ] Whether the enable bit of the pfc ("pfc_en") is changed or not is one of the conditions for reconfiguring the DCB. Currently, pfc_en is not rolled back when DCB configuration fails. This patch fixes it. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_dcb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c index 15f5f05134..7ed220be2b 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -1501,6 +1501,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns) enum hns3_fc_status fc_status = hw->current_fc_status; enum hns3_fc_mode requested_fc_mode = hw->requested_fc_mode; uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map; + uint8_t pfc_en = hw->dcb_info.pfc_en; int ret; if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE && @@ -1554,6 +1555,7 @@ pfc_setup_fail: hw->current_fc_status = fc_status; buffer_alloc_fail: + hw->dcb_info.pfc_en = pfc_en; hw->dcb_info.hw_pfc_map = hw_pfc_map; return ret; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:54:00.871395700 +0800 +++ 0171-net-hns3-fix-DCB-reconfiguration.patch 2021-06-12 06:53:56.680000000 +0800 @@ -1 +1 @@ -From b67bdfc8f6630934f3005ad531225c7203304661 Mon Sep 17 00:00:00 2001 +From f4a3f4a6b9111ab5ec3682e9cd8428a87040b1f4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit b67bdfc8f6630934f3005ad531225c7203304661 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 1cb6adb886..90c0d041c9 100644 +index 15f5f05134..7ed220be2b 100644 @@ -23 +25 @@ -@@ -1543,6 +1543,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns) +@@ -1501,6 +1501,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns) @@ -31 +33 @@ -@@ -1596,6 +1597,7 @@ pfc_setup_fail: +@@ -1554,6 +1555,7 @@ pfc_setup_fail: