Skip to content

Commit 6ba3bb3

Browse files
torvaldstorvalds
committed
Merge tag 'platform-drivers-x86-v6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fixes from Ilpo Järvinen: "This one has lots of new HW entries which adds to the size in diffstat but the individual changes are simple. Fixes - acer-wmi: Ignore backlight event - alienware-wmi-wmax: Fix quirk match table order & drop redundant entries - amd/pmc: - Add Xbox Ally to spurious 8042 quirk list - Quirk list Lenovo Legion Go 2 NVMe resume - msi-wmi-platform: - Correct GUID to uppercase - GUID is uncleverly copy-pasted from an example so add a DMI whitelist - intel/speed_select_if: PCIBIOS_* return code conversion - intel-uncore-freq & ISST: Fix kernel doc warnings New HW support - alienware-wmi-wmax: - Alienware 16 Aurora support - Alienware M support - Alienware X support - Dell G support - amd/pmc: - ROG Xbox Ally (non-X) support - huaway-wmi: HONOR MagicBoox X16/X14 PrintScreen & YOYO keys - hp-wmi: - Omen 16-wf1xxx fan support - Omen MAX 16-ah0xx fan + thermal profile support - Victus 16-r0 and 16-s0 fan + thermal profile support - intel/hid: Intel Nova Lake support - intel-uncore-freq: - Intel Panther Lake support - Intel Wildcat Lake support - Intel Nova Lake support" * tag 'platform-drivers-x86-v6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (21 commits) platform/x86: intel-uncore-freq: fix all header kernel-doc warnings platform/x86: acer-wmi: Ignore backlight event platform/x86/intel/speed_select_if: Convert PCIBIOS_* return codes to errnos platform/x86/intel/hid: Add Nova Lake support platform/x86: alienware-wmi-wmax: Add AWCC support to Alienware 16 Aurora platform/x86: hp-wmi: Add Omen MAX 16-ah0xx fan support and thermal profile platform/x86: msi-wmi-platform: Fix typo in WMI GUID platform/x86: msi-wmi-platform: Only load on MSI devices platform/x86/amd: pmc: Add Lenovo Legion Go 2 to pmc quirk list platform/x86/amd/pmc: Add spurious_8042 to Xbox Ally platform/x86/amd/pmc: Add support for Van Gogh SoC platform/x86: alienware-wmi-wmax: Add support for the whole "G" family platform/x86: alienware-wmi-wmax: Add support for the whole "X" family platform/x86: alienware-wmi-wmax: Add support for the whole "M" family platform/x86: alienware-wmi-wmax: Drop redundant DMI entries platform/x86: alienware-wmi-wmax: Fix "Alienware m16 R1 AMD" quirk order platform/x86: ISST: isst_if.h: fix all kernel-doc warnings platform/x86: intel-uncore-freq: Add additional client processors platform/x86: hp-wmi: Add Omen 16-wf1xxx fan support platform/x86: huawei-wmi: add keys for HONOR models ...
2 parents 8e621c9 + db30233 commit 6ba3bb3

File tree

15 files changed

+148
-114
lines changed

15 files changed

+148
-114
lines changed

‎Documentation/wmi/driver-development-guide.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ to matching WMI devices using a struct wmi_device_id table:
5454
::
5555

5656
static const struct wmi_device_id foo_id_table[] = {
57+
/* Only use uppercase letters! */
5758
{ "936DA01F-9ABD-4D9D-80C7-02AF85C822A8", NULL },
5859
{ }
5960
};

‎drivers/platform/x86/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ config MSI_WMI
545545
config MSI_WMI_PLATFORM
546546
tristate "MSI WMI Platform features"
547547
depends on ACPI_WMI
548+
depends on DMI
548549
depends on HWMON
549550
help
550551
Say Y here if you want to have support for WMI-based platform features

‎drivers/platform/x86/acer-wmi.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026");
102102

