mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00

Highlights: - alienware-wmi-wmax: - Add HWMON support - Add ABI and admin-guide documentation - Expose GPIO debug methods through debug FS - Support manual fan control and "custom" thermal profile - amd/hsmp: - Add sysfs files to show HSMP telemetry - Report power readings and limits via hwmon - amd/isp4: Add AMD ISP platform config for OV05C10 - asus-wmi: - Refactor Ally suspend/resume to work better with older FW - hid-asus: check ROG Ally MCU version and warn about old FW versions - dasharo-acpi: Add driver for Dasharo devices supporting fans and temperatures monitoring - dell-ddv: - Expose the battery health and manufacture date to userspace using power supply extensions - Implement the battery matching algorithm - dell-pc: - Improve error propagation - Use faux device - int3472: - Add delays to avoid GPIO regulator spikes - Add handshake pin support - Make regulator supply name configurable and allow registering more than 1 GPIO regulator - Map mt9m114 powerdown pin to powerenable - intel/pmc: Add separate SSRAM Telemetry driver - intel-uncore-freq: Add attributes to show agent types and die ID - ISST: - Support SST-TF revision 2 (allows more cores per bucket) - Support SST-PP revision 2 (fabric 1 frequencies) - Remove unnecessary SST MSRs restore (the package retains MSRs despite CPU offlining) - mellanox: Add support for SN2201, SN4280, SN5610, and SN5640 - mellanox: mlxbf-pmc: Support additional PMC blocks - oxpec: - Add OneXFly variants - Add support for charge limit, charge thresholds, and turbo LED - Distinguish current X1 variants to avoid unwanted matching to new variants - Follow hwmon conventions - Move from hwmon/oxp-sensors to platform/x86 to match the enlarged scope - power: supply: - Add inhibit-charge-awake (needed by oxpec) - Add additional battery health status values ("blown fuse" and "cell imbalance") (needed by dell-ddv) - powerwell-ec: Add driver for Portwell EC supporting GPIO and watchdog - thinkpad-acpi: Support camera shutter switch hotkey - tuxedo: Add virtual LampArray for TUXEDO NB04 devices - tools/power/x86/intel-speed-select: - Support displaying SST-PP revision 2 fields - Skip uncore frequency update on newer generations of CPUs - Miscellaneous cleanups / refactoring / improvements The following is an automated shortlog grouped by driver: ABI: testing: sysfs-class-oxp: - add missing documentation - add tt_led attribute documentation Add AMD ISP platform config for OV05C10: - Add AMD ISP platform config for OV05C10 alienware-wmi-wmax: - Add a DebugFS interface - Add HWMON support - Add support for manual fan control - Add support for the "custom" thermal profile - Expose GPIO debug methods - Fix awcc_hwmon_fans_init() label logic - Fix uninitialized bitmap in awcc_hwmon_fans_init() - Improve ID processing - Improve internal AWCC API - Improve platform profile probe - Modify supported_thermal_profiles[] - Rename thermal related symbols amd/hsmp: acpi: - Add sysfs files to display HSMP telemetry amd/hsmp: - fix building with CONFIG_HWMON=m - Report power via hwmon sensors - Use a single DRIVER_VERSION for all hsmp modules arm64: huawei-gaokun-ec: - Remove unneeded semicolon asus-wmi: - fix build without CONFIG_SUSPEND - Refactor Ally suspend/resume Avoid -Wflex-array-member-not-at-end warning: - Avoid -Wflex-array-member-not-at-end warning barco-p50: - use new GPIO line value setter callbacks dell-ddv: - Expose the battery health to userspace - Expose the battery manufacture date to userspace - Implement the battery matching algorithm dell-pc: - Propagate errors when detecting feature support - Transition to faux device - Use non-atomic bitmap operations docs: ABI: - Fix "aassociated" to "associated" Documentation/ABI: - Add new attribute for mlxreg-io sysfs interfaces Documentation: ABI: - Add sysfs platform and debugfs ABI documentation for alienware-wmi Documentation: admin-guide: laptops: - Add documentation for alienware-wmi Documentation: admin-guide: pm: - Add documentation for agent_types - Add documentation for die_id Documentation: wmi: alienware-wmi: - Add GPIO control documentation Documentation: wmi: - Improve and update alienware-wmi documentation Do not enable by default during compile testing: - Do not enable by default during compile testing hid-asus: - check ROG Ally MCU version and warn hwmon: - (oxp-sensors) Add all OneXFly variants - (oxp-sensors) Distinguish the X1 variants int0002: - use new GPIO line value setter callbacks int3472: - Add handshake pin support - Add skl_int3472_register_clock() helper - Avoid GPIO regulator spikes - Debug log when remapping pins - Drop unused gpio field from struct int3472_gpio_regulator - Export int3472_discrete_parse_crs() - For mt9m114 sensors map powerdown to powerenable - Make regulator supply name configurable - Move common.h to public includes, symbols to INTEL_INT3472 - Prepare for registering more than 1 GPIO regulator - Remove unused sensor_config struct member - Rework AVDD second sensor quirk handling - Stop setting a supply-name for GPIO regulators - Stop using devm_gpiod_get() intel/pmc: - Convert index variables to be unsigned - Create Intel PMC SSRAM Telemetry driver - Improve pmc_core_get_lpm_req() - Move error handling to init function - Move PMC Core related functions - Move PMC devid to core.h - Remove unneeded header file inclusion - Remove unneeded io operations - Rename core_ssram to ssram_telemetry - Use devm for mutex_init intel: power-domains: - Add interface to get Linux die ID intel-uncore-freq: - Add attributes to show agent types - Add attributes to show die_id intel/vsec: - Change return type of intel_vsec_register Introduce dasharo-acpi platform driver: - Introduce dasharo-acpi platform driver ISST: - Do Not Restore SST MSRs on CPU Online Operation - Support SST-PP revision 2 - Support SST-TF revision 2 - Update minor version mellanox: - Cosmetic changes to improve code style - Introduce support of Nvidia smart switch - Rename field to improve code readability mlxbf-pmc: - Support additional PMC blocks mlx-platform: - Add support for new Nvidia system mlxreg-dpu: - Add initial support for Nvidia DPU - Fix smatch warnings nvsw-sn2200: - Add support for new system flavour - Fix .items in nvsw_sn2201_busbar_hotplug oxpec: - Add a lower bounds check in oxp_psy_ext_set_prop() - Add charge threshold and behaviour to OneXPlayer - Add support for the OneXPlayer G1 - Add turbo led support to X1 devices - Adhere to sysfs-class-hwmon and enable pwm on 2 - Convert defines to using tabs - Follow reverse xmas convention for tt_toggle - Make turbo val apply a bitmask - Move fan speed read to separate function - Move hwmon/oxp-sensors to platform/x86 - Move pwm_enable read to its own function - Move pwm value read/write to separate functions - Rename ec group to tt_toggle - Rename rval to ret in tt_toggle portwell-ec: - Add GPIO and WDT driver for Portwell EC power: supply: - add inhibit-charge-awake to charge_behaviour power: supply: core: - Add additional health status values silicom: - use new GPIO line value setter callbacks sony-laptop: - Remove unused sony laptop camera code thermal/drivers/acerhdf: - Constify struct thermal_zone_device_ops thinkpad-acpi: - Add support for new hotkey for camera shutter switch tools/power/x86/intel-speed-select: - Skip uncore frequency update - Support SST PP revision 2 fields - v1.23 release tuxedo: - Add virtual LampArray for TUXEDO NB04 devices - Prevent invalid Kconfig state Use strscpy()/scnprintf() with acpi_device_name/class(): - Use strscpy()/scnprintf() with acpi_device_name/class() Merges: - Merge branch 'fixes' into for-next - Merge branch 'intel-sst' of https://github.com/spandruvada/linux-kernel into for-next -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQSCSUwRdwTNL2MhaBlZrE9hU+XOMQUCaDWJ7wAKCRBZrE9hU+XO MT8JAQDWW6qBoXuqpd6Yx1oOyROc6gJMQAsS9sNc7I60mGooEAEAnTLhOHDGkKb5 av1fz/SmXGl7joeRYkZV9FRzJ/26AAk= =ytxa -----END PGP SIGNATURE----- Merge tag 'platform-drivers-x86-v6.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 Pull x86 platform drivers updates from Ilpo Järvinen: "The changes are mostly business as usual. Besides pdx86 changes, there are a few power supply changes needed for related pdx86 features, move of oxpec driver from hwmon (oxp-sensors) to pdx86, and one FW version warning to hid-asus. Highlights: - alienware-wmi-wmax: - Add HWMON support - Add ABI and admin-guide documentation - Expose GPIO debug methods through debug FS - Support manual fan control and "custom" thermal profile - amd/hsmp: - Add sysfs files to show HSMP telemetry - Report power readings and limits via hwmon - amd/isp4: Add AMD ISP platform config for OV05C10 - asus-wmi: - Refactor Ally suspend/resume to work better with older FW - hid-asus: check ROG Ally MCU version and warn about old FW versions - dasharo-acpi: - Add driver for Dasharo devices supporting fans and temperatures monitoring - dell-ddv: - Expose the battery health and manufacture date to userspace using power supply extensions - Implement the battery matching algorithm - dell-pc: - Improve error propagation - Use faux device - int3472: - Add delays to avoid GPIO regulator spikes - Add handshake pin support - Make regulator supply name configurable and allow registering more than 1 GPIO regulator - Map mt9m114 powerdown pin to powerenable - intel/pmc: Add separate SSRAM Telemetry driver - intel-uncore-freq: Add attributes to show agent types and die ID - ISST: - Support SST-TF revision 2 (allows more cores per bucket) - Support SST-PP revision 2 (fabric 1 frequencies) - Remove unnecessary SST MSRs restore (the package retains MSRs despite CPU offlining) - mellanox: Add support for SN2201, SN4280, SN5610, and SN5640 - mellanox: mlxbf-pmc: Support additional PMC blocks - oxpec: - Add OneXFly variants - Add support for charge limit, charge thresholds, and turbo LED - Distinguish current X1 variants to avoid unwanted matching to new variants - Follow hwmon conventions - Move from hwmon/oxp-sensors to platform/x86 to match the enlarged scope - power supply: - Add inhibit-charge-awake (needed by oxpec) - Add additional battery health status values ("blown fuse" and "cell imbalance") (needed by dell-ddv) - powerwell-ec: Add driver for Portwell EC supporting GPIO and watchdog - thinkpad-acpi: Support camera shutter switch hotkey - tuxedo: Add virtual LampArray for TUXEDO NB04 devices - tools/power/x86/intel-speed-select: - Support displaying SST-PP revision 2 fields - Skip uncore frequency update on newer generations of CPUs - Miscellaneous cleanups / refactoring / improvements" * tag 'platform-drivers-x86-v6.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (112 commits) thermal/drivers/acerhdf: Constify struct thermal_zone_device_ops platform/x86/amd/hsmp: fix building with CONFIG_HWMON=m platform/x86: asus-wmi: fix build without CONFIG_SUSPEND docs: ABI: Fix "aassociated" to "associated" platform/x86: Add AMD ISP platform config for OV05C10 Documentation: admin-guide: pm: Add documentation for die_id platform/x86/intel-uncore-freq: Add attributes to show die_id platform/x86/intel: power-domains: Add interface to get Linux die ID Documentation: admin-guide: pm: Add documentation for agent_types platform/x86/intel-uncore-freq: Add attributes to show agent types platform/x86/tuxedo: Prevent invalid Kconfig state platform/x86: dell-ddv: Expose the battery health to userspace platform/x86: dell-ddv: Expose the battery manufacture date to userspace platform/x86: dell-ddv: Implement the battery matching algorithm power: supply: core: Add additional health status values platform/x86/amd/hsmp: acpi: Add sysfs files to display HSMP telemetry platform/x86/amd/hsmp: Report power via hwmon sensors platform/x86/amd/hsmp: Use a single DRIVER_VERSION for all hsmp modules platform/mellanox: mlxreg-dpu: Fix smatch warnings platform: mellanox: nvsw-sn2200: Fix .items in nvsw_sn2201_busbar_hotplug ...
121 lines
2.6 KiB
C
121 lines
2.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* AMD HSMP hwmon support
|
|
* Copyright (c) 2025, AMD.
|
|
* All Rights Reserved.
|
|
*
|
|
* This file provides hwmon implementation for HSMP interface.
|
|
*/
|
|
|
|
#include <asm/amd/hsmp.h>
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/err.h>
|
|
#include <linux/hwmon.h>
|
|
#include <linux/types.h>
|
|
#include <linux/units.h>
|
|
|
|
#include "hsmp.h"
|
|
|
|
#define HSMP_HWMON_NAME "amd_hsmp_hwmon"
|
|
|
|
static int hsmp_hwmon_write(struct device *dev, enum hwmon_sensor_types type,
|
|
u32 attr, int channel, long val)
|
|
{
|
|
u16 sock_ind = (uintptr_t)dev_get_drvdata(dev);
|
|
struct hsmp_message msg = {};
|
|
|
|
if (type != hwmon_power)
|
|
return -EOPNOTSUPP;
|
|
|
|
if (attr != hwmon_power_cap)
|
|
return -EOPNOTSUPP;
|
|
|
|
msg.num_args = 1;
|
|
msg.args[0] = val / MICROWATT_PER_MILLIWATT;
|
|
msg.msg_id = HSMP_SET_SOCKET_POWER_LIMIT;
|
|
msg.sock_ind = sock_ind;
|
|
return hsmp_send_message(&msg);
|
|
}
|
|
|
|
static int hsmp_hwmon_read(struct device *dev,
|
|
enum hwmon_sensor_types type,
|
|
u32 attr, int channel, long *val)
|
|
{
|
|
u16 sock_ind = (uintptr_t)dev_get_drvdata(dev);
|
|
struct hsmp_message msg = {};
|
|
int ret;
|
|
|
|
if (type != hwmon_power)
|
|
return -EOPNOTSUPP;
|
|
|
|
msg.sock_ind = sock_ind;
|
|
msg.response_sz = 1;
|
|
|
|
switch (attr) {
|
|
case hwmon_power_input:
|
|
msg.msg_id = HSMP_GET_SOCKET_POWER;
|
|
break;
|
|
case hwmon_power_cap:
|
|
msg.msg_id = HSMP_GET_SOCKET_POWER_LIMIT;
|
|
break;
|
|
case hwmon_power_cap_max:
|
|
msg.msg_id = HSMP_GET_SOCKET_POWER_LIMIT_MAX;
|
|
break;
|
|
default:
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
ret = hsmp_send_message(&msg);
|
|
if (!ret)
|
|
*val = msg.args[0] * MICROWATT_PER_MILLIWATT;
|
|
|
|
return ret;
|
|
}
|
|
|
|
static umode_t hsmp_hwmon_is_visble(const void *data,
|
|
enum hwmon_sensor_types type,
|
|
u32 attr, int channel)
|
|
{
|
|
if (type != hwmon_power)
|
|
return 0;
|
|
|
|
switch (attr) {
|
|
case hwmon_power_input:
|
|
return 0444;
|
|
case hwmon_power_cap:
|
|
return 0644;
|
|
case hwmon_power_cap_max:
|
|
return 0444;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
static const struct hwmon_ops hsmp_hwmon_ops = {
|
|
.read = hsmp_hwmon_read,
|
|
.is_visible = hsmp_hwmon_is_visble,
|
|
.write = hsmp_hwmon_write,
|
|
};
|
|
|
|
static const struct hwmon_channel_info * const hsmp_info[] = {
|
|
HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_CAP | HWMON_P_CAP_MAX),
|
|
NULL
|
|
};
|
|
|
|
static const struct hwmon_chip_info hsmp_chip_info = {
|
|
.ops = &hsmp_hwmon_ops,
|
|
.info = hsmp_info,
|
|
};
|
|
|
|
int hsmp_create_sensor(struct device *dev, u16 sock_ind)
|
|
{
|
|
struct device *hwmon_dev;
|
|
|
|
hwmon_dev = devm_hwmon_device_register_with_info(dev, HSMP_HWMON_NAME,
|
|
(void *)(uintptr_t)sock_ind,
|
|
&hsmp_chip_info,
|
|
NULL);
|
|
return PTR_ERR_OR_ZERO(hwmon_dev);
|
|
}
|
|
EXPORT_SYMBOL_NS(hsmp_create_sensor, "AMD_HSMP");
|