From nobody Wed Dec 31 10:35:02 2025 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 BDB22C4332F for ; Mon, 6 Nov 2023 06:45:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231142AbjKFGpN (ORCPT ); Mon, 6 Nov 2023 01:45:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231220AbjKFGou (ORCPT ); Mon, 6 Nov 2023 01:44:50 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 678BF10C2; Sun, 5 Nov 2023 22:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1699253046; x=1699857846; i=w_armin@gmx.de; bh=Pv7pzN61cV/w6SaQYsvtsAErhKAdUju7HrUHAjn72K8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=tvg/8DW5AahxKOJHDA7rlaIBnmYveyjW69qn3OAhgjQajyaTudOwdqUOZ4PGs/FS F5gC7HHauNMVZ1XnQg+QkZDDaWYPnyb6Zh/mEpuLtKipBxM32ROKBBo+5142ibSXK DJ7liRmkkGsdvDwoT/h685SYMO3wu/DrVPo7/ajOBcg1eLhKnE61liuEmif54a5xf 5cLXJl4D1Sen6EY4afXW3MHxiMFXAicdCCk2v+/el6471Cj0jOH0oU3jPg7Oq2v5u uwuRYChrwZkJnRkGQz/XbXtGoxZXzW4zVm+RGO3FEGmrXJfA1iOHr+c4r8/7INP+n lt3G2nrYehsTqO2r+w== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MVeI2-1qsIde1JsC-00RWw7; Mon, 06 Nov 2023 07:44:06 +0100 From: Armin Wolf To: pali@kernel.org Cc: hdegoede@redhat.com, markgross@kernel.org, ilpo.jarvinen@linux.intel.com, jdelvare@suse.com, linux@roeck-us.net, platform-driver-x86@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/9] hwmon: (dell-smm) Add support for WMI SMM interface Date: Mon, 6 Nov 2023 07:43:49 +0100 Message-Id: <20231106064351.42347-8-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231106064351.42347-1-W_Armin@gmx.de> References: <20231106064351.42347-1-W_Armin@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:9yaYy3Tjj1tHlRN49vB/2j2dv16dtrWpCkwrcl0M6Ru6MsjPM8N 272PvPz5+YDMDV/9CMH3BODpZ3fnZGt15AmR+tbJU870Vu0gPkmlIclipvBZZh1YKG0zvIa 7WGA5PdGy+rRanljvvTrz2BZF25Wk33JstmMn1EqySOmGxBIB61avd7K4lXJDTTlbRuN3cL foePTlOUhuRijDuCeo10g== UI-OutboundReport: notjunk:1;M01:P0:hS35UcD7vMg=;Grdahy78+kb3/NRuwoVaYZfV8Cy /GQRmDIG0hSr3YST+IpvURRkxbHeDR5RE26gCUYq4HTdpN3hikvPaACMFjPnrOhMNanOf2nsu /2I9Tj+3NxSU1+1Dxn+EXifz47oK8MKfnlMq7XUIQfdbO8r3K5+5ycAV+gCsRf5UgRNztYRBX 1NLlmHs1yBscyd67rAcGPY9NB2zcnHoQxCAi5Uy9gsNmB2UGWqaQmK1Pfn21VwRF/IQULIBuq c49XXz7R/uvP48OL9VCcI1oOdGWSc9Ws1oquVehBShZ09Su4Y3hNipZNu92UhTqVchgUZF0fr HweNPfbxcA4XG1zoRxLGebHbGNglcUAc0tbzfS7uwuqpxeQLgsjmTzQ8A5w8cxWu1NyXrZMGj DTkyNJ73HgQ95CWJgDbn4EogcZvqcd6sJcrEAhsQEGYjhVO2tY3tWw0YfTeljXeiSVmjnzqdu HkLGQ2IP9Jdq9E4JqBedCMSXYyVFcuMQGWXIxnWto4L2/9VJlSz90beLNuMlyBRbp05+ORt6F j2ZOjnNVhz9aemiMNnON8BTUv31oP5TtLBwpdwugq8k4vi6IIH2kjjpgTKnAUIuUMqtE4WrHX RpmdMhbFJUQ4VTaV2gEUTVOm1uf/HDObJCYIdZZdW1PNMdl/i0AGQuJUcSBztTr4acColW267 lrYpGv6WdL5B/EY25GcfAOwFcv9tiojIUN51vr0rhf2xpDTdlQIjz0WVoOeQbnCji2NWsEPj4 7NTCM4awqBA1bJw+G0hn6RZFPlkxznHbOCfvQHaRPirm7DgcnTJkN2+hjyFxVAa3lqfBzTFm7 KIXfsEnuRiro2yExCdGOU6dUK8PwaHixsHZEKHHCiIJ1545PcSm6G45R7rOcMWxAaZcGtP16r LUhm57Mmd+9CAAh6xmiX5w3KOzHN/XXtKximkP/X/TFZ4P/d8xHj7dSxozS3i8+TyO/ESV0BW CG6Igz8WJHbU8LtyrVl0dUZGLLw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some Dell machines like the Dell Optiplex 7000 do not support the legacy SMM interface, but instead expect all SMM calls to be issued over a special WMI interface. Add support for this interface so users can control the fans on those machines. Tested-by: Signed-off-by: Armin Wolf --- drivers/hwmon/Kconfig | 1 + drivers/hwmon/dell-smm-hwmon.c | 198 +++++++++++++++++++++++++++++---- drivers/platform/x86/wmi.c | 1 + 3 files changed, 181 insertions(+), 19 deletions(-) diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index cf27523eed5a..76cb05db1dcf 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -512,6 +512,7 @@ config SENSORS_DS1621 config SENSORS_DELL_SMM tristate "Dell laptop SMM BIOS hwmon driver" + depends on ACPI_WMI depends on X86 imply THERMAL help diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 2547b09929e6..d1bcfd447bb0 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include #include @@ -34,8 +35,10 @@ #include #include #include +#include #include +#include #define I8K_SMM_FN_STATUS 0x0025 #define I8K_SMM_POWER_STATUS 0x0069 @@ -66,6 +69,9 @@ #define I8K_POWER_AC 0x05 #define I8K_POWER_BATTERY 0x01 +#define DELL_SMM_WMI_GUID "F1DDEE52-063C-4784-A11E-8A06684B9B01" +#define DELL_SMM_LEGACY_EXECUTE 0x1 + #define DELL_SMM_NO_TEMP 10 #define DELL_SMM_NO_FANS 3 @@ -219,6 +225,102 @@ static const struct dell_smm_ops i8k_smm_ops =3D { .smm_call =3D i8k_smm_call, }; +/* + * Call the System Management Mode BIOS over WMI. + */ +static int wmi_parse_register(u8 *buffer, u32 length, int *reg) +{ + __le32 value; + u32 reg_size; + + if (length <=3D sizeof(reg_size)) + return -ENODATA; + + reg_size =3D get_unaligned_le32(buffer); + if (!reg_size || reg_size > sizeof(value)) + return -ENOMSG; + + if (length < sizeof(reg_size) + reg_size) + return -ENODATA; + + memcpy_and_pad(&value, sizeof(value), buffer + sizeof(reg_size), reg_size= , 0); + *reg =3D le32_to_cpu(value); + + return (int)(reg_size + sizeof(reg_size)); +} + +static int wmi_parse_response(u8 *buffer, u32 length, struct smm_regs *reg= s) +{ + int *registers[] =3D { + ®s->eax, + ®s->ebx, + ®s->ecx, + ®s->edx + }; + u32 offset =3D 0; + int ret, i; + + for (i =3D 0; i < ARRAY_SIZE(registers); i++) { + if (offset >=3D length) + return -ENODATA; + + ret =3D wmi_parse_register(buffer + offset, length - offset, registers[i= ]); + if (ret < 0) + return ret; + + offset +=3D ret; + } + + if (offset !=3D length) + return -ENOMSG; + + return 0; +} + +static int wmi_smm_call(struct device *dev, struct smm_regs *regs) +{ + struct wmi_device *wdev =3D container_of(dev, struct wmi_device, dev); + struct acpi_buffer out =3D { ACPI_ALLOCATE_BUFFER, NULL }; + u32 wmi_payload[] =3D { + sizeof(regs->eax), + regs->eax, + sizeof(regs->ebx), + regs->ebx, + sizeof(regs->ecx), + regs->ecx, + sizeof(regs->edx), + regs->edx + }; + const struct acpi_buffer in =3D { + .length =3D sizeof(wmi_payload), + .pointer =3D &wmi_payload, + }; + union acpi_object *obj; + acpi_status status; + int ret; + + status =3D wmidev_evaluate_method(wdev, 0x0, DELL_SMM_LEGACY_EXECUTE, &in= , &out); + if (ACPI_FAILURE(status)) + return -EIO; + + obj =3D out.pointer; + if (!obj) + return -ENODATA; + + if (obj->type !=3D ACPI_TYPE_BUFFER) { + ret =3D -ENOMSG; + + goto err_free; + } + + ret =3D wmi_parse_response(obj->buffer.pointer, obj->buffer.length, regs); + +err_free: + kfree(obj); + + return ret; +} + static int dell_smm_call(const struct dell_smm_ops *ops, struct smm_regs *= regs) { int eax =3D regs->eax; @@ -306,7 +408,7 @@ static int i8k_get_fan_type(struct dell_smm_data *data,= u8 fan) /* * Read the fan nominal rpm for specific fan speed. */ -static int __init i8k_get_fan_nominal_speed(const struct dell_smm_data *da= ta, u8 fan, int speed) +static int i8k_get_fan_nominal_speed(const struct dell_smm_data *data, u8 = fan, int speed) { struct smm_regs regs =3D { .eax =3D I8K_SMM_GET_NOM_SPEED, @@ -349,7 +451,7 @@ static int i8k_set_fan(const struct dell_smm_data *data= , u8 fan, int speed) return dell_smm_call(data->ops, ®s); } -static int __init i8k_get_temp_type(const struct dell_smm_data *data, u8 s= ensor) +static int i8k_get_temp_type(const struct dell_smm_data *data, u8 sensor) { struct smm_regs regs =3D { .eax =3D I8K_SMM_GET_TEMP_TYPE, @@ -401,7 +503,7 @@ static int i8k_get_temp(const struct dell_smm_data *dat= a, u8 sensor) return temp; } -static int __init dell_smm_get_signature(const struct dell_smm_ops *ops, i= nt req_fn) +static int dell_smm_get_signature(const struct dell_smm_ops *ops, int req_= fn) { struct smm_regs regs =3D { .eax =3D req_fn, }; int rc; @@ -986,7 +1088,7 @@ static const struct hwmon_chip_info dell_smm_chip_info= =3D { .info =3D dell_smm_info, }; -static int __init dell_smm_init_cdev(struct device *dev, u8 fan_num) +static int dell_smm_init_cdev(struct device *dev, u8 fan_num) { struct dell_smm_data *data =3D dev_get_drvdata(dev); struct thermal_cooling_device *cdev; @@ -1017,7 +1119,7 @@ static int __init dell_smm_init_cdev(struct device *d= ev, u8 fan_num) return ret; } -static int __init dell_smm_init_hwmon(struct device *dev) +static int dell_smm_init_hwmon(struct device *dev) { struct dell_smm_data *data =3D dev_get_drvdata(dev); struct device *dell_smm_hwmon_dev; @@ -1083,7 +1185,7 @@ static int __init dell_smm_init_hwmon(struct device *= dev) return PTR_ERR_OR_ZERO(dell_smm_hwmon_dev); } -static int __init dell_smm_init_data(struct device *dev, const struct dell= _smm_ops *ops) +static int dell_smm_init_data(struct device *dev, const struct dell_smm_op= s *ops) { struct dell_smm_data *data; @@ -1409,6 +1511,9 @@ static const struct dmi_system_id i8k_whitelist_fan_c= ontrol[] __initconst =3D { { } }; +/* + * Legacy SMM backend driver. + */ static int __init dell_smm_probe(struct platform_device *pdev) { int ret; @@ -1434,6 +1539,47 @@ static struct platform_driver dell_smm_driver =3D { static struct platform_device *dell_smm_device; +/* + * WMI SMM backend driver. + */ +static int dell_smm_wmi_probe(struct wmi_device *wdev, const void *context) +{ + struct dell_smm_ops *ops; + int ret; + + ops =3D devm_kzalloc(&wdev->dev, sizeof(*ops), GFP_KERNEL); + if (!ops) + return -ENOMEM; + + ops->smm_call =3D wmi_smm_call; + ops->smm_dev =3D &wdev->dev; + + if (dell_smm_get_signature(ops, I8K_SMM_GET_DELL_SIG1) && + dell_smm_get_signature(ops, I8K_SMM_GET_DELL_SIG2)) + return -ENODEV; + + ret =3D dell_smm_init_data(&wdev->dev, ops); + if (ret < 0) + return ret; + + return dell_smm_init_hwmon(&wdev->dev); +} + +static const struct wmi_device_id dell_smm_wmi_id_table[] =3D { + { DELL_SMM_WMI_GUID, NULL }, + { } +}; +MODULE_DEVICE_TABLE(wmi, dell_smm_wmi_id_table); + +static struct wmi_driver dell_smm_wmi_driver =3D { + .driver =3D { + .name =3D KBUILD_MODNAME, + .probe_type =3D PROBE_PREFER_ASYNCHRONOUS, + }, + .id_table =3D dell_smm_wmi_id_table, + .probe =3D dell_smm_wmi_probe, +}; + /* * Probe for the presence of a supported laptop. */ @@ -1485,33 +1631,43 @@ static void __init dell_smm_init_dmi(void) } } -static int __init i8k_init(void) +static int __init dell_smm_legacy_check(void) { - /* - * Get DMI information - */ if (!dmi_check_system(i8k_dmi_table)) { if (!ignore_dmi && !force) return -ENODEV; - pr_info("not running on a supported Dell system.\n"); + pr_info("Probing for legacy SMM handler on unsupported machine\n"); pr_info("vendor=3D%s, model=3D%s, version=3D%s\n", i8k_get_dmi_data(DMI_SYS_VENDOR), i8k_get_dmi_data(DMI_PRODUCT_NAME), i8k_get_dmi_data(DMI_BIOS_VERSION)); } - dell_smm_init_dmi(); - - /* - * Get SMM Dell signature - */ if (dell_smm_get_signature(&i8k_smm_ops, I8K_SMM_GET_DELL_SIG1) && dell_smm_get_signature(&i8k_smm_ops, I8K_SMM_GET_DELL_SIG2)) { if (!force) return -ENODEV; - pr_err("Unable to get Dell SMM signature\n"); + pr_warn("Forcing legacy SMM calls on a possibly incompatible machine\n"); + } + + return 0; +} + +static int __init i8k_init(void) +{ + int ret; + + dell_smm_init_dmi(); + + ret =3D dell_smm_legacy_check(); + if (ret < 0) { + /* + * On modern machines, SMM communication happens over WMI, meaning + * the SMM handler might not react to legacy SMM calls. + */ + return wmi_driver_register(&dell_smm_wmi_driver); } dell_smm_device =3D platform_create_bundle(&dell_smm_driver, dell_smm_pro= be, NULL, 0, NULL, @@ -1522,8 +1678,12 @@ static int __init i8k_init(void) static void __exit i8k_exit(void) { - platform_device_unregister(dell_smm_device); - platform_driver_unregister(&dell_smm_driver); + if (dell_smm_device) { + platform_device_unregister(dell_smm_device); + platform_driver_unregister(&dell_smm_driver); + } else { + wmi_driver_unregister(&dell_smm_wmi_driver); + } } module_init(i8k_init); diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index a78ddd83cda0..0b3e63c21d26 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -106,6 +106,7 @@ MODULE_DEVICE_TABLE(acpi, wmi_device_ids); static const char * const allow_duplicates[] =3D { "05901221-D566-11D1-B2F0-00A0C9062910", /* wmi-bmof */ "8A42EA14-4F2A-FD45-6422-0087F7A7E608", /* dell-wmi-ddv */ + "F1DDEE52-063C-4784-A11E-8A06684B9B01", /* dell-smm-hwmon */ NULL }; -- 2.39.2