Skip to content

hwmon: (macsmc) keep a fan whose optional keys are missing #1084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanTheTide merged 1 commit into from
Nov 8, 2026
+34 −19
Merged

hwmon: (macsmc) keep a fan whose optional keys are missing #1084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 34 additions & 19 deletions drivers/hwmon/macsmc-hwmon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,8 @@ static int macsmc_hwmon_create_fan(struct device *dev, struct apple_smc *smc,
struct macsmc_hwmon_fan *fan)
{
const char *label, *now, *min, *max, *set, *mode;
char missing[64] = "";
int len = 0;
int ret;

ret = of_property_read_string(fan_node, "apple,key-id", &now);
Expand All @@ -961,37 +963,50 @@ static int macsmc_hwmon_create_fan(struct device *dev, struct apple_smc *smc,
fan->attrs |= HWMON_F_LABEL;
}

/* The following keys are not required to simply monitor fan speed */
/*
* The following keys are not required to simply monitor fan speed.
* A key the firmware lacks (the T6050 SMC spells the mode key F0md,
* not F0Md) drops only that attribute, not the whole fan; the missing
* keys are reported together below.
*/
if (!of_property_read_string(fan_node, "apple,fan-minimum", &min)) {
ret = macsmc_hwmon_parse_key(dev, smc, &fan->min, min);
if (ret)
return ret;

fan->attrs |= HWMON_F_MIN;
if (macsmc_hwmon_parse_key(dev, smc, &fan->min, min))
len += scnprintf(missing + len, sizeof(missing) - len,
" minimum %s", min);
else
fan->attrs |= HWMON_F_MIN;
}

if (!of_property_read_string(fan_node, "apple,fan-maximum", &max)) {
ret = macsmc_hwmon_parse_key(dev, smc, &fan->max, max);
if (ret)
return ret;

fan->attrs |= HWMON_F_MAX;
if (macsmc_hwmon_parse_key(dev, smc, &fan->max, max))
len += scnprintf(missing + len, sizeof(missing) - len,
" maximum %s", max);
else
fan->attrs |= HWMON_F_MAX;
}

if (!of_property_read_string(fan_node, "apple,fan-target", &set)) {
ret = macsmc_hwmon_parse_key(dev, smc, &fan->set, set);
if (ret)
return ret;

fan->attrs |= HWMON_F_TARGET;
if (macsmc_hwmon_parse_key(dev, smc, &fan->set, set))
len += scnprintf(missing + len, sizeof(missing) - len,
" target %s", set);
else
fan->attrs |= HWMON_F_TARGET;
}

if (!of_property_read_string(fan_node, "apple,fan-mode", &mode)) {
ret = macsmc_hwmon_parse_key(dev, smc, &fan->mode, mode);
if (ret)
return ret;
if (macsmc_hwmon_parse_key(dev, smc, &fan->mode, mode))
len += scnprintf(missing + len, sizeof(missing) - len,
" mode %s", mode);
}

if (len)
dev_info(dev, "Fan %s: optional keys not found:%s\n", now, missing);

/* Manual control needs the minimum, maximum and target keys too */
if ((fan->attrs & (HWMON_F_MIN | HWMON_F_MAX | HWMON_F_TARGET)) !=
(HWMON_F_MIN | HWMON_F_MAX | HWMON_F_TARGET))
fan->mode.macsmc_key = 0;

if (of_property_read_bool(fan_node, "apple,fan-manual-control")) {
if (fan->mode.macsmc_key && (fan->attrs & HWMON_F_TARGET))
fan->manual_control = true;
Expand Down
Loading