103103
enum acer_wmi_event_ids {
104104
WMID_HOTKEY_EVENT = 0x1,
105+
WMID_BACKLIGHT_EVENT = 0x4,
105106
WMID_ACCEL_OR_KBD_DOCK_EVENT = 0x5,
106107
WMID_GAMING_TURBO_KEY_EVENT = 0x7,
107108
WMID_AC_EVENT = 0x8,
@@ -2369,6 +2370,9 @@ static void acer_wmi_notify(union acpi_object *obj, void *context)
23692370
sparse_keymap_report_event(acer_wmi_input_dev, scancode, 1, true);
23702371
}
23712372
break;
2373+
case WMID_BACKLIGHT_EVENT:
2374+
/* Already handled by acpi-video */
2375+
break;
23722376
case WMID_ACCEL_OR_KBD_DOCK_EVENT:
23732377
acer_gsensor_event();
23742378
acer_kbd_dock_event(&return_value);

‎drivers/platform/x86/amd/pmc/pmc-quirks.c‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,14 @@ static const struct dmi_system_id fwbug_list[] = {
122122
DMI_MATCH(DMI_PRODUCT_NAME, "21A1"),
123123
}
124124
},
125+
{
126+
.ident = "ROG Xbox Ally RC73YA",
127+
.driver_data = &quirk_spurious_8042,
128+
.matches = {
129+
DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
130+
DMI_MATCH(DMI_BOARD_NAME, "RC73YA"),
131+
}
132+
},
125133
/* https://bugzilla.kernel.org/show_bug.cgi?id=218024 */
126134
{
127135
.ident = "V14 G4 AMN",
@@ -204,6 +212,23 @@ static const struct dmi_system_id fwbug_list[] = {
204212
DMI_MATCH(DMI_PRODUCT_NAME, "82ND"),
205213
}
206214
},
215+
/* https://gitlab.freedesktop.org/drm/amd/-/issues/4618 */
216+
{
217+
.ident = "Lenovo Legion Go 2",
218+
.driver_data = &quirk_s2idle_bug,
219+
.matches = {
220+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
221+
DMI_MATCH(DMI_PRODUCT_NAME, "83N0"),
222+
}
223+
},
224+
{
225+
.ident = "Lenovo Legion Go 2",
226+
.driver_data = &quirk_s2idle_bug,
227+
.matches = {
228+
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
229+
DMI_MATCH(DMI_PRODUCT_NAME, "83N1"),
230+
}
231+
},
207232
/* https://gitlab.freedesktop.org/drm/amd/-/issues/2684 */
208233
{
209234
.ident = "HP Laptop 15s-eq2xxx",

‎drivers/platform/x86/amd/pmc/pmc.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ static void amd_pmc_get_ip_info(struct amd_pmc_dev *dev)
106106
switch (dev->cpu_id) {
107107
case AMD_CPU_ID_PCO:
108108
case AMD_CPU_ID_RN:
109+
case AMD_CPU_ID_VG:
109110
case AMD_CPU_ID_YC:
110111
case AMD_CPU_ID_CB:
111112
dev->num_ips = 12;
@@ -517,6 +518,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
517518
case AMD_CPU_ID_PCO:
518519
return MSG_OS_HINT_PCO;
519520
case AMD_CPU_ID_RN:
521+
case AMD_CPU_ID_VG:
520522
case AMD_CPU_ID_YC:
521523
case AMD_CPU_ID_CB:
522524
case AMD_CPU_ID_PS:
@@ -717,6 +719,7 @@ static const struct pci_device_id pmc_pci_ids[] = {
717719
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },
718720
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SP) },
719721
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SHP) },
722+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_VG) },
720723
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },
721724
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) },
722725
{ }

