History

Merge tag 'platform-drivers-x86-v5.1-1' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform driver updates from Darren Hart: - use MODULE_DEVICE_TABLE across several wmi drivers, keeping wmi_device_id and MODULE_ALIAS() declarations in sync - add several Ideapad models to the no_hw_rfkill list - add support for new Mellanox platforms, including new fan and LED functionality - address Dell keyboard backlight change event and power button release issues - update dell_rbu to use appropriate memory allocation mechanisms - several small fixes and Ice Lake support for intel_pmc_core - fix a suspend regression for Cherry Trail based devices in intel_int0002_vgpio - a few other routine fixes * tag 'platform-drivers-x86-v5.1-1' of git://git.infradead.org/linux-platform-drivers-x86: (50 commits) MAINTAINERS: Include mlxreg.h in Mellanox Platform Driver files platform/x86: ideapad-laptop: Add S130-14IGM to no_hw_rfkill list platform/x86: mlx-platform: Fix access mode for fan_dir attribute platform/x86: mlx-platform: Add UID LED for the next generation systems platform/x86: mlx-platform: Add extra CPLD for next generation systems platform/x86: wmi-bmof: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: intel-wmi-thunderbolt: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: huawei-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: dell-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: dell-wmi-descriptor: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: dell-smbios-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: wmi: add WMI support to MODULE_DEVICE_TABLE() platform/x86: wmi: move struct wmi_device_id to mod_devicetable.h modpost: file2alias: define size of alias platform/x86: touchscreen_dmi: Add info for the CHUWI Hi10 Air tablet platform/x86: ideapad-laptop: Add Ideapad 530S-14ARR to no_hw_rfkill list platform/x86: ideapad-laptop: Add Yoga C930 to no_hw_rfkill_list platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown platform/x86: intel_pmc_core: Add Package cstates residency info platform/x86: intel_pmc_core: Add ICL platform support ...

Linus Torvalds committed 7 years ago

Commit dbbdf542 parents 45ba8d5 9c22cc027 files · +541 −100Browse files

Unified · Split

27 files
  1. Documentation/ABI/stable/sysfs-driver-mlxreg-io +13 −1
  2. MAINTAINERS +1 −0
  3. drivers/acpi/scan.c +1 −0
  4. drivers/leds/leds-mlxreg.c +19 −0
  5. drivers/platform/mellanox/mlxreg-hotplug.c +25 −3
  6. drivers/platform/x86/asus-wmi.c +2 −7
  7. drivers/platform/x86/dell-smbios-wmi.c +1 −1
  8. drivers/platform/x86/dell-wmi-descriptor.c +1 −1
  9. drivers/platform/x86/dell-wmi.c +5 −2
  10. drivers/platform/x86/dell_rbu.c +14 −36
  11. drivers/platform/x86/huawei-wmi.c +1 −2
  12. drivers/platform/x86/i2c-multi-instantiate.c +9 −0
  13. drivers/platform/x86/ideapad-laptop.c +36 −1
  14. drivers/platform/x86/intel-hid.c +5 −2
  15. drivers/platform/x86/intel-wmi-thunderbolt.c +1 −1
  16. drivers/platform/x86/intel_int0002_vgpio.c +26 −6
  17. drivers/platform/x86/intel_pmc_core.c +132 −27
  18. drivers/platform/x86/intel_pmc_core.h +13 −1
  19. drivers/platform/x86/mlx-platform.c +105 −0
  20. drivers/platform/x86/touchscreen_dmi.c +79 −0
  21. drivers/platform/x86/wmi-bmof.c +1 −1
  22. drivers/platform/x86/wmi.c +4 −1
  23. include/linux/mod_devicetable.h +12 −0
  24. include/linux/platform_data/mlxreg.h +4 −2
  25. include/linux/wmi.h +1 −4
  26. scripts/mod/devicetable-offsets.c +3 −0
  27. scripts/mod/file2alias.c +27 −1
