From: Michal Wilczynski <michal.wilczynski@intel.com>
To: linux-acpi@vger.kernel.org
Cc: rafael@kernel.org, andriy.shevchenko@intel.com,
artem.bityutskiy@linux.intel.com, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com, lenb@kernel.org,
jgross@suse.com, linux-kernel@vger.kernel.org, x86@kernel.org
Subject: [PATCH v3 3/5] acpi: Introduce new function callback for _OSC
Date: Tue, 13 Jun 2023 19:10:32 +0300 [thread overview]
Message-ID: <20230613161034.3496047-4-michal.wilczynski@intel.com> (raw)
In-Reply-To: <20230613161034.3496047-1-michal.wilczynski@intel.com>
Currently in ACPI code _OSC method is already used for workaround
introduced in commit a21211672c9a ("ACPI / processor: Request native
thermal interrupt handling via _OSC"). Create new function, similar to
already existing acpi_hwp_native_thermal_lvt_osc(). Call new function
acpi_processor_osc(). Make this function fulfill the purpose previously
fulfilled by the workaround plus convey OSPM processor capabilities
with it by setting correct processor capability bits.
Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/include/asm/acpi.h | 3 +++
drivers/acpi/acpi_processor.c | 43 ++++++++++++++++++++++++++++++++++-
include/acpi/pdc_intel.h | 1 +
3 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 6a498d1781e7..6c25ce2dad18 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -112,6 +112,9 @@ static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
if (cpu_has(c, X86_FEATURE_ACPI))
*cap |= ACPI_PDC_T_FFH;
+ if (cpu_has(c, X86_FEATURE_HWP))
+ *cap |= ACPI_PDC_COLLAB_PROC_PERF;
+
/*
* If mwait/monitor is unsupported, C2/C3_FFH will be disabled
*/
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 8c5d0295a042..0de0b05b6f53 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -591,13 +591,54 @@ void __init processor_dmi_check(void)
dmi_check_system(processor_idle_dmi_table);
}
+/* vendor specific UUID indicating an Intel platform */
+static u8 sb_uuid_str[] = "4077A616-290C-47BE-9EBD-D87058713953";
static bool acpi_hwp_native_thermal_lvt_set;
+static acpi_status __init acpi_processor_osc(acpi_handle handle, u32 lvl,
+ void *context, void **rv)
+{
+ u32 capbuf[2] = {};
+ acpi_status status;
+ struct acpi_osc_context osc_context = {
+ .uuid_str = sb_uuid_str,
+ .rev = 1,
+ .cap.length = 8,
+ .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)
+ capbuf[OSC_SUPPORT_DWORD] &=
+ ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH);
+
+ status = acpi_run_osc(handle, &osc_context);
+ if (ACPI_FAILURE(status))
+ return status;
+
+ if (osc_context.ret.pointer && osc_context.ret.length > 1) {
+ u32 *capbuf_ret = osc_context.ret.pointer;
+
+ if (!acpi_hwp_native_thermal_lvt_set &&
+ capbuf_ret[1] & ACPI_PDC_COLLAB_PROC_PERF) {
+ acpi_handle_info(handle,
+ "_OSC native thermal LVT Acked\n");
+ acpi_hwp_native_thermal_lvt_set = true;
+ }
+ }
+ kfree(osc_context.ret.pointer);
+
+ return AE_OK;
+}
+
static acpi_status __init acpi_hwp_native_thermal_lvt_osc(acpi_handle handle,
u32 lvl,
void *context,
void **rv)
{
- u8 sb_uuid_str[] = "4077A616-290C-47BE-9EBD-D87058713953";
u32 capbuf[2];
struct acpi_osc_context osc_context = {
.uuid_str = sb_uuid_str,
diff --git a/include/acpi/pdc_intel.h b/include/acpi/pdc_intel.h
index 967c552d1cd3..9427f639287f 100644
--- a/include/acpi/pdc_intel.h
+++ b/include/acpi/pdc_intel.h
@@ -16,6 +16,7 @@
#define ACPI_PDC_C_C1_FFH (0x0100)
#define ACPI_PDC_C_C2C3_FFH (0x0200)
#define ACPI_PDC_SMP_P_HWCOORD (0x0800)
+#define ACPI_PDC_COLLAB_PROC_PERF (0x1000)
#define ACPI_PDC_EST_CAPABILITY_SMP (ACPI_PDC_SMP_C1PT | \
ACPI_PDC_C_C1_HALT | \
--
2.41.0
next prev parent reply other threads:[~2023-06-13 16:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 16:10 [PATCH v3 0/5] Prefer using _OSC method over deprecated _PDC Michal Wilczynski
2023-06-13 16:10 ` [PATCH v3 1/5] acpi: Move logic responsible for conveying processor OSPM capabilities Michal Wilczynski
2023-06-13 16:10 ` [PATCH v3 2/5] acpi: Refactor arch_acpi_set_pdc_bits() Michal Wilczynski
2023-06-29 10:48 ` Rafael J. Wysocki
2023-06-13 16:10 ` Michal Wilczynski [this message]
2023-06-29 11:04 ` [PATCH v3 3/5] acpi: Introduce new function callback for _OSC Rafael J. Wysocki
2023-06-29 13:15 ` Rafael J. Wysocki
2023-06-30 9:02 ` Wilczynski, Michal
2023-06-30 9:10 ` Rafael J. Wysocki
2023-06-30 9:23 ` Wilczynski, Michal
2023-07-03 9:51 ` Wilczynski, Michal
2023-07-03 15:22 ` Rafael J. Wysocki
2023-07-06 13:25 ` Wilczynski, Michal
2023-06-30 8:46 ` Wilczynski, Michal
2023-07-03 8:54 ` Wilczynski, Michal
2023-07-03 15:20 ` Rafael J. Wysocki
2023-06-13 16:10 ` [PATCH v3 4/5] acpi: Use _OSC method to convey processor OSPM capabilities Michal Wilczynski
2023-06-29 14:23 ` Rafael J. Wysocki
2023-06-30 9:18 ` Wilczynski, Michal
2023-06-13 16:10 ` [PATCH v3 5/5] acpi: Remove acpi_hwp_native_thermal_lvt_osc() Michal Wilczynski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230613161034.3496047-4-michal.wilczynski@intel.com \
--to=michal.wilczynski@intel.com \
--cc=andriy.shevchenko@intel.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rafael@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®