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 B329EA0A0E for ; Mon, 10 May 2021 18:25:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD6264003E; Mon, 10 May 2021 18:25:52 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760042.outbound.protection.outlook.com [40.107.76.42]) by mails.dpdk.org (Postfix) with ESMTP id D44B0406A3 for ; Mon, 10 May 2021 18:25:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aK3l1n68JqTAkWizMSLAPomcRDUrFUMHI1DXxLJV+RPdbJs0nc+0MpkoUlYaPfAHLQT75UwtzMtrPJ5a/dJ+GPSj92XIGBz3iLluUwE6ZUjU6xNkfa1Gw+fumJYmlBua/MU0d6EZEnjCXyDNQyKo+s3+CxfjRqKzNAlZQ9RcfZuUuk4xUt8rNTF3eqjRWKZT/1/ILlFtrqkWpWVK0VR2OAAQz4Z2uWMNfcErg0qdbGpXK5w+TjTrK3v+0cxDUOOp+s0NRwOqydRaKZka6s3mo/Yik2rmqujD6mCytfYQ+Zy6vlIhsuLeNRyhtzTATbDyPWicDn2Y8dcGzpKuumtbBA== 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=a5mp5vUT9M2alsBI0mqaG2GsOzfWKFeZqFGYXcr94Lw=; b=XOexfLLQu1U5mJ9rE/9ZDeF9YyNBhD7+0H+y5l6HA0EppblFvvO9I0cYnV2Y/MBaXT64tHIkwZeEJIkWQQKW0RGGvM8z6cf4QXcgAqtPrJUwqIhKaI/or0/NXuj4HfUvg7ipn2EehDQnhYlwQx+BGaaV+L5zXku25NPsWDXeyAsjsp5pnNas3+ByKHiEjyH4gbnWubmHEvy2C3lPBVsuYC5p8BrD7lYvROt/KXq0wkYNfw6RT6LfPhhNvOnKaDB9O2lXfbGNjVhA6Zi+zVQDUtjadf/ZDPXEU6o7+1Op9PeNKq+/gT1z5wSK/z5/P3D5RdDyDWO0lhsBMFa73RQFFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=a5mp5vUT9M2alsBI0mqaG2GsOzfWKFeZqFGYXcr94Lw=; b=kXdIKRplaFy7HSz9DzgyjIkbijJz4TcNm9HeBt5hCHbl+MVmHh2mqzq1bqT8brIg5N4CA/4tHlFb5pdVdvrCFNRrnySPt+IZLk9cmnSqQKG9G5qLo3p+Dq+B1d6CWN4spaTHxcsWb3+tDTyuDkyPr0v+kPacXO4SMNvmHPIMCQ/4H5FHTBV3QgZovTp5DVX5CF6gnSnjmSrMpdG2QbAxhI6QOu4/QRIxNzRhk8gVy7pkOYEXPb7yIEdM8WA+QQ88IYeR+0AE9tYXwzZWzeCBAcEPFbgBQ2xb7eIPR06g9pE0dOPF+R0Vaem4agPqxXTHs/946xzoKp9y1pXUGMehOw== Received: from BN6PR11CA0065.namprd11.prod.outlook.com (2603:10b6:404:f7::27) by DM6PR12MB4073.namprd12.prod.outlook.com (2603:10b6:5:217::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:25:50 +0000 Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f7:cafe::9f) by BN6PR11CA0065.outlook.office365.com (2603:10b6:404:f7::27) 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:25:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 BN8NAM11FT034.mail.protection.outlook.com (10.13.176.139) 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:25:50 +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:25:47 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , Haiyue Wang , dpdk stable Date: Tue, 11 May 2021 00:02:57 +0800 Message-ID: <20210510160258.30982-228-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: d41afc5c-a320-4ee0-0cee-08d913d04640 X-MS-TrafficTypeDiagnostic: DM6PR12MB4073: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YubPY/9YytHv/JZC4m6Z77tKgNlE1tNE+Kn1DszttVD+EqNFOpZJwDaajOBHXWYyp2D4ViQQOUbiundn1pKzbk/vAlb4v56Q+fj9Rtd3dN7QGjhS9IYIotFeRrye0+CKKzhwQCMvcmi9HHttJXkn23ipxYGJbqUvpKlKznBFC5l3YJrMzn0JCiCPMpNSrJxBN78lIrfKUgweCWnYMJRN/K6uaJZx3X7oXwUyQRdxfa43bMlVrvImiZ/wc7mAcNw9UEvsyJLI8sG2iNn09h4s2XORArP9ehsqd6MsMxBhuTvE22RFYPrbo3H9oFNioyjJ4+SZ+xL7mrbg4oxRdA3FO748bCp9zSPXqGy+R7bMd1zSbr5GB8h3N6A4IL0cTumjuAhMaq8aROnb8XGuFGeoNAP3IjKTF1B5K4mDI9Sv3FmhtLojzt9PAK1zcGEacva1S6t+cdOd//upU0lQYLnYGxcUh+fiTNjAH3WOHOiXr1qEXTUBLAa8W6zZ43ZUggB6lJDKf5bUaUWPPmc1jesDNLPo8C8Ygf8aQEbxjjYjF00pMaREqbiz4Ovbq7MqpTyc6u6ZpHDWwjtffMfQ/QUxkAsRI8rc/c6pM5I7ONrR7+dhsnI1RYTgmbCW6WA67OhxPwSdh32CBUdign7ncHnvqlKHpIxNIQ5cb4SWGEWMWBpevOc1gH4oy9SYtWBUXNE3OnRE6bjq/4unwI3G+dOT/KuF9KHFlK7r06GYT8T/LkJv7QvPu6tBfBLB1aM4xd0kYv2bc+nxJnAfPqbeLMfQmg== 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)(376002)(346002)(136003)(396003)(46966006)(36840700001)(4326008)(6286002)(356005)(8676002)(7636003)(36756003)(47076005)(316002)(6916009)(36906005)(186003)(53546011)(426003)(86362001)(82740400003)(2616005)(8936002)(7696005)(26005)(70586007)(70206006)(336012)(16526019)(2906002)(55016002)(478600001)(83380400001)(966005)(54906003)(5660300002)(1076003)(36860700001)(6666004)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:25:50.0574 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d41afc5c-a320-4ee0-0cee-08d913d04640 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: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4073 Subject: [dpdk-stable] patch 'net/e1000/base: fix timeout for shadow RAM write' 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/7d3e01ef10158530d72aa1271084ba7c5680ec63 Thanks. Xueming Li --- >From 7d3e01ef10158530d72aa1271084ba7c5680ec63 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 21 Apr 2021 17:15:35 +0800 Subject: [PATCH] net/e1000/base: fix timeout for shadow RAM write Cc: Luca Boccassi [ upstream commit 4a8ab48ec47b3616272e50620b8e1a9599358ea6 ] This fixes the timed out for shadow RAM write EEWR can't be detected. Fixes: 5a32a257f957 ("e1000: more NICs in base driver") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Haiyue Wang --- drivers/net/e1000/base/e1000_i210.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/e1000/base/e1000_i210.c b/drivers/net/e1000/base/e1000_i210.c index 3c349d33ff..52800376e4 100644 --- a/drivers/net/e1000/base/e1000_i210.c +++ b/drivers/net/e1000/base/e1000_i210.c @@ -310,6 +310,8 @@ STATIC s32 e1000_write_nvm_srwr(struct e1000_hw *hw, u16 offset, u16 words, } for (i = 0; i < words; i++) { + ret_val = -E1000_ERR_NVM; + eewr = ((offset + i) << E1000_NVM_RW_ADDR_SHIFT) | (data[i] << E1000_NVM_RW_REG_DATA) | E1000_NVM_RW_REG_START; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:32.463158400 +0800 +++ 0229-net-e1000-base-fix-timeout-for-shadow-RAM-write.patch 2021-05-10 23:59:26.710000000 +0800 @@ -1 +1 @@ -From 4a8ab48ec47b3616272e50620b8e1a9599358ea6 Mon Sep 17 00:00:00 2001 +From 7d3e01ef10158530d72aa1271084ba7c5680ec63 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 4a8ab48ec47b3616272e50620b8e1a9599358ea6 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org