This patch adds support for fan control on T2 Macs in the applesmc driver.
It introduces functions to handle floating-point fan speed values (which are required by t2 chips).
The fan speed reading and writing are updated to support both integer and floating-point values.
The fan manual control is also updated to handle T2 Mac-specific keys.
and also Guenter Roeck asked me "Why use applesmc_write_key here?" (line: 917)
The use of applesmc_write_key is to directly update specific SMC keys
for controlling hardware parameters like fan speeds or sensor calibration
Changes since v1:
-- added spaces as Guenter Roeck asked me
-- also removed the type casting for buffer
Signed-off-by: Aun-Ali Zaidi <admin@xxxxxxxxxx>
Co-developed-by: Aun-Ali Zaidi <admin@xxxxxxxxxx>
Signed-off-by: Atharva Tiwari <evepolonium@xxxxxxxxx>
---
drivers/hwmon/applesmc.c | 108 +++++++++++++++++++++++++++++++--------
1 file changed, 86 insertions(+), 22 deletions(-)
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index fc6d6a9053ce..1f60776fe56a 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -511,6 +511,31 @@ static int applesmc_read_s16(const char *key, s16 *value)
return 0;
}
+static inline u32 applesmc_float_to_u32(u32 d)
+{
+ u8 sign = (d >> 31) & 1;
+ s32 exp = ((d >> 23) & 0xff) - 0x7F;
+ u32 fr = d & ((1u << 23) - 1);
+
+ if (sign || exp < 0)
+ return 0;
+
+ return (1u << exp) + (fr >> (23 - exp));
+}
+
+static inline u32 applesmc_u32_to_float(u32 d)
+{
+ u32 dc = d, bc = 0, exp;
+
+ if (!d)
+ return 0;
+ while (dc >>= 1)
+ ++bc;
+ exp = 0x7F + bc;
+ return (exp << 23) |
+ ((d << (23 - (exp - 0x7F))) & ((1u << 23) - 1));
+}
+
/*
* applesmc_device_init - initialize the accelerometer. Can sleep.
*/
@@ -842,15 +867,24 @@ static ssize_t applesmc_show_fan_speed(struct device *dev,
unsigned int speed = 0;
char newkey[5];
u8 buffer[2];
+ const struct applesmc_entry *entry;
scnprintf(newkey, sizeof(newkey), fan_speed_fmt[to_option(attr)],
to_index(attr));
- ret = applesmc_read_key(newkey, buffer, 2);
+ entry = applesmc_get_entry_by_key(newkey);
+ if (IS_ERR(entry))
+ return PTR_ERR(entry);
+
+ if (!strcmp(entry->type, "flt")) {
+ ret = applesmc_read_entry(entry, buffer, 4);
+ speed = applesmc_float_to_u32(*(u32 *)buffer);
+ } else {
+ ret = applesmc_read_entry(entry, buffer, 2);
+ speed = ((buffer[0] << 8 | buffer[1]) >> 2);
+ }
if (ret)
return ret;
-
- speed = ((buffer[0] << 8 | buffer[1]) >> 2);
return sysfs_emit(sysfsbuf, "%u\n", speed);
}
@@ -861,7 +895,8 @@ static ssize_t applesmc_store_fan_speed(struct device *dev,
int ret;
unsigned long speed;
char newkey[5];
- u8 buffer[2];
+ u8 buffer[4];
+ const struct applesmc_entry *entry;
if (kstrtoul(sysfsbuf, 10, &speed) < 0 || speed >= 0x4000)
return -EINVAL; /* Bigger than a 14-bit value */
@@ -869,9 +904,18 @@ static ssize_t applesmc_store_fan_speed(struct device *dev,
scnprintf(newkey, sizeof(newkey), fan_speed_fmt[to_option(attr)],
to_index(attr));
- buffer[0] = (speed >> 6) & 0xff;
- buffer[1] = (speed << 2) & 0xff;
- ret = applesmc_write_key(newkey, buffer, 2);
+ entry = applesmc_get_entry_by_key(newkey);
+ if (IS_ERR(entry))
+ return PTR_ERR(entry);
+
+ if (!strcmp(entry->type, "flt")) {
+ *(u32 *)buffer = applesmc_u32_to_float(speed);
+ ret = applesmc_write_entry(entry, buffer, 4);
+ } else {
+ buffer[0] = (speed >> 6) & 0xff;
+ buffer[1] = (speed << 2) & 0xff;
+ ret = applesmc_write_key(newkey, buffer, 2);
+ }
if (ret)
return ret;
@@ -885,12 +929,23 @@ static ssize_t applesmc_show_fan_manual(struct device *dev,
int ret;
u16 manual = 0;
u8 buffer[2];
+ char newkey[5];
+ bool has_newkey = false;
+
+ scnprintf(newkey, sizeof(newkey), "F%dMd", to_index(attr));
+
+ ret = applesmc_has_key(newkey, &has_newkey);
+ if (has_newkey) {
+ ret = applesmc_read_key(newkey, buffer, 1);
+ manual = buffer[0];
+ } else {
+ ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
+ manual = ((buffer[0] << 8 | buffer[1]) >> to_index(attr)) & 0x01;
+ }
- ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
if (ret)
return ret;
- manual = ((buffer[0] << 8 | buffer[1]) >> to_index(attr)) & 0x01;
return sysfs_emit(sysfsbuf, "%d\n", manual);
}
@@ -900,28 +955,37 @@ static ssize_t applesmc_store_fan_manual(struct device *dev,
{
int ret;
u8 buffer[2];
+ char newkey[5];
+ bool has_newkey = false;
unsigned long input;
u16 val;
if (kstrtoul(sysfsbuf, 10, &input) < 0)
return -EINVAL;
- ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
- if (ret)
- goto out;
-
- val = (buffer[0] << 8 | buffer[1]);
+ scnprintf(newkey, sizeof(newkey), "F%dMd", to_index(attr));
- if (input)
- val = val | (0x01 << to_index(attr));
- else
- val = val & ~(0x01 << to_index(attr));
-
- buffer[0] = (val >> 8) & 0xFF;
- buffer[1] = val & 0xFF;
+ ret = applesmc_has_key(newkey, &has_newkey);
+ if (ret)
+ return ret;
+ if (has_newkey) {
+ buffer[0] = input & 1;
+ ret = applesmc_write_key(newkey, buffer, 1);
+ } else {
+ ret = applesmc_read_key(FANS_MANUAL, buffer, 2);
+ val = (buffer[0] << 8 | buffer[1]);
+ if (ret)
+ goto out;
+ if (input)
+ val = val | (0x01 << to_index(attr));
+ else
+ val = val & ~(0x01 << to_index(attr));
- ret = applesmc_write_key(FANS_MANUAL, buffer, 2);
+ buffer[0] = (val >> 8) & 0xFF;
+ buffer[1] = val & 0xFF;
+ ret = applesmc_write_key(FANS_MANUAL, buffer, 2);
+ }
out:
if (ret)
return ret;
--
2.39.5
