From patchwork Wed Jan 25 09:59:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 13115402 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1064BC27C76 for ; Wed, 25 Jan 2023 10:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235216AbjAYKAS (ORCPT ); Wed, 25 Jan 2023 05:00:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235023AbjAYKAN (ORCPT ); Wed, 25 Jan 2023 05:00:13 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::60b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D86353B2D for ; Wed, 25 Jan 2023 02:00:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gc3S8krCr14SitHvyTGksarDSF2llOyZgmuMJSabydsgUmsVxf0ucEUNwJ4jieLxZti3i4+w+Vag8LEAgQsY8bZv/dN8HLSJxw5ld1ynlLO0pXpI4txihRdEm57KitB3S9Y6gCQljmM3za6qT2PfwoPrXFSTRWaVRnqjyTAPPeSPg5kDNnIB6W1+KFfbXPFHAGWoZ14sxung5LRvloWF3cVgdKPBgNtvvkZ1XRmpz4n/QD21XHwbhlKsmdt/58sJTwdK3Xb5e5mGygXxrn827xHiuprh3JdM0lK7bk3MneO9mSj2Pn0V39QPoiz7OhDgdYDespmUTFkYW/1h99waUA== 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=McCf1gMo11JwQNE1yC2b85xqCjsPPEW5eK5XlgIUMoo=; b=PyT8LXaEJbzg4XDpToluz4InacwE/3/8rChB87gsZLtdwxI7DXB6GyJ8frIkTjBG6CbhjE6IoAunlylKPIczh15c8lS90Mao0XmQNoFEiOrR6DOQ8P9ZttN/5srkBNJnYiLVl6cDELe9qnxozOmhfkGFxRlOpfOD24K3MkCEUl7Sfnp5R/ZRepR38b3KmbVuNZG1x782JS8BI3FTJB9NTke9rrXIYn81rG+LkyE5Shdiyp0oKsMCCQKnkfsOwuLVijd2zjnoVbb4sbM0VhVW8kRDbeAexWbpQhuFvI5GLDICyhZqtbzNs0WPQZGwtMFijboz7M9d0sqBdlYcOInOow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=McCf1gMo11JwQNE1yC2b85xqCjsPPEW5eK5XlgIUMoo=; b=RAQY0z6aZPhvj6ApVFHrEn1rbIAARRZ4vtUKuiKWhSR4yaxk4mnMdhDC8M4aNGeNBNBIIhuEzEvfJJItz/BidVeyipX7vqDN/A3SjxQzpHCIa0fFlFw/BJCqU+Xq1qUPjhesKa1cnFhlhOigWBiv8o1vJ1Wm3IGmTc9pjgN+y1o= Received: from MW2PR2101CA0017.namprd21.prod.outlook.com (2603:10b6:302:1::30) by SN7PR12MB7979.namprd12.prod.outlook.com (2603:10b6:806:32a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 10:00:08 +0000 Received: from CO1NAM11FT103.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::6a) by MW2PR2101CA0017.outlook.office365.com (2603:10b6:302:1::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.4 via Frontend Transport; Wed, 25 Jan 2023 10:00:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT103.mail.protection.outlook.com (10.13.174.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6043.17 via Frontend Transport; Wed, 25 Jan 2023 10:00:07 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 25 Jan 2023 04:00:04 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 1/5] platform/x86/amd/pmf: Add helper routine to update SPS thermals Date: Wed, 25 Jan 2023 15:29:32 +0530 Message-ID: <20230125095936.3292883-2-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> References: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT103:EE_|SN7PR12MB7979:EE_ X-MS-Office365-Filtering-Correlation-Id: ea217f8b-a12e-4090-2ae4-08dafebaf0ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NqXf6tgcnrLVfrMwCuHdRdhyBZwegJxlKmut27dlmSVI14DzrIr+8d73gc0VeAvuU2lRosdvQodto8gl/rmVPvlMa8W3wwDPfBvnkUrK6tT8htpGVfY2NkShBemHMEMKJC19UVpqDQloSjeImNkKSDvZYYFIuejDMBolwMZ/6ZVnB5u735XoJIG7U3Wq5iXxJ3jVvG/fNM71GiUgpXhem0vyKzlSWQ3ZfEngVCbMuYCTOu9gvYtMMIUTGQz+qjz5VNnSzf42cl8COb6EbM3qUyHfc4176Hf/LaxIaZ1nRl1ci4tVVhPjmfciAjue8thwwyRDZ+LP/GUB2c/DMQv9cv/ERppw1ONKG53PZGcxkpVMf36njp+A1BgQnOPiGZQfZTvlmtwG05ffrutp+IyE2Nt+Y+5V7R2VLiEuZpKixs8sd8aOFrqnVJI4T1haKGyXrBPa6MdVeWlqNVBjXhkOpOephrlPtfdj0y1DIDgdKXs7E+LAUyoNU8yiNzvHLa9AW8jBaxzv8y2+Dydsm3w8sEN37L5C6VsTA64m4R83262xXnfyyYCdU1EklTSrlQCUKAKrlK3RJ2fwbIZcUFkAlKoyBg8Woh99zsNQMjzL7KESnwfM+z+JaZdILR6Zp4a7B7ewS0vDYrWNfJkVOFTeVLEGqDfx10oKVrPMSPZVAV+p9DON5gmpasriknXuMTE7YN3VQH3/eSo69lp0BFuAM9HqHpqn/emzYKiDH5TjwKk= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(376002)(39860400002)(136003)(346002)(396003)(451199018)(46966006)(36840700001)(40470700004)(36860700001)(83380400001)(426003)(336012)(54906003)(47076005)(2616005)(478600001)(8676002)(186003)(36756003)(1076003)(70206006)(70586007)(110136005)(7696005)(356005)(2906002)(86362001)(82740400003)(41300700001)(26005)(81166007)(5660300002)(16526019)(316002)(40480700001)(40460700003)(6666004)(4326008)(82310400005)(8936002)(15650500001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 10:00:07.9658 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea217f8b-a12e-4090-2ae4-08dafebaf0ac X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT103.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7979 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Add helper routine to update the static slider information and remove the duplicate code occurrences after this change. Signed-off-by: Shyam Sundar S K --- drivers/platform/x86/amd/pmf/auto-mode.c | 7 +------ drivers/platform/x86/amd/pmf/cnqf.c | 8 ++------ drivers/platform/x86/amd/pmf/pmf.h | 1 + drivers/platform/x86/amd/pmf/sps.c | 20 ++++++++++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c index 644af42e07cf..7564ef1bca7d 100644 --- a/drivers/platform/x86/amd/pmf/auto-mode.c +++ b/drivers/platform/x86/amd/pmf/auto-mode.c @@ -275,13 +275,8 @@ int amd_pmf_reset_amt(struct amd_pmf_dev *dev) */ if (is_apmf_func_supported(dev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) { - int mode = amd_pmf_get_pprof_modes(dev); - - if (mode < 0) - return mode; - dev_dbg(dev->dev, "resetting AMT thermals\n"); - amd_pmf_update_slider(dev, SLIDER_OP_SET, mode, NULL); + amd_pmf_set_sps_power_limits(dev); } return 0; } diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c index 3f9731a2ac28..21e00ba39f19 100644 --- a/drivers/platform/x86/amd/pmf/cnqf.c +++ b/drivers/platform/x86/amd/pmf/cnqf.c @@ -307,13 +307,9 @@ static ssize_t cnqf_enable_store(struct device *dev, const char *buf, size_t count) { struct amd_pmf_dev *pdev = dev_get_drvdata(dev); - int mode, result, src; + int result, src; bool input; - mode = amd_pmf_get_pprof_modes(pdev); - if (mode < 0) - return mode; - result = kstrtobool(buf, &input); if (result) return result; @@ -325,7 +321,7 @@ static ssize_t cnqf_enable_store(struct device *dev, amd_pmf_set_cnqf(pdev, src, config_store.current_mode, NULL); } else { if (is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) - amd_pmf_update_slider(pdev, SLIDER_OP_SET, mode, NULL); + amd_pmf_set_sps_power_limits(pdev); } dev_dbg(pdev->dev, "Received CnQF %s\n", input ? "on" : "off"); diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index 84bbe2c6ea61..b5b77a353b96 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -394,6 +394,7 @@ int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev, int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx); +int amd_pmf_set_sps_power_limits(struct amd_pmf_dev *pmf); /* Auto Mode Layer */ int apmf_get_auto_mode_def(struct amd_pmf_dev *pdev, struct apmf_auto_mode *data); diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c index dba7e36962dc..5f842d6e6db2 100644 --- a/drivers/platform/x86/amd/pmf/sps.c +++ b/drivers/platform/x86/amd/pmf/sps.c @@ -70,6 +70,19 @@ void amd_pmf_update_slider(struct amd_pmf_dev *dev, bool op, int idx, } } +int amd_pmf_set_sps_power_limits(struct amd_pmf_dev *pmf) +{ + int mode; + + mode = amd_pmf_get_pprof_modes(pmf); + if (mode < 0) + return mode; + + amd_pmf_update_slider(pmf, SLIDER_OP_SET, mode, NULL); + + return 0; +} + static int amd_pmf_profile_get(struct platform_profile_handler *pprof, enum platform_profile_option *profile) { @@ -105,15 +118,10 @@ static int amd_pmf_profile_set(struct platform_profile_handler *pprof, enum platform_profile_option profile) { struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof); - int mode; pmf->current_profile = profile; - mode = amd_pmf_get_pprof_modes(pmf); - if (mode < 0) - return mode; - amd_pmf_update_slider(pmf, SLIDER_OP_SET, mode, NULL); - return 0; + return amd_pmf_set_sps_power_limits(pmf); } int amd_pmf_init_sps(struct amd_pmf_dev *dev) From patchwork Wed Jan 25 09:59:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 13115403 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DFE8C54E94 for ; Wed, 25 Jan 2023 10:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235090AbjAYKAT (ORCPT ); Wed, 25 Jan 2023 05:00:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235467AbjAYKAP (ORCPT ); Wed, 25 Jan 2023 05:00:15 -0500 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49D0A53B2C for ; Wed, 25 Jan 2023 02:00:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nZXanfMBFWfVQsajef6AjgrNCnTcHkEWZzvDBbezve15bCrWa6tiXLNNmInpGWsc32M8Le8ln/MHOD/YSIliKkt2/q9msZer+nwJ9Qrjz7sbOZ8lJFSCECorZ+MDRZno3FqPy+v3qTKShbh9XvOrtJ0/YlbQrPi2Bt04lD0iC3O/ShYWb3Ecl+N1ddNg5LYzt/Ywer9DnW6DsUwbgsvRdRR3rtuXKm0pmI45kDazL60bwiH5x4e0edsyHMKyHh9ygGbIK6nfNqRgtZEDdcASg2Lhx5rQjatEn3sPF0UIFqE6Iuja0MzBKmiHb9QmLvQxnsrG9K2pzr4DG4/Q2zwlpg== 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=ZgqgZnBvR/NrUiq13MMrTs+ihoG7/CMoNt+8y6tr6kU=; b=eLhoD9N9aXC3GvV+e0C5k7eFSmYr9UjDS2dbzWHEdZw6dqvKFpgG40LnbyK6LQHLgvZcfhaNcG8dV4PcK374aQFe/Hiym8ysVT943iTY+mJmE33WtClL8lWVj3qdOxzowJHc9eYmDY0D919KTGiFOdO/l9LAOivCoK7/9dlch4jN52FFSgJq1D8cmHTD7u+b2g8TStA7IsrNgJmw4aJEeaaqjGUySIGf5EgNdwEKQ1Tq+tz+fZxZViJYlFcHi80FU3dZMA594qtY+vGQv02HaUieGvpF43u4T/JWgkXqeesMhffKNWQWSq2scpwLETxyMS0fwYb8pWJTuBnxAGhZXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZgqgZnBvR/NrUiq13MMrTs+ihoG7/CMoNt+8y6tr6kU=; b=I9QCzMqXjh8MZbtHBCs/ZMWtdcAH81nYlJMwZO58vGgB6ZKq1w/JnFidVk+5eHU247XYF6Z0SIk3CQLYyHq7Sx5uYe5sLv3WCkQsRv5oQ9sFlgieJRhkeDSrGx6Y9/Rwm1siTnK+00NJsUtyfx5gzBV8MBQ/Ql1NVRsNIPom25c= Received: from MW2PR2101CA0035.namprd21.prod.outlook.com (2603:10b6:302:1::48) by CH3PR12MB8308.namprd12.prod.outlook.com (2603:10b6:610:131::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Wed, 25 Jan 2023 10:00:09 +0000 Received: from CO1NAM11FT103.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::c) by MW2PR2101CA0035.outlook.office365.com (2603:10b6:302:1::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.4 via Frontend Transport; Wed, 25 Jan 2023 10:00:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT103.mail.protection.outlook.com (10.13.174.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6043.17 via Frontend Transport; Wed, 25 Jan 2023 10:00:08 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 25 Jan 2023 04:00:06 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 2/5] platform/x86/amd/pmf: Add helper routine to check pprof is balanced Date: Wed, 25 Jan 2023 15:29:33 +0530 Message-ID: <20230125095936.3292883-3-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> References: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT103:EE_|CH3PR12MB8308:EE_ X-MS-Office365-Filtering-Correlation-Id: 8139495d-5ce6-40d4-5b9a-08dafebaf142 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cigTokpbci5XJXaXitBvGAbZlNLM3IqKi3UHjwuBZ4VY9eMnxHrbXKTqss5tiFiLugaeFqT7uGYsaoIDIfela1IAYCCjJfEqP8sBAbXhDOs+8e6BA8k9b7ls7YFbbvWbEHXBVZk5K/q+AAeWLWWQVTrzbw1ZPMna/oazDf0Kn9ZFLQuLCC6rG98K8AFweUKbELFiSHhSFAcbNX26yr9u98O/4z1vE5tzjkJ0+5WORUo2u0ne4D1VAX/yV7TIYlqawkGuOxx6PztrmuugBBkgoJL4/CqxoldmZ8r8xT5a4Jd2Vqeb7lDuIk5uwQPE6+qK9hpPSAnZ7iVfVuRqPWkuEIiDlkdvrkF4PFbXs0hTzEdxUKlpkkI0VYf03M0eeIVZiBhpKfdVlh5VXUbirs9QPlVklbDcMXG9GcnRwlBVuosboaI3fugLGgHDOqjKVUjUWT90gh5LM3dLS3tBc99JETxfUGVBrWhlaA80sBCXlopEqerDD07EHdt3z5BDbIPjBDKDJDdvMerRgYmm7SpBfhCrrZWa8kdk8p6tq/voYdgrSmBQvnqSa2J+tXBUs3BKkEk9z8r0key5QbdXrYAj9LzjZymwHdKShcqMz3buM2iblaE2hDzYPwoXNRMoQT3lT1SIp9EGhIIm2Qj3x5UxxWRjfGfhTyBF1votu3eeoKfeF/mft9r6BjtGS97eL+zF3PDkS6XvGK2qrUMxpZ+lEfgoeyaCKKxfSvUikatQwHI= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(346002)(396003)(136003)(376002)(39860400002)(451199018)(40470700004)(46966006)(36840700001)(47076005)(16526019)(36756003)(8676002)(40460700003)(40480700001)(81166007)(36860700001)(356005)(54906003)(2616005)(426003)(83380400001)(336012)(86362001)(26005)(82310400005)(186003)(478600001)(5660300002)(6666004)(316002)(7696005)(1076003)(82740400003)(70206006)(41300700001)(8936002)(70586007)(2906002)(4326008)(110136005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 10:00:08.9970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8139495d-5ce6-40d4-5b9a-08dafebaf142 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT103.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8308 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Add helper routine to check if the current platform profile is balanced mode and remove duplicate code occurrences. Signed-off-by: Shyam Sundar S K --- drivers/platform/x86/amd/pmf/cnqf.c | 6 +++--- drivers/platform/x86/amd/pmf/pmf.h | 1 + drivers/platform/x86/amd/pmf/sps.c | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/amd/pmf/cnqf.c b/drivers/platform/x86/amd/pmf/cnqf.c index 21e00ba39f19..4beb22a19466 100644 --- a/drivers/platform/x86/amd/pmf/cnqf.c +++ b/drivers/platform/x86/amd/pmf/cnqf.c @@ -103,7 +103,7 @@ int amd_pmf_trans_cnqf(struct amd_pmf_dev *dev, int socket_power, ktime_t time_l src = amd_pmf_cnqf_get_power_source(dev); - if (dev->current_profile == PLATFORM_PROFILE_BALANCED) { + if (is_pprof_balanced(dev)) { amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); } else { /* @@ -317,7 +317,7 @@ static ssize_t cnqf_enable_store(struct device *dev, src = amd_pmf_cnqf_get_power_source(pdev); pdev->cnqf_enabled = input; - if (pdev->cnqf_enabled && pdev->current_profile == PLATFORM_PROFILE_BALANCED) { + if (pdev->cnqf_enabled && is_pprof_balanced(pdev)) { amd_pmf_set_cnqf(pdev, src, config_store.current_mode, NULL); } else { if (is_apmf_func_supported(pdev, APMF_FUNC_STATIC_SLIDER_GRANULAR)) @@ -382,7 +382,7 @@ int amd_pmf_init_cnqf(struct amd_pmf_dev *dev) dev->cnqf_enabled = amd_pmf_check_flags(dev); /* update the thermal for CnQF */ - if (dev->cnqf_enabled && dev->current_profile == PLATFORM_PROFILE_BALANCED) { + if (dev->cnqf_enabled && is_pprof_balanced(dev)) { src = amd_pmf_cnqf_get_power_source(dev); amd_pmf_set_cnqf(dev, src, config_store.current_mode, NULL); } diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index b5b77a353b96..b94e1a9030f8 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -391,6 +391,7 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev); void amd_pmf_deinit_sps(struct amd_pmf_dev *dev); int apmf_get_static_slider_granular(struct amd_pmf_dev *pdev, struct apmf_static_slider_granular_output *output); +bool is_pprof_balanced(struct amd_pmf_dev *pmf); int apmf_update_fan_idx(struct amd_pmf_dev *pdev, bool manual, u32 idx); diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c index 5f842d6e6db2..3b4a09a84c29 100644 --- a/drivers/platform/x86/amd/pmf/sps.c +++ b/drivers/platform/x86/amd/pmf/sps.c @@ -83,6 +83,11 @@ int amd_pmf_set_sps_power_limits(struct amd_pmf_dev *pmf) return 0; } +bool is_pprof_balanced(struct amd_pmf_dev *pmf) +{ + return (pmf->current_profile == PLATFORM_PROFILE_BALANCED) ? true : false; +} + static int amd_pmf_profile_get(struct platform_profile_handler *pprof, enum platform_profile_option *profile) { From patchwork Wed Jan 25 09:59:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 13115405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9872C61DA0 for ; Wed, 25 Jan 2023 10:00:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235226AbjAYKAU (ORCPT ); Wed, 25 Jan 2023 05:00:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235137AbjAYKAP (ORCPT ); Wed, 25 Jan 2023 05:00:15 -0500 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2071.outbound.protection.outlook.com [40.107.223.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C16394997B for ; Wed, 25 Jan 2023 02:00:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Acw/IP67lP8/CAKN54mb+pEvHnrr2GSMTCRgmQ0CfWH7eu7R1eZ0fx7tltIAV2MpX0F6FsPv8x17ofK49UhmTSpzklSTiyRUYT91vFHc2Q9fAV5m8CTEa0XOuQ3w5r/o4XTHoKSGPk4eQbMYBZi8AwQ9mJrfye1OT66XLnIEqLBTYCs5thTaQA7eKBkhsx74SyQKsnuXKLdnr3ssBF51GGhAQoL4c6fbhU/8/C3j3CwfAhGNPHd7OM+GGV44Nt34rURsHbLE/U8m6MeWDEaS4Sb9ocGb6F8DUf5UwvZL0cFLh3Ky65xAgnbWKT3w9WI5qIpGFZ5Uc2aF+VnaLzG0FQ== 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=IERVCiG5vSZ2Sa0cLnv2oGw99VtZFIDx1g0Fx4EZ2BI=; b=h2in8cKCZaw6ZMXzfCMLZ/wYF3j7F0HcCsK3l5x5kKagYOG74ZDc26IHhxutt90LLDyxfUW7LS0/wbw4dfkoJ7bnGTVjz6eAuPgbShy/8Wf+eWG0U8s2ATO/pdwsDndaPfCzWWn8+ruONobqAgNNtiqA9lHDyni/ufRrb+A+LgA5e74puFfDF+/eIJ/0YL/IfqIgUWOWK78KDEFLiwGWS49hQ6KRafwGs2AK+1eAtMfd8m/fBZj+VbjeV/TYk+M6cuqidLqwPzlVPVDqW13jSzL0kIY6SyOkT+NDzh410zsCduoMoO/0KN3AApsb96dJ8gcfoYUsq+qc3dDob22x1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IERVCiG5vSZ2Sa0cLnv2oGw99VtZFIDx1g0Fx4EZ2BI=; b=zVsGfE6UKvlQFrnkqrr4Om7AG7S0dUvZu0toM0w3YgF+RiEYWd8weTkefkKR+7cTqN/d+CCq+Kh+pJKPH+wm9RLLToWCadUrxdDLB72Nof84S2BviS4NMSv/YZiGXb5rFTrQm5fu9NHG3mq4fyy23jFE/rTtkgwITwmvu/a9o5I= Received: from MW2PR2101CA0026.namprd21.prod.outlook.com (2603:10b6:302:1::39) by BY5PR12MB5014.namprd12.prod.outlook.com (2603:10b6:a03:1c4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 10:00:11 +0000 Received: from CO1NAM11FT103.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::e) by MW2PR2101CA0026.outlook.office365.com (2603:10b6:302:1::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.4 via Frontend Transport; Wed, 25 Jan 2023 10:00:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT103.mail.protection.outlook.com (10.13.174.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6043.17 via Frontend Transport; Wed, 25 Jan 2023 10:00:10 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 25 Jan 2023 04:00:08 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 3/5] platform/x86/amd/pmf: update to auto-mode limits only after AMT event Date: Wed, 25 Jan 2023 15:29:34 +0530 Message-ID: <20230125095936.3292883-4-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> References: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT103:EE_|BY5PR12MB5014:EE_ X-MS-Office365-Filtering-Correlation-Id: 74be6d9d-26cb-4c15-bf2b-08dafebaf24f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vHSShzQs/O5jJlefFsXRqMOc6+FWMHoidxJKZ9fsp773JBS0vhrmGgPIQNPFCiyLRV51bm0DS93D4RhzBTITP2y01cXVWPVv1TfU9joVYIiJqr8G9Pb+HuqNcDVgj1KtYN8nTsXmu87Pe9C1iFip1nmsfOKbvHFSj9JuXTB/s5BTsOKJ8lybmB0Z5z5MWvgiPml/6ylu7vqVwoAiHElluF0m5r1lx8eh0XVcfvu/gIucJ2ZgYog9EFfIJR5frNU+T/1zV3tGOOJU/HVRU/aUs52fPvJfbL1JlcIe7h/TMbXOVDtLtWvD6p6HZFj5n7nGmEjRo5+AYPtEhSZHs0w8R/uNeHVDNfJLKIJ0hN7DmiwVbGQN/Qrg/iYSVr/yhoFH2ZTKQxr5uF2mUj5kUU+2OaX5sDZ5iajtuZS7rSdp9SNNL5/08Q8xzky6WfRwYY6iz9jM4OXoZItusi+wHqHg7rgLUxET/OWUFRNpELD9qN/MA2VM7OcfRMTUYaQkT4hJWaTeDoG0xaWdsAxdkUt6XXeSXwUsHz8EmBIEpKdaPl1CviALsgdUBGAP8864GU/9iO0G8OdU35LpHRWEEgAezd1NIwdd2SGMhkpUhdceOMw+wvY+1TcMnnGVEFTv6rOPez2y4ml4P22BiRXM4iOIOxs5lxkD1VsbWhy9A/qgx5SXVuJA1tqo1RwmN5wHJWb96mXEyL5lQQ5KEIRQPuDvK6uNx9Yz5vz+vrWPHAxGZfc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(136003)(39860400002)(396003)(346002)(376002)(451199018)(36840700001)(40470700004)(46966006)(70586007)(41300700001)(4326008)(8676002)(54906003)(36860700001)(110136005)(26005)(316002)(70206006)(2616005)(336012)(8936002)(356005)(1076003)(81166007)(5660300002)(15650500001)(82310400005)(40480700001)(40460700003)(426003)(2906002)(16526019)(83380400001)(7696005)(6666004)(82740400003)(86362001)(47076005)(478600001)(36756003)(186003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 10:00:10.7625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74be6d9d-26cb-4c15-bf2b-08dafebaf24f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT103.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB5014 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Auto-mode thermal limits should be updated only after receiving the AMT event. But due to a bug in the older commit, these settings were getting applied during the auto-mode init. Fix this by removing amd_pmf_set_automode() during auto-mode initialization. Fixes: 3f5571d99524 ("platform/x86/amd/pmf: Add support for Auto mode feature") Suggested-by: Patil Rajesh Reddy Signed-off-by: Shyam Sundar S K --- drivers/platform/x86/amd/pmf/auto-mode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/platform/x86/amd/pmf/auto-mode.c b/drivers/platform/x86/amd/pmf/auto-mode.c index 7564ef1bca7d..96a8e1832c05 100644 --- a/drivers/platform/x86/amd/pmf/auto-mode.c +++ b/drivers/platform/x86/amd/pmf/auto-mode.c @@ -294,7 +294,5 @@ void amd_pmf_deinit_auto_mode(struct amd_pmf_dev *dev) void amd_pmf_init_auto_mode(struct amd_pmf_dev *dev) { amd_pmf_load_defaults_auto_mode(dev); - /* update the thermal limits for Automode */ - amd_pmf_set_automode(dev, config_store.current_mode, NULL); amd_pmf_init_metrics_table(dev); } From patchwork Wed Jan 25 09:59:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 13115404 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A042C61DA2 for ; Wed, 25 Jan 2023 10:00:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230174AbjAYKAU (ORCPT ); Wed, 25 Jan 2023 05:00:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235474AbjAYKAQ (ORCPT ); Wed, 25 Jan 2023 05:00:16 -0500 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2041.outbound.protection.outlook.com [40.107.100.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C39F253E7B for ; Wed, 25 Jan 2023 02:00:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MHEZVGA6o7UWJwfmaJYbNa2SJ1lbnkzIa7KruWY6XeMz0JfpfKT3vZzhEMnsXvrjA3uI+DQibKB2fO2IB2sLInqXgEW80EO3nQJFV9nUAmj9DAcZElqjS9Oml18jYaxb3Ogs+PwBGcW/Ye3/MLjpFqZMbuWyobsjmUk+J1iwoNZsqQr5gVPUFFzddcFzXMTMraJkMpATTteiJH+gDSTubgybbbGZ9xZnq2B5Kq7YBKc1EJ1KqPc2uSnPdllWYMH14+yqDM2Nzg5nY1iLbiC7Rpy2LX+6fBTjU4Cu0TLCGITpsfvn8ZdZT0R9UCLBhCSuC3K0wek1nolPSCEX7Er3YQ== 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=uLj1CLMXG9O3xAYddWMV1raf69V6yJB5Bylarx/UYVM=; b=RjRHeKL/xyJlq/FsgTH5NrOZB+EDgmwk+FPw+dSNcLs+NTDKSyRCMuKP6BYx++ou9Et1YJG5IBn2a5v3+DiPaixxgzVpJn9o8y2GxYcdGhKTuWHfhboS1RD/FGJXp4ufHoE7mXzHJFGdfn4Hzj8kPerJMbmp9y80vzPkW3ZYqZG6pC6XdXvWfcITR2r/Qpm0iRgcY6evdVvSQ+nCOZX9t41eT1ilFQUT2+jt9ztavBVEIDFiNYbcc/tfEvUTbkqPLXyGmkiItkJuXxuJKkDLvd4uwmBHUG5v3t9D48A1caEseUvrUZ5/ak/nEuZJ9iPYpikmNmJ/TDOP2Sqv1NBKQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uLj1CLMXG9O3xAYddWMV1raf69V6yJB5Bylarx/UYVM=; b=UlNbrlUyTfkZlCd//gp+fzUyrNK/2CBX43kLL2UJ5PbhJQMBvugv8gF2g1vQG5kGOsxGEzhXmFLNb0OAcW4/0WK9ZDWKXhk0teLnLr/MUbDxxd4BzN8t4f3rnTD481fP50DcF8aFMSCNMZxnqHGkSz4tsL0lsClcQ5sGbf3eb9g= Received: from MW2PR2101CA0029.namprd21.prod.outlook.com (2603:10b6:302:1::42) by IA1PR12MB8078.namprd12.prod.outlook.com (2603:10b6:208:3f1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 10:00:12 +0000 Received: from CO1NAM11FT103.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::1d) by MW2PR2101CA0029.outlook.office365.com (2603:10b6:302:1::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.3 via Frontend Transport; Wed, 25 Jan 2023 10:00:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT103.mail.protection.outlook.com (10.13.174.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6043.17 via Frontend Transport; Wed, 25 Jan 2023 10:00:12 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 25 Jan 2023 04:00:10 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 4/5] platform/x86/amd/pmf: Fix to update SPS default pprof thermals Date: Wed, 25 Jan 2023 15:29:35 +0530 Message-ID: <20230125095936.3292883-5-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> References: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT103:EE_|IA1PR12MB8078:EE_ X-MS-Office365-Filtering-Correlation-Id: 19d372c8-496a-419d-728c-08dafebaf34c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fKw8zQBA//055OtPgV11lRdjXZTYnUby9hoK+s1HrgB8uUwXw+UPz+CegaZm4lRf7z0zo/2pwe955WGpMhMiBCXElbMl1+8TXJOuKyKF1+sl6jFDATUIC90dcIxraEnU88mOzI/vbLe5ioiTE5oR908oyLlN+wCEGAKpkAsdq9cP7jJgXCRh7b/SUWvJvpnR4D8eW2Uq/u+urdbQAu05JyX+OPQU6ldkknmDNrIpVgqGjspdlyESUfOeOsOwuUgVErw0tHYzTD2plW6W8aFfHkm/i+IEMdEEIJx0ZdSPAgHO0shgyLmRBcWPnWyYgggzbNS6ZwF3CJCiIYTp93HkDFcYtczFoaJUOLXV38sQldfVKecHw4CYMYlnhxBG7JdWAPkBXubqFy8zsl8ZYp2Aj1l+kBuQacNhHJhWQISCvxuA1bSw7igJh9K2rH2OYZQIxotniyR4Wmgzh0zw4Ywy/LlEEubwpzi4gtd2z7lwrrkSLXiIUB4Yu6DPY0o1mTx/4WYjDWAbpc3hKR4XxIxX/rvI4DQys3RJFiPOTDPiBC2iKrRuAVkQ4hhsLxdnnKGq+Q1R658V36TpbBw6Rr5ZLt82VLxLeqRbLyAS6G5hz1VID5QBbuQbKOxDb4gkQw1Qv9ZXKFuXXUMl6FcXYnQkmqrJy5vLNKrVU8wjh80irhveeaULrHGM4YwC2GQQaiqze9l73+pssPZUtbakpnj1UVlH4ydq2xPZfrHH5DuLEDI= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(136003)(39860400002)(376002)(396003)(346002)(451199018)(36840700001)(40470700004)(46966006)(82740400003)(82310400005)(81166007)(4326008)(86362001)(41300700001)(36756003)(2906002)(110136005)(40460700003)(186003)(70586007)(8676002)(26005)(6666004)(47076005)(16526019)(40480700001)(426003)(54906003)(336012)(1076003)(5660300002)(7696005)(8936002)(2616005)(83380400001)(356005)(478600001)(15650500001)(70206006)(36860700001)(316002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 10:00:12.4186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 19d372c8-496a-419d-728c-08dafebaf34c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT103.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8078 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org By design PMF static slider will be set to BALANCED during init, but updating to corresponding thermal values from the PMF config store was missed, leading to improper settings getting propagated to PMFW. Fixes: 4c71ae414474 ("platform/x86/amd/pmf: Add support SPS PMF feature") Suggested-by: Patil Rajesh Reddy Signed-off-by: Shyam Sundar S K --- drivers/platform/x86/amd/pmf/sps.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c index 3b4a09a84c29..bed762d47a14 100644 --- a/drivers/platform/x86/amd/pmf/sps.c +++ b/drivers/platform/x86/amd/pmf/sps.c @@ -136,6 +136,9 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev) dev->current_profile = PLATFORM_PROFILE_BALANCED; amd_pmf_load_defaults_sps(dev); + /* update SPS balanced power mode thermals */ + amd_pmf_set_sps_power_limits(dev); + dev->pprof.profile_get = amd_pmf_profile_get; dev->pprof.profile_set = amd_pmf_profile_set; From patchwork Wed Jan 25 09:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Sundar S K X-Patchwork-Id: 13115406 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7925C54E94 for ; Wed, 25 Jan 2023 10:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235477AbjAYKAW (ORCPT ); Wed, 25 Jan 2023 05:00:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235471AbjAYKAV (ORCPT ); Wed, 25 Jan 2023 05:00:21 -0500 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2086.outbound.protection.outlook.com [40.107.212.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8254953E5A for ; Wed, 25 Jan 2023 02:00:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bur6lkVHisxwE9MlM4INUzc5Het8quAS7NtDvMhXFBEe6gNOtfjuk0eekrD7S609LkoGN25/h0g8x+GRB7KAd01brfz7pJD72DfaZanIBaoCIkU6htPul8Wnnwqg995ACKJCb+l46HqXm1pgl0Y9ClL9tct4deeBQmUDx5iJXNKWmnQ+NDh+N+/dmvQXtbYwvPg+giJeiXKiOxbqDp1NukfqDU10yN06U4glaxE4mbPpsS+M+JFZhIOHnsE6Pvg3pSaJx6W3WLaakYJPHr/AIFn1v7aYD/DO7orXbZwz9caBkNq5y3xrsgnLhg/0Jgu+uePWyj0BJsh//8u+UZ5yiA== 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=kFQ9iUzsc4MllCsmKFhsufK8d2Pyo4EscP9o56b94eA=; b=C3MucVJEfatI0h7L1xS2Vk4RzZg8rhy7oNs8ZHlvyWD7gZdDFNeJuZWDSsO6kRUwpheoOiuSZP0hCcLbjPxKfurcPv7j+j9/B6SXQern1qWFaikfJZxvpX4Inliua1Ky8yc7BEb86uPthtw2LiucRGADbHdRGscR/bbdUVrjczEl5U2s7vtgajSwJeNKPo8PH2dbJHwg4ASB75FSexzsYdHEjSbxbMS6bNaT2LEOKumZJssSawzt1+aDDuzEzRAEblCsIijvsRW3E62ueRAbTa8ble0d42r+c5dmSS0X36sAvk1wQlkjBuKE4fk1/GeZ3Duw+5zrkbVBXWbiH+C/ZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kFQ9iUzsc4MllCsmKFhsufK8d2Pyo4EscP9o56b94eA=; b=K/4TRpSIfCq3wZf14fdN9KxgtL1ukIKkLdpb9vKOHP6fdqi7UTUNmgBI8nn23Z3yIlQjxWKIauOS89Fnk8fIVcgSMkGMmudR5mOeSABJ4jzQRWYp+AMa23UCZEALYKKVmyteoVDHl8aZ1/sHl0RcbCxagTAvfIKZwnQBn9FQSpY= Received: from MW4PR04CA0046.namprd04.prod.outlook.com (2603:10b6:303:6a::21) by SN7PR12MB6959.namprd12.prod.outlook.com (2603:10b6:806:261::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Wed, 25 Jan 2023 10:00:18 +0000 Received: from CO1NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6a:cafe::85) by MW4PR04CA0046.outlook.office365.com (2603:10b6:303:6a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33 via Frontend Transport; Wed, 25 Jan 2023 10:00:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT025.mail.protection.outlook.com (10.13.175.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6023.16 via Frontend Transport; Wed, 25 Jan 2023 10:00:16 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 25 Jan 2023 04:00:12 -0600 From: Shyam Sundar S K To: , CC: , , "Shyam Sundar S K" Subject: [PATCH 5/5] platform/x86/amd/pmf: Fix to update SPS thermals when power supply change Date: Wed, 25 Jan 2023 15:29:36 +0530 Message-ID: <20230125095936.3292883-6-Shyam-sundar.S-k@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> References: <20230125095936.3292883-1-Shyam-sundar.S-k@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT025:EE_|SN7PR12MB6959:EE_ X-MS-Office365-Filtering-Correlation-Id: f3ff96d9-ad6f-46bb-2ace-08dafebaf5b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Odr+43KUllh5Htsim74KvwO9b8PAiRontlug1FyOCYfYNPs6nEoKjT2NZjWJueYfjO8Kk7a3yRmLBIdF0uAn2AY33i8ZabfvwgeXpCTqdVEsNVjXXdWP+wJ8Zocx/mfP1Cwbsmjk+pBuFVSGaNEgYIHgyMGAyAet3vo4XAG3R/6x5/VJBsBKbuPZXqK3v7rXJUE0OLYzaODCcj1zGsI9m89uMrF2WfaTTIItMYZhewdeJBcW2tde75gKFT3Fy/UE44Dgpb+LBImKsY5j2tGsP3qi0XVzvgOLfB5i7B1QrMoIo/luOQuAZMyBpI09vnzxU+OOcPRQ0m/Hab9mSJ4tmhSkPfA3o9vangy6narNInMWDVzy8YIKl1BgBa3shTsk1LhJTf0aEV7tjrj0awa1qBuHcinlqXHrou8CWjehZg+7vW0wTDYjCQvo0Tr6CKBJZ2YQIzIkPXsMFH+AGhc6pyKGIHEaDCU6M8W5MUxo5xPtKV3bga7YwrH77NEbaQWLZjfloyELM+EySzPLdqdP/Th71ZWL32U1ckE5kiZ5xmAuhzTSGSELVRwES1xTty+55dAJ3hyM6uLWbS4wF6biRUr47iRR7iPa0O7RfTxGe68N3JnfEbYlKeRp/4GoJjgmH5n1STlNfZzcO8FsEsiyuRz+8nDgsNFIgW/NYYkDYxLflAHpPGTsUoArIPqxZQ7MrwMy3WNgSDo4U3YtjilUH/Cxf0yp+T6SIj94QesQ9nw= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(376002)(346002)(136003)(396003)(39860400002)(451199018)(46966006)(36840700001)(40470700004)(4326008)(36860700001)(70586007)(86362001)(54906003)(70206006)(36756003)(1076003)(8936002)(5660300002)(426003)(2906002)(82740400003)(41300700001)(15650500001)(82310400005)(40460700003)(47076005)(6666004)(26005)(83380400001)(16526019)(40480700001)(110136005)(186003)(8676002)(2616005)(316002)(336012)(81166007)(478600001)(7696005)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 10:00:16.4250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3ff96d9-ad6f-46bb-2ace-08dafebaf5b2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6959 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Every power mode of static power slider has its own AC and DC power settings. When the power source changes from AC to DC, corresponding DC thermals were not updated from PMF config store and this leads the system to always run on AC power settings. Fix it by registering with power_supply notifier and apply DC settings upon getting notified by the power_supply handler. Fixes: da5ce22df5fe ("platform/x86/amd/pmf: Add support for PMF core layer") Suggested-by: Patil Rajesh Reddy Signed-off-by: Shyam Sundar S K --- drivers/platform/x86/amd/pmf/core.c | 23 +++++++++++++++++++++++ drivers/platform/x86/amd/pmf/pmf.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c index a5f5a4bcff6d..f7ace0e8fbee 100644 --- a/drivers/platform/x86/amd/pmf/core.c +++ b/drivers/platform/x86/amd/pmf/core.c @@ -58,6 +58,25 @@ static bool force_load; module_param(force_load, bool, 0444); MODULE_PARM_DESC(force_load, "Force load this driver on supported older platforms (experimental)"); +static int amd_pmf_pwr_src_notify_call(struct notifier_block *nb, unsigned long event, void *data) +{ + struct amd_pmf_dev *pmf = container_of(nb, struct amd_pmf_dev, pwr_src_notifier); + + if (event != PSY_EVENT_PROP_CHANGED) + return NOTIFY_OK; + + if (is_apmf_func_supported(pmf, APMF_FUNC_AUTO_MODE) || + is_apmf_func_supported(pmf, APMF_FUNC_DYN_SLIDER_DC) || + is_apmf_func_supported(pmf, APMF_FUNC_DYN_SLIDER_AC)) { + if ((pmf->amt_enabled || pmf->cnqf_enabled) && is_pprof_balanced(pmf)) + return NOTIFY_DONE; + } + + amd_pmf_set_sps_power_limits(pmf); + + return NOTIFY_OK; +} + static int current_power_limits_show(struct seq_file *seq, void *unused) { struct amd_pmf_dev *dev = seq->private; @@ -372,6 +391,9 @@ static int amd_pmf_probe(struct platform_device *pdev) apmf_install_handler(dev); amd_pmf_dbgfs_register(dev); + dev->pwr_src_notifier.notifier_call = amd_pmf_pwr_src_notify_call; + power_supply_reg_notifier(&dev->pwr_src_notifier); + mutex_init(&dev->lock); mutex_init(&dev->update_mutex); dev_info(dev->dev, "registered PMF device successfully\n"); @@ -389,6 +411,7 @@ static int amd_pmf_remove(struct platform_device *pdev) apmf_acpi_deinit(dev); amd_pmf_dbgfs_unregister(dev); kfree(dev->buf); + power_supply_unreg_notifier(&dev->pwr_src_notifier); return 0; } diff --git a/drivers/platform/x86/amd/pmf/pmf.h b/drivers/platform/x86/amd/pmf/pmf.h index b94e1a9030f8..06c30cdc0573 100644 --- a/drivers/platform/x86/amd/pmf/pmf.h +++ b/drivers/platform/x86/amd/pmf/pmf.h @@ -169,6 +169,7 @@ struct amd_pmf_dev { struct mutex update_mutex; /* protects race between ACPI handler and metrics thread */ bool cnqf_enabled; bool cnqf_supported; + struct notifier_block pwr_src_notifier; }; struct apmf_sps_prop_granular {