33 *
44 * Check to see if the given machine has a known bad ACPI BIOS
55 * or if the BIOS is too old.
6- * Check given machine against acpi_osi_dmi_table [].
6+ * Check given machine against acpi_rev_dmi_table [].
77 *
88 * Copyright (C) 2004 Len Brown <[email protected] > 99 * Copyright (C) 2002 Andy Grover <[email protected] > @@ -47,7 +47,7 @@ struct acpi_blacklist_item {
4747 u32 is_critical_error ;
4848};
4949
50- static struct dmi_system_id acpi_osi_dmi_table [] __initdata ;
50+ static struct dmi_system_id acpi_rev_dmi_table [] __initdata ;
5151
5252/*
5353 * POLICY: If *anything* doesn't work, put it on the blacklist.
@@ -128,36 +128,12 @@ int __init acpi_blacklisted(void)
128128 }
129129 }
130130
131- dmi_check_system (acpi_osi_dmi_table );
131+ (void )early_acpi_osi_init ();
132+ dmi_check_system (acpi_rev_dmi_table );
132133
133134 return blacklisted ;
134135}
135136#ifdef CONFIG_DMI
136- static int __init dmi_enable_osi_linux (const struct dmi_system_id * d )
137- {
138- acpi_dmi_osi_linux (1 , d ); /* enable */
139- return 0 ;
140- }
141- static int __init dmi_disable_osi_vista (const struct dmi_system_id * d )
142- {
143- printk (KERN_NOTICE PREFIX "DMI detected: %s\n" , d -> ident );
144- acpi_osi_setup ("!Windows 2006" );
145- acpi_osi_setup ("!Windows 2006 SP1" );
146- acpi_osi_setup ("!Windows 2006 SP2" );
147- return 0 ;
148- }
149- static int __init dmi_disable_osi_win7 (const struct dmi_system_id * d )
150- {
151- printk (KERN_NOTICE PREFIX "DMI detected: %s\n" , d -> ident );
152- acpi_osi_setup ("!Windows 2009" );
153- return 0 ;
154- }
155- static int __init dmi_disable_osi_win8 (const struct dmi_system_id * d )
156- {
157- printk (KERN_NOTICE PREFIX "DMI detected: %s\n" , d -> ident );
158- acpi_osi_setup ("!Windows 2012" );
159- return 0 ;
160- }
161137#ifdef CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
162138static int __init dmi_enable_rev_override (const struct dmi_system_id * d )
163139{
@@ -168,169 +144,7 @@ static int __init dmi_enable_rev_override(const struct dmi_system_id *d)
168144}
169145#endif
170146
171- static struct dmi_system_id acpi_osi_dmi_table [] __initdata = {
172- {
173- .callback = dmi_disable_osi_vista ,
174- .ident = "Fujitsu Siemens" ,
175- .matches = {
176- DMI_MATCH (DMI_SYS_VENDOR , "FUJITSU SIEMENS" ),
177- DMI_MATCH (DMI_PRODUCT_NAME , "ESPRIMO Mobile V5505" ),
178- },
179- },
180- {
181- /*
182- * There have a NVIF method in MSI GX723 DSDT need call by Nvidia
183- * driver (e.g. nouveau) when user press brightness hotkey.
184- * Currently, nouveau driver didn't do the job and it causes there
185- * have a infinite while loop in DSDT when user press hotkey.
186- * We add MSI GX723's dmi information to this table for workaround
187- * this issue.
188- * Will remove MSI GX723 from the table after nouveau grows support.
189- */
190- .callback = dmi_disable_osi_vista ,
191- .ident = "MSI GX723" ,
192- .matches = {
193- DMI_MATCH (DMI_SYS_VENDOR , "Micro-Star International" ),
194- DMI_MATCH (DMI_PRODUCT_NAME , "GX723" ),
195- },
196- },
197- {
198- .callback = dmi_disable_osi_vista ,
199- .ident = "Sony VGN-NS10J_S" ,
200- .matches = {
201- DMI_MATCH (DMI_SYS_VENDOR , "Sony Corporation" ),
202- DMI_MATCH (DMI_PRODUCT_NAME , "VGN-NS10J_S" ),
203- },
204- },
205- {
206- .callback = dmi_disable_osi_vista ,
207- .ident = "Sony VGN-SR290J" ,
208- .matches = {
209- DMI_MATCH (DMI_SYS_VENDOR , "Sony Corporation" ),
210- DMI_MATCH (DMI_PRODUCT_NAME , "VGN-SR290J" ),
211- },
212- },
213- {
214- .callback = dmi_disable_osi_vista ,
215- .ident = "VGN-NS50B_L" ,
216- .matches = {
217- DMI_MATCH (DMI_SYS_VENDOR , "Sony Corporation" ),
218- DMI_MATCH (DMI_PRODUCT_NAME , "VGN-NS50B_L" ),
219- },
220- },
221- {
222- .callback = dmi_disable_osi_vista ,
223- .ident = "VGN-SR19XN" ,
224- .matches = {
225- DMI_MATCH (DMI_SYS_VENDOR , "Sony Corporation" ),
226- DMI_MATCH (DMI_PRODUCT_NAME , "VGN-SR19XN" ),
227- },
228- },
229- {
230- .callback = dmi_disable_osi_vista ,
231- .ident = "Toshiba Satellite L355" ,
232- .matches = {
233- DMI_MATCH (DMI_SYS_VENDOR , "TOSHIBA" ),
234- DMI_MATCH (DMI_PRODUCT_VERSION , "Satellite L355" ),
235- },
236- },
237- {
238- .callback = dmi_disable_osi_win7 ,
239- .ident = "ASUS K50IJ" ,
240- .matches = {
241- DMI_MATCH (DMI_SYS_VENDOR , "ASUSTeK Computer Inc." ),
242- DMI_MATCH (DMI_PRODUCT_NAME , "K50IJ" ),
243- },
244- },
245- {
246- .callback = dmi_disable_osi_vista ,
247- .ident = "Toshiba P305D" ,
248- .matches = {
249- DMI_MATCH (DMI_SYS_VENDOR , "TOSHIBA" ),
250- DMI_MATCH (DMI_PRODUCT_NAME , "Satellite P305D" ),
251- },
252- },
253- {
254- .callback = dmi_disable_osi_vista ,
255- .ident = "Toshiba NB100" ,
256- .matches = {
257- DMI_MATCH (DMI_SYS_VENDOR , "TOSHIBA" ),
258- DMI_MATCH (DMI_PRODUCT_NAME , "NB100" ),
259- },
260- },
261-
262- /*
263- * The wireless hotkey does not work on those machines when
264- * returning true for _OSI("Windows 2012")
265- */
266- {
267- .callback = dmi_disable_osi_win8 ,
268- .ident = "Dell Inspiron 7737" ,
269- .matches = {
270- DMI_MATCH (DMI_SYS_VENDOR , "Dell Inc." ),
271- DMI_MATCH (DMI_PRODUCT_NAME , "Inspiron 7737" ),
272- },
273- },
274- {
275- .callback = dmi_disable_osi_win8 ,
276- .ident = "Dell Inspiron 7537" ,
277- .matches = {
278- DMI_MATCH (DMI_SYS_VENDOR , "Dell Inc." ),
279- DMI_MATCH (DMI_PRODUCT_NAME , "Inspiron 7537" ),
280- },
281- },
282- {
283- .callback = dmi_disable_osi_win8 ,
284- .ident = "Dell Inspiron 5437" ,
285- .matches = {
286- DMI_MATCH (DMI_SYS_VENDOR , "Dell Inc." ),
287- DMI_MATCH (DMI_PRODUCT_NAME , "Inspiron 5437" ),
288- },
289- },
290- {
291- .callback = dmi_disable_osi_win8 ,
292- .ident = "Dell Inspiron 3437" ,
293- .matches = {
294- DMI_MATCH (DMI_SYS_VENDOR , "Dell Inc." ),
295- DMI_MATCH (DMI_PRODUCT_NAME , "Inspiron 3437" ),
296- },
297- },
298- {
299- .callback = dmi_disable_osi_win8 ,
300- .ident = "Dell Vostro 3446" ,
301- .matches = {
302- DMI_MATCH (DMI_SYS_VENDOR , "Dell Inc." ),
303- DMI_MATCH (DMI_PRODUCT_NAME , "Vostro 3446" ),
304- },
305- },
306- {
307- .callback = dmi_disable_osi_win8 ,
308- .ident = "Dell Vostro 3546" ,
309- .matches = {
310- DMI_MATCH (DMI_SYS_VENDOR , "Dell Inc." ),
311- DMI_MATCH (DMI_PRODUCT_NAME , "Vostro 3546" ),
312- },
313- },
314-
315- /*
316- * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
317- * Linux ignores it, except for the machines enumerated below.
318- */
319-
320- /*
321- * Without this this EEEpc exports a non working WMI interface, with
322- * this it exports a working "good old" eeepc_laptop interface, fixing
323- * both brightness control, and rfkill not working.
324- */
325- {
326- .callback = dmi_enable_osi_linux ,
327- .ident = "Asus EEE PC 1015PX" ,
328- .matches = {
329- DMI_MATCH (DMI_SYS_VENDOR , "ASUSTeK Computer INC." ),
330- DMI_MATCH (DMI_PRODUCT_NAME , "1015PX" ),
331- },
332- },
333-
147+ static struct dmi_system_id acpi_rev_dmi_table [] __initdata = {
334148#ifdef CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
335149 /*
336150 * DELL XPS 13 (2015) switches sound between HDA and I2S
0 commit comments