* [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system @ 2025-11-25 13:49 Werner Sembach 2025-11-25 13:49 ` [RFC PATCH 1/2] " Werner Sembach 2025-11-25 13:49 ` [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting Werner Sembach 0 siblings, 2 replies; 10+ messages in thread From: Werner Sembach @ 2025-11-25 13:49 UTC (permalink / raw) To: W_Armin, hansg, ilpo.jarvinen Cc: platform-driver-x86, linux-kernel, Werner Sembach The first patch of this RFC is based on a PoC by Armin and extended the be able to modify feature bits based on readouts from the EC Memory. The 2nd patch is a new feature that requires such a modification. Armin what do you think? Is this a clean approach? Technically the feature bits can be modified arbitrarily, but it should only ever be accessed by the slightly modified getter method, so the risk should be very minimal. I wonder if the static device_descriptor variable can somehow be skipped, but it doesn't bother to have it there either IMHO. Armin Wolf (1): platform/x86: uniwill-laptop: Introduce device descriptor system Werner Sembach (1): platform/x86/uniwill: Implement cTGP setting drivers/platform/x86/uniwill/uniwill-acpi.c | 269 +++++++++++++++++--- 1 file changed, 240 insertions(+), 29 deletions(-) -- 2.43.0 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [RFC PATCH 1/2] platform/x86: uniwill-laptop: Introduce device descriptor system 2025-11-25 13:49 [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system Werner Sembach @ 2025-11-25 13:49 ` Werner Sembach 2025-11-25 20:18 ` Armin Wolf 2025-11-25 13:49 ` [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting Werner Sembach 1 sibling, 1 reply; 10+ messages in thread From: Werner Sembach @ 2025-11-25 13:49 UTC (permalink / raw) To: W_Armin, hansg, ilpo.jarvinen Cc: platform-driver-x86, linux-kernel, Werner Sembach From: Armin Wolf <W_Armin@gmx.de> Future additions to the driver will depend on device-specific initialization steps. Extend the DMI-based feature detection system to include device descriptors. Each descriptor contains a bitmap of supported features and a set of callback for performing device-specific initialization. Signed-off-by: Armin Wolf <W_Armin@gmx.de> Co-developed-by: Werner Sembach <wse@tuxedocomputers.com> Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> --- drivers/platform/x86/uniwill/uniwill-acpi.c | 156 ++++++++++++++++---- 1 file changed, 130 insertions(+), 26 deletions(-) diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c index bd7e63dd51810..f6a1054379ee1 100644 --- a/drivers/platform/x86/uniwill/uniwill-acpi.c +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c @@ -334,6 +334,7 @@ struct uniwill_data { struct mutex input_lock; /* Protects input sequence during notify */ struct input_dev *input_device; struct notifier_block nb; + unsigned int features; }; struct uniwill_battery_entry { @@ -341,12 +342,21 @@ struct uniwill_battery_entry { struct power_supply *battery; }; +struct uniwill_device_descriptor { + unsigned int features; + /* Executed during driver probing */ + int (*probe)(struct uniwill_data *data); +}; + static bool force; module_param_unsafe(force, bool, 0); MODULE_PARM_DESC(force, "Force loading without checking for supported devices\n"); -/* Feature bitmask since the associated registers are not reliable */ -static unsigned int supported_features; +/* + * Contains device specific data like the feature bitmap since + * the associated registers are not always reliable. + */ +static struct uniwill_device_descriptor device_descriptor __ro_after_init; static const char * const uniwill_temp_labels[] = { "CPU", @@ -411,6 +421,12 @@ static const struct key_entry uniwill_keymap[] = { { KE_END } }; +static inline bool uniwill_device_supports(struct uniwill_data *data, + unsigned int feature_mask) +{ + return data->features & feature_mask; +} + static int uniwill_ec_reg_write(void *context, unsigned int reg, unsigned int val) { union acpi_object params[2] = { @@ -799,24 +815,27 @@ static struct attribute *uniwill_attrs[] = { static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n) { + struct device *dev = kobj_to_dev(kobj); + struct uniwill_data *data = dev_get_drvdata(dev); + if (attr == &dev_attr_fn_lock_toggle_enable.attr) { - if (supported_features & UNIWILL_FEATURE_FN_LOCK_TOGGLE) + if (uniwill_device_supports(data, UNIWILL_FEATURE_FN_LOCK_TOGGLE)) return attr->mode; } if (attr == &dev_attr_super_key_toggle_enable.attr) { - if (supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE) + if (uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) return attr->mode; } if (attr == &dev_attr_touchpad_toggle_enable.attr) { - if (supported_features & UNIWILL_FEATURE_TOUCHPAD_TOGGLE) + if (uniwill_device_supports(data, UNIWILL_FEATURE_TOUCHPAD_TOGGLE)) return attr->mode; } if (attr == &dev_attr_rainbow_animation.attr || attr == &dev_attr_breathing_in_suspend.attr) { - if (supported_features & UNIWILL_FEATURE_LIGHTBAR) + if (uniwill_device_supports(data, UNIWILL_FEATURE_LIGHTBAR)) return attr->mode; } @@ -944,7 +963,7 @@ static int uniwill_hwmon_init(struct uniwill_data *data) { struct device *hdev; - if (!(supported_features & UNIWILL_FEATURE_HWMON)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_HWMON)) return 0; hdev = devm_hwmon_device_register_with_info(data->dev, "uniwill", data, @@ -1019,7 +1038,7 @@ static int uniwill_led_init(struct uniwill_data *data) unsigned int value; int ret; - if (!(supported_features & UNIWILL_FEATURE_LIGHTBAR)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_LIGHTBAR)) return 0; ret = devm_mutex_init(data->dev, &data->led_lock); @@ -1232,7 +1251,7 @@ static int uniwill_battery_init(struct uniwill_data *data) { int ret; - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) return 0; ret = devm_mutex_init(data->dev, &data->battery_lock); @@ -1361,6 +1380,19 @@ static int uniwill_probe(struct platform_device *pdev) if (ret < 0) return ret; + data->features = device_descriptor.features; + + /* + * Some devices might need to perform some device-specific initialization steps + * before the supported features are initialized. Because of this we have to call + * this callback just after the EC itself was initialized. + */ + if (device_descriptor.probe) { + ret = device_descriptor.probe(data); + if (ret < 0) + return ret; + } + ret = uniwill_battery_init(data); if (ret < 0) return ret; @@ -1385,7 +1417,7 @@ static void uniwill_shutdown(struct platform_device *pdev) static int uniwill_suspend_keyboard(struct uniwill_data *data) { - if (!(supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) return 0; /* @@ -1397,7 +1429,7 @@ static int uniwill_suspend_keyboard(struct uniwill_data *data) static int uniwill_suspend_battery(struct uniwill_data *data) { - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) return 0; /* @@ -1432,7 +1464,7 @@ static int uniwill_resume_keyboard(struct uniwill_data *data) unsigned int value; int ret; - if (!(supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) return 0; ret = regmap_read(data->regmap, EC_ADDR_SWITCH_STATUS, &value); @@ -1448,7 +1480,7 @@ static int uniwill_resume_keyboard(struct uniwill_data *data) static int uniwill_resume_battery(struct uniwill_data *data) { - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) return 0; return regmap_update_bits(data->regmap, EC_ADDR_CHARGE_CTRL, CHARGE_CTRL_MASK, @@ -1496,6 +1528,25 @@ static struct platform_driver uniwill_driver = { .shutdown = uniwill_shutdown, }; +struct uniwill_device_descriptor lapac71h_descriptor __initdata = { + .features = UNIWILL_FEATURE_FN_LOCK_TOGGLE | + UNIWILL_FEATURE_SUPER_KEY_TOGGLE | + UNIWILL_FEATURE_TOUCHPAD_TOGGLE | + UNIWILL_FEATURE_BATTERY | + UNIWILL_FEATURE_HWMON +}; + +struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { + .features = UNIWILL_FEATURE_FN_LOCK_TOGGLE | + UNIWILL_FEATURE_SUPER_KEY_TOGGLE | + UNIWILL_FEATURE_TOUCHPAD_TOGGLE | + UNIWILL_FEATURE_LIGHTBAR | + UNIWILL_FEATURE_BATTERY | + UNIWILL_FEATURE_HWMON +}; + +struct uniwill_device_descriptor void_descriptor __initdata = {}; + static const struct dmi_system_id uniwill_dmi_table[] __initconst = { { .ident = "XMG FUSION 15", @@ -1503,6 +1554,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "LAPQC71A"), }, + .driver_data = &void_descriptor, }, { .ident = "XMG FUSION 15", @@ -1510,6 +1562,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "LAPQC71B"), }, + .driver_data = &void_descriptor, }, { .ident = "Intel NUC x15", @@ -1517,11 +1570,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LAPAC71H"), }, - .driver_data = (void *)(UNIWILL_FEATURE_FN_LOCK_TOGGLE | - UNIWILL_FEATURE_SUPER_KEY_TOGGLE | - UNIWILL_FEATURE_TOUCHPAD_TOGGLE | - UNIWILL_FEATURE_BATTERY | - UNIWILL_FEATURE_HWMON), + .driver_data = &lapac71h_descriptor, }, { .ident = "Intel NUC x15", @@ -1529,12 +1578,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LAPKC71F"), }, - .driver_data = (void *)(UNIWILL_FEATURE_FN_LOCK_TOGGLE | - UNIWILL_FEATURE_SUPER_KEY_TOGGLE | - UNIWILL_FEATURE_TOUCHPAD_TOGGLE | - UNIWILL_FEATURE_LIGHTBAR | - UNIWILL_FEATURE_BATTERY | - UNIWILL_FEATURE_HWMON), + .driver_data = &lapkc71f_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14 Gen6 Intel", @@ -1542,6 +1586,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTxX1"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14 Gen6 Intel", @@ -1549,6 +1594,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", @@ -1556,6 +1602,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore Omnia-Book Pro Gen 7", @@ -1563,6 +1610,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", @@ -1570,6 +1618,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", @@ -1577,6 +1626,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", @@ -1584,6 +1634,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", @@ -1591,6 +1642,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GXxHRXx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 Intel/Commodore Omnia-Book 15 Gen9", @@ -1598,6 +1650,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GXxMRXx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/15 Gen10 AMD", @@ -1605,6 +1658,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxHP4NAx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/15 Gen10 AMD", @@ -1612,6 +1666,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxKK4NAx_XxSP4NAx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 15 Gen10 Intel", @@ -1619,6 +1674,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxAR4NAx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Max 15 Gen10 AMD", @@ -1626,6 +1682,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X5KK45xS_X5SP45xS"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Max 16 Gen10 AMD", @@ -1633,6 +1690,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6HP45xU"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Max 16 Gen10 AMD", @@ -1640,6 +1698,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6KK45xU_X6SP45xU"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Max 15 Gen10 Intel", @@ -1647,6 +1706,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X5AR45xS"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO InfinityBook Max 16 Gen10 Intel", @@ -1654,6 +1714,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR55xU"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15 Gen1 AMD", @@ -1661,6 +1722,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501A1650TI"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15 Gen1 AMD", @@ -1668,6 +1730,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501A2060"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 17 Gen1 AMD", @@ -1675,6 +1738,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701A1650TI"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 17 Gen1 AMD", @@ -1682,6 +1746,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701A2060"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15 Gen1 Intel", @@ -1689,6 +1754,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501I1650TI"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15 Gen1 Intel", @@ -1696,6 +1762,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501I2060"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 17 Gen1 Intel", @@ -1703,6 +1770,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701I1650TI"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 17 Gen1 Intel", @@ -1710,6 +1778,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701I2060"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Trinity 15 Intel Gen1", @@ -1717,6 +1786,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "TRINITY1501I"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Trinity 17 Intel Gen1", @@ -1724,6 +1794,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "TRINITY1701I"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen2 AMD", @@ -1731,6 +1802,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen2 Intel", @@ -1738,6 +1810,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", @@ -1745,6 +1818,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", @@ -1752,6 +1826,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", @@ -1759,6 +1834,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 15 Gen4 Intel", @@ -1766,6 +1842,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen5 AMD", @@ -1773,6 +1850,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen5 AMD", @@ -1780,6 +1858,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", @@ -1787,6 +1866,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", @@ -1794,6 +1874,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim 15 Gen6", @@ -1801,6 +1882,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", @@ -1808,6 +1890,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", @@ -1815,6 +1898,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", @@ -1822,6 +1906,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 AMD", @@ -1829,6 +1914,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 Intel", @@ -1836,6 +1922,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 Intel", @@ -1843,6 +1930,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Pulse 14 Gen1 AMD", @@ -1850,6 +1938,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PULSE1401"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Pulse 15 Gen1 AMD", @@ -1857,6 +1946,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PULSE1501"), }, + .driver_data = &void_descriptor, }, { .ident = "TUXEDO Pulse 15 Gen2 AMD", @@ -1864,6 +1954,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PF5LUXG"), }, + .driver_data = &void_descriptor, }, { } }; @@ -1871,6 +1962,7 @@ MODULE_DEVICE_TABLE(dmi, uniwill_dmi_table); static int __init uniwill_init(void) { + const struct uniwill_device_descriptor *descriptor; const struct dmi_system_id *id; int ret; @@ -1880,10 +1972,22 @@ static int __init uniwill_init(void) return -ENODEV; /* Assume that the device supports all features */ - supported_features = UINT_MAX; + device_descriptor.features = UINT_MAX; pr_warn("Loading on a potentially unsupported device\n"); } else { - supported_features = (uintptr_t)id->driver_data; + /* + * Some devices might support additional features depending on + * the BIOS version/date, so we call this callback to let them + * modify their device descriptor accordingly. + */ + if (id->callback) { + ret = id->callback(id); + if (ret < 0) + return ret; + } + + descriptor = id->driver_data; + device_descriptor = *descriptor; } ret = platform_driver_register(&uniwill_driver); -- 2.43.0 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC PATCH 1/2] platform/x86: uniwill-laptop: Introduce device descriptor system 2025-11-25 13:49 ` [RFC PATCH 1/2] " Werner Sembach @ 2025-11-25 20:18 ` Armin Wolf 2025-11-26 12:14 ` Werner Sembach 0 siblings, 1 reply; 10+ messages in thread From: Armin Wolf @ 2025-11-25 20:18 UTC (permalink / raw) To: Werner Sembach, hansg, ilpo.jarvinen; +Cc: platform-driver-x86, linux-kernel Am 25.11.25 um 14:49 schrieb Werner Sembach: > From: Armin Wolf <W_Armin@gmx.de> > > Future additions to the driver will depend on device-specific > initialization steps. Extend the DMI-based feature detection system > to include device descriptors. Each descriptor contains a bitmap of > supported features and a set of callback for performing > device-specific initialization. > > Signed-off-by: Armin Wolf <W_Armin@gmx.de> > Co-developed-by: Werner Sembach <wse@tuxedocomputers.com> > Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> > --- > drivers/platform/x86/uniwill/uniwill-acpi.c | 156 ++++++++++++++++---- > 1 file changed, 130 insertions(+), 26 deletions(-) > > diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c > index bd7e63dd51810..f6a1054379ee1 100644 > --- a/drivers/platform/x86/uniwill/uniwill-acpi.c > +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c > @@ -334,6 +334,7 @@ struct uniwill_data { > struct mutex input_lock; /* Protects input sequence during notify */ > struct input_dev *input_device; > struct notifier_block nb; > + unsigned int features; Hi, could you please move this field just below the regmap field? This would be a good way to signal the importance of said field for the remaining fields. > }; > > struct uniwill_battery_entry { > @@ -341,12 +342,21 @@ struct uniwill_battery_entry { > struct power_supply *battery; > }; > > +struct uniwill_device_descriptor { > + unsigned int features; > + /* Executed during driver probing */ > + int (*probe)(struct uniwill_data *data); > +}; > + > static bool force; > module_param_unsafe(force, bool, 0); > MODULE_PARM_DESC(force, "Force loading without checking for supported devices\n"); > > -/* Feature bitmask since the associated registers are not reliable */ > -static unsigned int supported_features; > +/* > + * Contains device specific data like the feature bitmap since > + * the associated registers are not always reliable. > + */ > +static struct uniwill_device_descriptor device_descriptor __ro_after_init; > > static const char * const uniwill_temp_labels[] = { > "CPU", > @@ -411,6 +421,12 @@ static const struct key_entry uniwill_keymap[] = { > { KE_END } > }; > > +static inline bool uniwill_device_supports(struct uniwill_data *data, > + unsigned int feature_mask) > +{ > + return data->features & feature_mask; Do we want to support for testing multiple features at once? If yes then please change this to: return (data->features & feature_mask) == feature_mask; If no then please rename "feature_mask" to "feature". > +} > + > static int uniwill_ec_reg_write(void *context, unsigned int reg, unsigned int val) > { > union acpi_object params[2] = { > @@ -799,24 +815,27 @@ static struct attribute *uniwill_attrs[] = { > > static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n) > { > + struct device *dev = kobj_to_dev(kobj); > + struct uniwill_data *data = dev_get_drvdata(dev); > + > if (attr == &dev_attr_fn_lock_toggle_enable.attr) { > - if (supported_features & UNIWILL_FEATURE_FN_LOCK_TOGGLE) > + if (uniwill_device_supports(data, UNIWILL_FEATURE_FN_LOCK_TOGGLE)) > return attr->mode; > } > > if (attr == &dev_attr_super_key_toggle_enable.attr) { > - if (supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE) > + if (uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) > return attr->mode; > } > > if (attr == &dev_attr_touchpad_toggle_enable.attr) { > - if (supported_features & UNIWILL_FEATURE_TOUCHPAD_TOGGLE) > + if (uniwill_device_supports(data, UNIWILL_FEATURE_TOUCHPAD_TOGGLE)) > return attr->mode; > } > > if (attr == &dev_attr_rainbow_animation.attr || > attr == &dev_attr_breathing_in_suspend.attr) { > - if (supported_features & UNIWILL_FEATURE_LIGHTBAR) > + if (uniwill_device_supports(data, UNIWILL_FEATURE_LIGHTBAR)) > return attr->mode; > } > > @@ -944,7 +963,7 @@ static int uniwill_hwmon_init(struct uniwill_data *data) > { > struct device *hdev; > > - if (!(supported_features & UNIWILL_FEATURE_HWMON)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_HWMON)) > return 0; > > hdev = devm_hwmon_device_register_with_info(data->dev, "uniwill", data, > @@ -1019,7 +1038,7 @@ static int uniwill_led_init(struct uniwill_data *data) > unsigned int value; > int ret; > > - if (!(supported_features & UNIWILL_FEATURE_LIGHTBAR)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_LIGHTBAR)) > return 0; > > ret = devm_mutex_init(data->dev, &data->led_lock); > @@ -1232,7 +1251,7 @@ static int uniwill_battery_init(struct uniwill_data *data) > { > int ret; > > - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) > return 0; > > ret = devm_mutex_init(data->dev, &data->battery_lock); > @@ -1361,6 +1380,19 @@ static int uniwill_probe(struct platform_device *pdev) > if (ret < 0) > return ret; > > + data->features = device_descriptor.features; > + > + /* > + * Some devices might need to perform some device-specific initialization steps > + * before the supported features are initialized. Because of this we have to call > + * this callback just after the EC itself was initialized. > + */ > + if (device_descriptor.probe) { > + ret = device_descriptor.probe(data); > + if (ret < 0) > + return ret; > + } > + > ret = uniwill_battery_init(data); > if (ret < 0) > return ret; > @@ -1385,7 +1417,7 @@ static void uniwill_shutdown(struct platform_device *pdev) > > static int uniwill_suspend_keyboard(struct uniwill_data *data) > { > - if (!(supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) > return 0; > > /* > @@ -1397,7 +1429,7 @@ static int uniwill_suspend_keyboard(struct uniwill_data *data) > > static int uniwill_suspend_battery(struct uniwill_data *data) > { > - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) > return 0; > > /* > @@ -1432,7 +1464,7 @@ static int uniwill_resume_keyboard(struct uniwill_data *data) > unsigned int value; > int ret; > > - if (!(supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) > return 0; > > ret = regmap_read(data->regmap, EC_ADDR_SWITCH_STATUS, &value); > @@ -1448,7 +1480,7 @@ static int uniwill_resume_keyboard(struct uniwill_data *data) > > static int uniwill_resume_battery(struct uniwill_data *data) > { > - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) > return 0; > > return regmap_update_bits(data->regmap, EC_ADDR_CHARGE_CTRL, CHARGE_CTRL_MASK, > @@ -1496,6 +1528,25 @@ static struct platform_driver uniwill_driver = { > .shutdown = uniwill_shutdown, > }; > > +struct uniwill_device_descriptor lapac71h_descriptor __initdata = { > + .features = UNIWILL_FEATURE_FN_LOCK_TOGGLE | > + UNIWILL_FEATURE_SUPER_KEY_TOGGLE | > + UNIWILL_FEATURE_TOUCHPAD_TOGGLE | > + UNIWILL_FEATURE_BATTERY | > + UNIWILL_FEATURE_HWMON > +}; > + > +struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { > + .features = UNIWILL_FEATURE_FN_LOCK_TOGGLE | > + UNIWILL_FEATURE_SUPER_KEY_TOGGLE | > + UNIWILL_FEATURE_TOUCHPAD_TOGGLE | > + UNIWILL_FEATURE_LIGHTBAR | > + UNIWILL_FEATURE_BATTERY | > + UNIWILL_FEATURE_HWMON > +}; > + > +struct uniwill_device_descriptor void_descriptor __initdata = {}; void_descriptor -> empty_descriptor. With the above issues being fixed: Reviewed-by: Armin Wolf <W_Armin@gmx.de> > + > static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > { > .ident = "XMG FUSION 15", > @@ -1503,6 +1554,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "LAPQC71A"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "XMG FUSION 15", > @@ -1510,6 +1562,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "LAPQC71B"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "Intel NUC x15", > @@ -1517,11 +1570,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), > DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LAPAC71H"), > }, > - .driver_data = (void *)(UNIWILL_FEATURE_FN_LOCK_TOGGLE | > - UNIWILL_FEATURE_SUPER_KEY_TOGGLE | > - UNIWILL_FEATURE_TOUCHPAD_TOGGLE | > - UNIWILL_FEATURE_BATTERY | > - UNIWILL_FEATURE_HWMON), > + .driver_data = &lapac71h_descriptor, > }, > { > .ident = "Intel NUC x15", > @@ -1529,12 +1578,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), > DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LAPKC71F"), > }, > - .driver_data = (void *)(UNIWILL_FEATURE_FN_LOCK_TOGGLE | > - UNIWILL_FEATURE_SUPER_KEY_TOGGLE | > - UNIWILL_FEATURE_TOUCHPAD_TOGGLE | > - UNIWILL_FEATURE_LIGHTBAR | > - UNIWILL_FEATURE_BATTERY | > - UNIWILL_FEATURE_HWMON), > + .driver_data = &lapkc71f_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14 Gen6 Intel", > @@ -1542,6 +1586,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTxX1"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14 Gen6 Intel", > @@ -1549,6 +1594,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", > @@ -1556,6 +1602,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore Omnia-Book Pro Gen 7", > @@ -1563,6 +1610,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", > @@ -1570,6 +1618,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", > @@ -1577,6 +1626,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", > @@ -1584,6 +1634,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", > @@ -1591,6 +1642,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GXxHRXx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 Intel/Commodore Omnia-Book 15 Gen9", > @@ -1598,6 +1650,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GXxMRXx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/15 Gen10 AMD", > @@ -1605,6 +1658,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxHP4NAx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/15 Gen10 AMD", > @@ -1612,6 +1666,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxKK4NAx_XxSP4NAx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 15 Gen10 Intel", > @@ -1619,6 +1674,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxAR4NAx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Max 15 Gen10 AMD", > @@ -1626,6 +1682,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X5KK45xS_X5SP45xS"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Max 16 Gen10 AMD", > @@ -1633,6 +1690,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6HP45xU"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Max 16 Gen10 AMD", > @@ -1640,6 +1698,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6KK45xU_X6SP45xU"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Max 15 Gen10 Intel", > @@ -1647,6 +1706,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X5AR45xS"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Max 16 Gen10 Intel", > @@ -1654,6 +1714,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR55xU"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15 Gen1 AMD", > @@ -1661,6 +1722,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501A1650TI"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15 Gen1 AMD", > @@ -1668,6 +1730,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501A2060"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 17 Gen1 AMD", > @@ -1675,6 +1738,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701A1650TI"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 17 Gen1 AMD", > @@ -1682,6 +1746,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701A2060"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15 Gen1 Intel", > @@ -1689,6 +1754,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501I1650TI"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15 Gen1 Intel", > @@ -1696,6 +1762,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501I2060"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 17 Gen1 Intel", > @@ -1703,6 +1770,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701I1650TI"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 17 Gen1 Intel", > @@ -1710,6 +1778,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701I2060"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Trinity 15 Intel Gen1", > @@ -1717,6 +1786,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "TRINITY1501I"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Trinity 17 Intel Gen1", > @@ -1724,6 +1794,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "TRINITY1701I"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15/17 Gen2 AMD", > @@ -1731,6 +1802,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15/17 Gen2 Intel", > @@ -1738,6 +1810,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", > @@ -1745,6 +1818,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", > @@ -1752,6 +1826,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", > @@ -1759,6 +1834,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 15 Gen4 Intel", > @@ -1766,6 +1842,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Polaris 15/17 Gen5 AMD", > @@ -1773,6 +1850,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen5 AMD", > @@ -1780,6 +1858,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", > @@ -1787,6 +1866,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", > @@ -1794,6 +1874,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim 15 Gen6", > @@ -1801,6 +1882,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", > @@ -1808,6 +1890,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", > @@ -1815,6 +1898,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", > @@ -1822,6 +1906,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen7 AMD", > @@ -1829,6 +1914,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen7 Intel", > @@ -1836,6 +1922,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen7 Intel", > @@ -1843,6 +1930,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Pulse 14 Gen1 AMD", > @@ -1850,6 +1938,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PULSE1401"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Pulse 15 Gen1 AMD", > @@ -1857,6 +1946,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PULSE1501"), > }, > + .driver_data = &void_descriptor, > }, > { > .ident = "TUXEDO Pulse 15 Gen2 AMD", > @@ -1864,6 +1954,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PF5LUXG"), > }, > + .driver_data = &void_descriptor, > }, > { } > }; > @@ -1871,6 +1962,7 @@ MODULE_DEVICE_TABLE(dmi, uniwill_dmi_table); > > static int __init uniwill_init(void) > { > + const struct uniwill_device_descriptor *descriptor; > const struct dmi_system_id *id; > int ret; > > @@ -1880,10 +1972,22 @@ static int __init uniwill_init(void) > return -ENODEV; > > /* Assume that the device supports all features */ > - supported_features = UINT_MAX; > + device_descriptor.features = UINT_MAX; > pr_warn("Loading on a potentially unsupported device\n"); > } else { > - supported_features = (uintptr_t)id->driver_data; > + /* > + * Some devices might support additional features depending on > + * the BIOS version/date, so we call this callback to let them > + * modify their device descriptor accordingly. > + */ > + if (id->callback) { > + ret = id->callback(id); > + if (ret < 0) > + return ret; > + } > + > + descriptor = id->driver_data; > + device_descriptor = *descriptor; > } > > ret = platform_driver_register(&uniwill_driver); ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC PATCH 1/2] platform/x86: uniwill-laptop: Introduce device descriptor system 2025-11-25 20:18 ` Armin Wolf @ 2025-11-26 12:14 ` Werner Sembach 0 siblings, 0 replies; 10+ messages in thread From: Werner Sembach @ 2025-11-26 12:14 UTC (permalink / raw) To: Armin Wolf, hansg, ilpo.jarvinen; +Cc: platform-driver-x86, linux-kernel Am 25.11.25 um 21:18 schrieb Armin Wolf: > Am 25.11.25 um 14:49 schrieb Werner Sembach: > >> From: Armin Wolf <W_Armin@gmx.de> >> >> Future additions to the driver will depend on device-specific >> initialization steps. Extend the DMI-based feature detection system >> to include device descriptors. Each descriptor contains a bitmap of >> supported features and a set of callback for performing >> device-specific initialization. >> >> Signed-off-by: Armin Wolf <W_Armin@gmx.de> >> Co-developed-by: Werner Sembach <wse@tuxedocomputers.com> >> Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> >> --- >> drivers/platform/x86/uniwill/uniwill-acpi.c | 156 ++++++++++++++++---- >> 1 file changed, 130 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c >> b/drivers/platform/x86/uniwill/uniwill-acpi.c >> index bd7e63dd51810..f6a1054379ee1 100644 >> --- a/drivers/platform/x86/uniwill/uniwill-acpi.c >> +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c >> @@ -334,6 +334,7 @@ struct uniwill_data { >> struct mutex input_lock; /* Protects input sequence during notify */ >> struct input_dev *input_device; >> struct notifier_block nb; >> + unsigned int features; > > Hi, > > could you please move this field just below the regmap field? This would be a > good way > to signal the importance of said field for the remaining fields. ack > >> }; >> struct uniwill_battery_entry { >> @@ -341,12 +342,21 @@ struct uniwill_battery_entry { >> struct power_supply *battery; >> }; >> +struct uniwill_device_descriptor { >> + unsigned int features; >> + /* Executed during driver probing */ >> + int (*probe)(struct uniwill_data *data); >> +}; >> + >> static bool force; >> module_param_unsafe(force, bool, 0); >> MODULE_PARM_DESC(force, "Force loading without checking for supported >> devices\n"); >> -/* Feature bitmask since the associated registers are not reliable */ >> -static unsigned int supported_features; >> +/* >> + * Contains device specific data like the feature bitmap since >> + * the associated registers are not always reliable. >> + */ >> +static struct uniwill_device_descriptor device_descriptor __ro_after_init; >> static const char * const uniwill_temp_labels[] = { >> "CPU", >> @@ -411,6 +421,12 @@ static const struct key_entry uniwill_keymap[] = { >> { KE_END } >> }; >> +static inline bool uniwill_device_supports(struct uniwill_data *data, >> + unsigned int feature_mask) >> +{ >> + return data->features & feature_mask; > > Do we want to support for testing multiple features at once? If yes then > please change this to: > > return (data->features & feature_mask) == feature_mask; > > If no then please rename "feature_mask" to "feature". sounds usefull, will do > >> +} >> + >> static int uniwill_ec_reg_write(void *context, unsigned int reg, unsigned >> int val) >> { >> union acpi_object params[2] = { >> @@ -799,24 +815,27 @@ static struct attribute *uniwill_attrs[] = { >> static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct >> attribute *attr, int n) >> { >> + struct device *dev = kobj_to_dev(kobj); >> + struct uniwill_data *data = dev_get_drvdata(dev); >> + >> if (attr == &dev_attr_fn_lock_toggle_enable.attr) { >> - if (supported_features & UNIWILL_FEATURE_FN_LOCK_TOGGLE) >> + if (uniwill_device_supports(data, UNIWILL_FEATURE_FN_LOCK_TOGGLE)) >> return attr->mode; >> } >> if (attr == &dev_attr_super_key_toggle_enable.attr) { >> - if (supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE) >> + if (uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) >> return attr->mode; >> } >> if (attr == &dev_attr_touchpad_toggle_enable.attr) { >> - if (supported_features & UNIWILL_FEATURE_TOUCHPAD_TOGGLE) >> + if (uniwill_device_supports(data, UNIWILL_FEATURE_TOUCHPAD_TOGGLE)) >> return attr->mode; >> } >> if (attr == &dev_attr_rainbow_animation.attr || >> attr == &dev_attr_breathing_in_suspend.attr) { >> - if (supported_features & UNIWILL_FEATURE_LIGHTBAR) >> + if (uniwill_device_supports(data, UNIWILL_FEATURE_LIGHTBAR)) >> return attr->mode; >> } >> @@ -944,7 +963,7 @@ static int uniwill_hwmon_init(struct uniwill_data *data) >> { >> struct device *hdev; >> - if (!(supported_features & UNIWILL_FEATURE_HWMON)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_HWMON)) >> return 0; >> hdev = devm_hwmon_device_register_with_info(data->dev, "uniwill", data, >> @@ -1019,7 +1038,7 @@ static int uniwill_led_init(struct uniwill_data *data) >> unsigned int value; >> int ret; >> - if (!(supported_features & UNIWILL_FEATURE_LIGHTBAR)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_LIGHTBAR)) >> return 0; >> ret = devm_mutex_init(data->dev, &data->led_lock); >> @@ -1232,7 +1251,7 @@ static int uniwill_battery_init(struct uniwill_data *data) >> { >> int ret; >> - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) >> return 0; >> ret = devm_mutex_init(data->dev, &data->battery_lock); >> @@ -1361,6 +1380,19 @@ static int uniwill_probe(struct platform_device *pdev) >> if (ret < 0) >> return ret; >> + data->features = device_descriptor.features; >> + >> + /* >> + * Some devices might need to perform some device-specific >> initialization steps >> + * before the supported features are initialized. Because of this we >> have to call >> + * this callback just after the EC itself was initialized. >> + */ >> + if (device_descriptor.probe) { >> + ret = device_descriptor.probe(data); >> + if (ret < 0) >> + return ret; >> + } >> + >> ret = uniwill_battery_init(data); >> if (ret < 0) >> return ret; >> @@ -1385,7 +1417,7 @@ static void uniwill_shutdown(struct platform_device *pdev) >> static int uniwill_suspend_keyboard(struct uniwill_data *data) >> { >> - if (!(supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) >> return 0; >> /* >> @@ -1397,7 +1429,7 @@ static int uniwill_suspend_keyboard(struct uniwill_data >> *data) >> static int uniwill_suspend_battery(struct uniwill_data *data) >> { >> - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) >> return 0; >> /* >> @@ -1432,7 +1464,7 @@ static int uniwill_resume_keyboard(struct uniwill_data >> *data) >> unsigned int value; >> int ret; >> - if (!(supported_features & UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_SUPER_KEY_TOGGLE)) >> return 0; >> ret = regmap_read(data->regmap, EC_ADDR_SWITCH_STATUS, &value); >> @@ -1448,7 +1480,7 @@ static int uniwill_resume_keyboard(struct uniwill_data >> *data) >> static int uniwill_resume_battery(struct uniwill_data *data) >> { >> - if (!(supported_features & UNIWILL_FEATURE_BATTERY)) >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_BATTERY)) >> return 0; >> return regmap_update_bits(data->regmap, EC_ADDR_CHARGE_CTRL, >> CHARGE_CTRL_MASK, >> @@ -1496,6 +1528,25 @@ static struct platform_driver uniwill_driver = { >> .shutdown = uniwill_shutdown, >> }; >> +struct uniwill_device_descriptor lapac71h_descriptor __initdata = { >> + .features = UNIWILL_FEATURE_FN_LOCK_TOGGLE | >> + UNIWILL_FEATURE_SUPER_KEY_TOGGLE | >> + UNIWILL_FEATURE_TOUCHPAD_TOGGLE | >> + UNIWILL_FEATURE_BATTERY | >> + UNIWILL_FEATURE_HWMON >> +}; >> + >> +struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { >> + .features = UNIWILL_FEATURE_FN_LOCK_TOGGLE | >> + UNIWILL_FEATURE_SUPER_KEY_TOGGLE | >> + UNIWILL_FEATURE_TOUCHPAD_TOGGLE | >> + UNIWILL_FEATURE_LIGHTBAR | >> + UNIWILL_FEATURE_BATTERY | >> + UNIWILL_FEATURE_HWMON >> +}; >> + >> +struct uniwill_device_descriptor void_descriptor __initdata = {}; > > void_descriptor -> empty_descriptor. ack > > With the above issues being fixed: > > Reviewed-by: Armin Wolf <W_Armin@gmx.de> > >> + >> static const struct dmi_system_id uniwill_dmi_table[] __initconst = { >> { >> .ident = "XMG FUSION 15", >> @@ -1503,6 +1554,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "LAPQC71A"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "XMG FUSION 15", >> @@ -1510,6 +1562,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "LAPQC71B"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "Intel NUC x15", >> @@ -1517,11 +1570,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), >> DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LAPAC71H"), >> }, >> - .driver_data = (void *)(UNIWILL_FEATURE_FN_LOCK_TOGGLE | >> - UNIWILL_FEATURE_SUPER_KEY_TOGGLE | >> - UNIWILL_FEATURE_TOUCHPAD_TOGGLE | >> - UNIWILL_FEATURE_BATTERY | >> - UNIWILL_FEATURE_HWMON), >> + .driver_data = &lapac71h_descriptor, >> }, >> { >> .ident = "Intel NUC x15", >> @@ -1529,12 +1578,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), >> DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LAPKC71F"), >> }, >> - .driver_data = (void *)(UNIWILL_FEATURE_FN_LOCK_TOGGLE | >> - UNIWILL_FEATURE_SUPER_KEY_TOGGLE | >> - UNIWILL_FEATURE_TOUCHPAD_TOGGLE | >> - UNIWILL_FEATURE_LIGHTBAR | >> - UNIWILL_FEATURE_BATTERY | >> - UNIWILL_FEATURE_HWMON), >> + .driver_data = &lapkc71f_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14 Gen6 Intel", >> @@ -1542,6 +1586,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTxX1"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14 Gen6 Intel", >> @@ -1549,6 +1594,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", >> @@ -1556,6 +1602,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore >> Omnia-Book Pro Gen 7", >> @@ -1563,6 +1610,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore >> Omnia-Book Pro Gen 8", >> @@ -1570,6 +1618,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14 Gen8 Intel/Commodore >> Omnia-Book Pro Gen 8", >> @@ -1577,6 +1626,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", >> @@ -1584,6 +1634,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", >> @@ -1591,6 +1642,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GXxHRXx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 Intel/Commodore >> Omnia-Book 15 Gen9", >> @@ -1598,6 +1650,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GXxMRXx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/15 Gen10 AMD", >> @@ -1605,6 +1658,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxHP4NAx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/15 Gen10 AMD", >> @@ -1612,6 +1666,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxKK4NAx_XxSP4NAx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 15 Gen10 Intel", >> @@ -1619,6 +1674,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "XxAR4NAx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Max 15 Gen10 AMD", >> @@ -1626,6 +1682,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X5KK45xS_X5SP45xS"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Max 16 Gen10 AMD", >> @@ -1633,6 +1690,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6HP45xU"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Max 16 Gen10 AMD", >> @@ -1640,6 +1698,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6KK45xU_X6SP45xU"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Max 15 Gen10 Intel", >> @@ -1647,6 +1706,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X5AR45xS"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Max 16 Gen10 Intel", >> @@ -1654,6 +1714,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR55xU"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15 Gen1 AMD", >> @@ -1661,6 +1722,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501A1650TI"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15 Gen1 AMD", >> @@ -1668,6 +1730,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501A2060"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 17 Gen1 AMD", >> @@ -1675,6 +1738,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701A1650TI"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 17 Gen1 AMD", >> @@ -1682,6 +1746,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701A2060"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15 Gen1 Intel", >> @@ -1689,6 +1754,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501I1650TI"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15 Gen1 Intel", >> @@ -1696,6 +1762,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1501I2060"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 17 Gen1 Intel", >> @@ -1703,6 +1770,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701I1650TI"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 17 Gen1 Intel", >> @@ -1710,6 +1778,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "POLARIS1701I2060"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Trinity 15 Intel Gen1", >> @@ -1717,6 +1786,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "TRINITY1501I"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Trinity 17 Intel Gen1", >> @@ -1724,6 +1794,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "TRINITY1701I"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15/17 Gen2 AMD", >> @@ -1731,6 +1802,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15/17 Gen2 Intel", >> @@ -1738,6 +1810,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", >> @@ -1745,6 +1818,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", >> @@ -1752,6 +1826,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", >> @@ -1759,6 +1834,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 15 Gen4 Intel", >> @@ -1766,6 +1842,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15/17 Gen5 AMD", >> @@ -1773,6 +1850,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen5 AMD", >> @@ -1780,6 +1858,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", >> @@ -1787,6 +1866,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", >> @@ -1794,6 +1874,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim >> 15 Gen6", >> @@ -1801,6 +1882,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", >> @@ -1808,6 +1890,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", >> @@ -1815,6 +1898,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", >> @@ -1822,6 +1906,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen7 AMD", >> @@ -1829,6 +1914,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >> @@ -1836,6 +1922,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >> @@ -1843,6 +1930,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Pulse 14 Gen1 AMD", >> @@ -1850,6 +1938,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PULSE1401"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Pulse 15 Gen1 AMD", >> @@ -1857,6 +1946,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PULSE1501"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { >> .ident = "TUXEDO Pulse 15 Gen2 AMD", >> @@ -1864,6 +1954,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PF5LUXG"), >> }, >> + .driver_data = &void_descriptor, >> }, >> { } >> }; >> @@ -1871,6 +1962,7 @@ MODULE_DEVICE_TABLE(dmi, uniwill_dmi_table); >> static int __init uniwill_init(void) >> { >> + const struct uniwill_device_descriptor *descriptor; >> const struct dmi_system_id *id; >> int ret; >> @@ -1880,10 +1972,22 @@ static int __init uniwill_init(void) >> return -ENODEV; >> /* Assume that the device supports all features */ >> - supported_features = UINT_MAX; >> + device_descriptor.features = UINT_MAX; >> pr_warn("Loading on a potentially unsupported device\n"); >> } else { >> - supported_features = (uintptr_t)id->driver_data; >> + /* >> + * Some devices might support additional features depending on >> + * the BIOS version/date, so we call this callback to let them >> + * modify their device descriptor accordingly. >> + */ >> + if (id->callback) { >> + ret = id->callback(id); >> + if (ret < 0) >> + return ret; >> + } >> + >> + descriptor = id->driver_data; >> + device_descriptor = *descriptor; >> } >> ret = platform_driver_register(&uniwill_driver); ^ permalink raw reply [flat|nested] 10+ messages in thread
* [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting 2025-11-25 13:49 [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system Werner Sembach 2025-11-25 13:49 ` [RFC PATCH 1/2] " Werner Sembach @ 2025-11-25 13:49 ` Werner Sembach 2025-11-25 20:31 ` Armin Wolf 1 sibling, 1 reply; 10+ messages in thread From: Werner Sembach @ 2025-11-25 13:49 UTC (permalink / raw) To: W_Armin, hansg, ilpo.jarvinen Cc: platform-driver-x86, linux-kernel, Werner Sembach Uniwill offers user setable cTGP for their EC on devices using NVIDIA 3000 Series and newer GPUs. This patch implements this setting as a sysfs attribute. For one device, the TUXEDO InfinityBook Gen7, the variant with and without NVIDIA GPU can't be differentiated using only the DMI strings, so the new probe callback needs to be used to test a bit from the EC memory. Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> --- drivers/platform/x86/uniwill/uniwill-acpi.c | 157 ++++++++++++++++---- 1 file changed, 132 insertions(+), 25 deletions(-) diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c index f6a1054379ee1..503de3858cc0b 100644 --- a/drivers/platform/x86/uniwill/uniwill-acpi.c +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c @@ -88,6 +88,9 @@ #define EC_ADDR_GPU_TEMP 0x044F +#define EC_ADDR_SYSTEM_ID 0x0456 +#define HAS_GPU BIT(7) + #define EC_ADDR_MAIN_FAN_RPM_1 0x0464 #define EC_ADDR_MAIN_FAN_RPM_2 0x0465 @@ -122,11 +125,11 @@ #define CTGP_DB_DB_ENABLE BIT(1) #define CTGP_DB_CTGP_ENABLE BIT(2) -#define EC_ADDR_CTGP_OFFSET 0x0744 +#define EC_ADDR_CTGP_DB_CTGP_OFFSET 0x0744 -#define EC_ADDR_TPP_OFFSET 0x0745 +#define EC_ADDR_CTGP_DB_TPP_OFFSET 0x0745 -#define EC_ADDR_MAX_TGP 0x0746 +#define EC_ADDR_CTGP_DB_DB_OFFSET 0x0746 #define EC_ADDR_LIGHTBAR_AC_CTRL 0x0748 #define LIGHTBAR_APP_EXISTS BIT(0) @@ -317,6 +320,7 @@ #define UNIWILL_FEATURE_LIGHTBAR BIT(3) #define UNIWILL_FEATURE_BATTERY BIT(4) #define UNIWILL_FEATURE_HWMON BIT(5) +#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL BIT(6) struct uniwill_data { struct device *dev; @@ -514,6 +518,10 @@ static bool uniwill_writeable_reg(struct device *dev, unsigned int reg) case EC_ADDR_LIGHTBAR_BAT_RED: case EC_ADDR_LIGHTBAR_BAT_GREEN: case EC_ADDR_LIGHTBAR_BAT_BLUE: + case EC_ADDR_CTGP_DB_CTRL: + case EC_ADDR_CTGP_DB_CTGP_OFFSET: + case EC_ADDR_CTGP_DB_TPP_OFFSET: + case EC_ADDR_CTGP_DB_DB_OFFSET: return true; default: return false; @@ -547,6 +555,10 @@ static bool uniwill_readable_reg(struct device *dev, unsigned int reg) case EC_ADDR_LIGHTBAR_BAT_RED: case EC_ADDR_LIGHTBAR_BAT_GREEN: case EC_ADDR_LIGHTBAR_BAT_BLUE: + case EC_ADDR_CTGP_DB_CTRL: + case EC_ADDR_CTGP_DB_CTGP_OFFSET: + case EC_ADDR_CTGP_DB_TPP_OFFSET: + case EC_ADDR_CTGP_DB_DB_OFFSET: return true; default: return false; @@ -802,6 +814,68 @@ static ssize_t breathing_in_suspend_show(struct device *dev, struct device_attri static DEVICE_ATTR_RW(breathing_in_suspend); +static ssize_t ctgp_offset_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct uniwill_data *data = dev_get_drvdata(dev); + unsigned int value; + int ret; + + ret = kstrtouint(buf, 0, &value); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, value); + if (ret < 0) + return ret; + + return count; +} + +static ssize_t ctgp_offset_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct uniwill_data *data = dev_get_drvdata(dev); + unsigned int value; + int ret; + + ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, &value); + if (ret < 0) + return ret; + + return sysfs_emit(buf, "%u\n", value); +} + +DEVICE_ATTR_RW(ctgp_offset); + +static int uniwill_nvidia_ctgp_init(struct uniwill_data *data) +{ + int ret; + + if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) + return 0; + + ret = regmap_update_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL, + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE, + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25); + if (ret < 0) + return ret; + + return 0; +} + static struct attribute *uniwill_attrs[] = { /* Keyboard-related */ &dev_attr_fn_lock_toggle_enable.attr, @@ -810,6 +884,8 @@ static struct attribute *uniwill_attrs[] = { /* Lightbar-related */ &dev_attr_rainbow_animation.attr, &dev_attr_breathing_in_suspend.attr, + /* Power-management-related */ + &dev_attr_ctgp_offset.attr, NULL }; @@ -839,6 +915,11 @@ static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct attribute *a return attr->mode; } + if (attr == &dev_attr_ctgp_offset.attr) { + if (uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) + return attr->mode; + } + return 0; } @@ -1405,6 +1486,10 @@ static int uniwill_probe(struct platform_device *pdev) if (ret < 0) return ret; + ret = uniwill_nvidia_ctgp_init(data); + if (ret < 0) + return ret; + return uniwill_input_init(data); } @@ -1545,6 +1630,28 @@ struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { UNIWILL_FEATURE_HWMON }; +static int phxarx1_phxaqf1_probe(struct uniwill_data *data) +{ + unsigned int value; + int ret; + + ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value); + if (ret < 0) + return ret; + if (value & HAS_GPU) + data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL; + + return 0; +}; + +struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor __initdata = { + .probe = phxarx1_phxaqf1_probe +}; + +struct uniwill_device_descriptor tux_featureset_1_descriptor __initdata = { + .features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL +}; + struct uniwill_device_descriptor void_descriptor __initdata = {}; static const struct dmi_system_id uniwill_dmi_table[] __initconst = { @@ -1594,7 +1701,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", @@ -1602,7 +1709,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore Omnia-Book Pro Gen 7", @@ -1610,7 +1717,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", @@ -1626,7 +1733,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", @@ -1634,7 +1741,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", @@ -1802,7 +1909,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen2 Intel", @@ -1810,7 +1917,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", @@ -1818,7 +1925,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", @@ -1826,7 +1933,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", @@ -1834,7 +1941,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 15 Gen4 Intel", @@ -1842,7 +1949,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen5 AMD", @@ -1850,7 +1957,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen5 AMD", @@ -1858,7 +1965,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", @@ -1866,7 +1973,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", @@ -1874,7 +1981,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim 15 Gen6", @@ -1882,7 +1989,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", @@ -1890,7 +1997,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", @@ -1898,7 +2005,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", @@ -1906,7 +2013,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 AMD", @@ -1914,7 +2021,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 Intel", @@ -1922,7 +2029,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 Intel", @@ -1930,7 +2037,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), }, - .driver_data = &void_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Pulse 14 Gen1 AMD", -- 2.43.0 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting 2025-11-25 13:49 ` [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting Werner Sembach @ 2025-11-25 20:31 ` Armin Wolf 2025-11-26 12:23 ` Werner Sembach 0 siblings, 1 reply; 10+ messages in thread From: Armin Wolf @ 2025-11-25 20:31 UTC (permalink / raw) To: Werner Sembach, hansg, ilpo.jarvinen; +Cc: platform-driver-x86, linux-kernel Am 25.11.25 um 14:49 schrieb Werner Sembach: > Uniwill offers user setable cTGP for their EC on devices using NVIDIA 3000 > Series and newer GPUs. This patch implements this setting as a sysfs > attribute. > > For one device, the TUXEDO InfinityBook Gen7, the variant with and without > NVIDIA GPU can't be differentiated using only the DMI strings, so the new > probe callback needs to be used to test a bit from the EC memory. > > Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> > --- > drivers/platform/x86/uniwill/uniwill-acpi.c | 157 ++++++++++++++++---- > 1 file changed, 132 insertions(+), 25 deletions(-) > > diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c > index f6a1054379ee1..503de3858cc0b 100644 > --- a/drivers/platform/x86/uniwill/uniwill-acpi.c > +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c > @@ -88,6 +88,9 @@ > > #define EC_ADDR_GPU_TEMP 0x044F > > +#define EC_ADDR_SYSTEM_ID 0x0456 > +#define HAS_GPU BIT(7) > + > #define EC_ADDR_MAIN_FAN_RPM_1 0x0464 > > #define EC_ADDR_MAIN_FAN_RPM_2 0x0465 > @@ -122,11 +125,11 @@ > #define CTGP_DB_DB_ENABLE BIT(1) > #define CTGP_DB_CTGP_ENABLE BIT(2) > > -#define EC_ADDR_CTGP_OFFSET 0x0744 > +#define EC_ADDR_CTGP_DB_CTGP_OFFSET 0x0744 > > -#define EC_ADDR_TPP_OFFSET 0x0745 > +#define EC_ADDR_CTGP_DB_TPP_OFFSET 0x0745 > > -#define EC_ADDR_MAX_TGP 0x0746 > +#define EC_ADDR_CTGP_DB_DB_OFFSET 0x0746 > > #define EC_ADDR_LIGHTBAR_AC_CTRL 0x0748 > #define LIGHTBAR_APP_EXISTS BIT(0) > @@ -317,6 +320,7 @@ > #define UNIWILL_FEATURE_LIGHTBAR BIT(3) > #define UNIWILL_FEATURE_BATTERY BIT(4) > #define UNIWILL_FEATURE_HWMON BIT(5) > +#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL BIT(6) > > struct uniwill_data { > struct device *dev; > @@ -514,6 +518,10 @@ static bool uniwill_writeable_reg(struct device *dev, unsigned int reg) > case EC_ADDR_LIGHTBAR_BAT_RED: > case EC_ADDR_LIGHTBAR_BAT_GREEN: > case EC_ADDR_LIGHTBAR_BAT_BLUE: > + case EC_ADDR_CTGP_DB_CTRL: > + case EC_ADDR_CTGP_DB_CTGP_OFFSET: > + case EC_ADDR_CTGP_DB_TPP_OFFSET: > + case EC_ADDR_CTGP_DB_DB_OFFSET: > return true; > default: > return false; > @@ -547,6 +555,10 @@ static bool uniwill_readable_reg(struct device *dev, unsigned int reg) > case EC_ADDR_LIGHTBAR_BAT_RED: > case EC_ADDR_LIGHTBAR_BAT_GREEN: > case EC_ADDR_LIGHTBAR_BAT_BLUE: > + case EC_ADDR_CTGP_DB_CTRL: > + case EC_ADDR_CTGP_DB_CTGP_OFFSET: > + case EC_ADDR_CTGP_DB_TPP_OFFSET: > + case EC_ADDR_CTGP_DB_DB_OFFSET: > return true; > default: > return false; > @@ -802,6 +814,68 @@ static ssize_t breathing_in_suspend_show(struct device *dev, struct device_attri > > static DEVICE_ATTR_RW(breathing_in_suspend); > > +static ssize_t ctgp_offset_store(struct device *dev, struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + struct uniwill_data *data = dev_get_drvdata(dev); > + unsigned int value; > + int ret; > + > + ret = kstrtouint(buf, 0, &value); > + if (ret < 0) > + return ret; > Please check for input values larger than 255 and return -EINVAL in such a case. > + > + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, value); > + if (ret < 0) > + return ret; > + > + return count; > +} > + > +static ssize_t ctgp_offset_show(struct device *dev, struct device_attribute *attr, > + char *buf) > +{ > + struct uniwill_data *data = dev_get_drvdata(dev); > + unsigned int value; > + int ret; > + > + ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, &value); > + if (ret < 0) > + return ret; > + > + return sysfs_emit(buf, "%u\n", value); > +} > + > +DEVICE_ATTR_RW(ctgp_offset); Please mark this device attribute as static. > + > +static int uniwill_nvidia_ctgp_init(struct uniwill_data *data) > +{ > + int ret; > + > + if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) > + return 0; > + > + ret = regmap_update_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL, > + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE, > + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE); Please initialize the power limits before enabling them. Also, maybe disabling those power limits during suspend and re-enabling them during resume would be a good idea? This way we can avoid overheating the device should the fan stop too early. > + if (ret < 0) > + return ret; > + > + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0); > + if (ret < 0) > + return ret; > + > + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255); > + if (ret < 0) > + return ret; > + > + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > static struct attribute *uniwill_attrs[] = { > /* Keyboard-related */ > &dev_attr_fn_lock_toggle_enable.attr, > @@ -810,6 +884,8 @@ static struct attribute *uniwill_attrs[] = { > /* Lightbar-related */ > &dev_attr_rainbow_animation.attr, > &dev_attr_breathing_in_suspend.attr, > + /* Power-management-related */ > + &dev_attr_ctgp_offset.attr, > NULL > }; > > @@ -839,6 +915,11 @@ static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct attribute *a > return attr->mode; > } > > + if (attr == &dev_attr_ctgp_offset.attr) { > + if (uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) > + return attr->mode; > + } > + > return 0; > } > > @@ -1405,6 +1486,10 @@ static int uniwill_probe(struct platform_device *pdev) > if (ret < 0) > return ret; > > + ret = uniwill_nvidia_ctgp_init(data); > + if (ret < 0) > + return ret; > + > return uniwill_input_init(data); > } > > @@ -1545,6 +1630,28 @@ struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { > UNIWILL_FEATURE_HWMON > }; > > +static int phxarx1_phxaqf1_probe(struct uniwill_data *data) > +{ > + unsigned int value; > + int ret; > + > + ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value); > + if (ret < 0) > + return ret; Please add an empty line here. > + if (value & HAS_GPU) > + data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL; > + > + return 0; > +}; > + > +struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor __initdata = { > + .probe = phxarx1_phxaqf1_probe > +}; > + > +struct uniwill_device_descriptor tux_featureset_1_descriptor __initdata = { > + .features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL > +}; > + > struct uniwill_device_descriptor void_descriptor __initdata = {}; I just noticed that all device descriptors are not marked as static. Please fix this. Other than that, the patch looks very promising. Thanks, Armin Wolf > > static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > @@ -1594,7 +1701,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", > @@ -1602,7 +1709,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore Omnia-Book Pro Gen 7", > @@ -1610,7 +1717,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", > @@ -1626,7 +1733,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", > @@ -1634,7 +1741,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", > @@ -1802,7 +1909,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Polaris 15/17 Gen2 Intel", > @@ -1810,7 +1917,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", > @@ -1818,7 +1925,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", > @@ -1826,7 +1933,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", > @@ -1834,7 +1941,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 15 Gen4 Intel", > @@ -1842,7 +1949,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Polaris 15/17 Gen5 AMD", > @@ -1850,7 +1957,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen5 AMD", > @@ -1858,7 +1965,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", > @@ -1866,7 +1973,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", > @@ -1874,7 +1981,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim 15 Gen6", > @@ -1882,7 +1989,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", > @@ -1890,7 +1997,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", > @@ -1898,7 +2005,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", > @@ -1906,7 +2013,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen7 AMD", > @@ -1914,7 +2021,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen7 Intel", > @@ -1922,7 +2029,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Stellaris 16 Gen7 Intel", > @@ -1930,7 +2037,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), > DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), > }, > - .driver_data = &void_descriptor, > + .driver_data = &tux_featureset_1_descriptor, > }, > { > .ident = "TUXEDO Pulse 14 Gen1 AMD", ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting 2025-11-25 20:31 ` Armin Wolf @ 2025-11-26 12:23 ` Werner Sembach 2025-11-26 19:33 ` Armin Wolf 0 siblings, 1 reply; 10+ messages in thread From: Werner Sembach @ 2025-11-26 12:23 UTC (permalink / raw) To: Armin Wolf, hansg, ilpo.jarvinen; +Cc: platform-driver-x86, linux-kernel Am 25.11.25 um 21:31 schrieb Armin Wolf: > Am 25.11.25 um 14:49 schrieb Werner Sembach: > >> Uniwill offers user setable cTGP for their EC on devices using NVIDIA 3000 >> Series and newer GPUs. This patch implements this setting as a sysfs >> attribute. >> >> For one device, the TUXEDO InfinityBook Gen7, the variant with and without >> NVIDIA GPU can't be differentiated using only the DMI strings, so the new >> probe callback needs to be used to test a bit from the EC memory. >> >> Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> >> --- >> drivers/platform/x86/uniwill/uniwill-acpi.c | 157 ++++++++++++++++---- >> 1 file changed, 132 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c >> b/drivers/platform/x86/uniwill/uniwill-acpi.c >> index f6a1054379ee1..503de3858cc0b 100644 >> --- a/drivers/platform/x86/uniwill/uniwill-acpi.c >> +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c >> @@ -88,6 +88,9 @@ >> #define EC_ADDR_GPU_TEMP 0x044F >> +#define EC_ADDR_SYSTEM_ID 0x0456 >> +#define HAS_GPU BIT(7) >> + >> #define EC_ADDR_MAIN_FAN_RPM_1 0x0464 >> #define EC_ADDR_MAIN_FAN_RPM_2 0x0465 >> @@ -122,11 +125,11 @@ >> #define CTGP_DB_DB_ENABLE BIT(1) >> #define CTGP_DB_CTGP_ENABLE BIT(2) >> -#define EC_ADDR_CTGP_OFFSET 0x0744 >> +#define EC_ADDR_CTGP_DB_CTGP_OFFSET 0x0744 >> -#define EC_ADDR_TPP_OFFSET 0x0745 >> +#define EC_ADDR_CTGP_DB_TPP_OFFSET 0x0745 >> -#define EC_ADDR_MAX_TGP 0x0746 >> +#define EC_ADDR_CTGP_DB_DB_OFFSET 0x0746 >> #define EC_ADDR_LIGHTBAR_AC_CTRL 0x0748 >> #define LIGHTBAR_APP_EXISTS BIT(0) >> @@ -317,6 +320,7 @@ >> #define UNIWILL_FEATURE_LIGHTBAR BIT(3) >> #define UNIWILL_FEATURE_BATTERY BIT(4) >> #define UNIWILL_FEATURE_HWMON BIT(5) >> +#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL BIT(6) >> struct uniwill_data { >> struct device *dev; >> @@ -514,6 +518,10 @@ static bool uniwill_writeable_reg(struct device *dev, >> unsigned int reg) >> case EC_ADDR_LIGHTBAR_BAT_RED: >> case EC_ADDR_LIGHTBAR_BAT_GREEN: >> case EC_ADDR_LIGHTBAR_BAT_BLUE: >> + case EC_ADDR_CTGP_DB_CTRL: >> + case EC_ADDR_CTGP_DB_CTGP_OFFSET: >> + case EC_ADDR_CTGP_DB_TPP_OFFSET: >> + case EC_ADDR_CTGP_DB_DB_OFFSET: >> return true; >> default: >> return false; >> @@ -547,6 +555,10 @@ static bool uniwill_readable_reg(struct device *dev, >> unsigned int reg) >> case EC_ADDR_LIGHTBAR_BAT_RED: >> case EC_ADDR_LIGHTBAR_BAT_GREEN: >> case EC_ADDR_LIGHTBAR_BAT_BLUE: >> + case EC_ADDR_CTGP_DB_CTRL: >> + case EC_ADDR_CTGP_DB_CTGP_OFFSET: >> + case EC_ADDR_CTGP_DB_TPP_OFFSET: >> + case EC_ADDR_CTGP_DB_DB_OFFSET: >> return true; >> default: >> return false; >> @@ -802,6 +814,68 @@ static ssize_t breathing_in_suspend_show(struct device >> *dev, struct device_attri >> static DEVICE_ATTR_RW(breathing_in_suspend); >> +static ssize_t ctgp_offset_store(struct device *dev, struct >> device_attribute *attr, >> + const char *buf, size_t count) >> +{ >> + struct uniwill_data *data = dev_get_drvdata(dev); >> + unsigned int value; >> + int ret; >> + >> + ret = kstrtouint(buf, 0, &value); >> + if (ret < 0) >> + return ret; >> Please check for input values larger than 255 and return -EINVAL in such a case. >> + >> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, value); >> + if (ret < 0) >> + return ret; >> + >> + return count; >> +} >> + >> +static ssize_t ctgp_offset_show(struct device *dev, struct device_attribute >> *attr, >> + char *buf) >> +{ >> + struct uniwill_data *data = dev_get_drvdata(dev); >> + unsigned int value; >> + int ret; >> + >> + ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, &value); >> + if (ret < 0) >> + return ret; >> + >> + return sysfs_emit(buf, "%u\n", value); >> +} >> + >> +DEVICE_ATTR_RW(ctgp_offset); > > Please mark this device attribute as static. ack thanks for spotting > >> + >> +static int uniwill_nvidia_ctgp_init(struct uniwill_data *data) >> +{ >> + int ret; >> + >> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) >> + return 0; >> + >> + ret = regmap_update_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL, >> + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | >> CTGP_DB_CTGP_ENABLE, >> + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | >> CTGP_DB_CTGP_ENABLE); > > Please initialize the power limits before enabling them. ack, sorry forgot > Also, maybe disabling those power limits during > suspend and re-enabling them during resume would be a good idea? This way we > can avoid overheating the > device should the fan stop too early. Don't think that is necessary as other vendors don't even have the ability to disable db for example. Also even with ctgp and db disabled the minimum TGP is still reachable and that already is 125W on some devices. > >> + if (ret < 0) >> + return ret; >> + >> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0); >> + if (ret < 0) >> + return ret; >> + >> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255); >> + if (ret < 0) >> + return ret; >> + >> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25); >> + if (ret < 0) >> + return ret; >> + >> + return 0; >> +} >> + >> static struct attribute *uniwill_attrs[] = { >> /* Keyboard-related */ >> &dev_attr_fn_lock_toggle_enable.attr, >> @@ -810,6 +884,8 @@ static struct attribute *uniwill_attrs[] = { >> /* Lightbar-related */ >> &dev_attr_rainbow_animation.attr, >> &dev_attr_breathing_in_suspend.attr, >> + /* Power-management-related */ >> + &dev_attr_ctgp_offset.attr, >> NULL >> }; >> @@ -839,6 +915,11 @@ static umode_t uniwill_attr_is_visible(struct kobject >> *kobj, struct attribute *a >> return attr->mode; >> } >> + if (attr == &dev_attr_ctgp_offset.attr) { >> + if (uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) >> + return attr->mode; >> + } >> + >> return 0; >> } >> @@ -1405,6 +1486,10 @@ static int uniwill_probe(struct platform_device *pdev) >> if (ret < 0) >> return ret; >> + ret = uniwill_nvidia_ctgp_init(data); >> + if (ret < 0) >> + return ret; >> + >> return uniwill_input_init(data); >> } >> @@ -1545,6 +1630,28 @@ struct uniwill_device_descriptor lapkc71f_descriptor >> __initdata = { >> UNIWILL_FEATURE_HWMON >> }; >> +static int phxarx1_phxaqf1_probe(struct uniwill_data *data) >> +{ >> + unsigned int value; >> + int ret; >> + >> + ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value); >> + if (ret < 0) >> + return ret; > > Please add an empty line here. kk > >> + if (value & HAS_GPU) >> + data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL; >> + >> + return 0; >> +}; >> + >> +struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor __initdata = { >> + .probe = phxarx1_phxaqf1_probe >> +}; >> + >> +struct uniwill_device_descriptor tux_featureset_1_descriptor __initdata = { >> + .features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL >> +}; >> + >> struct uniwill_device_descriptor void_descriptor __initdata = {}; > > I just noticed that all device descriptors are not marked as static. Please > fix this. ack, sorry overlooked that Quick feedback if I should include the suspend disable anyway and I will wait a little bit to give Ilpo a chance to respond, but other than that: non RFC of this patchset incoming Best regards, Werner > > Other than that, the patch looks very promising. > > Thanks, > Armin Wolf > >> static const struct dmi_system_id uniwill_dmi_table[] __initconst = { >> @@ -1594,7 +1701,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", >> @@ -1602,7 +1709,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore >> Omnia-Book Pro Gen 7", >> @@ -1610,7 +1717,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore >> Omnia-Book Pro Gen 8", >> @@ -1626,7 +1733,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", >> @@ -1634,7 +1741,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", >> @@ -1802,7 +1909,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15/17 Gen2 Intel", >> @@ -1810,7 +1917,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", >> @@ -1818,7 +1925,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", >> @@ -1826,7 +1933,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", >> @@ -1834,7 +1941,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 15 Gen4 Intel", >> @@ -1842,7 +1949,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Polaris 15/17 Gen5 AMD", >> @@ -1850,7 +1957,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen5 AMD", >> @@ -1858,7 +1965,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", >> @@ -1866,7 +1973,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", >> @@ -1874,7 +1981,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim >> 15 Gen6", >> @@ -1882,7 +1989,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", >> @@ -1890,7 +1997,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", >> @@ -1898,7 +2005,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", >> @@ -1906,7 +2013,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen7 AMD", >> @@ -1914,7 +2021,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >> @@ -1922,7 +2029,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >> @@ -1930,7 +2037,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >> __initconst = { >> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), >> }, >> - .driver_data = &void_descriptor, >> + .driver_data = &tux_featureset_1_descriptor, >> }, >> { >> .ident = "TUXEDO Pulse 14 Gen1 AMD", ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting 2025-11-26 12:23 ` Werner Sembach @ 2025-11-26 19:33 ` Armin Wolf 2025-11-26 22:59 ` Werner Sembach 0 siblings, 1 reply; 10+ messages in thread From: Armin Wolf @ 2025-11-26 19:33 UTC (permalink / raw) To: Werner Sembach, hansg, ilpo.jarvinen; +Cc: platform-driver-x86, linux-kernel Am 26.11.25 um 13:23 schrieb Werner Sembach: > > Am 25.11.25 um 21:31 schrieb Armin Wolf: >> Am 25.11.25 um 14:49 schrieb Werner Sembach: >> >>> Uniwill offers user setable cTGP for their EC on devices using >>> NVIDIA 3000 >>> Series and newer GPUs. This patch implements this setting as a sysfs >>> attribute. >>> >>> For one device, the TUXEDO InfinityBook Gen7, the variant with and >>> without >>> NVIDIA GPU can't be differentiated using only the DMI strings, so >>> the new >>> probe callback needs to be used to test a bit from the EC memory. >>> >>> Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> >>> --- >>> drivers/platform/x86/uniwill/uniwill-acpi.c | 157 >>> ++++++++++++++++---- >>> 1 file changed, 132 insertions(+), 25 deletions(-) >>> >>> diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c >>> b/drivers/platform/x86/uniwill/uniwill-acpi.c >>> index f6a1054379ee1..503de3858cc0b 100644 >>> --- a/drivers/platform/x86/uniwill/uniwill-acpi.c >>> +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c >>> @@ -88,6 +88,9 @@ >>> #define EC_ADDR_GPU_TEMP 0x044F >>> +#define EC_ADDR_SYSTEM_ID 0x0456 >>> +#define HAS_GPU BIT(7) >>> + >>> #define EC_ADDR_MAIN_FAN_RPM_1 0x0464 >>> #define EC_ADDR_MAIN_FAN_RPM_2 0x0465 >>> @@ -122,11 +125,11 @@ >>> #define CTGP_DB_DB_ENABLE BIT(1) >>> #define CTGP_DB_CTGP_ENABLE BIT(2) >>> -#define EC_ADDR_CTGP_OFFSET 0x0744 >>> +#define EC_ADDR_CTGP_DB_CTGP_OFFSET 0x0744 >>> -#define EC_ADDR_TPP_OFFSET 0x0745 >>> +#define EC_ADDR_CTGP_DB_TPP_OFFSET 0x0745 >>> -#define EC_ADDR_MAX_TGP 0x0746 >>> +#define EC_ADDR_CTGP_DB_DB_OFFSET 0x0746 >>> #define EC_ADDR_LIGHTBAR_AC_CTRL 0x0748 >>> #define LIGHTBAR_APP_EXISTS BIT(0) >>> @@ -317,6 +320,7 @@ >>> #define UNIWILL_FEATURE_LIGHTBAR BIT(3) >>> #define UNIWILL_FEATURE_BATTERY BIT(4) >>> #define UNIWILL_FEATURE_HWMON BIT(5) >>> +#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL BIT(6) >>> struct uniwill_data { >>> struct device *dev; >>> @@ -514,6 +518,10 @@ static bool uniwill_writeable_reg(struct device >>> *dev, unsigned int reg) >>> case EC_ADDR_LIGHTBAR_BAT_RED: >>> case EC_ADDR_LIGHTBAR_BAT_GREEN: >>> case EC_ADDR_LIGHTBAR_BAT_BLUE: >>> + case EC_ADDR_CTGP_DB_CTRL: >>> + case EC_ADDR_CTGP_DB_CTGP_OFFSET: >>> + case EC_ADDR_CTGP_DB_TPP_OFFSET: >>> + case EC_ADDR_CTGP_DB_DB_OFFSET: >>> return true; >>> default: >>> return false; >>> @@ -547,6 +555,10 @@ static bool uniwill_readable_reg(struct device >>> *dev, unsigned int reg) >>> case EC_ADDR_LIGHTBAR_BAT_RED: >>> case EC_ADDR_LIGHTBAR_BAT_GREEN: >>> case EC_ADDR_LIGHTBAR_BAT_BLUE: >>> + case EC_ADDR_CTGP_DB_CTRL: >>> + case EC_ADDR_CTGP_DB_CTGP_OFFSET: >>> + case EC_ADDR_CTGP_DB_TPP_OFFSET: >>> + case EC_ADDR_CTGP_DB_DB_OFFSET: >>> return true; >>> default: >>> return false; >>> @@ -802,6 +814,68 @@ static ssize_t breathing_in_suspend_show(struct >>> device *dev, struct device_attri >>> static DEVICE_ATTR_RW(breathing_in_suspend); >>> +static ssize_t ctgp_offset_store(struct device *dev, struct >>> device_attribute *attr, >>> + const char *buf, size_t count) >>> +{ >>> + struct uniwill_data *data = dev_get_drvdata(dev); >>> + unsigned int value; >>> + int ret; >>> + >>> + ret = kstrtouint(buf, 0, &value); >>> + if (ret < 0) >>> + return ret; >>> Please check for input values larger than 255 and return -EINVAL in >>> such a case. >>> + >>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, >>> value); >>> + if (ret < 0) >>> + return ret; >>> + >>> + return count; >>> +} >>> + >>> +static ssize_t ctgp_offset_show(struct device *dev, struct >>> device_attribute *attr, >>> + char *buf) >>> +{ >>> + struct uniwill_data *data = dev_get_drvdata(dev); >>> + unsigned int value; >>> + int ret; >>> + >>> + ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, >>> &value); >>> + if (ret < 0) >>> + return ret; >>> + >>> + return sysfs_emit(buf, "%u\n", value); >>> +} >>> + >>> +DEVICE_ATTR_RW(ctgp_offset); >> >> Please mark this device attribute as static. > ack thanks for spotting >> >>> + >>> +static int uniwill_nvidia_ctgp_init(struct uniwill_data *data) >>> +{ >>> + int ret; >>> + >>> + if (!uniwill_device_supports(data, >>> UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) >>> + return 0; >>> + >>> + ret = regmap_update_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL, >>> + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | >>> CTGP_DB_CTGP_ENABLE, >>> + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | >>> CTGP_DB_CTGP_ENABLE); >> >> Please initialize the power limits before enabling them. > ack, sorry forgot >> Also, maybe disabling those power limits during >> suspend and re-enabling them during resume would be a good idea? This >> way we can avoid overheating the >> device should the fan stop too early. > > Don't think that is necessary as other vendors don't even have the > ability to disable db for example. > > Also even with ctgp and db disabled the minimum TGP is still reachable > and that already is 125W on some devices. > Disabling cTGP and dynamic boost during suspend is necessary because regmap might restore EC_ADDR_CTGP_DB_CTRL first during resume, and this might cause issues should EC_ADDR_CTGP_DB_CTGP_OFFSET and friends contain garbage data. I am aware that the OEM software on the Intel Nuc laptop does not disable those settings when suspending, but i just want to make sure that no bad things happen on devices with a badly designed platform firmware. Thanks, Armin Wolf >> >>> + if (ret < 0) >>> + return ret; >>> + >>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0); >>> + if (ret < 0) >>> + return ret; >>> + >>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255); >>> + if (ret < 0) >>> + return ret; >>> + >>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25); >>> + if (ret < 0) >>> + return ret; >>> + >>> + return 0; >>> +} >>> + >>> static struct attribute *uniwill_attrs[] = { >>> /* Keyboard-related */ >>> &dev_attr_fn_lock_toggle_enable.attr, >>> @@ -810,6 +884,8 @@ static struct attribute *uniwill_attrs[] = { >>> /* Lightbar-related */ >>> &dev_attr_rainbow_animation.attr, >>> &dev_attr_breathing_in_suspend.attr, >>> + /* Power-management-related */ >>> + &dev_attr_ctgp_offset.attr, >>> NULL >>> }; >>> @@ -839,6 +915,11 @@ static umode_t uniwill_attr_is_visible(struct >>> kobject *kobj, struct attribute *a >>> return attr->mode; >>> } >>> + if (attr == &dev_attr_ctgp_offset.attr) { >>> + if (uniwill_device_supports(data, >>> UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) >>> + return attr->mode; >>> + } >>> + >>> return 0; >>> } >>> @@ -1405,6 +1486,10 @@ static int uniwill_probe(struct >>> platform_device *pdev) >>> if (ret < 0) >>> return ret; >>> + ret = uniwill_nvidia_ctgp_init(data); >>> + if (ret < 0) >>> + return ret; >>> + >>> return uniwill_input_init(data); >>> } >>> @@ -1545,6 +1630,28 @@ struct uniwill_device_descriptor >>> lapkc71f_descriptor __initdata = { >>> UNIWILL_FEATURE_HWMON >>> }; >>> +static int phxarx1_phxaqf1_probe(struct uniwill_data *data) >>> +{ >>> + unsigned int value; >>> + int ret; >>> + >>> + ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value); >>> + if (ret < 0) >>> + return ret; >> >> Please add an empty line here. > kk >> >>> + if (value & HAS_GPU) >>> + data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL; >>> + >>> + return 0; >>> +}; >>> + >>> +struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor >>> __initdata = { >>> + .probe = phxarx1_phxaqf1_probe >>> +}; >>> + >>> +struct uniwill_device_descriptor tux_featureset_1_descriptor >>> __initdata = { >>> + .features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL >>> +}; >>> + >>> struct uniwill_device_descriptor void_descriptor __initdata = {}; >> >> I just noticed that all device descriptors are not marked as static. >> Please fix this. > > ack, sorry overlooked that > > Quick feedback if I should include the suspend disable anyway and I > will wait a little bit to give Ilpo a chance to respond, but other > than that: non RFC of this patchset incoming > > Best regards, > > Werner > >> >> Other than that, the patch looks very promising. >> >> Thanks, >> Armin Wolf >> >>> static const struct dmi_system_id uniwill_dmi_table[] >>> __initconst = { >>> @@ -1594,7 +1701,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", >>> @@ -1602,7 +1709,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore >>> Omnia-Book Pro Gen 7", >>> @@ -1610,7 +1717,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, >>> "PH6AG01_PH6AQ71_PH6AQI1"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 >>> Intel/Commodore Omnia-Book Pro Gen 8", >>> @@ -1626,7 +1733,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", >>> @@ -1634,7 +1741,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", >>> @@ -1802,7 +1909,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Polaris 15/17 Gen2 Intel", >>> @@ -1810,7 +1917,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", >>> @@ -1818,7 +1925,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", >>> @@ -1826,7 +1933,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", >>> @@ -1834,7 +1941,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 15 Gen4 Intel", >>> @@ -1842,7 +1949,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Polaris 15/17 Gen5 AMD", >>> @@ -1850,7 +1957,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16 Gen5 AMD", >>> @@ -1858,7 +1965,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore >>> ORION Gen 5", >>> @@ -1866,7 +1973,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", >>> @@ -1874,7 +1981,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore >>> ORION Slim 15 Gen6", >>> @@ -1882,7 +1989,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION >>> 16 Gen6", >>> @@ -1890,7 +1997,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION >>> 16 Gen6", >>> @@ -1898,7 +2005,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION >>> 17 Gen6", >>> @@ -1906,7 +2013,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16 Gen7 AMD", >>> @@ -1914,7 +2021,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >>> @@ -1922,7 +2029,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >>> @@ -1930,7 +2037,7 @@ static const struct dmi_system_id >>> uniwill_dmi_table[] __initconst = { >>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), >>> }, >>> - .driver_data = &void_descriptor, >>> + .driver_data = &tux_featureset_1_descriptor, >>> }, >>> { >>> .ident = "TUXEDO Pulse 14 Gen1 AMD", ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting 2025-11-26 19:33 ` Armin Wolf @ 2025-11-26 22:59 ` Werner Sembach 0 siblings, 0 replies; 10+ messages in thread From: Werner Sembach @ 2025-11-26 22:59 UTC (permalink / raw) To: Armin Wolf, hansg, ilpo.jarvinen; +Cc: platform-driver-x86, linux-kernel Am 26.11.25 um 20:33 schrieb Armin Wolf: > Am 26.11.25 um 13:23 schrieb Werner Sembach: > >> >> Am 25.11.25 um 21:31 schrieb Armin Wolf: >>> Am 25.11.25 um 14:49 schrieb Werner Sembach: >>> >>>> Uniwill offers user setable cTGP for their EC on devices using NVIDIA 3000 >>>> Series and newer GPUs. This patch implements this setting as a sysfs >>>> attribute. >>>> >>>> For one device, the TUXEDO InfinityBook Gen7, the variant with and without >>>> NVIDIA GPU can't be differentiated using only the DMI strings, so the new >>>> probe callback needs to be used to test a bit from the EC memory. >>>> >>>> Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> >>>> --- >>>> drivers/platform/x86/uniwill/uniwill-acpi.c | 157 ++++++++++++++++---- >>>> 1 file changed, 132 insertions(+), 25 deletions(-) >>>> >>>> diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c >>>> b/drivers/platform/x86/uniwill/uniwill-acpi.c >>>> index f6a1054379ee1..503de3858cc0b 100644 >>>> --- a/drivers/platform/x86/uniwill/uniwill-acpi.c >>>> +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c >>>> @@ -88,6 +88,9 @@ >>>> #define EC_ADDR_GPU_TEMP 0x044F >>>> +#define EC_ADDR_SYSTEM_ID 0x0456 >>>> +#define HAS_GPU BIT(7) >>>> + >>>> #define EC_ADDR_MAIN_FAN_RPM_1 0x0464 >>>> #define EC_ADDR_MAIN_FAN_RPM_2 0x0465 >>>> @@ -122,11 +125,11 @@ >>>> #define CTGP_DB_DB_ENABLE BIT(1) >>>> #define CTGP_DB_CTGP_ENABLE BIT(2) >>>> -#define EC_ADDR_CTGP_OFFSET 0x0744 >>>> +#define EC_ADDR_CTGP_DB_CTGP_OFFSET 0x0744 >>>> -#define EC_ADDR_TPP_OFFSET 0x0745 >>>> +#define EC_ADDR_CTGP_DB_TPP_OFFSET 0x0745 >>>> -#define EC_ADDR_MAX_TGP 0x0746 >>>> +#define EC_ADDR_CTGP_DB_DB_OFFSET 0x0746 >>>> #define EC_ADDR_LIGHTBAR_AC_CTRL 0x0748 >>>> #define LIGHTBAR_APP_EXISTS BIT(0) >>>> @@ -317,6 +320,7 @@ >>>> #define UNIWILL_FEATURE_LIGHTBAR BIT(3) >>>> #define UNIWILL_FEATURE_BATTERY BIT(4) >>>> #define UNIWILL_FEATURE_HWMON BIT(5) >>>> +#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL BIT(6) >>>> struct uniwill_data { >>>> struct device *dev; >>>> @@ -514,6 +518,10 @@ static bool uniwill_writeable_reg(struct device *dev, >>>> unsigned int reg) >>>> case EC_ADDR_LIGHTBAR_BAT_RED: >>>> case EC_ADDR_LIGHTBAR_BAT_GREEN: >>>> case EC_ADDR_LIGHTBAR_BAT_BLUE: >>>> + case EC_ADDR_CTGP_DB_CTRL: >>>> + case EC_ADDR_CTGP_DB_CTGP_OFFSET: >>>> + case EC_ADDR_CTGP_DB_TPP_OFFSET: >>>> + case EC_ADDR_CTGP_DB_DB_OFFSET: >>>> return true; >>>> default: >>>> return false; >>>> @@ -547,6 +555,10 @@ static bool uniwill_readable_reg(struct device *dev, >>>> unsigned int reg) >>>> case EC_ADDR_LIGHTBAR_BAT_RED: >>>> case EC_ADDR_LIGHTBAR_BAT_GREEN: >>>> case EC_ADDR_LIGHTBAR_BAT_BLUE: >>>> + case EC_ADDR_CTGP_DB_CTRL: >>>> + case EC_ADDR_CTGP_DB_CTGP_OFFSET: >>>> + case EC_ADDR_CTGP_DB_TPP_OFFSET: >>>> + case EC_ADDR_CTGP_DB_DB_OFFSET: >>>> return true; >>>> default: >>>> return false; >>>> @@ -802,6 +814,68 @@ static ssize_t breathing_in_suspend_show(struct device >>>> *dev, struct device_attri >>>> static DEVICE_ATTR_RW(breathing_in_suspend); >>>> +static ssize_t ctgp_offset_store(struct device *dev, struct >>>> device_attribute *attr, >>>> + const char *buf, size_t count) >>>> +{ >>>> + struct uniwill_data *data = dev_get_drvdata(dev); >>>> + unsigned int value; >>>> + int ret; >>>> + >>>> + ret = kstrtouint(buf, 0, &value); >>>> + if (ret < 0) >>>> + return ret; >>>> Please check for input values larger than 255 and return -EINVAL in such a >>>> case. >>>> + >>>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, value); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + return count; >>>> +} >>>> + >>>> +static ssize_t ctgp_offset_show(struct device *dev, struct >>>> device_attribute *attr, >>>> + char *buf) >>>> +{ >>>> + struct uniwill_data *data = dev_get_drvdata(dev); >>>> + unsigned int value; >>>> + int ret; >>>> + >>>> + ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, &value); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + return sysfs_emit(buf, "%u\n", value); >>>> +} >>>> + >>>> +DEVICE_ATTR_RW(ctgp_offset); >>> >>> Please mark this device attribute as static. >> ack thanks for spotting >>> >>>> + >>>> +static int uniwill_nvidia_ctgp_init(struct uniwill_data *data) >>>> +{ >>>> + int ret; >>>> + >>>> + if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) >>>> + return 0; >>>> + >>>> + ret = regmap_update_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL, >>>> + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | >>>> CTGP_DB_CTGP_ENABLE, >>>> + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | >>>> CTGP_DB_CTGP_ENABLE); >>> >>> Please initialize the power limits before enabling them. >> ack, sorry forgot >>> Also, maybe disabling those power limits during >>> suspend and re-enabling them during resume would be a good idea? This way we >>> can avoid overheating the >>> device should the fan stop too early. >> >> Don't think that is necessary as other vendors don't even have the ability to >> disable db for example. >> >> Also even with ctgp and db disabled the minimum TGP is still reachable and >> that already is 125W on some devices. >> > Disabling cTGP and dynamic boost during suspend is necessary because regmap > might restore EC_ADDR_CTGP_DB_CTRL first > during resume, and this might cause issues should EC_ADDR_CTGP_DB_CTGP_OFFSET > and friends contain garbage data. > > I am aware that the OEM software on the Intel Nuc laptop does not disable > those settings when suspending, but i > just want to make sure that no bad things happen on devices with a badly > designed platform firmware. ok > > Thanks, > Armin Wolf > >>> >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> + return 0; >>>> +} >>>> + >>>> static struct attribute *uniwill_attrs[] = { >>>> /* Keyboard-related */ >>>> &dev_attr_fn_lock_toggle_enable.attr, >>>> @@ -810,6 +884,8 @@ static struct attribute *uniwill_attrs[] = { >>>> /* Lightbar-related */ >>>> &dev_attr_rainbow_animation.attr, >>>> &dev_attr_breathing_in_suspend.attr, >>>> + /* Power-management-related */ >>>> + &dev_attr_ctgp_offset.attr, >>>> NULL >>>> }; >>>> @@ -839,6 +915,11 @@ static umode_t uniwill_attr_is_visible(struct >>>> kobject *kobj, struct attribute *a >>>> return attr->mode; >>>> } >>>> + if (attr == &dev_attr_ctgp_offset.attr) { >>>> + if (uniwill_device_supports(data, >>>> UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) >>>> + return attr->mode; >>>> + } >>>> + >>>> return 0; >>>> } >>>> @@ -1405,6 +1486,10 @@ static int uniwill_probe(struct platform_device >>>> *pdev) >>>> if (ret < 0) >>>> return ret; >>>> + ret = uniwill_nvidia_ctgp_init(data); >>>> + if (ret < 0) >>>> + return ret; >>>> + >>>> return uniwill_input_init(data); >>>> } >>>> @@ -1545,6 +1630,28 @@ struct uniwill_device_descriptor >>>> lapkc71f_descriptor __initdata = { >>>> UNIWILL_FEATURE_HWMON >>>> }; >>>> +static int phxarx1_phxaqf1_probe(struct uniwill_data *data) >>>> +{ >>>> + unsigned int value; >>>> + int ret; >>>> + >>>> + ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value); >>>> + if (ret < 0) >>>> + return ret; >>> >>> Please add an empty line here. >> kk >>> >>>> + if (value & HAS_GPU) >>>> + data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL; >>>> + >>>> + return 0; >>>> +}; >>>> + >>>> +struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor __initdata = { >>>> + .probe = phxarx1_phxaqf1_probe >>>> +}; >>>> + >>>> +struct uniwill_device_descriptor tux_featureset_1_descriptor __initdata = { >>>> + .features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL >>>> +}; >>>> + >>>> struct uniwill_device_descriptor void_descriptor __initdata = {}; >>> >>> I just noticed that all device descriptors are not marked as static. Please >>> fix this. >> >> ack, sorry overlooked that >> >> Quick feedback if I should include the suspend disable anyway and I will wait >> a little bit to give Ilpo a chance to respond, but other than that: non RFC >> of this patchset incoming >> >> Best regards, >> >> Werner >> >>> >>> Other than that, the patch looks very promising. >>> >>> Thanks, >>> Armin Wolf >>> >>>> static const struct dmi_system_id uniwill_dmi_table[] __initconst = { >>>> @@ -1594,7 +1701,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", >>>> @@ -1602,7 +1709,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore >>>> Omnia-Book Pro Gen 7", >>>> @@ -1610,7 +1717,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore >>>> Omnia-Book Pro Gen 8", >>>> @@ -1626,7 +1733,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", >>>> @@ -1634,7 +1741,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", >>>> @@ -1802,7 +1909,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Polaris 15/17 Gen2 Intel", >>>> @@ -1810,7 +1917,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", >>>> @@ -1818,7 +1925,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", >>>> @@ -1826,7 +1933,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", >>>> @@ -1834,7 +1941,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 15 Gen4 Intel", >>>> @@ -1842,7 +1949,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Polaris 15/17 Gen5 AMD", >>>> @@ -1850,7 +1957,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16 Gen5 AMD", >>>> @@ -1858,7 +1965,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", >>>> @@ -1866,7 +1973,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", >>>> @@ -1874,7 +1981,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION >>>> Slim 15 Gen6", >>>> @@ -1882,7 +1989,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", >>>> @@ -1890,7 +1997,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", >>>> @@ -1898,7 +2005,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", >>>> @@ -1906,7 +2013,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16 Gen7 AMD", >>>> @@ -1914,7 +2021,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >>>> @@ -1922,7 +2029,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Stellaris 16 Gen7 Intel", >>>> @@ -1930,7 +2037,7 @@ static const struct dmi_system_id uniwill_dmi_table[] >>>> __initconst = { >>>> DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), >>>> DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), >>>> }, >>>> - .driver_data = &void_descriptor, >>>> + .driver_data = &tux_featureset_1_descriptor, >>>> }, >>>> { >>>> .ident = "TUXEDO Pulse 14 Gen1 AMD", ^ permalink raw reply [flat|nested] 10+ messages in thread
* [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system
@ 2025-12-04 13:40 Werner Sembach
2025-12-04 13:40 ` [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting Werner Sembach
0 siblings, 1 reply; 10+ messages in thread
From: Werner Sembach @ 2025-12-04 13:40 UTC (permalink / raw)
To: W_Armin, hansg, ilpo.jarvinen
Cc: platform-driver-x86, linux-kernel, Werner Sembach
The first patch is based on a PoC by Armin and extended the be able to
modify feature bits based on readouts from the EC Memory.
The 2nd patch is a new feature that requires such a modification.
Changes since RFC: - more flexible uniwill_device_supports
- minor cleanups
- initialization of cTGP before activation
Armin Wolf (1):
platform/x86: uniwill-laptop: Introduce device descriptor system
Werner Sembach (1):
platform/x86/uniwill: Implement cTGP setting
drivers/platform/x86/uniwill/uniwill-acpi.c | 284 ++++++++++++++++++--
1 file changed, 255 insertions(+), 29 deletions(-)
--
2.43.0
^ permalink raw reply [flat|nested] 10+ messages in thread* [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting 2025-12-04 13:40 [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system Werner Sembach @ 2025-12-04 13:40 ` Werner Sembach 0 siblings, 0 replies; 10+ messages in thread From: Werner Sembach @ 2025-12-04 13:40 UTC (permalink / raw) To: W_Armin, hansg, ilpo.jarvinen Cc: platform-driver-x86, linux-kernel, Werner Sembach Uniwill offers user setable cTGP for their EC on devices using NVIDIA 3000 Series and newer GPUs. This patch implements this setting as a sysfs attribute. For one device, the TUXEDO InfinityBook Gen7, the variant with and without NVIDIA GPU can't be differentiated using only the DMI strings, so the new probe callback needs to be used to test a bit from the EC memory. Signed-off-by: Werner Sembach <wse@tuxedocomputers.com> --- drivers/platform/x86/uniwill/uniwill-acpi.c | 160 +++++++++++++++++--- 1 file changed, 135 insertions(+), 25 deletions(-) diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c index 01192c32608e5..f87f6e9d08234 100644 --- a/drivers/platform/x86/uniwill/uniwill-acpi.c +++ b/drivers/platform/x86/uniwill/uniwill-acpi.c @@ -88,6 +88,9 @@ #define EC_ADDR_GPU_TEMP 0x044F +#define EC_ADDR_SYSTEM_ID 0x0456 +#define HAS_GPU BIT(7) + #define EC_ADDR_MAIN_FAN_RPM_1 0x0464 #define EC_ADDR_MAIN_FAN_RPM_2 0x0465 @@ -122,11 +125,11 @@ #define CTGP_DB_DB_ENABLE BIT(1) #define CTGP_DB_CTGP_ENABLE BIT(2) -#define EC_ADDR_CTGP_OFFSET 0x0744 +#define EC_ADDR_CTGP_DB_CTGP_OFFSET 0x0744 -#define EC_ADDR_TPP_OFFSET 0x0745 +#define EC_ADDR_CTGP_DB_TPP_OFFSET 0x0745 -#define EC_ADDR_MAX_TGP 0x0746 +#define EC_ADDR_CTGP_DB_DB_OFFSET 0x0746 #define EC_ADDR_LIGHTBAR_AC_CTRL 0x0748 #define LIGHTBAR_APP_EXISTS BIT(0) @@ -317,6 +320,7 @@ #define UNIWILL_FEATURE_LIGHTBAR BIT(3) #define UNIWILL_FEATURE_BATTERY BIT(4) #define UNIWILL_FEATURE_HWMON BIT(5) +#define UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL BIT(6) struct uniwill_data { struct device *dev; @@ -515,6 +519,10 @@ static bool uniwill_writeable_reg(struct device *dev, unsigned int reg) case EC_ADDR_LIGHTBAR_BAT_RED: case EC_ADDR_LIGHTBAR_BAT_GREEN: case EC_ADDR_LIGHTBAR_BAT_BLUE: + case EC_ADDR_CTGP_DB_CTRL: + case EC_ADDR_CTGP_DB_CTGP_OFFSET: + case EC_ADDR_CTGP_DB_TPP_OFFSET: + case EC_ADDR_CTGP_DB_DB_OFFSET: return true; default: return false; @@ -548,6 +556,10 @@ static bool uniwill_readable_reg(struct device *dev, unsigned int reg) case EC_ADDR_LIGHTBAR_BAT_RED: case EC_ADDR_LIGHTBAR_BAT_GREEN: case EC_ADDR_LIGHTBAR_BAT_BLUE: + case EC_ADDR_CTGP_DB_CTRL: + case EC_ADDR_CTGP_DB_CTGP_OFFSET: + case EC_ADDR_CTGP_DB_TPP_OFFSET: + case EC_ADDR_CTGP_DB_DB_OFFSET: return true; default: return false; @@ -803,6 +815,69 @@ static ssize_t breathing_in_suspend_show(struct device *dev, struct device_attri static DEVICE_ATTR_RW(breathing_in_suspend); +static ssize_t ctgp_offset_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct uniwill_data *data = dev_get_drvdata(dev); + unsigned int value; + int ret; + + ret = kstrtouint(buf, 0, &value); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, value); + if (ret < 0) + return ret; + + return count; +} + +static ssize_t ctgp_offset_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct uniwill_data *data = dev_get_drvdata(dev); + unsigned int value; + int ret; + + ret = regmap_read(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, &value); + if (ret < 0) + return ret; + + return sysfs_emit(buf, "%u\n", value); +} + +static DEVICE_ATTR_RW(ctgp_offset); + +static int uniwill_nvidia_ctgp_init(struct uniwill_data *data) +{ + int ret; + + if (!uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL, + UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) + return 0; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_CTGP_OFFSET, 0); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_TPP_OFFSET, 255); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, EC_ADDR_CTGP_DB_DB_OFFSET, 25); + if (ret < 0) + return ret; + + ret = regmap_update_bits(data->regmap, EC_ADDR_CTGP_DB_CTRL, + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE, + CTGP_DB_GENERAL_ENABLE | CTGP_DB_DB_ENABLE | CTGP_DB_CTGP_ENABLE); + if (ret < 0) + return ret; + + return 0; +} + static struct attribute *uniwill_attrs[] = { /* Keyboard-related */ &dev_attr_fn_lock_toggle_enable.attr, @@ -811,6 +886,8 @@ static struct attribute *uniwill_attrs[] = { /* Lightbar-related */ &dev_attr_rainbow_animation.attr, &dev_attr_breathing_in_suspend.attr, + /* Power-management-related */ + &dev_attr_ctgp_offset.attr, NULL }; @@ -844,6 +921,12 @@ static umode_t uniwill_attr_is_visible(struct kobject *kobj, struct attribute *a return attr->mode; } + if (attr == &dev_attr_ctgp_offset.attr) { + if (uniwill_device_supports(data, UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL, + UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL)) + return attr->mode; + } + return 0; } @@ -1413,6 +1496,10 @@ static int uniwill_probe(struct platform_device *pdev) if (ret < 0) return ret; + ret = uniwill_nvidia_ctgp_init(data); + if (ret < 0) + return ret; + return uniwill_input_init(data); } @@ -1557,6 +1644,29 @@ static struct uniwill_device_descriptor lapkc71f_descriptor __initdata = { UNIWILL_FEATURE_HWMON }; +static int phxarx1_phxaqf1_probe(struct uniwill_data *data) +{ + unsigned int value; + int ret; + + ret = regmap_read(data->regmap, EC_ADDR_SYSTEM_ID, &value); + if (ret < 0) + return ret; + + if (value & HAS_GPU) + data->features |= UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL; + + return 0; +}; + +static struct uniwill_device_descriptor phxarx1_phxaqf1_descriptor __initdata = { + .probe = phxarx1_phxaqf1_probe +}; + +static struct uniwill_device_descriptor tux_featureset_1_descriptor __initdata = { + .features = UNIWILL_FEATURE_NVIDIA_CTGP_CONTROL +}; + static struct uniwill_device_descriptor empty_descriptor __initdata = {}; static const struct dmi_system_id uniwill_dmi_table[] __initconst = { @@ -1606,7 +1716,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxTQx1"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/16 Gen7 Intel", @@ -1614,7 +1724,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PHxARX1_PHxAQF1"), }, - .driver_data = &empty_descriptor, + .driver_data = &phxarx1_phxaqf1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 16 Gen7 Intel/Commodore Omnia-Book Pro Gen 7", @@ -1622,7 +1732,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6AG01_PH6AQ71_PH6AQI1"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/16 Gen8 Intel/Commodore Omnia-Book Pro Gen 8", @@ -1638,7 +1748,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH4PG31"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 16 Gen8 Intel", @@ -1646,7 +1756,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "PH6PG01_PH6PG71"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO InfinityBook Pro 14/15 Gen9 AMD", @@ -1814,7 +1924,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxMGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen2 Intel", @@ -1822,7 +1932,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxNGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 AMD", @@ -1830,7 +1940,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxZGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen3 Intel", @@ -1838,7 +1948,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxTGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris/Polaris 15/17 Gen4 AMD", @@ -1846,7 +1956,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxRGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 15 Gen4 Intel", @@ -1854,7 +1964,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxAGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Polaris 15/17 Gen5 AMD", @@ -1862,7 +1972,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxXGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen5 AMD", @@ -1870,7 +1980,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6XGxX"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16/17 Gen5 Intel/Commodore ORION Gen 5", @@ -1878,7 +1988,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxPXxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris Slim 15 Gen6 AMD", @@ -1886,7 +1996,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GMxHGxx"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris Slim 15 Gen6 Intel/Commodore ORION Slim 15 Gen6", @@ -1894,7 +2004,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM5IXxA"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", @@ -1902,7 +2012,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB1"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen6 Intel/Commodore ORION 16 Gen6", @@ -1910,7 +2020,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM6IXxB_MB2"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 17 Gen6 Intel/Commodore ORION 17 Gen6", @@ -1918,7 +2028,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "GM7IXxN"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 AMD", @@ -1926,7 +2036,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6FR5xxY"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 Intel", @@ -1934,7 +2044,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Stellaris 16 Gen7 Intel", @@ -1942,7 +2052,7 @@ static const struct dmi_system_id uniwill_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "X6AR5xxY_mLED"), }, - .driver_data = &empty_descriptor, + .driver_data = &tux_featureset_1_descriptor, }, { .ident = "TUXEDO Pulse 14 Gen1 AMD", -- 2.43.0 ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-12-04 13:49 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2025-11-25 13:49 [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system Werner Sembach 2025-11-25 13:49 ` [RFC PATCH 1/2] " Werner Sembach 2025-11-25 20:18 ` Armin Wolf 2025-11-26 12:14 ` Werner Sembach 2025-11-25 13:49 ` [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting Werner Sembach 2025-11-25 20:31 ` Armin Wolf 2025-11-26 12:23 ` Werner Sembach 2025-11-26 19:33 ` Armin Wolf 2025-11-26 22:59 ` Werner Sembach 2025-12-04 13:40 [RFC PATCH 0/2] platform/x86: uniwill-laptop: Introduce device descriptor system Werner Sembach 2025-12-04 13:40 ` [RFC PATCH 2/2] platform/x86/uniwill: Implement cTGP setting Werner Sembach
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®