From patchwork Tue Jan 31 13:00:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Pavlu X-Patchwork-Id: 50815 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2738035wrn; Tue, 31 Jan 2023 05:04:47 -0800 (PST) X-Google-Smtp-Source: AK7set/UHJ1KyJYOhRfhYbhQqnEr0T/PWGyHmjFpFdtFaaq+Cs6wcDT2xhGJI5kK/K4+UhFvKAeS X-Received: by 2002:a05:6402:4502:b0:4a2:b97:adc4 with SMTP id ez2-20020a056402450200b004a20b97adc4mr3222008edb.38.1675170286942; Tue, 31 Jan 2023 05:04:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675170286; cv=none; d=google.com; s=arc-20160816; b=nsgxXvWGIDZ6qJfLb9Hvrv/m8rg/6Cl/VIcPiZWTNyAtmhqydx7Dp2QBPRQPt3bscu 6HgZoWGEP5KBjAcAKu7wlUJMG+CpEnRX2Ef8ypz1z2Vja2XSjBZYxNxKZ7iKiI4jTDm7 LdnBhe5VdyY2bl+XTk47wKcJot8q/HlepKkSVnnbAxUc2Yv18dQfglSZuGazVWGWg6+x MIAfTGLh4Qf73CTjmsb4gne7Uq4usF98S86vJdfHwbcXRYNPpyXSWTzizcD8wEQeFdNB Ei2cdxpzpqWmq0fl2QS2ShziVuXTiMT626DR7JEyDNlha3VMZ2QUdsoZDQxDfktePAZz ShpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=NLETNYRB1I9t8cXemPHR0hkOBQ4tV56gRSZ+uiABDF4=; b=vvwdsISAyVCBoH8zfezzhrykhgerLDR33FKZPJUY48yRk892aUcc2pLHAK9A5GYgaD 6Ro7f7zsNxc3OBjzEeGOYA7KoOVZrbxv+mkjJD1QGjWyBdnBQH6m7HUKMOn9hod3j2Le gKwJeGCQFLeki92iGgC4kPk+isdvlV9Gm0xCvqtNrfFFFWQoTQP5gjJhfaH8mPAPbFdL cNsBXkYER/bUXxeWTcM5V/jyVu/4psjVGeSJXymT14/N6/Cp63hzEWJ43HwoI/yO2mNd rSAGXHzOVeRpqUoC9/qs6tRjtKLJKuNgq/c/1jfsXLIdoINFIFRRnBiunygV79HO6yXz h/ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=GPWeZ4Hz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v10-20020aa7cd4a000000b004a23541e661si9327149edw.611.2023.01.31.05.04.19; Tue, 31 Jan 2023 05:04:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=GPWeZ4Hz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231485AbjAaNBW (ORCPT + 99 others); Tue, 31 Jan 2023 08:01:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbjAaNBU (ORCPT ); Tue, 31 Jan 2023 08:01:20 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DED624B898; Tue, 31 Jan 2023 05:01:18 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 91455228FF; Tue, 31 Jan 2023 13:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1675170077; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NLETNYRB1I9t8cXemPHR0hkOBQ4tV56gRSZ+uiABDF4=; b=GPWeZ4HzDM+VzbgslendF66NPeXFYqPxEb+vlNczJZkOEBnHkue46fCyggBcrvUCJ+ZdtD dgppdI6fldhPvn0YyQG8kOFBaE4Htszp+4/n+hQYJHrzDN9tu5My+G/4+1UdIYvDCQ22mY 2StCAs8kkuRu508IIn7Nxr111QM/E6k= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 574BB13585; Tue, 31 Jan 2023 13:01:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id n5lvFB0R2WPmGgAAMHmgww (envelope-from ); Tue, 31 Jan 2023 13:01:17 +0000 From: Petr Pavlu To: rafael@kernel.org, lenb@kernel.org, viresh.kumar@linaro.org Cc: pmladek@suse.com, mcgrof@kernel.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Pavlu Subject: [PATCH] ACPI: cpufreq: use a platform device to load ACPI PPC and PCC drivers Date: Tue, 31 Jan 2023 14:00:41 +0100 Message-Id: <20230131130041.629-1-petr.pavlu@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756543358764553505?= X-GMAIL-MSGID: =?utf-8?q?1756543358764553505?= The acpi-cpufreq and pcc-cpufreq drivers are loaded through per-CPU module aliases. This can result in many unnecessary load requests during boot if another frequency module, such as intel_pstate, is already active. For instance, on a typical Intel system, one can observe that udev makes 2x#CPUs attempts to insert acpi_cpufreq and 1x#CPUs attempts for pcc_cpufreq. All these tries then fail if another frequency module is already registered. Both acpi-cpufreq and pcc-cpufreq drivers have their platform firmware interface defined by ACPI. Allowed performance states and parameters must be same for each CPU. This makes it possible to model these interfaces as platform devices. The patch extends the ACPI parsing logic to check the ACPI namespace if the PPC or PCC interface is present and creates a virtual platform device for each if it is available. The acpi-cpufreq and pcc-cpufreq drivers are then updated to map to these devices. This allows to try loading acpi-cpufreq and pcc-cpufreq only once during boot and only if a given interface is available in the firmware. Signed-off-by: Petr Pavlu --- drivers/acpi/Makefile | 1 + drivers/acpi/acpi_cpufreq.c | 49 ++++++++++++++++++++++++++++++++++ drivers/acpi/bus.c | 1 + drivers/acpi/internal.h | 2 ++ drivers/cpufreq/acpi-cpufreq.c | 39 +++++++++++++++------------ drivers/cpufreq/pcc-cpufreq.c | 34 ++++++++++++++++------- 6 files changed, 99 insertions(+), 27 deletions(-) create mode 100644 drivers/acpi/acpi_cpufreq.c diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index feb36c0b9446..880db1082c3e 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -57,6 +57,7 @@ acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o acpi-$(CONFIG_X86) += acpi_cmos_rtc.o +acpi-$(CONFIG_X86) += acpi_cpufreq.o acpi-$(CONFIG_X86) += x86/apple.o acpi-$(CONFIG_X86) += x86/utils.o acpi-$(CONFIG_X86) += x86/s2idle.o diff --git a/drivers/acpi/acpi_cpufreq.c b/drivers/acpi/acpi_cpufreq.c new file mode 100644 index 000000000000..7cf243c67475 --- /dev/null +++ b/drivers/acpi/acpi_cpufreq.c @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Registration of platform devices for ACPI Processor Performance Control and + * Processor Clocking Control. + */ + +#include +#include + +#include "internal.h" + +static void __init cpufreq_add_device(const char *name) +{ + struct platform_device *pdev; + + pdev = platform_device_register_simple(name, PLATFORM_DEVID_NONE, NULL, + 0); + if (IS_ERR(pdev)) + pr_err("%s device creation failed: %ld\n", name, PTR_ERR(pdev)); +} + +static acpi_status __init acpi_pct_match(acpi_handle handle, u32 level, + void *context, void **return_value) +{ + bool *pct = context; + + /* Check if the first CPU has _PCT. The data must be same for all. */ + *pct = acpi_has_method(handle, "_PCT"); + return AE_CTRL_TERMINATE; +} + +void __init acpi_cpufreq_init(void) +{ + acpi_status status; + acpi_handle handle; + bool pct = false; + + status = acpi_get_handle(NULL, "\\_SB", &handle); + if (ACPI_FAILURE(status)) + return; + + acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, + ACPI_UINT32_MAX, acpi_pct_match, NULL, &pct, NULL); + if (pct) + cpufreq_add_device("acpi-cpufreq"); + + if (acpi_has_method(handle, "PCCH")) + cpufreq_add_device("pcc-cpufreq"); +} diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0c05ccde1f7a..f1559e26d5ff 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1428,6 +1428,7 @@ static int __init acpi_init(void) acpi_viot_init(); acpi_agdi_init(); acpi_apmt_init(); + acpi_cpufreq_init(); return 0; } diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index ec584442fb29..c9b1a5f689fa 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -157,8 +157,10 @@ static inline void acpi_early_processor_set_pdc(void) {} #ifdef CONFIG_X86 void acpi_early_processor_osc(void); +void acpi_cpufreq_init(void); #else static inline void acpi_early_processor_osc(void) {} +static inline void acpi_cpufreq_init(void) {} #endif /* -------------------------------------------------------------------------- diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 78adfb2ffff6..e1a5384cf21c 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -965,7 +965,7 @@ static void __init acpi_cpufreq_boost_init(void) acpi_cpufreq_driver.boost_enabled = boost_state(0); } -static int __init acpi_cpufreq_init(void) +static int __init acpi_cpufreq_probe(struct platform_device *pdev) { int ret; @@ -1010,13 +1010,32 @@ static int __init acpi_cpufreq_init(void) return ret; } -static void __exit acpi_cpufreq_exit(void) +static int acpi_cpufreq_remove(struct platform_device *pdev) { pr_debug("%s\n", __func__); cpufreq_unregister_driver(&acpi_cpufreq_driver); free_acpi_perf_data(); + + return 0; +} + +static struct platform_driver acpi_cpufreq_platdrv = { + .driver = { + .name = "acpi-cpufreq", + }, + .remove = acpi_cpufreq_remove, +}; + +static int __init acpi_cpufreq_init(void) +{ + return platform_driver_probe(&acpi_cpufreq_platdrv, acpi_cpufreq_probe); +} + +static void __exit acpi_cpufreq_exit(void) +{ + platform_driver_unregister(&acpi_cpufreq_platdrv); } module_param(acpi_pstate_strict, uint, 0644); @@ -1027,18 +1046,4 @@ MODULE_PARM_DESC(acpi_pstate_strict, late_initcall(acpi_cpufreq_init); module_exit(acpi_cpufreq_exit); -static const struct x86_cpu_id __maybe_unused acpi_cpufreq_ids[] = { - X86_MATCH_FEATURE(X86_FEATURE_ACPI, NULL), - X86_MATCH_FEATURE(X86_FEATURE_HW_PSTATE, NULL), - {} -}; -MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids); - -static const struct acpi_device_id __maybe_unused processor_device_ids[] = { - {ACPI_PROCESSOR_OBJECT_HID, }, - {ACPI_PROCESSOR_DEVICE_HID, }, - {}, -}; -MODULE_DEVICE_TABLE(acpi, processor_device_ids); - -MODULE_ALIAS("acpi"); +MODULE_ALIAS("platform:acpi-cpufreq"); diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index 9f3fc7a073d0..0c362932ca60 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c @@ -384,7 +384,7 @@ static int __init pcc_cpufreq_do_osc(acpi_handle *handle) return ret; } -static int __init pcc_cpufreq_probe(void) +static int __init pcc_cpufreq_evaluate(void) { acpi_status status; struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL}; @@ -576,7 +576,7 @@ static struct cpufreq_driver pcc_cpufreq_driver = { .name = "pcc-cpufreq", }; -static int __init pcc_cpufreq_init(void) +static int __init pcc_cpufreq_probe(struct platform_device *pdev) { int ret; @@ -587,9 +587,9 @@ static int __init pcc_cpufreq_init(void) if (acpi_disabled) return -ENODEV; - ret = pcc_cpufreq_probe(); + ret = pcc_cpufreq_evaluate(); if (ret) { - pr_debug("pcc_cpufreq_init: PCCH evaluation failed\n"); + pr_debug("pcc_cpufreq_probe: PCCH evaluation failed\n"); return ret; } @@ -607,21 +607,35 @@ static int __init pcc_cpufreq_init(void) return ret; } -static void __exit pcc_cpufreq_exit(void) +static int pcc_cpufreq_remove(struct platform_device *pdev) { cpufreq_unregister_driver(&pcc_cpufreq_driver); pcc_clear_mapping(); free_percpu(pcc_cpu_info); + + return 0; } -static const struct acpi_device_id __maybe_unused processor_device_ids[] = { - {ACPI_PROCESSOR_OBJECT_HID, }, - {ACPI_PROCESSOR_DEVICE_HID, }, - {}, +static struct platform_driver pcc_cpufreq_platdrv = { + .driver = { + .name = "pcc-cpufreq", + }, + .remove = pcc_cpufreq_remove, }; -MODULE_DEVICE_TABLE(acpi, processor_device_ids); + +static int __init pcc_cpufreq_init(void) +{ + return platform_driver_probe(&pcc_cpufreq_platdrv, pcc_cpufreq_probe); +} + +static void __exit pcc_cpufreq_exit(void) +{ + platform_driver_unregister(&pcc_cpufreq_platdrv); +} + +MODULE_ALIAS("platform:pcc-cpufreq"); MODULE_AUTHOR("Matthew Garrett, Naga Chumbalkar"); MODULE_VERSION(PCC_VERSION);