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 9C0A042D46 for ; Sun, 25 Jun 2023 08:46:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96B62410ED; Sun, 25 Jun 2023 08:46:07 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2055.outbound.protection.outlook.com [40.107.101.55]) by mails.dpdk.org (Postfix) with ESMTP id C8E3540A7F for ; Sun, 25 Jun 2023 08:46:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cXLbCZUPcECexF9QcMQ0sjHtp08Fng2jCCZ0An0tin0YUIOvU2HUeJTAJVjhTrKRyu4FiFEVbk+dTQoghzUKUIwniTRp9mVMMrlkooxX6KusuWFTMxqrhUlWoJM1cvnPRE/LgR1MRF1agECXWofApUqe7O5hE4OHCUMptpeeHSs3Yun6jVxVUCBHZKNdXSMqrdIA96RSOQsKPefrlDTo63HGNLj+Ufu8LCLftECvd7y5q7wPgRsXndu0xAPjUdZ96sa00XjzfD8XMyUtD0WuJiam5hA7J0jEe1sBSo+MgKpf5siC6prpOJ6vl3lvoMLSzlsYaBxoL0xj4+Bi1zKg8g== 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=5SCAvYbzItc3GbhWQyYEcLRbw9cgU+h4XHRJy0y1cLo=; b=VHPV1pcUpeevl7pLWUuW8ki0YQRna2s7ZX/OmOMcfFSTMqTIo6rl5VHMNSJW3wqF96wqCqELrVkPzTUHarnyNv5tFFnNRffN43YaUJly2jFEEmMLtbbUk8jV9RWwIOdBCkmxtBW4AWW9GCKnVSak+L4TNMhOoUewVF7O1yZAlTr5nPltPZE6JQsdI9+7TnQrH0w5cA9kuEc3+fIus5pJtP17+nI2ziN2C9botdS3l+N6sCvycyMVVHx+cXX1oVBXWmC2g8rXSwicWFQuy+eLINAk0rEZbamcP+AkKLmiPYboH7LtaQIftdct/scLjS/oQvSitQHRLiJqVcOEJQmN0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=5SCAvYbzItc3GbhWQyYEcLRbw9cgU+h4XHRJy0y1cLo=; b=iztQwlDli6OrZX3O/Byq2iJ1HQkwsWOnLv1vD8+Z57kpiOh+PlJXcWwoH5HCTFUJS8lQvFATYMP5B2gYH7a3gyHgSySt4NmF8S/lU8jz3w3zINnqiC3fx/hSfjKYg+aIukuXbXlxKbp469M2fSYwkuigWBuUJSOnfh3r2r4AB2PaSIxaQH5Ko0qTusxjtl0uwaimf+KPnv9Am4aKgvmfBocl5vFUFBBg1Qq4AswGuA1NbHCKXtF0By1i56+7/jK2J7KlfA/RngrjxBZ239ten8vY4d3V+vl7vaxhLqFkXETU9pJqIM8qQi4W1gHpGNix9PNjzwZQTd5soO3oA+kQTg== Received: from DM6PR11CA0014.namprd11.prod.outlook.com (2603:10b6:5:190::27) by BL3PR12MB6473.namprd12.prod.outlook.com (2603:10b6:208:3b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:46:03 +0000 Received: from DM6NAM11FT080.eop-nam11.prod.protection.outlook.com (2603:10b6:5:190:cafe::b5) by DM6PR11CA0014.outlook.office365.com (2603:10b6:5:190::27) 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:46:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT080.mail.protection.outlook.com (10.13.173.105) 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:46:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:45:57 -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:45:55 -0700 From: Xueming Li To: Qiming Yang CC: Vignesh Sridhar , Qi Zhang , dpdk stable Subject: patch 'net/ice/base: remove unreachable code' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:35 +0800 Message-ID: <20230625063544.11183-118-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: DM6NAM11FT080:EE_|BL3PR12MB6473:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ab6dc7d-381b-429a-84c2-08db7547d82b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dPj8YwZWebEN5CIp0iXd1pukPenwDOtTT5swjcrQzIxua+WaY+XeHcCZg/icsQZ8BpQbHxIXbhfySMFsQ7dvS3KwZhd75TpBAPbvqnHwOVxsImvVpDxwf1QL1S8IB/Zdmo2Yhio6xllXYM7B8djZbbJMf8xDhcNBOhV1ls7CBZxZOd13zFM05NFdFNnu8EDiB/jvUOpyAGEfBGGERk1Blu3hzNq/TNgPOVAH3vb0O6jUxtJNVg1mzeJIyjok6eJwf58Z9WzmIcNE2cQPIswupgtFY3S+mbq1bqqFVAQYGqRVSaDf9TvjyOTWqjPjq3UYxogx0fq9XWOgE+MBY+L4nUdzfG+/zGJeKXdCsglPLSOgZFfu6N0M6eK714QsZ4ADn+O7wjptD/oyZ8JcEMRRtHi/4YVHOkVhXvk8CKZjEjNykp8NeND1DaMTbgJyfJ6acp48QMGrLX/XUqm/Td2y2hOJ1xwfCOxa96klBBOuSKj/qwHZzTAQHly2G7ZgMhJimb8mJwf34y57ILMV9J0RCBeW7D06lGA5/DacTrE2j7crCFRwZuchJ8FdSYQucz+GBnFaCkaFCVIAn2l4XKSy2i1Mkgsz3AZo5YGYMvaFlLkb3MlbvEEm1p4ETPOEnbjHqcp0eTjLgFXtuyorV7Rb1zUi42w80Gd2/fkLdh1ikBgILeaLsfTEyh9l9bEuxOoMAWkh5ZDx0/m0LCXEmU8v1NwGDNGLINV07EYN5JBx7y96G8mTjyc208FdoRUAtw1QxZ1Qt7O8aidJTQldzR75Tw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(346002)(396003)(39860400002)(451199021)(40470700004)(36840700001)(46966006)(40460700003)(2906002)(55016003)(7696005)(82310400005)(6666004)(356005)(2616005)(82740400003)(83380400001)(7636003)(336012)(426003)(1076003)(26005)(186003)(53546011)(16526019)(47076005)(6286002)(36860700001)(966005)(40480700001)(41300700001)(54906003)(86362001)(478600001)(36756003)(4326008)(70586007)(6916009)(316002)(70206006)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:46:03.1509 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ab6dc7d-381b-429a-84c2-08db7547d82b 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT080.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6473 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=1d71b68237d3f4e67c96cc50386cb2b5e3ce1455 Thanks. Xueming Li --- >From 1d71b68237d3f4e67c96cc50386cb2b5e3ce1455 Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Thu, 18 May 2023 15:16:36 +0000 Subject: [PATCH] net/ice/base: remove unreachable code Cc: Xueming Li [ upstream commit ca2011635fa38c71f47933d77ee618ca4d4f640f ] The default condition in the switch statement in ice_sched_get_psm_clk_freq() is an unreachable code. The variable clk_src is restricted to values 0 to 3 with the bit mask and shift values set. Fixes: 76ac9d771c97 ("net/ice/base: read PSM clock frequency from register") Signed-off-by: Vignesh Sridhar Signed-off-by: Qiming Yang Acked-by: Qi Zhang --- drivers/net/ice/base/ice_sched.c | 16 ++++++---------- drivers/net/ice/base/ice_sched.h | 5 +++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c index a526c8f32c..b16b27dcbf 100644 --- a/drivers/net/ice/base/ice_sched.c +++ b/drivers/net/ice/base/ice_sched.c @@ -1417,11 +1417,6 @@ void ice_sched_get_psm_clk_freq(struct ice_hw *hw) clk_src = (val & GLGEN_CLKSTAT_SRC_PSM_CLK_SRC_M) >> GLGEN_CLKSTAT_SRC_PSM_CLK_SRC_S; -#define PSM_CLK_SRC_367_MHZ 0x0 -#define PSM_CLK_SRC_416_MHZ 0x1 -#define PSM_CLK_SRC_446_MHZ 0x2 -#define PSM_CLK_SRC_390_MHZ 0x3 - switch (clk_src) { case PSM_CLK_SRC_367_MHZ: hw->psm_clk_freq = ICE_PSM_CLK_367MHZ_IN_HZ; @@ -1435,11 +1430,12 @@ void ice_sched_get_psm_clk_freq(struct ice_hw *hw) case PSM_CLK_SRC_390_MHZ: hw->psm_clk_freq = ICE_PSM_CLK_390MHZ_IN_HZ; break; - default: - ice_debug(hw, ICE_DBG_SCHED, "PSM clk_src unexpected %u\n", - clk_src); - /* fall back to a safe default */ - hw->psm_clk_freq = ICE_PSM_CLK_446MHZ_IN_HZ; + + /* default condition is not required as clk_src is restricted + * to a 2-bit value from GLGEN_CLKSTAT_SRC_PSM_CLK_SRC_M mask. + * The above switch statements cover the possible values of + * this variable. + */ } } diff --git a/drivers/net/ice/base/ice_sched.h b/drivers/net/ice/base/ice_sched.h index 3724ef33a8..64ed5e0f9b 100644 --- a/drivers/net/ice/base/ice_sched.h +++ b/drivers/net/ice/base/ice_sched.h @@ -38,6 +38,11 @@ #define ICE_PSM_CLK_446MHZ_IN_HZ 446428571 #define ICE_PSM_CLK_390MHZ_IN_HZ 390625000 +#define PSM_CLK_SRC_367_MHZ 0x0 +#define PSM_CLK_SRC_416_MHZ 0x1 +#define PSM_CLK_SRC_446_MHZ 0x2 +#define PSM_CLK_SRC_390_MHZ 0x3 + struct rl_profile_params { u32 bw; /* in Kbps */ u16 rl_multiplier; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.608651700 +0800 +++ 0117-net-ice-base-remove-unreachable-code.patch 2023-06-25 14:31:58.575773900 +0800 @@ -1 +1 @@ -From ca2011635fa38c71f47933d77ee618ca4d4f640f Mon Sep 17 00:00:00 2001 +From 1d71b68237d3f4e67c96cc50386cb2b5e3ce1455 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ca2011635fa38c71f47933d77ee618ca4d4f640f ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org