Received-SPF: pass (google.com: domain of linux-kernel+bounces-55667-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Armin Wolf <W_Armin@gmx.de>
To: hdegoede@redhat.com,
	ilpo.jarvinen@linux.intel.com
Cc: platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] platform/x86: wmi: Check if WMxx control method exists
Date: Tue,  6 Feb 2024 23:04:44 +0100
Message-Id: <20240206220447.3102-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:9k1+nBJUUnc=;8RH+2D2XDGPEx8aG+E9Xmp2k46V
 V/eh78PXdd72aGRQm9ypNrAB3mLEh2c7zKrmifctM1rIIu4L9g4TqAKPyU4TFdPKQTPmXVEML
 4FL20ssIeP23bVlZwYyyJkBEj2Q642Om2wfswzRiF8NeMDEZOnIil+XlznbQZUzCqPcnsHYfH
 TLvNlftj+dNLUzq+Px8vnPi3cqCQvv5DDsIQrIxusYaXohBA/eCsjBrbWYspSG1xRQp5UseP2
 AacNnFYv+EDhoyCbN8HKVHK5EDyoipSP9DpHSRQfvbAstV09rMazAXq+aEG+8mHOzfcgjykQR
 /6rN2OsU/zaEw8SnsvO9luyIFeEM3vlOFnzl1r4Nx/922aUMdtdI+GdGSKFA0Yq8YK/htdQYm
 sxs/9hl4cNs1g1c16i4ed+04ltxk9HjOk83+NXxTOaZeDoJf81io1LVMuz17jxbsNdl9qHREH
 mqqOjHtgBEaeetMEf3/1lR3yoN+7+5OMiH5fQp64ryoJZqOb6lEdETSCtWlbWsm+4gW9JRMr8
 aSN/MlC81exJEkjzSay7q2siakWgbN9ApWWR0UJMuZ7ITgbtHVZivRvXH57IO6EwENqa6fq9R
 9DB8C9joMLcn7EEUhjTFrQ1kxYHkS+iMw9N4tw0nsUwJBJH1l9LuebUxfZ4OFO7PZyPpQ+Dno
 5gvEOUV43CRHnjHCQ1bmLEhITtog/byFsfEK+SOMRqriRAN6TO7zSbRswV29Pbj1aFcLYCIQR
 J9uMbt/uu0PRlkuNRNx+ztFn2n51l9sff9pktsJvfGn2MBa3r5mRNCW9GgCGd/MTPWqlPi7mo
 8Zb9XX0wW9wEgtT/i3QLX+0HOoJmYcGafhSs2l9DzymW0=

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>
=2D--
 drivers/platform/x86/wmi.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 3c288e8f404b..9d544c85e5a8 100644
=2D-- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -990,6 +990,15 @@ static int wmi_create_device(struct device *wmi_bus_d=
ev,
 	}

 	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 =3D &wmi_type_method;
 		goto out_init;
 	}
=2D-
2.39.2