platform/x86: wmi: Check if WMxx control method exists
authorArmin Wolf <W_Armin@gmx.de>
Tue, 6 Feb 2024 22:04:44 +0000 (23:04 +0100)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Wed, 7 Feb 2024 13:51:06 +0000 (15:51 +0200)
Some devices like the MSI GF63-12VF contain WMI method blocks
without providing the necessary WMxx ACPI control methods.
Avoid creating WMI devices for such WMI method blocks since
the resulting WMI device is going to be unusable.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20240206220447.3102-1-W_Armin@gmx.de
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/wmi.c

index 5682c7de0394e5d3212f89ec7447b1ee74fa0fb7..af273623bc5b3cf9f0dc7dba34cc2fb4c45ac087 100644 (file)
@@ -958,6 +958,15 @@ static int wmi_create_device(struct device *wmi_bus_dev,
        }
 
        if (wblock->gblock.flags & ACPI_WMI_METHOD) {
+               get_acpi_method_name(wblock, 'M', method);
+               if (!acpi_has_method(device->handle, method)) {
+                       dev_warn(wmi_bus_dev,
+                                FW_BUG "%s method block execution control method not found\n",
+                                method);
+
+                       return -ENXIO;
+               }
+
                wblock->dev.dev.type = &wmi_type_method;
                goto out_init;
        }