From patchwork Tue May 16 15:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Wilczynski X-Patchwork-Id: 682457 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 CED34C7EE25 for ; Tue, 16 May 2023 15:06:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232108AbjEPPG5 (ORCPT ); Tue, 16 May 2023 11:06:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234069AbjEPPGy (ORCPT ); Tue, 16 May 2023 11:06:54 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 241CF6A5B for ; Tue, 16 May 2023 08:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684249609; x=1715785609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ctOUzRb+ZcegTGCVkNEVrNY8x7q5FeX0R0PBONTTeig=; b=TjbBw+ZDd4+HP0iJI/10e98yICja2X5ukOxG6YEpOWswD1gCVyNwtLmc u2diizuAMIF4BIpj0ROX5Ts+1cE3QS89+SZ+GOrqLTTBDLCWO1BdCQNPX gF+s5uCKP+NzHAwa3FoeWImaI3h2T4FMOOJCR/72hbyDhyUKK1T/7LHih sumgoTiYc/NQxLxGqB4Y0BlOefF0ig9UXeWVCJxd3OH7n1ceuMpHvqAmB L3Q6QaVXcvaw4/IFW1FGNyrEyMi5Hz1zOhlmWTES+ly0y11cbdm8KZxSd zxz81y+3stONDF+ymczv/88yZ7Ylq2xBw46iCAmuBRaQew8Lq6zb36gUr g==; X-IronPort-AV: E=McAfee;i="6600,9927,10711"; a="417158346" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="417158346" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 08:06:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10711"; a="704446245" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="704446245" Received: from hextor.igk.intel.com ([10.123.220.6]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 08:06:18 -0700 From: Michal Wilczynski To: linux-acpi@vger.kernel.org Cc: rafael@kernel.org, srinivas.pandruvada@linux.intel.com, Michal Wilczynski Subject: [PATCH v2 2/2] acpi: Move logic responsible for conveying processor OSPM capabilities Date: Tue, 16 May 2023 17:05:58 +0200 Message-Id: <20230516150558.149886-3-michal.wilczynski@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230516150558.149886-1-michal.wilczynski@intel.com> References: <20230516150558.149886-1-michal.wilczynski@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Since _PDC method is deprecated and a preferred method of communicating OSPM processor power management capabilities is _OSC, there is a need to move functions checking whether processor is present and workarounds for specific hardware to acpi_processor.c as this logic is not _PDC specific. It also applies to the _OSC objects. Move processor_dmi_check(), processor_idle_dmi_table, set_no_mwait() and processor_physically_present() to acpi_processor.c. Introduce IDLE_NOMWAIT workaround and processor_dmi_table workarounds to work with _OSC objects. Mark acpi_early_processor_set_pdc() and acpi_processor_set_pdc() as deprecated. Signed-off-by: Michal Wilczynski --- drivers/acpi/acpi_processor.c | 81 +++++++++++++++++++++++++++++++++++ drivers/acpi/internal.h | 3 ++ drivers/acpi/processor_pdc.c | 80 +--------------------------------- include/acpi/processor.h | 2 +- 4 files changed, 87 insertions(+), 79 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 26f6c002016b..7ab53d0a42d3 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -10,6 +10,7 @@ * Rafael J. Wysocki */ +#include #include #include #include @@ -21,6 +22,8 @@ #include +#include + #include "internal.h" DEFINE_PER_CPU(struct acpi_processor *, processors); @@ -508,6 +511,79 @@ static void acpi_processor_remove(struct acpi_device *device) } #endif /* CONFIG_ACPI_HOTPLUG_CPU */ +bool __init processor_physically_present(acpi_handle handle) +{ + int cpuid, type; + u32 acpi_id; + acpi_status status; + acpi_object_type acpi_type; + unsigned long long tmp; + union acpi_object object = { 0 }; + struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; + + status = acpi_get_type(handle, &acpi_type); + if (ACPI_FAILURE(status)) + return false; + + switch (acpi_type) { + case ACPI_TYPE_PROCESSOR: + status = acpi_evaluate_object(handle, NULL, NULL, &buffer); + if (ACPI_FAILURE(status)) + return false; + acpi_id = object.processor.proc_id; + break; + case ACPI_TYPE_DEVICE: + status = acpi_evaluate_integer(handle, "_UID", NULL, &tmp); + if (ACPI_FAILURE(status)) + return false; + acpi_id = tmp; + break; + default: + return false; + } + + if (xen_initial_domain()) + /* + * When running as a Xen dom0 the number of processors Linux + * sees can be different from the real number of processors on + * the system, and we still need to execute _PDC for all of + * them. + */ + return xen_processor_present(acpi_id); + + type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; + cpuid = acpi_get_cpuid(handle, type, acpi_id); + + return !invalid_logical_cpuid(cpuid); +} + +static int __init set_no_mwait(const struct dmi_system_id *id) +{ + pr_notice("%s detected - disabling mwait for CPU C-states\n", + id->ident); + boot_option_idle_override = IDLE_NOMWAIT; + return 0; +} + +static const struct dmi_system_id processor_idle_dmi_table[] __initconst = { + { + set_no_mwait, "Extensa 5220", { + DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), + DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, + {}, +}; + +void __init processor_dmi_check(void) +{ + /* + * Check whether the system is DMI table. If yes, OSPM + * should not use mwait for CPU-states. + */ + dmi_check_system(processor_idle_dmi_table); +} + #ifdef CONFIG_X86 static bool acpi_hwp_native_thermal_lvt_set; static acpi_status __init acpi_processor_osc(acpi_handle handle, u32 lvl, @@ -523,6 +599,9 @@ static acpi_status __init acpi_processor_osc(acpi_handle handle, u32 lvl, .cap.pointer = capbuf, }; + if (processor_physically_present(handle) == false) + return AE_OK; + arch_acpi_set_proc_cap_bits(&capbuf[OSC_SUPPORT_DWORD]); if (boot_option_idle_override == IDLE_NOMWAIT) @@ -550,6 +629,8 @@ acpi_status __init acpi_early_processor_osc(void) { acpi_status status; + processor_dmi_check(); + status = acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, acpi_processor_osc, NULL, NULL, NULL); diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 58e892376391..24e93413ae41 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -155,6 +155,9 @@ void acpi_early_processor_set_pdc(void); static inline void acpi_early_processor_set_pdc(void) {} #endif +void processor_dmi_check(void); +bool processor_physically_present(acpi_handle handle); + #ifdef CONFIG_X86 acpi_status acpi_early_processor_osc(void); #else diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c index 8d10d000ebc2..ce3acd86dd12 100644 --- a/drivers/acpi/processor_pdc.c +++ b/drivers/acpi/processor_pdc.c @@ -9,61 +9,12 @@ #define pr_fmt(fmt) "ACPI: " fmt -#include #include #include #include -#include - #include "internal.h" -static bool __init processor_physically_present(acpi_handle handle) -{ - int cpuid, type; - u32 acpi_id; - acpi_status status; - acpi_object_type acpi_type; - unsigned long long tmp; - union acpi_object object = { 0 }; - struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; - - status = acpi_get_type(handle, &acpi_type); - if (ACPI_FAILURE(status)) - return false; - - switch (acpi_type) { - case ACPI_TYPE_PROCESSOR: - status = acpi_evaluate_object(handle, NULL, NULL, &buffer); - if (ACPI_FAILURE(status)) - return false; - acpi_id = object.processor.proc_id; - break; - case ACPI_TYPE_DEVICE: - status = acpi_evaluate_integer(handle, "_UID", NULL, &tmp); - if (ACPI_FAILURE(status)) - return false; - acpi_id = tmp; - break; - default: - return false; - } - - if (xen_initial_domain()) - /* - * When running as a Xen dom0 the number of processors Linux - * sees can be different from the real number of processors on - * the system, and we still need to execute _PDC for all of - * them. - */ - return xen_processor_present(acpi_id); - - type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0; - cpuid = acpi_get_cpuid(handle, type, acpi_id); - - return !invalid_logical_cpuid(cpuid); -} - static void acpi_set_pdc_bits(u32 *buf) { buf[0] = ACPI_PDC_REVISION_ID; @@ -146,7 +97,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) return status; } -void acpi_processor_set_pdc(acpi_handle handle) +void __deprecated acpi_processor_set_pdc(acpi_handle handle) { struct acpi_object_list *obj_list; @@ -174,34 +125,7 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; } -static int __init set_no_mwait(const struct dmi_system_id *id) -{ - pr_notice("%s detected - disabling mwait for CPU C-states\n", - id->ident); - boot_option_idle_override = IDLE_NOMWAIT; - return 0; -} - -static const struct dmi_system_id processor_idle_dmi_table[] __initconst = { - { - set_no_mwait, "Extensa 5220", { - DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), - DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, - {}, -}; - -static void __init processor_dmi_check(void) -{ - /* - * Check whether the system is DMI table. If yes, OSPM - * should not use mwait for CPU-states. - */ - dmi_check_system(processor_idle_dmi_table); -} - -void __init acpi_early_processor_set_pdc(void) +void __init __deprecated acpi_early_processor_set_pdc(void) { processor_dmi_check(); diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 94181fe9780a..83ed42254567 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -372,7 +372,7 @@ static inline void acpi_cppc_processor_exit(struct acpi_processor *pr) #endif /* CONFIG_ACPI_CPPC_LIB */ /* in processor_pdc.c */ -void acpi_processor_set_pdc(acpi_handle handle); +void __deprecated acpi_processor_set_pdc(acpi_handle handle); /* in processor_throttling.c */ #ifdef CONFIG_ACPI_CPU_FREQ_PSS