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.0Am 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);
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);
© 2016 - 2025 Red Hat, Inc.