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 9172142D46 for ; Sun, 25 Jun 2023 08:40:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CAE440ED8; Sun, 25 Jun 2023 08:40:25 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 93C8B40A7F for ; Sun, 25 Jun 2023 08:40:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QcAOCBPRn3UEDa/L9b+SXDRm3/CIrO0+9lGJiLTkK92/+kiindjESI8ayKZhjgxKQBikXLKjL4nFFpKvR4G2aYXR+O75/t8XoOtOvETvMVU41a0MSHxpHAH5Bup7493F89ROL3+8CFlP60K2Aihw/Vhv9ZOXIZX7EuAT37ovhSCgsjXbtYy3Br28EwRK04QF6pvfwld0WlTVB2ysLDF8zqqOKsgA7UTIi6DTAHcy58GYe0XDyTjoR2EdokAq4z37WrQE732I7jmJ8e+dgngQs0zGH9OJHlV+Y2PsPS1lEiSIBVREOoo4tZKdrJhwXbZkNduyNY+GO5DM6SPpvDx8jw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EJQBYONv6TT4YYL9n5Qk9sBoedvGwl0O+WH8tK1y0XY=; b=k+7udml6bIk4IgoQqY8v2opduVWk0ovq7osF1uOFBBkbaBdm8sRn8+b0dXyaXtLW0ZkV5gdWe9KhnRr0tIpxvsdYXSBteshJZjGoxsi5cwAsxJOlqnJBOWZltK86GxBgGubX70ZZ/6O42uCXHwVja6bQVsFfYBlW8dTAscyaoKl9CuG7I8Uw5F4iKD8lGm41c6aZWL7soqFWLeLFFk/fl6pVbnkxIaf0uIdum+ONiXjYkem+xrymlXd8r2FpPhtNBWVVkSjRpZUkxmlKK5/daa10Guu4sKywZVsudlK5AkZR5yJvEv7Inv9Vtd48EGBlRCxPTKHxkBdYytXilqMQKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=EJQBYONv6TT4YYL9n5Qk9sBoedvGwl0O+WH8tK1y0XY=; b=Ig9Z+igEoP3mFZYgf5p4a2bmhd9KOfHDLjpL1pHoA35YWVOVXJaubtgv7lVpmPgHY4x+mnh3/gM30SHfb2x+DSZnqxXl9/ymqobuNIg6cEmgyGtHdVxQjYy2VN6qgs9y2Moiojc0x13ux7jAiugvjyxbk+JQPSCbmNni+Akkp53LwVVeihHmvUmOy9e2pNqfJaqZe8I9OAQ7S5zCmyDso9TBVVMy8n9uzC/ayGy+s78Ua1RQ/i9bQwtgmP5R0Q2G/Lt0cc+KeI6CcHla2MiUS6sgC5Kmy3lIc7bV2nJvrPtirfiYrwkNKi54BiSTNsxjSKZkCKMk5QvlyvHO+OyGcQ== Received: from BN9PR03CA0062.namprd03.prod.outlook.com (2603:10b6:408:fc::7) by BY5PR12MB4322.namprd12.prod.outlook.com (2603:10b6:a03:20a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:40:21 +0000 Received: from BN8NAM11FT101.eop-nam11.prod.protection.outlook.com (2603:10b6:408:fc:cafe::98) by BN9PR03CA0062.outlook.office365.com (2603:10b6:408:fc::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:40:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT101.mail.protection.outlook.com (10.13.177.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:40:19 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:40:05 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:40:04 -0700 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix RTC time after reset' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:27 +0800 Message-ID: <20230625063544.11183-50-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT101:EE_|BY5PR12MB4322:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a6885b8-8245-4243-676f-08db75470b4d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pY8t7Fqbbm/QmUcZgci6pEOmcuCoC11y2XKGENs5fSeQeMb4QwlDRrEtjNhPhGIlwD1bTUFrTM+hv7iL9BT/Nx6KaVIXUgo6L0yBQEYaVxnc6F/Aij9nbelWJjgovJ9PSCmcQIixNrfTGxhAa4GwHMMlrYNXfxuZNQGC7PCLpz7QRgiUF9SMRrCmdsFgUW+CzSiON5Aso+wMXb0hnTaZL2+AJ/TIKjEwYWOfjZjzV6cC0NwCvhmt8iEzII/XagaikWTUiCUxwUhWD+SAPeqvLq8NhSv2skkoxfORtqHTzebhHzWmr2fsntnzGW/S/ckCMGz+ULUxa3a4Lgpf0hJYkDtX8oXeEh8LaNa6My8K2isF3hq9bHj7Ec8LRAE6dSNfjhFeAy+hNPtp33e0pIKj6pD3wWuLToYdUPy731MnGw0Nw1TWp2TS3Fn5J+sDyKWhdRcgkjrSA/wxYq3PWrKNjkdKqACgrjZafyvSzid+UoC7eNvsMxPAxjgLu5BHZRzHNUNrQ149QBd7FqMDgEPLtlReLPyfbEQZiJZaDPK8W/N86Vz3ZmIkMYb23HoC0JAIyJAbBQRraqVQyRHiEbcxhISLspBrk4C7Lbjww6R509m57pLcPzb9+pFCZ8KN5Rp594TbXkTmyIITirbpeouG3NpcnGxTGDK15Vwb0l+mzkGIyWEYydsOIKGVHlO4ikN059BLH94ewuxDvv9/8ISsX3B4K0bYTGOGlErV+7LOV+obSC5OIQRRC+K7UKiIkXxtgdSKJstQRSs1o4MjIwgENzIy/vcz8cVjMHBKXAI/gJo= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(136003)(396003)(39850400004)(451199021)(46966006)(36840700001)(5660300002)(316002)(70586007)(70206006)(4326008)(6916009)(478600001)(36756003)(8936002)(8676002)(55016003)(966005)(36860700001)(40480700001)(86362001)(54906003)(41300700001)(7696005)(82310400005)(2906002)(6286002)(16526019)(53546011)(186003)(336012)(426003)(1076003)(26005)(47076005)(356005)(6666004)(82740400003)(83380400001)(7636003)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:40:19.3619 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a6885b8-8245-4243-676f-08db75470b4d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT101.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4322 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 Hi, FYI, your patch has been queued to stable release 22.11.3 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/27/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=3999b58cd323505d28365c4cfaed2c2db35ea5c2 Thanks. Xueming Li --- >From 3999b58cd323505d28365c4cfaed2c2db35ea5c2 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 2 Jun 2023 19:41:56 +0800 Subject: [PATCH] net/hns3: fix RTC time after reset Cc: Xueming Li [ upstream commit 14d9281d9c65afd743354737b8c70555161d4a69 ] The enabled status of RTC time will be cleared after global or IMP reset, which cause the local RTC time doesn't work. So this patch fix it. Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 69446933b9..5d5ccefcc9 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4408,6 +4408,12 @@ hns3_init_hardware(struct hns3_adapter *hns) goto err_mac_init; } + ret = hns3_ptp_init(hw); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to init PTP, ret = %d", ret); + goto err_mac_init; + } + return 0; err_mac_init: @@ -4587,10 +4593,6 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) goto err_intr_callback_register; } - ret = hns3_ptp_init(hw); - if (ret) - goto err_get_config; - /* Enable interrupt */ rte_intr_enable(pci_dev->intr_handle); hns3_pf_enable_irq0(hw); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.821364200 +0800 +++ 0049-net-hns3-fix-RTC-time-after-reset.patch 2023-06-25 14:31:58.375773900 +0800 @@ -1 +1 @@ -From 14d9281d9c65afd743354737b8c70555161d4a69 Mon Sep 17 00:00:00 2001 +From 3999b58cd323505d28365c4cfaed2c2db35ea5c2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 14d9281d9c65afd743354737b8c70555161d4a69 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 600accea93..9ed54ae384 100644 +index 69446933b9..5d5ccefcc9 100644 @@ -23 +25 @@ -@@ -4416,6 +4416,12 @@ hns3_init_hardware(struct hns3_adapter *hns) +@@ -4408,6 +4408,12 @@ hns3_init_hardware(struct hns3_adapter *hns) @@ -36 +38 @@ -@@ -4577,10 +4583,6 @@ hns3_init_pf(struct rte_eth_dev *eth_dev) +@@ -4587,10 +4593,6 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)