From patchwork Thu Mar 27 16:21:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLb3BlxIc=?= X-Patchwork-Id: 14031281 Received: from 1.mo560.mail-out.ovh.net (1.mo560.mail-out.ovh.net [46.105.63.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5016A2F50 for ; Thu, 27 Mar 2025 16:21:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.105.63.121 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743092508; cv=none; b=XCbuBFHXA7wlYoO563jP9JF/tzVE+oW764qyJN1YItPJeWXLGBQVSe61afzPVyVREvfMxAPkbSZeRCoSyH0GCV4iaIOm0zcVMO/sN11LqaeYfGMsKN1o+KakFDJvRZNey8OONK7RdgZNH/077RnuG/xRSc0GdSZohwo780sxzXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743092508; c=relaxed/simple; bh=YZ3sLQCuoC29MaaZFSEmriFHw0VY3iGKXFSMehcEg8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IRRsMNWOMIVoupYXI5GJMWihYJgg4l1Fo7PUAowdVtrfX4BK2u5ctF/Tkr2Vjk71K5/iAZ178/5Y+74MbSBwzc+sjoow9Txv7OwsPdncmz00DAETPCW89MngZQeBc/+hIswyFEt7dumKVxivB/e05lU+xO5F5GFPugrme3r+f+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=3mdeb.com; spf=pass smtp.mailfrom=3mdeb.com; dkim=pass (2048-bit key) header.d=3mdeb.com header.i=@3mdeb.com header.b=EJeGQi9u; arc=none smtp.client-ip=46.105.63.121 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=3mdeb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=3mdeb.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=3mdeb.com header.i=@3mdeb.com header.b="EJeGQi9u" Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.9.71]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4ZNpnd71YCz1knV for ; Thu, 27 Mar 2025 16:21:41 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-q4c9d (unknown [10.110.101.246]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7D2921FEBF; Thu, 27 Mar 2025 16:21:41 +0000 (UTC) Received: from 3mdeb.com ([37.59.142.108]) by ghost-submission-5b5ff79f4f-q4c9d with ESMTPSA id qF9+JBR75Wcm7gUAzBdejQ:T2 (envelope-from ); Thu, 27 Mar 2025 16:21:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0023b58d066-5a5f-4a4c-8df0-d658f5e72eb8, 05DB09BA71DD90540B36DFBD267885ED49907206) smtp.auth=michal.kopec@3mdeb.com X-OVh-ClientIp: 213.192.77.249 From: =?utf-8?b?TWljaGHFgiBLb3BlxIc=?= To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com Cc: platform-driver-x86@vger.kernel.org, piotr.krol@3mdeb.com, maciej.pijanowski@3mdeb.com, michal.kopec@3mdeb.com Subject: [PATCH v2 1/1] platform/x86: Introduce dasharo-acpi platform driver Date: Thu, 27 Mar 2025 17:21:13 +0100 Message-ID: <20250327162113.571940-2-michal.kopec@3mdeb.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250327162113.571940-1-michal.kopec@3mdeb.com> References: <20250327162113.571940-1-michal.kopec@3mdeb.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Ovh-Tracer-Id: 8868995043490598157 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduieekkeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofhitghhrghlucfmohhpvggtuceomhhitghhrghlrdhkohhpvggtseefmhguvggsrdgtohhmqeenucggtffrrghtthgvrhhnpefhgeehveejkeevkeetheeuveeiuedvieekgffgheelfefhkeduheeiudekhfefhfenucfkphepuddvjedrtddrtddruddpvddufedrudelvddrjeejrddvgeelpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehmihgthhgrlhdrkhhophgvtgesfehmuggvsgdrtghomhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehplhgrthhfohhrmhdqughrihhvvghrqdigkeeisehvghgvrhdrkhgvrhhnvghlrdhorhhgpdfovfetjfhoshhtpehmohehiedtmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=+fFaJs7nxetQ8iseGz70RcNPXQf6PuEyGJku8vwunq0=; c=relaxed/relaxed; d=3mdeb.com; h=From; s=ovhmo3617313-selector1; t=1743092502; v=1; b=EJeGQi9upfyolBprmN0Dgj9k8tWFg8QU2sW2m9s7XoT0g7f4hWxmZtA40NZlxNNJ/NOWstDD 8bWYANBeed8A4mnOE7BBsj8Xn+4fnW7cvxW/lYumLMbOuU9651NxsthOjdDeWzIvC8VU/f9Nja1 7buc1BTLLKCpznNFDRkJoCZavza+Br2T49KiFEYMN4tHPNuBvVEDxeOShg8AyKt0zr2l1iuszRg 2vHrQhR0lWBgYMwzhXfCmy+jtqbhHXuMg2qUxmVw0aoxnOGdVRnmjQ/YiUa2Co4szz/ZpNUJOxe VOzh0BqzJLAElVyIpKCAEPDzSaYhDSOwD6fLbV6ptT1lQ== Introduce a driver for devices running Dasharo firmware. The driver supports thermal monitoring using a new ACPI interface in Dasharo. The initial version supports monitoring fan speeds, fan PWM duty cycles and system temperatures as well as determining which specific interfaces are implemented by firmware. It has been tested on a NovaCustom laptop running pre-release Dasharo firmware, which implements fan and thermal monitoring for the CPU and the discrete GPU, if present. Signed-off-by: Michał Kopeć --- drivers/platform/x86/Kconfig | 10 + drivers/platform/x86/Makefile | 3 + drivers/platform/x86/dasharo-acpi.c | 375 ++++++++++++++++++++++++++++ 3 files changed, 388 insertions(+) create mode 100644 drivers/platform/x86/dasharo-acpi.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0258dd879d64..8168c5274a08 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1060,6 +1060,16 @@ config LENOVO_WMI_CAMERA To compile this driver as a module, choose M here: the module will be called lenovo-wmi-camera. +config DASHARO_ACPI + tristate "Dasharo ACPI Platform Driver" + depends on ACPI + depends on HWMON + help + This driver provides HWMON support for devices running Dasharo + firmware. + + If you have a device with Dasharo firmware, choose Y or M here. + source "drivers/platform/x86/x86-android-tablets/Kconfig" config FW_ATTR_CLASS diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index e1b142947067..3ca53ae01d93 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -110,6 +110,9 @@ obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o # Inspur obj-$(CONFIG_INSPUR_PLATFORM_PROFILE) += inspur_platform_profile.o +# Dasharo +obj-$(CONFIG_DASHARO_ACPI) += dasharo-acpi.o + # Laptop drivers obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o diff --git a/drivers/platform/x86/dasharo-acpi.c b/drivers/platform/x86/dasharo-acpi.c new file mode 100644 index 000000000000..f1fbf7a9074d --- /dev/null +++ b/drivers/platform/x86/dasharo-acpi.c @@ -0,0 +1,375 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Dasharo ACPI Driver + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +enum dasharo_feature { + DASHARO_FEATURE_TEMPERATURE = 0, + DASHARO_FEATURE_FAN_PWM, + DASHARO_FEATURE_FAN_TACH, + DASHARO_FEATURE_MAX, +}; + +enum dasharo_temperature { + DASHARO_TEMPERATURE_CPU_PACKAGE = 0, + DASHARO_TEMPERATURE_CPU_CORE, + DASHARO_TEMPERATURE_GPU, + DASHARO_TEMPERATURE_BOARD, + DASHARO_TEMPERATURE_CHASSIS, + DASHARO_TEMPERATURE_MAX, +}; + +enum dasharo_fan { + DASHARO_FAN_CPU = 0, + DASHARO_FAN_GPU, + DASHARO_FAN_CHASSIS, + DASHARO_FAN_MAX, +}; + +#define MAX_GROUPS_PER_FEAT 8 + +static char *dasharo_group_names[DASHARO_FEATURE_MAX][MAX_GROUPS_PER_FEAT] = { + [DASHARO_FEATURE_TEMPERATURE] = { + [DASHARO_TEMPERATURE_CPU_PACKAGE] = "CPU Package", + [DASHARO_TEMPERATURE_CPU_CORE] = "CPU Core", + [DASHARO_TEMPERATURE_GPU] = "GPU", + [DASHARO_TEMPERATURE_BOARD] = "Board", + [DASHARO_TEMPERATURE_CHASSIS] = "Chassis", + }, + [DASHARO_FEATURE_FAN_PWM] = { + [DASHARO_FAN_CPU] = "CPU", + [DASHARO_FAN_GPU] = "GPU", + [DASHARO_FAN_CHASSIS] = "Chassis", + }, + [DASHARO_FEATURE_FAN_TACH] = { + [DASHARO_FAN_CPU] = "CPU", + [DASHARO_FAN_GPU] = "GPU", + [DASHARO_FAN_CHASSIS] = "Chassis", + }, +}; + +#define MAX_CAP_NAME_LEN 16 + +struct dasharo_capability { + int cap; + int index; + char name[MAX_CAP_NAME_LEN]; +}; + +#define MAX_CAPS_PER_FEAT 24 + +struct dasharo_data { + struct acpi_device *acpi_dev; + int cap_counts[DASHARO_FEATURE_MAX]; + struct dasharo_capability capabilities[DASHARO_FEATURE_MAX][MAX_CAPS_PER_FEAT]; + struct device *hwmon; +}; + +static int dasharo_get_feature_cap_count(struct dasharo_data *data, int feat, int cap) +{ + struct acpi_object_list obj_list; + unsigned long long count = 0; + union acpi_object obj[2]; + acpi_handle handle; + acpi_status status; + + obj[0].type = ACPI_TYPE_INTEGER; + obj[0].integer.value = feat; + obj[1].type = ACPI_TYPE_INTEGER; + obj[1].integer.value = cap; + obj_list.count = 2; + obj_list.pointer = &obj[0]; + + handle = acpi_device_handle(data->acpi_dev); + status = acpi_evaluate_integer(handle, "GFCP", &obj_list, &count); + if (!ACPI_SUCCESS(status)) + return -ENODEV; + + return count; +} + +static int dasharo_read_value_by_cap_idx(struct dasharo_data *data, char *method, int cap, int index, long *value) +{ + struct acpi_object_list obj_list; + unsigned long long val = 0; + union acpi_object obj[2]; + acpi_handle handle; + acpi_status status; + + obj[0].type = ACPI_TYPE_INTEGER; + obj[0].integer.value = cap; + obj[1].type = ACPI_TYPE_INTEGER; + obj[1].integer.value = index; + obj_list.count = 2; + obj_list.pointer = &obj[0]; + + handle = acpi_device_handle(data->acpi_dev); + status = acpi_evaluate_integer(handle, method, &obj_list, &val); + if (!ACPI_SUCCESS(status)) + return -ENODEV; + + *value = val; + return val; +} + +static int dasharo_hwmon_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) +{ + struct dasharo_data *data = dev_get_drvdata(dev); + int ret = 0; + long value; + + switch (type) { + case hwmon_temp: + if (attr == hwmon_temp_input) { + ret = dasharo_read_value_by_cap_idx(data, + "GTMP", + data->capabilities[DASHARO_FEATURE_TEMPERATURE][channel].cap, + data->capabilities[DASHARO_FEATURE_TEMPERATURE][channel].index, + &value); + + if (ret > 0) + *val = value * 1000; + } + break; + case hwmon_fan: + if (attr == hwmon_fan_input) { + ret = dasharo_read_value_by_cap_idx(data, + "GFTH", + data->capabilities[DASHARO_FEATURE_FAN_TACH][channel].cap, + data->capabilities[DASHARO_FEATURE_FAN_TACH][channel].index, + &value); + + if (ret > 0) + *val = value; + } + break; + case hwmon_pwm: + if (attr == hwmon_pwm_input) { + ret = dasharo_read_value_by_cap_idx(data, + "GFDC", + data->capabilities[DASHARO_FEATURE_FAN_PWM][channel].cap, + data->capabilities[DASHARO_FEATURE_FAN_PWM][channel].index, + &value); + + if (ret > 0) + *val = value; + } + break; + default: + break; + } + + return 0; +} + +static int dasharo_hwmon_read_string(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, const char **str) +{ + struct dasharo_data *data = dev_get_drvdata(dev); + + switch (type) { + case hwmon_temp: + if (attr == hwmon_temp_label && channel < data->cap_counts[DASHARO_FEATURE_TEMPERATURE]) + *str = data->capabilities[DASHARO_FEATURE_TEMPERATURE][channel].name; + break; + case hwmon_fan: + if (attr == hwmon_fan_label && channel < data->cap_counts[DASHARO_FEATURE_FAN_TACH]) + *str = data->capabilities[DASHARO_FEATURE_FAN_TACH][channel].name; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static umode_t dasharo_hwmon_is_visible(const void *drvdata, enum hwmon_sensor_types type, + u32 attr, int channel) +{ + const struct dasharo_data *data = drvdata; + + switch (type) { + case hwmon_temp: + if (channel < data->cap_counts[DASHARO_FEATURE_TEMPERATURE]) + return 0444; + break; + case hwmon_pwm: + if (channel < data->cap_counts[DASHARO_FEATURE_FAN_PWM]) + return 0444; + break; + case hwmon_fan: + if (channel < data->cap_counts[DASHARO_FEATURE_FAN_TACH]) + return 0444; + break; + default: + break; + } + + return 0; +} +static const struct hwmon_ops dasharo_hwmon_ops = { + .is_visible = dasharo_hwmon_is_visible, + .read_string = dasharo_hwmon_read_string, + .read = dasharo_hwmon_read, +}; + +// Max 24 capabilities per feature +static const struct hwmon_channel_info * const dasharo_hwmon_info[] = { + HWMON_CHANNEL_INFO(fan, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT), + NULL +}; + +static const struct hwmon_chip_info dasharo_hwmon_chip_info = { + .ops = &dasharo_hwmon_ops, + .info = dasharo_hwmon_info, +}; + +static void dasharo_fill_feature_caps(struct dasharo_data *data, int feat) +{ + int cap_count = 0; + int count = 0; + + for (int group = 0; group < MAX_GROUPS_PER_FEAT; ++group) { + count = dasharo_get_feature_cap_count(data, feat, group); + + for (unsigned int i = 0; i < count && cap_count < MAX_CAPS_PER_FEAT; ++i) { + data->capabilities[feat][cap_count].cap = group; + data->capabilities[feat][cap_count].index = i; + scnprintf(data->capabilities[feat][cap_count].name, MAX_CAP_NAME_LEN, "%s %d", dasharo_group_names[feat][group], i); + cap_count++; + } + } + data->cap_counts[feat] = cap_count; +} + +static int dasharo_add(struct acpi_device *acpi_dev) +{ + struct dasharo_data *data; + + data = devm_kzalloc(&acpi_dev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + acpi_dev->driver_data = data; + data->acpi_dev = acpi_dev; + + for (unsigned int i = 0; i < DASHARO_FEATURE_MAX; ++i) { + dasharo_fill_feature_caps(data, i); + } + + data->hwmon = devm_hwmon_device_register_with_info(&acpi_dev->dev, + "dasharo_acpi", data, &dasharo_hwmon_chip_info, NULL); + + return 0; +} + +static void dasharo_remove(struct acpi_device *acpi_dev) +{ + struct dasharo_data *data = acpi_driver_data(acpi_dev); + + hwmon_device_unregister(data->hwmon); +} + +static const struct acpi_device_id device_ids[] = { + {"DSHR0001", 0}, + {} +}; +MODULE_DEVICE_TABLE(acpi, device_ids); + +static struct acpi_driver dasharo_driver = { + .name = "Dasharo ACPI Driver", + .class = "Dasharo", + .ids = device_ids, + .ops = { + .add = dasharo_add, + .remove = dasharo_remove, + }, +}; +module_acpi_driver(dasharo_driver); + +MODULE_DESCRIPTION("Dasharo ACPI Driver"); +MODULE_AUTHOR("Michał Kopeć "); +MODULE_LICENSE("GPL");