Documentation/ABI/stable/sysfs-driver-mlxreg-io+13−1
@@ -21,7 +21,19 @@ Description: These files show with which CPLD versions have been burned · 20 unmodified lines
2121 The files are read only.
2222
2323 What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
24− cpld3_version
24+ fan_dir
25+
26+Date: December 2018
27+KernelVersion: 5.0
28+Contact: Vadim Pasternak <vadimpmellanox.com>
29+Description: This file shows the system fans direction:
30+ forward direction - relevant bit is set 0;
31+ reversed direction - relevant bit is set 1.
32+
33+ The files are read only.
34+
35+What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
36+ jtag_enable
2537
2638 Date: November 2018
2739 KernelVersion: 5.0
MAINTAINERS+1−0
@@ -9900,6 +9900,7 @@ M: Vadim Pasternak <vadimp@mellanox.com> · 9899 unmodified lines
99009900 L: platform-driver-x86@vger.kernel.org
99019901 S: Supported
99029902 F: drivers/platform/mellanox/
9903+F: include/linux/platform_data/mlxreg.h
99039904
99049905 MELLANOX MLX4 core VPI driver
99059906 M: Tariq Toukan <tariqt@mellanox.com>
drivers/acpi/scan.c+1−0
@@ -1545,6 +1545,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) · 1544 unmodified lines
15451545 */
15461546 static const struct acpi_device_id i2c_multi_instantiate_ids[] = {
15471547 {"BSG1160", },
1548+ {"BSG2150", },
15481549 {"INT33FE", },
15491550 {"INT3515", },
15501551 {}
drivers/leds/leds-mlxreg.c+19−0
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #define MLXREG_LED_AMBER_SOLID 0x09 /* Solid amber */
2323 #define MLXREG_LED_BLINK_3HZ 167 /* ~167 msec off/on - HW support */
2424 #define MLXREG_LED_BLINK_6HZ 83 /* ~83 msec off/on - HW support */
25+#define MLXREG_LED_CAPABILITY_CLEAR GENMASK(31, 8) /* Clear mask */
2526
2627 /**
2728 * struct mlxreg_led_data - led control data:
@@ -187,6 +188,7 @@ static int mlxreg_led_config(struct mlxreg_led_priv_data *priv) · 159 unmodified lines
187188 struct mlxreg_led_data *led_data;
188189 struct led_classdev *led_cdev;
189190 enum led_brightness brightness;
191+ u32 regval;
190192 int i;
191193 int err;
192194
@@ -196,6 +198,23 @@ static int mlxreg_led_config(struct mlxreg_led_priv_data *priv) · 3 unmodified lines
196198 if (!led_data)
197199 return -ENOMEM;
198200
201+ if (data->capability) {
202+ err = regmap_read(led_pdata->regmap, data->capability,
203+ &regval);
204+ if (err) {
205+ dev_err(&priv->pdev->dev, "Failed to query capability register\n");
206+ return err;
207+ }
208+ if (!(regval & data->bit))
209+ continue;
210+ /*
211+ * Field "bit" can contain one capability bit in 0 byte
212+ * and offset bit in 1-3 bytes. Clear capability bit and
213+ * keep only offset bit.
214+ */
215+ data->bit &= MLXREG_LED_CAPABILITY_CLEAR;
216+ }
217+
199218 led_cdev = &led_data->led_cdev;
200219 led_data->data_parent = priv;
201220 if (strstr(data->label, "red") ||
drivers/platform/mellanox/mlxreg-hotplug.c+25−3
@@ -248,7 +248,8 @@ mlxreg_hotplug_work_helper(struct mlxreg_hotplug_priv_data *priv, · 247 unmodified lines
248248 struct mlxreg_core_item *item)
249249 {
250250 struct mlxreg_core_data *data;
251− u32 asserted, regval, bit;
251+ unsigned long asserted;
252+ u32 regval, bit;
252253 int ret;
253254
254255 /*
@@ -281,7 +282,7 @@ mlxreg_hotplug_work_helper(struct mlxreg_hotplug_priv_data *priv, · 26 unmodified lines
281282 asserted = item->cache ^ regval;
282283 item->cache = regval;
283284
284− for_each_set_bit(bit, (unsigned long *)&asserted, 8) {
285+ for_each_set_bit(bit, &asserted, 8) {
285286 data = item->data + bit;
286287 if (regval & BIT(bit)) {
287288 if (item->inversed)
@@ -495,7 +496,9 @@ static int mlxreg_hotplug_set_irq(struct mlxreg_hotplug_priv_data *priv) · 207 unmodified lines
495496 {
496497 struct mlxreg_core_hotplug_platform_data *pdata;
497498 struct mlxreg_core_item *item;
498− int i, ret;
499+ struct mlxreg_core_data *data;
500+ u32 regval;
501+ int i, j, ret;
499502
500503 pdata = dev_get_platdata(&priv->pdev->dev);
501504 item = pdata->items;
@@ -507,6 +510,25 @@ static int mlxreg_hotplug_set_irq(struct mlxreg_hotplug_priv_data *priv) · 5 unmodified lines
507510 if (ret)
508511 goto out;
509512
513+ /*
514+ * Verify if hardware configuration requires to disable
515+ * interrupt capability for some of components.
516+ */
517+ data = item->data;
518+ for (j = 0; j < item->count; j++, data++) {
519+ /* Verify if the attribute has capability register. */
520+ if (data->capability) {
521+ /* Read capability register. */
522+ ret = regmap_read(priv->regmap,
523+ data->capability, &regval);
524+ if (ret)
525+ goto out;
526+
527+ if (!(regval & data->bit))
528+ item->mask &= ~BIT(j);
529+ }
530+ }
531+
510532 /* Set group initial status as mask and unmask group event. */
511533 if (item->inversed) {
512534 item->cache = item->mask;
drivers/platform/x86/asus-wmi.c+2−7
@@ -2265,12 +2265,12 @@ static int asus_wmi_probe(struct platform_device *pdev) · 2264 unmodified lines
22652265 int ret;
22662266
22672267 if (!wmi_has_guid(ASUS_WMI_MGMT_GUID)) {
2268− pr_warn("Management GUID not found\n");
2268+ pr_warn("ASUS Management GUID not found\n");
22692269 return -ENODEV;
22702270 }
22712271
22722272 if (wdrv->event_guid && !wmi_has_guid(wdrv->event_guid)) {
2273− pr_warn("Event GUID not found\n");
2273+ pr_warn("ASUS Event GUID not found\n");
22742274 return -ENODEV;
22752275 }
22762276
@@ -2320,11 +2320,6 @@ EXPORT_SYMBOL_GPL(asus_wmi_unregister_driver); · 43 unmodified lines
23202320
23212321 static int __init asus_wmi_init(void)
23222322 {
2323− if (!wmi_has_guid(ASUS_WMI_MGMT_GUID)) {
2324− pr_info("Asus Management GUID not found\n");
2325− return -ENODEV;
2326− }
2327−
23282323 pr_info("ASUS WMI generic driver loaded\n");
23292324 return 0;
23302325 }
drivers/platform/x86/dell-smbios-wmi.c+1−1
@@ -277,4 +277,4 @@ void exit_dell_smbios_wmi(void) · 276 unmodified lines
277277 wmi_driver_unregister(&dell_smbios_wmi_driver);
278278 }
279279
280−MODULE_ALIAS("wmi:" DELL_WMI_SMBIOS_GUID);
280+MODULE_DEVICE_TABLE(wmi, dell_smbios_wmi_id_table);
drivers/platform/x86/dell-wmi-descriptor.c+1−1
@@ -207,7 +207,7 @@ static struct wmi_driver dell_wmi_descriptor_driver = { · 206 unmodified lines
207207
208208 module_wmi_driver(dell_wmi_descriptor_driver);
209209
210−MODULE_ALIAS("wmi:" DELL_WMI_DESCRIPTOR_GUID);
210+MODULE_DEVICE_TABLE(wmi, dell_wmi_descriptor_id_table);
211211 MODULE_AUTHOR("Mario Limonciello <mario.limonciello@dell.com>");
212212 MODULE_DESCRIPTION("Dell WMI descriptor driver");
213213 MODULE_LICENSE("GPL");
drivers/platform/x86/dell-wmi.c+5−2
@@ -50,8 +50,6 @@ MODULE_LICENSE("GPL"); · 49 unmodified lines
5050
5151 static bool wmi_requires_smbios_request;
5252
53−MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
54−
5553 struct dell_wmi_priv {
5654 struct input_dev *input_dev;
5755 u32 interface_version;
@@ -267,6 +265,9 @@ static const struct key_entry dell_wmi_keymap_type_0010[] = { · 209 unmodified lines
267265 /* Fn-lock switched to multimedia keys */
268266 { KE_IGNORE, 0x1, { KEY_RESERVED } },
269267
268+ /* Keyboard backlight change notification */
269+ { KE_IGNORE, 0x3f, { KEY_RESERVED } },
270+
270271 /* Mic mute */
271272 { KE_KEY, 0x150, { KEY_MICMUTE } },
272273
@@ -738,3 +739,5 @@ static void __exit dell_wmi_exit(void) · 465 unmodified lines
738739 wmi_driver_unregister(&dell_wmi_driver);
739740 }
740741 module_exit(dell_wmi_exit);
742+
743+MODULE_DEVICE_TABLE(wmi, dell_wmi_id_table);
drivers/platform/x86/dell_rbu.c+14−36
@@ -59,7 +59,6 @@ static struct _rbu_data { · 58 unmodified lines
5959 unsigned long image_update_buffer_size;
6060 unsigned long bios_image_size;
6161 int image_update_ordernum;
62− int dma_alloc;
6362 spinlock_t lock;
6463 unsigned long packet_read_count;
6564 unsigned long num_packets;
@@ -89,7 +88,6 @@ static struct packet_data packet_data_head; · 23 unmodified lines
8988
9089 static struct platform_device *rbu_device;
9190 static int context;
92−static dma_addr_t dell_rbu_dmaaddr;
9391
9492 static void init_packet_head(void)
9593 {
@@ -380,12 +378,8 @@ static void img_update_free(void) · 284 unmodified lines
380378 */
381379 memset(rbu_data.image_update_buffer, 0,
382380 rbu_data.image_update_buffer_size);
383− if (rbu_data.dma_alloc == 1)
384− dma_free_coherent(NULL, rbu_data.bios_image_size,
385− rbu_data.image_update_buffer, dell_rbu_dmaaddr);
386− else
387− free_pages((unsigned long) rbu_data.image_update_buffer,
388− rbu_data.image_update_ordernum);
381+ free_pages((unsigned long) rbu_data.image_update_buffer,
382+ rbu_data.image_update_ordernum);
389383
390384 /*
391385 * Re-initialize the rbu_data variables after a free
@@ -394,7 +388,6 @@ static void img_update_free(void) · 2 unmodified lines
394388 rbu_data.image_update_buffer = NULL;
395389 rbu_data.image_update_buffer_size = 0;
396390 rbu_data.bios_image_size = 0;
397− rbu_data.dma_alloc = 0;
398391 }
399392
400393 /*
@@ -410,10 +403,8 @@ static void img_update_free(void) · 9 unmodified lines
410403 static int img_update_realloc(unsigned long size)
411404 {
412405 unsigned char *image_update_buffer = NULL;
413− unsigned long rc;
414406 unsigned long img_buf_phys_addr;
415407 int ordernum;
416− int dma_alloc = 0;
417408
418409 /*
419410 * check if the buffer of sufficient size has been
@@ -444,36 +435,23 @@ static int img_update_realloc(unsigned long size) · 24 unmodified lines
444435
445436 ordernum = get_order(size);
446437 image_update_buffer =
447− (unsigned char *) __get_free_pages(GFP_KERNEL, ordernum);
448−
449− img_buf_phys_addr =
450− (unsigned long) virt_to_phys(image_update_buffer);
451−
452− if (img_buf_phys_addr > BIOS_SCAN_LIMIT) {
453− free_pages((unsigned long) image_update_buffer, ordernum);
454− ordernum = -1;
455− image_update_buffer = dma_alloc_coherent(NULL, size,
456− &dell_rbu_dmaaddr, GFP_KERNEL);
457− dma_alloc = 1;
458− }
459−
438+ (unsigned char *)__get_free_pages(GFP_DMA32, ordernum);
460439 spin_lock(&rbu_data.lock);
461−
462− if (image_update_buffer != NULL) {
463− rbu_data.image_update_buffer = image_update_buffer;
464− rbu_data.image_update_buffer_size = size;
465− rbu_data.bios_image_size =
466− rbu_data.image_update_buffer_size;
467− rbu_data.image_update_ordernum = ordernum;
468− rbu_data.dma_alloc = dma_alloc;
469− rc = 0;
470− } else {
440+ if (!image_update_buffer) {
471441 pr_debug("Not enough memory for image update:"
472442 "size = %ld\n", size);
473− rc = -ENOMEM;
443+ return -ENOMEM;
474444 }
475445
476− return rc;
446+ img_buf_phys_addr = (unsigned long)virt_to_phys(image_update_buffer);
447+ if (WARN_ON_ONCE(img_buf_phys_addr > BIOS_SCAN_LIMIT))
448+ return -EINVAL; /* can't happen per definition */
449+
450+ rbu_data.image_update_buffer = image_update_buffer;
451+ rbu_data.image_update_buffer_size = size;
452+ rbu_data.bios_image_size = rbu_data.image_update_buffer_size;
453+ rbu_data.image_update_ordernum = ordernum;
454+ return 0;
477455 }
478456
479457 static ssize_t read_packet_data(char *buffer, loff_t pos, size_t count)
drivers/platform/x86/huawei-wmi.c+1−2
@@ -201,8 +201,7 @@ static struct wmi_driver huawei_wmi_driver = { · 200 unmodified lines
201201
202202 module_wmi_driver(huawei_wmi_driver);
203203
204−MODULE_ALIAS("wmi:"WMI0_EVENT_GUID);
205−MODULE_ALIAS("wmi:"AMW0_EVENT_GUID);
204+MODULE_DEVICE_TABLE(wmi, huawei_wmi_id_table);
206205 MODULE_AUTHOR("Ayman Bagabas <ayman.bagabas@gmail.com>");
207206 MODULE_DESCRIPTION("Huawei WMI hotkeys");
208207 MODULE_LICENSE("GPL v2");
drivers/platform/x86/i2c-multi-instantiate.c+9−0
@@ -159,6 +159,14 @@ static const struct i2c_inst_data bsg1160_data[] = { · 158 unmodified lines
159159 {}
160160 };
161161
162+static const struct i2c_inst_data bsg2150_data[] = {
163+ { "bmc150_accel", IRQ_RESOURCE_GPIO, 0 },
164+ { "bmc150_magn" },
165+ /* The resources describe a 3th client, but it is not really there. */
166+ { "bsg2150_dummy_dev" },
167+ {}
168+};
169+
162170 static const struct i2c_inst_data int3515_data[] = {
163171 { "tps6598x", IRQ_RESOURCE_APIC, 0 },
164172 { "tps6598x", IRQ_RESOURCE_APIC, 1 },
@@ -173,6 +181,7 @@ static const struct i2c_inst_data int3515_data[] = { · 8 unmodified lines
173181 */
174182 static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = {
175183 { "BSG1160", (unsigned long)bsg1160_data },
184+ { "BSG2150", (unsigned long)bsg2150_data },
176185 { "INT3515", (unsigned long)int3515_data },
177186 { }
178187 };
drivers/platform/x86/ideapad-laptop.c+36−1
@@ -989,7 +989,7 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { · 988 unmodified lines
989989 .ident = "Lenovo RESCUER R720-15IKBN",
990990 .matches = {
991991 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
992− DMI_MATCH(DMI_BOARD_NAME, "80WW"),
992+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo R720-15IKBN"),
993993 },
994994 },
995995 {
@@ -1090,6 +1090,27 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { · 94 unmodified lines
10901090 DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ISK"),
10911091 },
10921092 },
1093+ {
1094+ .ident = "Lenovo ideapad 330-15ICH",
1095+ .matches = {
1096+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
1097+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 330-15ICH"),
1098+ },
1099+ },
1100+ {
1101+ .ident = "Lenovo ideapad 530S-14ARR",
1102+ .matches = {
1103+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
1104+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 530S-14ARR"),
1105+ },
1106+ },
1107+ {
1108+ .ident = "Lenovo ideapad S130-14IGM",
1109+ .matches = {
1110+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
1111+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad S130-14IGM"),
1112+ },
1113+ },
10931114 {
10941115 .ident = "Lenovo ideapad Y700-14ISK",
10951116 .matches = {
@@ -1153,6 +1174,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { · 57 unmodified lines
11531174 DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Legion Y530-15ICH"),
11541175 },
11551176 },
1177+ {
1178+ .ident = "Lenovo Legion Y530-15ICH-1060",
1179+ .matches = {
1180+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
1181+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Legion Y530-15ICH-1060"),
1182+ },
1183+ },
11561184 {
11571185 .ident = "Lenovo Legion Y720-15IKB",
11581186 .matches = {
@@ -1244,6 +1272,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { · 85 unmodified lines
12441272 DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 920-13IKB"),
12451273 },
12461274 },
1275+ {
1276+ .ident = "Lenovo YOGA C930-13IKB",
1277+ .matches = {
1278+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
1279+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA C930-13IKB"),
1280+ },
1281+ },
12471282 {
12481283 .ident = "Lenovo Zhaoyang E42-80",
12491284 .matches = {
drivers/platform/x86/intel-hid.c+5−2
@@ -363,7 +363,7 @@ wakeup: · 362 unmodified lines
363363 * the 5-button array, but still send notifies with power button
364364 * event code to this device object on power button actions.
365365 *
366− * Report the power button press; catch and ignore the button release.
366+ * Report the power button press and release.
367367 */
368368 if (!priv->array) {
369369 if (event == 0xce) {
@@ -372,8 +372,11 @@ wakeup: · 2 unmodified lines
372372 return;
373373 }
374374
375− if (event == 0xcf)
375+ if (event == 0xcf) {
376+ input_report_key(priv->input_dev, KEY_POWER, 0);
377+ input_sync(priv->input_dev);
376378 return;
379+ }
377380 }
378381
379382 /* 0xC0 is for HID events, other values are for 5 button array */
drivers/platform/x86/intel-wmi-thunderbolt.c+1−1
@@ -88,7 +88,7 @@ static struct wmi_driver intel_wmi_thunderbolt_driver = { · 87 unmodified lines
8888
8989 module_wmi_driver(intel_wmi_thunderbolt_driver);
9090
91−MODULE_ALIAS("wmi:" INTEL_WMI_THUNDERBOLT_GUID);
91+MODULE_DEVICE_TABLE(wmi, intel_wmi_thunderbolt_id_table);
9292 MODULE_AUTHOR("Mario Limonciello <mario.limonciello@dell.com>");
9393 MODULE_DESCRIPTION("Intel WMI Thunderbolt force power driver");
9494 MODULE_LICENSE("GPL v2");
drivers/platform/x86/intel_int0002_vgpio.c+26−6
@@ -51,11 +51,14 @@ · 50 unmodified lines
5151 #define GPE0A_STS_PORT 0x420
5252 #define GPE0A_EN_PORT 0x428
5353
54−#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
54+#define BAYTRAIL 0x01
55+#define CHERRYTRAIL 0x02
56+
57+#define ICPU(model, data) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, data }
5558
5659 static const struct x86_cpu_id int0002_cpu_ids[] = {
57− ICPU(INTEL_FAM6_ATOM_SILVERMONT), /* Valleyview, Bay Trail */
58− ICPU(INTEL_FAM6_ATOM_AIRMONT), /* Braswell, Cherry Trail */
60+ ICPU(INTEL_FAM6_ATOM_SILVERMONT, BAYTRAIL), /* Valleyview, Bay Trail */
61+ ICPU(INTEL_FAM6_ATOM_AIRMONT, CHERRYTRAIL), /* Braswell, Cherry Trail */
5962 {}
6063 };
6164
@@ -135,7 +138,7 @@ static irqreturn_t int0002_irq(int irq, void *data) · 73 unmodified lines
135138 return IRQ_HANDLED;
136139 }
137140
138−static struct irq_chip int0002_irqchip = {
141+static struct irq_chip int0002_byt_irqchip = {
139142 .name = DRV_NAME,
140143 .irq_ack = int0002_irq_ack,
141144 .irq_mask = int0002_irq_mask,
@@ -143,10 +146,22 @@ static struct irq_chip int0002_irqchip = { · 1 unmodified line
143146 .irq_set_wake = int0002_irq_set_wake,
144147 };
145148
149+static struct irq_chip int0002_cht_irqchip = {
150+ .name = DRV_NAME,
151+ .irq_ack = int0002_irq_ack,
152+ .irq_mask = int0002_irq_mask,
153+ .irq_unmask = int0002_irq_unmask,
154+ /*
155+ * No set_wake, on CHT the IRQ is typically shared with the ACPI SCI
156+ * and we don't want to mess with the ACPI SCI irq settings.
157+ */
158+};
159+
146160 static int int0002_probe(struct platform_device *pdev)
147161 {
148162 struct device *dev = &pdev->dev;
149163 const struct x86_cpu_id *cpu_id;
164+ struct irq_chip *irq_chip;
150165 struct gpio_chip *chip;
151166 int irq, ret;
152167
@@ -195,14 +210,19 @@ static int int0002_probe(struct platform_device *pdev) · 42 unmodified lines
195210 return ret;
196211 }
197212
198− ret = gpiochip_irqchip_add(chip, &int0002_irqchip, 0, handle_edge_irq,
213+ if (cpu_id->driver_data == BAYTRAIL)
214+ irq_chip = &int0002_byt_irqchip;
215+ else
216+ irq_chip = &int0002_cht_irqchip;
217+
218+ ret = gpiochip_irqchip_add(chip, irq_chip, 0, handle_edge_irq,
199219 IRQ_TYPE_NONE);
200220 if (ret) {
201221 dev_err(dev, "Error adding irqchip: %d\n", ret);
202222 return ret;
203223 }
204224
205− gpiochip_set_chained_irqchip(chip, &int0002_irqchip, irq, NULL);
225+ gpiochip_set_chained_irqchip(chip, irq_chip, irq, NULL);
206226
207227 return 0;
208228 }
drivers/platform/x86/intel_pmc_core.c+132−27
@@ -15,6 +15,7 @@ · 14 unmodified lines
1515 #include <linux/bitfield.h>
1616 #include <linux/debugfs.h>
1717 #include <linux/delay.h>
18+#include <linux/dmi.h>
1819 #include <linux/io.h>
1920 #include <linux/module.h>
2021 #include <linux/pci.h>
@@ -22,14 +23,24 @@ · 1 unmodified line
2223
2324 #include <asm/cpu_device_id.h>
2425 #include <asm/intel-family.h>
26+#include <asm/msr.h>
2527
2628 #include "intel_pmc_core.h"
2729
28−#define ICPU(model, data) \
29− { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (kernel_ulong_t)data }
30−
3130 static struct pmc_dev pmc;
3231
32+/* PKGC MSRs are common across Intel Core SoCs */
33+static const struct pmc_bit_map msr_map[] = {
34+ {"Package C2", MSR_PKG_C2_RESIDENCY},
35+ {"Package C3", MSR_PKG_C3_RESIDENCY},
36+ {"Package C6", MSR_PKG_C6_RESIDENCY},
37+ {"Package C7", MSR_PKG_C7_RESIDENCY},
38+ {"Package C8", MSR_PKG_C8_RESIDENCY},
39+ {"Package C9", MSR_PKG_C9_RESIDENCY},
40+ {"Package C10", MSR_PKG_C10_RESIDENCY},
41+ {}
42+};
43+
3344 static const struct pmc_bit_map spt_pll_map[] = {
3445 {"MIPI PLL", SPT_PMC_BIT_MPHY_CMN_LANE0},
3546 {"GEN2 USB2PCIE2 PLL", SPT_PMC_BIT_MPHY_CMN_LANE1},
@@ -108,6 +119,7 @@ static const struct pmc_bit_map spt_ltr_show_map[] = { · 72 unmodified lines
108119 {"SATA", SPT_PMC_LTR_SATA},
109120 {"GIGABIT_ETHERNET", SPT_PMC_LTR_GBE},
110121 {"XHCI", SPT_PMC_LTR_XHCI},
122+ {"Reserved", SPT_PMC_LTR_RESERVED},
111123 {"ME", SPT_PMC_LTR_ME},
112124 /* EVA is Enterprise Value Add, doesn't really exist on PCH */
113125 {"EVA", SPT_PMC_LTR_EVA},
@@ -131,6 +143,7 @@ static const struct pmc_reg_map spt_reg_map = { · 17 unmodified lines
131143 .mphy_sts = spt_mphy_map,
132144 .pll_sts = spt_pll_map,
133145 .ltr_show_sts = spt_ltr_show_map,
146+ .msr_sts = msr_map,
134147 .slp_s0_offset = SPT_PMC_SLP_S0_RES_COUNTER_OFFSET,
135148 .ltr_ignore_offset = SPT_PMC_LTR_IGNORE_OFFSET,
136149 .regmap_length = SPT_PMC_MMIO_REG_LEN,
@@ -139,6 +152,7 @@ static const struct pmc_reg_map spt_reg_map = { · 2 unmodified lines
139152 .pm_cfg_offset = SPT_PMC_PM_CFG_OFFSET,
140153 .pm_read_disable_bit = SPT_PMC_READ_DISABLE_BIT,
141154 .ltr_ignore_max = SPT_NUM_IP_IGN_ALLOWED,
155+ .pm_vric1_offset = SPT_PMC_VRIC1_OFFSET,
142156 };
143157
144158 /* Cannonlake: PGD PFET Enable Ack Status Register(s) bitmap */
@@ -168,25 +182,26 @@ static const struct pmc_bit_map cnp_pfear_map[] = { · 23 unmodified lines
168182 {"SDX", BIT(4)},
169183 {"SPE", BIT(5)},
170184 {"Fuse", BIT(6)},
171− {"Res_23", BIT(7)},
185+ /* Reserved for Cannonlake but valid for Icelake */
186+ {"SBR8", BIT(7)},
172187
173188 {"CSME_FSC", BIT(0)},
174189 {"USB3_OTG", BIT(1)},
175190 {"EXI", BIT(2)},
176191 {"CSE", BIT(3)},
177− {"csme_kvm", BIT(4)},
178− {"csme_pmt", BIT(5)},
179− {"csme_clink", BIT(6)},
180− {"csme_ptio", BIT(7)},
181−
182− {"csme_usbr", BIT(0)},
183− {"csme_susram", BIT(1)},
184− {"csme_smt1", BIT(2)},
192+ {"CSME_KVM", BIT(4)},
193+ {"CSME_PMT", BIT(5)},
194+ {"CSME_CLINK", BIT(6)},
195+ {"CSME_PTIO", BIT(7)},
196+
197+ {"CSME_USBR", BIT(0)},
198+ {"CSME_SUSRAM", BIT(1)},
199+ {"CSME_SMT1", BIT(2)},
185200 {"CSME_SMT4", BIT(3)},
186− {"csme_sms2", BIT(4)},
187− {"csme_sms1", BIT(5)},
188− {"csme_rtc", BIT(6)},
189− {"csme_psf", BIT(7)},
201+ {"CSME_SMS2", BIT(4)},
202+ {"CSME_SMS1", BIT(5)},
203+ {"CSME_RTC", BIT(6)},
204+ {"CSME_PSF", BIT(7)},
190205
191206 {"SBR0", BIT(0)},
192207 {"SBR1", BIT(1)},
@@ -203,7 +218,7 @@ static const struct pmc_bit_map cnp_pfear_map[] = { · 10 unmodified lines
203218 {"CNVI", BIT(3)},
204219 {"UFS0", BIT(4)},
205220 {"EMMC", BIT(5)},
206− {"Res_6", BIT(6)},
221+ {"SPF", BIT(6)},
207222 {"SBR6", BIT(7)},
208223
209224 {"SBR7", BIT(0)},
@@ -211,6 +226,20 @@ static const struct pmc_bit_map cnp_pfear_map[] = { · 1 unmodified line
211226 {"HDA_PGD4", BIT(2)},
212227 {"HDA_PGD5", BIT(3)},
213228 {"HDA_PGD6", BIT(4)},
229+ /* Reserved for Cannonlake but valid for Icelake */
230+ {"PSF6", BIT(5)},
231+ {"PSF7", BIT(6)},
232+ {"PSF8", BIT(7)},
233+
234+ /* Icelake generation onwards only */
235+ {"RES_65", BIT(0)},
236+ {"RES_66", BIT(1)},
237+ {"RES_67", BIT(2)},
238+ {"TAM", BIT(3)},
239+ {"GBETSN", BIT(4)},
240+ {"TBTLSX", BIT(5)},
241+ {"RES_71", BIT(6)},
242+ {"RES_72", BIT(7)},
214243 {}
215244 };
216245
@@ -276,6 +305,7 @@ static const struct pmc_bit_map cnp_ltr_show_map[] = { · 59 unmodified lines
276305 {"SATA", CNP_PMC_LTR_SATA},
277306 {"GIGABIT_ETHERNET", CNP_PMC_LTR_GBE},
278307 {"XHCI", CNP_PMC_LTR_XHCI},
308+ {"Reserved", CNP_PMC_LTR_RESERVED},
279309 {"ME", CNP_PMC_LTR_ME},
280310 /* EVA is Enterprise Value Add, doesn't really exist on PCH */
281311 {"EVA", CNP_PMC_LTR_EVA},
@@ -291,6 +321,8 @@ static const struct pmc_bit_map cnp_ltr_show_map[] = { · 9 unmodified lines
291321 {"ISH", CNP_PMC_LTR_ISH},
292322 {"UFSX2", CNP_PMC_LTR_UFSX2},
293323 {"EMMC", CNP_PMC_LTR_EMMC},
324+ /* Reserved for Cannonlake but valid for Icelake */
325+ {"WIGIG", ICL_PMC_LTR_WIGIG},
294326 /* Below two cannot be used for LTR_IGNORE */
295327 {"CURRENT_PLATFORM", CNP_PMC_LTR_CUR_PLT},
296328 {"AGGREGATED_SYSTEM", CNP_PMC_LTR_CUR_ASLT},
@@ -302,6 +334,7 @@ static const struct pmc_reg_map cnp_reg_map = { · 5 unmodified lines
302334 .slp_s0_offset = CNP_PMC_SLP_S0_RES_COUNTER_OFFSET,
303335 .slps0_dbg_maps = cnp_slps0_dbg_maps,
304336 .ltr_show_sts = cnp_ltr_show_map,
337+ .msr_sts = msr_map,
305338 .slps0_dbg_offset = CNP_PMC_SLPS0_DBG_OFFSET,
306339 .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET,
307340 .regmap_length = CNP_PMC_MMIO_REG_LEN,
@@ -312,6 +345,22 @@ static const struct pmc_reg_map cnp_reg_map = { · 4 unmodified lines
312345 .ltr_ignore_max = CNP_NUM_IP_IGN_ALLOWED,
313346 };
314347
348+static const struct pmc_reg_map icl_reg_map = {
349+ .pfear_sts = cnp_pfear_map,
350+ .slp_s0_offset = CNP_PMC_SLP_S0_RES_COUNTER_OFFSET,
351+ .slps0_dbg_maps = cnp_slps0_dbg_maps,
352+ .ltr_show_sts = cnp_ltr_show_map,
353+ .msr_sts = msr_map,
354+ .slps0_dbg_offset = CNP_PMC_SLPS0_DBG_OFFSET,
355+ .ltr_ignore_offset = CNP_PMC_LTR_IGNORE_OFFSET,
356+ .regmap_length = CNP_PMC_MMIO_REG_LEN,
357+ .ppfear0_offset = CNP_PMC_HOST_PPFEAR0A,
358+ .ppfear_buckets = ICL_PPFEAR_NUM_ENTRIES,
359+ .pm_cfg_offset = CNP_PMC_PM_CFG_OFFSET,
360+ .pm_read_disable_bit = CNP_PMC_READ_DISABLE_BIT,
361+ .ltr_ignore_max = ICL_NUM_IP_IGN_ALLOWED,
362+};
363+
315364 static inline u8 pmc_core_reg_read_byte(struct pmc_dev *pmcdev, int offset)
316365 {
317366 return readb(pmcdev->regbase + offset);
@@ -328,9 +377,9 @@ static inline void pmc_core_reg_write(struct pmc_dev *pmcdev, int · 10 unmodified lines
328377 writel(val, pmcdev->regbase + reg_offset);
329378 }
330379
331−static inline u32 pmc_core_adjust_slp_s0_step(u32 value)
380+static inline u64 pmc_core_adjust_slp_s0_step(u32 value)
332381 {
333− return value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
382+ return (u64)value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
334383 }
335384
336385 static int pmc_core_dev_state_get(void *data, u64 *val)
@@ -380,7 +429,8 @@ static int pmc_core_ppfear_show(struct seq_file *s, void *unused) · 43 unmodified lines
380429 index < PPFEAR_MAX_NUM_ENTRIES; index++, iter++)
381430 pf_regs[index] = pmc_core_reg_read_byte(pmcdev, iter);
382431
383− for (index = 0; map[index].name; index++)
432+ for (index = 0; map[index].name &&
433+ index < pmcdev->map->ppfear_buckets * 8; index++)
384434 pmc_core_display_map(s, index, pf_regs[index / 8], map);
385435
386436 return 0;
@@ -677,6 +727,25 @@ static int pmc_core_ltr_show(struct seq_file *s, void *unused) · 290 unmodified lines
677727 }
678728 DEFINE_SHOW_ATTRIBUTE(pmc_core_ltr);
679729
730+static int pmc_core_pkgc_show(struct seq_file *s, void *unused)
731+{
732+ struct pmc_dev *pmcdev = s->private;
733+ const struct pmc_bit_map *map = pmcdev->map->msr_sts;
734+ u64 pcstate_count;
735+ int index;
736+
737+ for (index = 0; map[index].name ; index++) {
738+ if (rdmsrl_safe(map[index].bit_mask, &pcstate_count))
739+ continue;
740+
741+ seq_printf(s, "%-8s : 0x%llx\n", map[index].name,
742+ pcstate_count);
743+ }
744+
745+ return 0;
746+}
747+DEFINE_SHOW_ATTRIBUTE(pmc_core_pkgc);
748+
680749 static void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
681750 {
682751 debugfs_remove_recursive(pmcdev->dbgfs_dir);
@@ -701,7 +770,10 @@ static int pmc_core_dbgfs_register(struct pmc_dev *pmcdev) · 18 unmodified lines
701770 debugfs_create_file("ltr_ignore", 0644, dir, pmcdev,
702771 &pmc_core_ltr_ignore_ops);
703772
704− debugfs_create_file("ltr_show", 0644, dir, pmcdev, &pmc_core_ltr_fops);
773+ debugfs_create_file("ltr_show", 0444, dir, pmcdev, &pmc_core_ltr_fops);
774+
775+ debugfs_create_file("package_cstate_show", 0444, dir, pmcdev,
776+ &pmc_core_pkgc_fops);
705777
706778 if (pmcdev->map->pll_sts)
707779 debugfs_create_file("pll_status", 0444, dir, pmcdev,
@@ -735,11 +807,12 @@ static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev) · 27 unmodified lines
735807 #endif /* CONFIG_DEBUG_FS */
736808
737809 static const struct x86_cpu_id intel_pmc_core_ids[] = {
738− ICPU(INTEL_FAM6_SKYLAKE_MOBILE, &spt_reg_map),
739− ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, &spt_reg_map),
740− ICPU(INTEL_FAM6_KABYLAKE_MOBILE, &spt_reg_map),
741− ICPU(INTEL_FAM6_KABYLAKE_DESKTOP, &spt_reg_map),
742− ICPU(INTEL_FAM6_CANNONLAKE_MOBILE, &cnp_reg_map),
810+ INTEL_CPU_FAM6(SKYLAKE_MOBILE, spt_reg_map),
811+ INTEL_CPU_FAM6(SKYLAKE_DESKTOP, spt_reg_map),
812+ INTEL_CPU_FAM6(KABYLAKE_MOBILE, spt_reg_map),
813+ INTEL_CPU_FAM6(KABYLAKE_DESKTOP, spt_reg_map),
814+ INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map),
815+ INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map),
743816 {}
744817 };
745818
@@ -750,6 +823,37 @@ static const struct pci_device_id pmc_pci_ids[] = { · 4 unmodified lines
750823 { 0, },
751824 };
752825
826+/*
827+ * This quirk can be used on those platforms where
828+ * the platform BIOS enforces 24Mhx Crystal to shutdown
829+ * before PMC can assert SLP_S0#.
830+ */
831+int quirk_xtal_ignore(const struct dmi_system_id *id)
832+{
833+ struct pmc_dev *pmcdev = &pmc;
834+ u32 value;
835+
836+ value = pmc_core_reg_read(pmcdev, pmcdev->map->pm_vric1_offset);
837+ /* 24MHz Crystal Shutdown Qualification Disable */
838+ value |= SPT_PMC_VRIC1_XTALSDQDIS;
839+ /* Low Voltage Mode Enable */
840+ value &= ~SPT_PMC_VRIC1_SLPS0LVEN;
841+ pmc_core_reg_write(pmcdev, pmcdev->map->pm_vric1_offset, value);
842+ return 0;
843+}
844+
845+static const struct dmi_system_id pmc_core_dmi_table[] = {
846+ {
847+ .callback = quirk_xtal_ignore,
848+ .ident = "HP Elite x2 1013 G3",
849+ .matches = {
850+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
851+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Elite x2 1013 G3"),
852+ },
853+ },
854+ {}
855+};
856+
753857 static int __init pmc_core_probe(void)
754858 {
755859 struct pmc_dev *pmcdev = &pmc;
@@ -768,7 +872,7 @@ static int __init pmc_core_probe(void) · 12 unmodified lines
768872 * Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap
769873 * in this case.
770874 */
771− if (!pci_dev_present(pmc_pci_ids))
875+ if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids))
772876 pmcdev->map = &cnp_reg_map;
773877
774878 if (lpit_read_residency_count_address(&slp_s0_addr))
@@ -791,6 +895,7 @@ static int __init pmc_core_probe(void) · 16 unmodified lines
791895 return err;
792896 }
793897
898+ dmi_check_system(pmc_core_dmi_table);
794899 pr_info(" initialized\n");
795900 return 0;
796901 }
drivers/platform/x86/intel_pmc_core.h+13−1
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #define SPT_PMC_MTPMC_OFFSET 0x20
2626 #define SPT_PMC_MFPMC_OFFSET 0x38
2727 #define SPT_PMC_LTR_IGNORE_OFFSET 0x30C
28+#define SPT_PMC_VRIC1_OFFSET 0x31c
2829 #define SPT_PMC_MPHY_CORE_STS_0 0x1143
2930 #define SPT_PMC_MPHY_CORE_STS_1 0x1142
3031 #define SPT_PMC_MPHY_COM_STS_0 0x1155
@@ -32,7 +33,7 @@ · 1 unmodified line
3233 #define SPT_PMC_SLP_S0_RES_COUNTER_STEP 0x64
3334 #define PMC_BASE_ADDR_MASK ~(SPT_PMC_MMIO_REG_LEN - 1)
3435 #define MTPMC_MASK 0xffff0000
35−#define PPFEAR_MAX_NUM_ENTRIES 5
36+#define PPFEAR_MAX_NUM_ENTRIES 12
3637 #define SPT_PPFEAR_NUM_ENTRIES 5
3738 #define SPT_PMC_READ_DISABLE_BIT 0x16
3839 #define SPT_PMC_MSG_FULL_STS_BIT 0x18
@@ -46,6 +47,7 @@ · 7 unmodified lines
4647 #define SPT_PMC_LTR_SATA 0x368
4748 #define SPT_PMC_LTR_GBE 0x36C
4849 #define SPT_PMC_LTR_XHCI 0x370
50+#define SPT_PMC_LTR_RESERVED 0x374
4951 #define SPT_PMC_LTR_ME 0x378
5052 #define SPT_PMC_LTR_EVA 0x37C
5153 #define SPT_PMC_LTR_SPC 0x380
@@ -135,6 +137,9 @@ enum ppfear_regs { · 83 unmodified lines
135137 #define SPT_PMC_BIT_MPHY_CMN_LANE2 BIT(2)
136138 #define SPT_PMC_BIT_MPHY_CMN_LANE3 BIT(3)
137139
140+#define SPT_PMC_VRIC1_SLPS0LVEN BIT(13)
141+#define SPT_PMC_VRIC1_XTALSDQDIS BIT(22)
142+
138143 /* Cannonlake Power Management Controller register offsets */
139144 #define CNP_PMC_SLPS0_DBG_OFFSET 0x10B4
140145 #define CNP_PMC_PM_CFG_OFFSET 0x1818
@@ -156,6 +161,7 @@ enum ppfear_regs { · 15 unmodified lines
156161 #define CNP_PMC_LTR_SATA 0x1B68
157162 #define CNP_PMC_LTR_GBE 0x1B6C
158163 #define CNP_PMC_LTR_XHCI 0x1B70
164+#define CNP_PMC_LTR_RESERVED 0x1B74
159165 #define CNP_PMC_LTR_ME 0x1B78
160166 #define CNP_PMC_LTR_EVA 0x1B7C
161167 #define CNP_PMC_LTR_SPC 0x1B80
@@ -176,6 +182,10 @@ enum ppfear_regs { · 14 unmodified lines
176182 #define LTR_REQ_SNOOP BIT(15)
177183 #define LTR_REQ_NONSNOOP BIT(31)
178184
185+#define ICL_PPFEAR_NUM_ENTRIES 9
186+#define ICL_NUM_IP_IGN_ALLOWED 20
187+#define ICL_PMC_LTR_WIGIG 0x1BFC
188+
179189 struct pmc_bit_map {
180190 const char *name;
181191 u32 bit_mask;
@@ -208,6 +218,7 @@ struct pmc_reg_map { · 26 unmodified lines
208218 const struct pmc_bit_map *pll_sts;
209219 const struct pmc_bit_map **slps0_dbg_maps;
210220 const struct pmc_bit_map *ltr_show_sts;
221+ const struct pmc_bit_map *msr_sts;
211222 const u32 slp_s0_offset;
212223 const u32 ltr_ignore_offset;
213224 const int regmap_length;
@@ -217,6 +228,7 @@ struct pmc_reg_map { · 3 unmodified lines
217228 const int pm_read_disable_bit;
218229 const u32 slps0_dbg_offset;
219230 const u32 ltr_ignore_max;
231+ const u32 pm_vric1_offset;
220232 };
221233
222234 /**
drivers/platform/x86/mlx-platform.c+105−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #define MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET 0x00
2626 #define MLXPLAT_CPLD_LPC_REG_CPLD2_VER_OFFSET 0x01
2727 #define MLXPLAT_CPLD_LPC_REG_CPLD3_VER_OFFSET 0x02
28+#define MLXPLAT_CPLD_LPC_REG_CPLD4_VER_OFFSET 0x03
2829 #define MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET 0x1d
2930 #define MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET 0x1e
3031 #define MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET 0x1f
@@ -33,6 +34,7 @@ · 2 unmodified lines
3334 #define MLXPLAT_CPLD_LPC_REG_LED3_OFFSET 0x22
3435 #define MLXPLAT_CPLD_LPC_REG_LED4_OFFSET 0x23
3536 #define MLXPLAT_CPLD_LPC_REG_LED5_OFFSET 0x24
37+#define MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION 0x2a
3638 #define MLXPLAT_CPLD_LPC_REG_GP1_OFFSET 0x30
3739 #define MLXPLAT_CPLD_LPC_REG_WP1_OFFSET 0x31
3840 #define MLXPLAT_CPLD_LPC_REG_GP2_OFFSET 0x32
@@ -67,6 +69,9 @@ · 28 unmodified lines
6769 #define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xee
6870 #define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xef
6971 #define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xf0
72+#define MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET 0xf5
73+#define MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET 0xf6
74+#define MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET 0xf7
7075 #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100
7176 #define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb
7277 #define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
@@ -584,36 +589,48 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_fan_items_data[] = { · 511 unmodified lines
584589 .label = "fan1",
585590 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
586591 .mask = BIT(0),
592+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
593+ .bit = BIT(0),
587594 .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
588595 },
589596 {
590597 .label = "fan2",
591598 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
592599 .mask = BIT(1),
600+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
601+ .bit = BIT(1),
593602 .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
594603 },
595604 {
596605 .label = "fan3",
597606 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
598607 .mask = BIT(2),
608+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
609+ .bit = BIT(2),
599610 .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
600611 },
601612 {
602613 .label = "fan4",
603614 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
604615 .mask = BIT(3),
616+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
617+ .bit = BIT(3),
605618 .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
606619 },
607620 {
608621 .label = "fan5",
609622 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
610623 .mask = BIT(4),
624+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
625+ .bit = BIT(4),
611626 .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
612627 },
613628 {
614629 .label = "fan6",
615630 .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET,
616631 .mask = BIT(5),
632+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
633+ .bit = BIT(5),
617634 .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
618635 },
619636 };
@@ -816,61 +833,90 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_led_data[] = { · 196 unmodified lines
816833 .label = "fan1:green",
817834 .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET,
818835 .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
836+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
837+ .bit = BIT(0),
819838 },
820839 {
821840 .label = "fan1:orange",
822841 .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET,
823842 .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
843+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
844+ .bit = BIT(0),
824845 },
825846 {
826847 .label = "fan2:green",
827848 .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET,
828849 .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK,
850+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
851+ .bit = BIT(1),
829852 },
830853 {
831854 .label = "fan2:orange",
832855 .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET,
833856 .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK,
857+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
858+ .bit = BIT(1),
834859 },
835860 {
836861 .label = "fan3:green",
837862 .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET,
838863 .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
864+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
865+ .bit = BIT(2),
839866 },
840867 {
841868 .label = "fan3:orange",
842869 .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET,
843870 .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
871+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
872+ .bit = BIT(2),
844873 },
845874 {
846875 .label = "fan4:green",
847876 .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET,
848877 .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK,
878+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
879+ .bit = BIT(3),
849880 },
850881 {
851882 .label = "fan4:orange",
852883 .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET,
853884 .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK,
885+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
886+ .bit = BIT(3),
854887 },
855888 {
856889 .label = "fan5:green",
857890 .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET,
858891 .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
892+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
893+ .bit = BIT(4),
859894 },
860895 {
861896 .label = "fan5:orange",
862897 .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET,
863898 .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
899+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
900+ .bit = BIT(4),
864901 },
865902 {
866903 .label = "fan6:green",
867904 .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET,
868905 .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK,
906+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
907+ .bit = BIT(5),
869908 },
870909 {
871910 .label = "fan6:orange",
872911 .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET,
873912 .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK,
913+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET,
914+ .bit = BIT(5),
915+ },
916+ {
917+ .label = "uid:blue",
918+ .reg = MLXPLAT_CPLD_LPC_REG_LED5_OFFSET,
919+ .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK,
874920 },
875921 };
876922
@@ -1099,6 +1145,12 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_regs_io_data[] = { · 222 unmodified lines
10991145 .bit = GENMASK(7, 0),
11001146 .mode = 0444,
11011147 },
1148+ {
1149+ .label = "cpld4_version",
1150+ .reg = MLXPLAT_CPLD_LPC_REG_CPLD4_VER_OFFSET,
1151+ .bit = GENMASK(7, 0),
1152+ .mode = 0444,
1153+ },
11021154 {
11031155 .label = "reset_long_pb",
11041156 .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET,
@@ -1184,6 +1236,12 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_regs_io_data[] = { · 79 unmodified lines
11841236 .bit = 1,
11851237 .mode = 0444,
11861238 },
1239+ {
1240+ .label = "fan_dir",
1241+ .reg = MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION,
1242+ .bit = GENMASK(7, 0),
1243+ .mode = 0444,
1244+ },
11871245 };
11881246
11891247 static struct mlxreg_core_platform_data mlxplat_default_ng_regs_io_data = {
@@ -1201,61 +1259,85 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_fan_data[] = { · 11 unmodified lines
12011259 .label = "tacho1",
12021260 .reg = MLXPLAT_CPLD_LPC_REG_TACHO1_OFFSET,
12031261 .mask = GENMASK(7, 0),
1262+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1263+ .bit = BIT(0),
12041264 },
12051265 {
12061266 .label = "tacho2",
12071267 .reg = MLXPLAT_CPLD_LPC_REG_TACHO2_OFFSET,
12081268 .mask = GENMASK(7, 0),
1269+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1270+ .bit = BIT(1),
12091271 },
12101272 {
12111273 .label = "tacho3",
12121274 .reg = MLXPLAT_CPLD_LPC_REG_TACHO3_OFFSET,
12131275 .mask = GENMASK(7, 0),
1276+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1277+ .bit = BIT(2),
12141278 },
12151279 {
12161280 .label = "tacho4",
12171281 .reg = MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET,
12181282 .mask = GENMASK(7, 0),
1283+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1284+ .bit = BIT(3),
12191285 },
12201286 {
12211287 .label = "tacho5",
12221288 .reg = MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET,
12231289 .mask = GENMASK(7, 0),
1290+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1291+ .bit = BIT(4),
12241292 },
12251293 {
12261294 .label = "tacho6",
12271295 .reg = MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET,
12281296 .mask = GENMASK(7, 0),
1297+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1298+ .bit = BIT(5),
12291299 },
12301300 {
12311301 .label = "tacho7",
12321302 .reg = MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET,
12331303 .mask = GENMASK(7, 0),
1304+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1305+ .bit = BIT(6),
12341306 },
12351307 {
12361308 .label = "tacho8",
12371309 .reg = MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET,
12381310 .mask = GENMASK(7, 0),
1311+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET,
1312+ .bit = BIT(7),
12391313 },
12401314 {
12411315 .label = "tacho9",
12421316 .reg = MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET,
12431317 .mask = GENMASK(7, 0),
1318+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET,
1319+ .bit = BIT(0),
12441320 },
12451321 {
12461322 .label = "tacho10",
12471323 .reg = MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET,
12481324 .mask = GENMASK(7, 0),
1325+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET,
1326+ .bit = BIT(1),
12491327 },
12501328 {
12511329 .label = "tacho11",
12521330 .reg = MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET,
12531331 .mask = GENMASK(7, 0),
1332+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET,
1333+ .bit = BIT(2),
12541334 },
12551335 {
12561336 .label = "tacho12",
12571337 .reg = MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET,
12581338 .mask = GENMASK(7, 0),
1339+ .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET,
1340+ .bit = BIT(3),
12591341 },
12601342 };
12611343
@@ -1299,6 +1381,7 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) · 37 unmodified lines
12991381 case MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET:
13001382 case MLXPLAT_CPLD_LPC_REG_CPLD2_VER_OFFSET:
13011383 case MLXPLAT_CPLD_LPC_REG_CPLD3_VER_OFFSET:
1384+ case MLXPLAT_CPLD_LPC_REG_CPLD4_VER_OFFSET:
13021385 case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET:
13031386 case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET:
13041387 case MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET:
@@ -1307,6 +1390,7 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) · 2 unmodified lines
13071390 case MLXPLAT_CPLD_LPC_REG_LED3_OFFSET:
13081391 case MLXPLAT_CPLD_LPC_REG_LED4_OFFSET:
13091392 case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET:
1393+ case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION:
13101394 case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET:
13111395 case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET:
13121396 case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET:
@@ -1341,6 +1425,9 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) · 28 unmodified lines
13411425 case MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET:
13421426 case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET:
13431427 case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET:
1428+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET:
1429+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET:
1430+ case MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET:
13441431 return true;
13451432 }
13461433 return false;
@@ -1352,6 +1439,7 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) · 5 unmodified lines
13521439 case MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET:
13531440 case MLXPLAT_CPLD_LPC_REG_CPLD2_VER_OFFSET:
13541441 case MLXPLAT_CPLD_LPC_REG_CPLD3_VER_OFFSET:
1442+ case MLXPLAT_CPLD_LPC_REG_CPLD4_VER_OFFSET:
13551443 case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET:
13561444 case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET:
13571445 case MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET:
@@ -1360,6 +1448,7 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) · 2 unmodified lines
13601448 case MLXPLAT_CPLD_LPC_REG_LED3_OFFSET:
13611449 case MLXPLAT_CPLD_LPC_REG_LED4_OFFSET:
13621450 case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET:
1451+ case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION:
13631452 case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET:
13641453 case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET:
13651454 case MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET:
@@ -1392,6 +1481,9 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) · 26 unmodified lines
13921481 case MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET:
13931482 case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET:
13941483 case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET:
1484+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET:
1485+ case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET:
1486+ case MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET:
13951487 return true;
13961488 }
13971489 return false;
@@ -1613,6 +1705,13 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { · 215 unmodified lines
16131705 DMI_MATCH(DMI_PRODUCT_NAME, "MSN34"),
16141706 },
16151707 },
1708+ {
1709+ .callback = mlxplat_dmi_qmb7xx_matched,
1710+ .matches = {
1711+ DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),
1712+ DMI_MATCH(DMI_PRODUCT_NAME, "MSN38"),
1713+ },
1714+ },
16161715 {
16171716 .callback = mlxplat_dmi_default_matched,
16181717 .matches = {
@@ -1643,6 +1742,12 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { · 24 unmodified lines
16431742 DMI_MATCH(DMI_BOARD_NAME, "VMOD0005"),
16441743 },
16451744 },
1745+ {
1746+ .callback = mlxplat_dmi_qmb7xx_matched,
1747+ .matches = {
1748+ DMI_MATCH(DMI_BOARD_NAME, "VMOD0007"),
1749+ },
1750+ },
16461751 { }
16471752 };
16481753
drivers/platform/x86/touchscreen_dmi.c+79−0
@@ -41,6 +41,20 @@ static const struct ts_dmi_data chuwi_hi8_data = { · 40 unmodified lines
4141 .properties = chuwi_hi8_props,
4242 };
4343
44+static const struct property_entry chuwi_hi8_air_props[] = {
45+ PROPERTY_ENTRY_U32("touchscreen-size-x", 1728),
46+ PROPERTY_ENTRY_U32("touchscreen-size-y", 1148),
47+ PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
48+ PROPERTY_ENTRY_STRING("firmware-name", "gsl3676-chuwi-hi8-air.fw"),
49+ PROPERTY_ENTRY_U32("silead,max-fingers", 10),
50+ { }
51+};
52+
53+static const struct ts_dmi_data chuwi_hi8_air_data = {
54+ .acpi_name = "MSSL1680:00",
55+ .properties = chuwi_hi8_air_props,
56+};
57+
4458 static const struct property_entry chuwi_hi8_pro_props[] = {
4559 PROPERTY_ENTRY_U32("touchscreen-min-x", 6),
4660 PROPERTY_ENTRY_U32("touchscreen-min-y", 3),
@@ -58,6 +72,25 @@ static const struct ts_dmi_data chuwi_hi8_pro_data = { · 11 unmodified lines
5872 .properties = chuwi_hi8_pro_props,
5973 };
6074
75+static const struct property_entry chuwi_hi10_air_props[] = {
76+ PROPERTY_ENTRY_U32("touchscreen-size-x", 1981),
77+ PROPERTY_ENTRY_U32("touchscreen-size-y", 1271),
78+ PROPERTY_ENTRY_U32("touchscreen-min-x", 99),
79+ PROPERTY_ENTRY_U32("touchscreen-min-y", 9),
80+ PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"),
81+ PROPERTY_ENTRY_U32("touchscreen-fuzz-x", 5),
82+ PROPERTY_ENTRY_U32("touchscreen-fuzz-y", 4),
83+ PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-chuwi-hi10-air.fw"),
84+ PROPERTY_ENTRY_U32("silead,max-fingers", 10),
85+ PROPERTY_ENTRY_BOOL("silead,home-button"),
86+ { }
87+};
88+
89+static const struct ts_dmi_data chuwi_hi10_air_data = {
90+ .acpi_name = "MSSL1680:00",
91+ .properties = chuwi_hi10_air_props,
92+};
93+
6194 static const struct property_entry chuwi_vi8_props[] = {
6295 PROPERTY_ENTRY_U32("touchscreen-min-x", 4),
6396 PROPERTY_ENTRY_U32("touchscreen-min-y", 6),
@@ -369,6 +402,24 @@ static const struct ts_dmi_data pov_mobii_wintab_p800w_v21_data = { · 305 unmodified lines
369402 .properties = pov_mobii_wintab_p800w_v21_props,
370403 };
371404
405+static const struct property_entry pov_mobii_wintab_p1006w_v10_props[] = {
406+ PROPERTY_ENTRY_U32("touchscreen-min-x", 1),
407+ PROPERTY_ENTRY_U32("touchscreen-min-y", 3),
408+ PROPERTY_ENTRY_U32("touchscreen-size-x", 1984),
409+ PROPERTY_ENTRY_U32("touchscreen-size-y", 1520),
410+ PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
411+ PROPERTY_ENTRY_STRING("firmware-name",
412+ "gsl3692-pov-mobii-wintab-p1006w-v10.fw"),
413+ PROPERTY_ENTRY_U32("silead,max-fingers", 10),
414+ PROPERTY_ENTRY_BOOL("silead,home-button"),
415+ { }
416+};
417+
418+static const struct ts_dmi_data pov_mobii_wintab_p1006w_v10_data = {
419+ .acpi_name = "MSSL1680:00",
420+ .properties = pov_mobii_wintab_p1006w_v10_props,
421+};
422+
372423 static const struct property_entry teclast_x3_plus_props[] = {
373424 PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
374425 PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
@@ -497,6 +548,15 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { · 122 unmodified lines
497548 DMI_MATCH(DMI_BIOS_VERSION, "H1D_S806_206"),
498549 },
499550 },
551+ {
552+ /* Chuwi Hi8 Air (CWI543) */
553+ .driver_data = (void *)&chuwi_hi8_air_data,
554+ .matches = {
555+ DMI_MATCH(DMI_BOARD_VENDOR, "Default string"),
556+ DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
557+ DMI_MATCH(DMI_PRODUCT_NAME, "Hi8 Air"),
558+ },
559+ },
500560 {
501561 /* Chuwi Hi8 Pro (CWI513) */
502562 .driver_data = (void *)&chuwi_hi8_pro_data,
@@ -505,6 +565,14 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { · 2 unmodified lines
505565 DMI_MATCH(DMI_PRODUCT_NAME, "X1D3_C806N"),
506566 },
507567 },
568+ {
569+ /* Chuwi Hi10 Air */
570+ .driver_data = (void *)&chuwi_hi10_air_data,
571+ .matches = {
572+ DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"),
573+ DMI_MATCH(DMI_PRODUCT_SKU, "P1W6_C109D_B"),
574+ },
575+ },
508576 {
509577 /* Chuwi Vi8 (CWI506) */
510578 .driver_data = (void *)&chuwi_vi8_data,
@@ -706,6 +774,17 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { · 195 unmodified lines
706774 DMI_MATCH(DMI_BIOS_DATE, "08/22/2014"),
707775 },
708776 },
777+ {
778+ /* Point of View mobii wintab p1006w (v1.0) */
779+ .driver_data = (void *)&pov_mobii_wintab_p1006w_v10_data,
780+ .matches = {
781+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Insyde"),
782+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "BayTrail"),
783+ /* Note 105b is Foxcon's USB/PCI vendor id */
784+ DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "105B"),
785+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"),
786+ },
787+ },
709788 {
710789 /* Teclast X3 Plus */
711790 .driver_data = (void *)&teclast_x3_plus_data,
drivers/platform/x86/wmi-bmof.c+1−1
@@ -119,7 +119,7 @@ static struct wmi_driver wmi_bmof_driver = { · 118 unmodified lines
119119
120120 module_wmi_driver(wmi_bmof_driver);
121121
122−MODULE_ALIAS("wmi:" WMI_BMOF_GUID);
122+MODULE_DEVICE_TABLE(wmi, wmi_bmof_id_table);
123123 MODULE_AUTHOR("Andrew Lutomirski <luto@kernel.org>");
124124 MODULE_DESCRIPTION("WMI embedded Binary MOF driver");
125125 MODULE_LICENSE("GPL");
drivers/platform/x86/wmi.c+4−1
@@ -768,7 +768,10 @@ static int wmi_dev_match(struct device *dev, struct device_driver *driver) · 767 unmodified lines
768768 struct wmi_block *wblock = dev_to_wblock(dev);
769769 const struct wmi_device_id *id = wmi_driver->id_table;
770770
771− while (id->guid_string) {
771+ if (id == NULL)
772+ return 0;
773+
774+ while (*id->guid_string) {
772775 uuid_le driver_guid;
773776
774777 if (WARN_ON(uuid_le_to_bin(id->guid_string, &driver_guid)))
include/linux/mod_devicetable.h+12−0
@@ -788,4 +788,16 @@ struct tee_client_device_id { · 787 unmodified lines
788788 uuid_t uuid;
789789 };
790790
791+/* WMI */
792+
793+#define WMI_MODULE_PREFIX "wmi:"
794+
795+/**
796+ * struct wmi_device_id - WMI device identifier
797+ * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
798+ */
799+struct wmi_device_id {
800+ const char guid_string[UUID_STRING_LEN+1];
801+};
802+
791803 #endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/platform_data/mlxreg.h+4−2
@@ -61,6 +61,7 @@ struct mlxreg_hotplug_device { · 60 unmodified lines
6161 * @reg: attribute register;
6262 * @mask: attribute access mask;
6363 * @bit: attribute effective bit;
64+ * @capability: attribute capability register;
6465 * @mode: access mode;
6566 * @np - pointer to node platform associated with attribute;
6667 * @hpdev - hotplug device data;
@@ -72,6 +73,7 @@ struct mlxreg_core_data { · 5 unmodified lines
7273 u32 reg;
7374 u32 mask;
7475 u32 bit;
76+ u32 capability;
7577 umode_t mode;
7678 struct device_node *np;
7779 struct mlxreg_hotplug_device hpdev;
@@ -107,9 +109,9 @@ struct mlxreg_core_item { · 29 unmodified lines
107109 /**
108110 * struct mlxreg_core_platform_data - platform data:
109111 *
110− * @led_data: led private data;
112+ * @data: instance private data;
111113 * @regmap: register map of parent device;
112− * @counter: number of led instances;
114+ * @counter: number of instances;
113115 */
114116 struct mlxreg_core_platform_data {
115117 struct mlxreg_core_data *data;
include/linux/wmi.h+1−4
@@ -18,6 +18,7 @@ · 17 unmodified lines
1818
1919 #include <linux/device.h>
2020 #include <linux/acpi.h>
21+#include <linux/mod_devicetable.h>
2122 #include <uapi/linux/wmi.h>
2223
2324 struct wmi_device {
@@ -39,10 +40,6 @@ extern union acpi_object *wmidev_block_query(struct wmi_device *wdev, · 15 unmodified lines
3940
4041 extern int set_required_buffer_size(struct wmi_device *wdev, u64 length);
4142
42−struct wmi_device_id {
43− const char *guid_string;
44−};
45−
4643 struct wmi_driver {
4744 struct device_driver driver;
4845 const struct wmi_device_id *id_table;
scripts/mod/devicetable-offsets.c+3−0
@@ -228,5 +228,8 @@ int main(void) · 227 unmodified lines
228228 DEVID(tee_client_device_id);
229229 DEVID_FIELD(tee_client_device_id, uuid);
230230
231+ DEVID(wmi_device_id);
232+ DEVID_FIELD(wmi_device_id, guid_string);
233+
231234 return 0;
232235 }
scripts/mod/file2alias.c+27−1
@@ -40,6 +40,7 @@ typedef struct { · 39 unmodified lines
4040 typedef struct {
4141 __u8 b[16];
4242 } uuid_t;
43+#define UUID_STRING_LEN 36
4344
4445 /* Big exception to the "don't include kernel headers into userspace, which
4546 * even potentially has different endianness and word sizes, since
@@ -53,6 +54,9 @@ struct devtable { · 7 unmodified lines
5354 int (*do_entry)(const char *filename, void *symval, char *alias);
5455 };
5556
57+/* Size of alias provided to do_entry functions */
58+#define ALIAS_SIZE 500
59+
5660 /* Define a variable f that holds the value of field f of struct devid
5761 * based at address m.
5862 */
@@ -1305,6 +1309,27 @@ static int do_tee_entry(const char *filename, void *symval, char *alias) · 1246 unmodified lines
13051309 return 1;
13061310 }
13071311
1312+/* Looks like: wmi:guid */
1313+static int do_wmi_entry(const char *filename, void *symval, char *alias)
1314+{
1315+ int len;
1316+ DEF_FIELD_ADDR(symval, wmi_device_id, guid_string);
1317+
1318+ if (strlen(*guid_string) != UUID_STRING_LEN) {
1319+ warn("Invalid WMI device id 'wmi:%s' in '%s'\n",
1320+ *guid_string, filename);
1321+ return 0;
1322+ }
1323+
1324+ len = snprintf(alias, ALIAS_SIZE, WMI_MODULE_PREFIX "%s", *guid_string);
1325+ if (len < 0 || len >= ALIAS_SIZE) {
1326+ warn("Could not generate all MODULE_ALIAS's in '%s'\n",
1327+ filename);
1328+ return 0;
1329+ }
1330+ return 1;
1331+}
1332+
13081333 /* Does namelen bytes of name exactly match the symbol? */
13091334 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
13101335 {
@@ -1321,7 +1346,7 @@ static void do_table(void *symval, unsigned long size, · 10 unmodified lines
13211346 struct module *mod)
13221347 {
13231348 unsigned int i;
1324− char alias[500];
1349+ char alias[ALIAS_SIZE];
13251350
13261351 device_id_check(mod->name, device_id, size, id_size, symval);
13271352 /* Leave last one: it's the terminator. */
@@ -1376,6 +1401,7 @@ static const struct devtable devtable[] = { · 48 unmodified lines
13761401 {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},
13771402 {"typec", SIZE_typec_device_id, do_typec_entry},
13781403 {"tee", SIZE_tee_client_device_id, do_tee_entry},
1404+ {"wmi", SIZE_wmi_device_id, do_wmi_entry},
13791405 };
13801406
13811407 /* Create MODULE_ALIAS() statements.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t