From patchwork Tue Jan 31 09:00:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yuan, Perry" X-Patchwork-Id: 649121 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 BDDEAC636D3 for ; Tue, 31 Jan 2023 09:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232257AbjAaJF1 (ORCPT ); Tue, 31 Jan 2023 04:05:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232398AbjAaJEz (ORCPT ); Tue, 31 Jan 2023 04:04:55 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC61110AA8; Tue, 31 Jan 2023 01:01:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fdTONT6XQvrfY3ADzMJzGJR02TbyFtX9KKJlv+EHYfND6Q88riWjfxKzZNaJHhu8w2voaAuadp3+aMCk96U5i/lqi84iV9pI7AQcNiOEhL4iFeWhQ5sZPBn+RDNxMdCvqhd/QpmQTD1NXMj+xIbz4hkda33raH638O+Dt06ZB/i5j8okqNiFtA9wZKKYtp5bo2i/NuQOQXCnhp1niushfIJviUdvwGkpl+5NaCyfbH7a00+0SR4INcYPKXxzb00t9e0jQpgMVHtvDT6vJZ7sAkkLqs125JaVY+hoPCOaqxZlHd7TvXrgzoYbsZchdGwSaUgr5g9OZ/EM1N/31BWrew== 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=y2kg3NyOxDpCcsc9p7SzAIbT3cisV55IEpKRJajCNT0=; b=FsRIUeQvk6YtV3h5BfLXmkAwaLdu6N8Ixg9qM/bfcb7/IwXzx+7/e7gN6km4uNTnbimv/lSkX0Rx0edD4KYzHcUuA1WoNYFCSYxeL7V0b1B3EJlMAFAAr+ADZOdVG3SaVYFeskLs2b47YWzezbs89p8+fmzUGn8vgZh6Z5g++kP7GCD59S0SyKEHYD9TLK6UZnnEaaibxwNOmJNaFidMOeGYCt1PrsQRD6wGJdYU0L5uHf1GGe6l6RU8KgiJsQgazAPHGtlzWn56mrsEv/1BHe8bjHyTXtCl2MNH/IkxV+36DM5z9PdbAzofQe3hpl10+3vyYi/J5UM3gSlH7Q+GhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=intel.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=y2kg3NyOxDpCcsc9p7SzAIbT3cisV55IEpKRJajCNT0=; b=TkbGQ1IpPjYSFtKZ1ZbmXJH9nRwAY3GfqtD+SJp4wyHOAByL3lY+Aqr2krTGzv/4cuKQQpAVuXEdHVuqxPXStxUIO6RpPDNk665n9Y/J9em6xiGo+y0+B/nVeUusPlEjdjephLz0GC0ZqcL1Q9B2jV4GlCVqsuHfHjobY1oarAc= Received: from MW4PR04CA0194.namprd04.prod.outlook.com (2603:10b6:303:86::19) by DM6PR12MB4958.namprd12.prod.outlook.com (2603:10b6:5:20a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Tue, 31 Jan 2023 09:00:55 +0000 Received: from CO1NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:303:86:cafe::48) by MW4PR04CA0194.outlook.office365.com (2603:10b6:303:86::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36 via Frontend Transport; Tue, 31 Jan 2023 09:00:54 +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 CO1NAM11FT060.mail.protection.outlook.com (10.13.175.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6043.22 via Frontend Transport; Tue, 31 Jan 2023 09:00:54 +0000 Received: from pyuan-Cloudripper.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; Tue, 31 Jan 2023 03:00:44 -0600 From: Perry Yuan To: , , , CC: , , , , , , , , Subject: [PATCH v12 01/11] ACPI: CPPC: Add AMD pstate energy performance preference cppc control Date: Tue, 31 Jan 2023 17:00:06 +0800 Message-ID: <20230131090016.3970625-2-perry.yuan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230131090016.3970625-1-perry.yuan@amd.com> References: <20230131090016.3970625-1-perry.yuan@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT060:EE_|DM6PR12MB4958:EE_ X-MS-Office365-Filtering-Correlation-Id: cfb5d03d-5048-4d0d-9232-08db0369a90e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Uoouq8SCRpTO1+oEn14+CV1Qo78VGNyGFro7BDr8g0Pu8nvas9C6tUDiz56Qv8du6Fcakl8Fko4TwjlqgCTIa8whS5GY1OtTmmabSTyhPal4A0WZ8d4iNrlm0abEETT5IAuVukBfnPUmtWIBOIZGjcRVcmvvwcwlZPXq0XTqN5yS6vpO3pY/Dn2BcxrDanazscIo41lTYjo3t4oixALxEv80JBTgNw3zDAYOZgeDXrekp/diLwYvewH85pkjQypHikd2GvSnWO2Z8kVDfphCPVdFXHTbbs1l+LvoihT1Va2JYXvRwRT3SHH571cVraBAXLw51zZWIlK1VMlTZ9Wu6OIV+9ezLEaHgCPk+A0zRCCcdfvuWmnDi7rERiRtXIzBfYM0Lu+3bnlfwtPertrG8piLQyxaStN9HQ6k4xeOmbFsi1bhIGRXqF4u2Iq0684Hrr7pSS5DL+hSpZnE/8j8TEcwmETcg8UXBAd/bGbktd4UIVdgEbaiq7qebKjMeE8HNe00UpkGxxtEQl8akAnKJufQESyU1/s4usELuphFW5v5LKcq+9SKwT2kulvLOUVsKY1BFpSHp5WVAuN6wAQsX1jUHw5+Ai+4E0wjRu3ZJYZUPTZgZ5j6ErW2LBlK0XHEI4xHYuErnj1qWY0BJzM2FUyFfc3q2t9HitnKeKSvz4Q1ZsKUeRrw9ke/H7YHog5/meff4t7RGdU7kM4eYq0qArEkRrKDmbYelyZuhhLTPbk= 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)(376002)(39860400002)(396003)(346002)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(81166007)(86362001)(356005)(5660300002)(36756003)(83380400001)(2906002)(7696005)(54906003)(110136005)(6666004)(478600001)(8936002)(40480700001)(4326008)(44832011)(41300700001)(70586007)(70206006)(8676002)(316002)(82740400003)(36860700001)(16526019)(186003)(1076003)(26005)(40460700003)(2616005)(426003)(336012)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 09:00:54.4248 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfb5d03d-5048-4d0d-9232-08db0369a90e 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: CO1NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4958 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Perry Yuan Add support for setting and querying EPP preferences to the generic CPPC driver. This enables downstream drivers such as amd-pstate to discover and use these values. Downstream drivers that want to use the new symbols cppc_get_epp_caps and cppc_set_epp_perf for querying and setting EPP preferences will need to call cppc_set_epp_perf to enable the EPP function firstly. Acked-by: Huang Rui Reviewed-by: Mario Limonciello Reviewed-by: Wyes Karny Tested-by: Wyes Karny Signed-off-by: Perry Yuan --- drivers/acpi/cppc_acpi.c | 67 ++++++++++++++++++++++++++++++++++++++++ include/acpi/cppc_acpi.h | 12 +++++++ 2 files changed, 79 insertions(+) diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 0f17b1c32718..02d83c807271 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -1153,6 +1153,19 @@ int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf) return cppc_get_perf(cpunum, NOMINAL_PERF, nominal_perf); } +/** + * cppc_get_epp_perf - Get the epp register value. + * @cpunum: CPU from which to get epp preference value. + * @epp_perf: Return address. + * + * Return: 0 for success, -EIO otherwise. + */ +int cppc_get_epp_perf(int cpunum, u64 *epp_perf) +{ + return cppc_get_perf(cpunum, ENERGY_PERF, epp_perf); +} +EXPORT_SYMBOL_GPL(cppc_get_epp_perf); + /** * cppc_get_perf_caps - Get a CPU's performance capabilities. * @cpunum: CPU from which to get capabilities info. @@ -1365,6 +1378,60 @@ int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs) } EXPORT_SYMBOL_GPL(cppc_get_perf_ctrs); +/* + * Set Energy Performance Preference Register value through + * Performance Controls Interface + */ +int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable) +{ + int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu); + struct cpc_register_resource *epp_set_reg; + struct cpc_register_resource *auto_sel_reg; + struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu); + struct cppc_pcc_data *pcc_ss_data = NULL; + int ret; + + if (!cpc_desc) { + pr_debug("No CPC descriptor for CPU:%d\n", cpu); + return -ENODEV; + } + + auto_sel_reg = &cpc_desc->cpc_regs[AUTO_SEL_ENABLE]; + epp_set_reg = &cpc_desc->cpc_regs[ENERGY_PERF]; + + if (CPC_IN_PCC(epp_set_reg) || CPC_IN_PCC(auto_sel_reg)) { + if (pcc_ss_id < 0) { + pr_debug("Invalid pcc_ss_id for CPU:%d\n", cpu); + return -ENODEV; + } + + if (CPC_SUPPORTED(auto_sel_reg)) { + ret = cpc_write(cpu, auto_sel_reg, enable); + if (ret) + return ret; + } + + if (CPC_SUPPORTED(epp_set_reg)) { + ret = cpc_write(cpu, epp_set_reg, perf_ctrls->energy_perf); + if (ret) + return ret; + } + + pcc_ss_data = pcc_data[pcc_ss_id]; + + down_write(&pcc_ss_data->pcc_lock); + /* after writing CPC, transfer the ownership of PCC to platform */ + ret = send_pcc_cmd(pcc_ss_id, CMD_WRITE); + up_write(&pcc_ss_data->pcc_lock); + } else { + ret = -ENOTSUPP; + pr_debug("_CPC in PCC is not supported\n"); + } + + return ret; +} +EXPORT_SYMBOL_GPL(cppc_set_epp_perf); + /** * cppc_set_enable - Set to enable CPPC on the processor by writing the * Continuous Performance Control package EnableRegister field. diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h index c5614444031f..6b487a5bd638 100644 --- a/include/acpi/cppc_acpi.h +++ b/include/acpi/cppc_acpi.h @@ -108,12 +108,14 @@ struct cppc_perf_caps { u32 lowest_nonlinear_perf; u32 lowest_freq; u32 nominal_freq; + u32 energy_perf; }; struct cppc_perf_ctrls { u32 max_perf; u32 min_perf; u32 desired_perf; + u32 energy_perf; }; struct cppc_perf_fb_ctrs { @@ -149,6 +151,8 @@ extern bool cpc_ffh_supported(void); extern bool cpc_supported_by_cpu(void); extern int cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val); extern int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val); +extern int cppc_get_epp_perf(int cpunum, u64 *epp_perf); +extern int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable); #else /* !CONFIG_ACPI_CPPC_LIB */ static inline int cppc_get_desired_perf(int cpunum, u64 *desired_perf) { @@ -202,6 +206,14 @@ static inline int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val) { return -ENOTSUPP; } +static inline int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable) +{ + return -ENOTSUPP; +} +static inline int cppc_get_epp_perf(int cpunum, u64 *epp_perf) +{ + return -ENOTSUPP; +} #endif /* !CONFIG_ACPI_CPPC_LIB */ #endif /* _CPPC_ACPI_H*/