‎drivers/platform/x86/amd/pmc/pmc.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ void amd_mp2_stb_deinit(struct amd_pmc_dev *dev);
156156
#define AMD_CPU_ID_RN 0x1630
157157
#define AMD_CPU_ID_PCO AMD_CPU_ID_RV
158158
#define AMD_CPU_ID_CZN AMD_CPU_ID_RN
159+
#define AMD_CPU_ID_VG 0x1645
159160
#define AMD_CPU_ID_YC 0x14B5
160161
#define AMD_CPU_ID_CB 0x14D8
161162
#define AMD_CPU_ID_PS 0x14E8

‎drivers/platform/x86/dell/alienware-wmi-wmax.c‎

Lines changed: 25 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -90,34 +90,34 @@ static struct awcc_quirks empty_quirks;
9090

9191
static const struct dmi_system_id awcc_dmi_table[] __initconst = {
9292
{
93-
.ident = "Alienware Area-51m",
93+
.ident = "Alienware 16 Aurora",
9494
.matches = {
9595
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
96-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware Area-51m"),
96+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware 16 Aurora"),
9797
},
98-
.driver_data = &generic_quirks,
98+
.driver_data = &g_series_quirks,
9999
},
100100
{
101-
.ident = "Alienware Area-51m R2",
101+
.ident = "Alienware Area-51m",
102102
.matches = {
103103
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
104-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware Area-51m R2"),
104+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware Area-51m"),
105105
},
106106
.driver_data = &generic_quirks,
107107
},
108108
{
109-
.ident = "Alienware m15 R5",
109+
.ident = "Alienware m15",
110110
.matches = {
111111
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
112-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m15 R5"),
112+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m15"),
113113
},
114114
.driver_data = &generic_quirks,
115115
},
116116
{
117-
.ident = "Alienware m15 R7",
117+
.ident = "Alienware m16 R1 AMD",
118118
.matches = {
119119
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
120-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m15 R7"),
120+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R1 AMD"),
121121
},
122122
.driver_data = &generic_quirks,
123123
},
@@ -129,14 +129,6 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = {
129129
},
130130
.driver_data = &g_series_quirks,
131131
},
132-
{
133-
.ident = "Alienware m16 R1 AMD",
134-
.matches = {
135-
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
136-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m16 R1 AMD"),
137-
},
138-
.driver_data = &generic_quirks,
139-
},
140132
{
141133
.ident = "Alienware m16 R2",
142134
.matches = {
@@ -146,114 +138,66 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = {
146138
.driver_data = &generic_quirks,
147139
},
148140
{
149-
.ident = "Alienware m17 R5",
141+
.ident = "Alienware m17",
150142
.matches = {
151143
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
152-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"),
144+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17"),
153145
},
154146
.driver_data = &generic_quirks,
155147
},
156148
{
157-
.ident = "Alienware m18 R2",
149+
.ident = "Alienware m18",
158150
.matches = {
159151
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
160-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m18 R2"),
152+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m18"),
161153
},
162154
.driver_data = &generic_quirks,
163155
},
164156
{
165-
.ident = "Alienware x15 R1",
157+
.ident = "Alienware x15",
166158
.matches = {
167159
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
168-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15 R1"),
160+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15"),
169161
},
170162
.driver_data = &generic_quirks,
171163
},
172164
{
173-
.ident = "Alienware x15 R2",
165+
.ident = "Alienware x17",
174166
.matches = {
175167
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
176-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15 R2"),
168+
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x17"),
177169
},
178170
.driver_data = &generic_quirks,
179171
},
180172
{
181-
.ident = "Alienware x17 R2",
182-
.matches = {
183-
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
184-
DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x17 R2"),
185-
},
186-
.driver_data = &generic_quirks,
187-
},
188-
{
189-
.ident = "Dell Inc. G15 5510",
190-
.matches = {
191-
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
192-
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5510"),
193-
},
194-
.driver_data = &g_series_quirks,
195-
},
196-
{
197-
.ident = "Dell Inc. G15 5511",
198-
.matches = {
199-
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
200-
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5511"),
201-
},
202-
.driver_data = &g_series_quirks,
203-
},
204-
{
205-
.ident = "Dell Inc. G15 5515",
206-
.matches = {
207-
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
208-
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5515"),
209-
},
210-
.driver_data = &g_series_quirks,
211-
},
212-
{
213-
.ident = "Dell Inc. G15 5530",
214-
.matches = {
215-
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
216-
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5530"),
217-
},
218-
.driver_data = &g_series_quirks,
219-
},
220-
{
221-
.ident = "Dell Inc. G16 7630",
222-
.matches = {
223-
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
224-
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G16 7630"),
225-
},
226-
.driver_data = &g_series_quirks,
227-
},
228-
{
229-
.ident = "Dell Inc. G3 3500",
173+
.ident = "Dell Inc. G15",
230174
.matches = {
231175
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
232-
DMI_MATCH(DMI_PRODUCT_NAME, "G3 3500"),
176+
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15"),
233177
},
234178
.driver_data = &g_series_quirks,
235179
},
236180
{
237-
.ident = "Dell Inc. G3 3590",
181+
.ident = "Dell Inc. G16",
238182
.matches = {
239183
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
240-
DMI_MATCH(DMI_PRODUCT_NAME, "G3 3590"),
184+
DMI_MATCH(DMI_PRODUCT_NAME, "Dell G16"),
241185
},
242186
.driver_data = &g_series_quirks,
243187
},
244188
{
245-
.ident = "Dell Inc. G5 5500",
189+
.ident = "Dell Inc. G3",
246190
.matches = {
247191
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
248-
DMI_MATCH(DMI_PRODUCT_NAME, "G5 5500"),
192+
DMI_MATCH(DMI_PRODUCT_NAME, "G3"),
249193
},
250194
.driver_data = &g_series_quirks,
251195
},
252196
{
253-
.ident = "Dell Inc. G5 5505",
197+
.ident = "Dell Inc. G5",
254198
.matches = {
255199
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
256-
DMI_MATCH(DMI_PRODUCT_NAME, "G5 5505"),
200+
DMI_MATCH(DMI_PRODUCT_NAME, "G5"),
257201
},
258202
.driver_data = &g_series_quirks,
259203
},

‎drivers/platform/x86/hp/hp-wmi.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ static const char * const victus_thermal_profile_boards[] = {
9292
"8A25"
9393
};
9494

95-
/* DMI Board names of Victus 16-r1000 and Victus 16-s1000 laptops */
95+
/* DMI Board names of Victus 16-r and Victus 16-s laptops */
9696
static const char * const victus_s_thermal_profile_boards[] = {
97-
"8C99", "8C9C"
97+
"8BBE", "8BD4", "8BD5",
98+
"8C78", "8C99", "8C9C",
99+
"8D41",
98100
};
99101

100102
enum hp_wmi_radio {

‎drivers/platform/x86/huawei-wmi.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ static const struct key_entry huawei_wmi_keymap[] = {
8181
{ KE_KEY, 0x289, { KEY_WLAN } },
8282
// Huawei |M| key
8383
{ KE_KEY, 0x28a, { KEY_CONFIG } },
84+
// HONOR YOYO key
85+
{ KE_KEY, 0x28b, { KEY_NOTIFICATION_CENTER } },
86+
// HONOR print screen
87+
{ KE_KEY, 0x28e, { KEY_PRINT } },
8488
// Keyboard backlit
8589
{ KE_IGNORE, 0x293, { KEY_KBDILLUMTOGGLE } },
8690
{ KE_IGNORE, 0x294, { KEY_KBDILLUMUP } },

‎drivers/platform/x86/intel/hid.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ static const struct acpi_device_id intel_hid_ids[] = {
5555
{ "INTC10CB" },
5656
{ "INTC10CC" },
5757
{ "INTC10F1" },
58+
{ "INTC10F2" },
5859
{ }
5960
};
6061
MODULE_DEVICE_TABLE(acpi, intel_hid_ids);

0 commit comments

Comments
 (0)