Received-SPF: pass (google.com: domain of linux-kernel+bounces-55668-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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 2/4] platform/x86: wmi: Use FW_BUG when warning about missing control methods
Date: Tue,  6 Feb 2024 23:04:45 +0100
Message-Id: <20240206220447.3102-2-W_Armin@gmx.de>
In-Reply-To: <20240206220447.3102-1-W_Armin@gmx.de>
References: <20240206220447.3102-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:d5RavgR5U4k=;pfOK4XPpO33tSCRC7M9m4bi9kFK
 rPrlyF25/eHhz8Sibr6/q/p4FL4rLAoRb2Le/YPGyelCJTxa5N9j/m+yQrKuE4JFiZ409d9JU
 e7cZA5FBc1ZdpKoeLSKs/pFVF75crO0Huhg5t1kBOjQrPTEl/22cXKp5jz7XMZM2aCc/wfwwa
 GdeWivrKymAC0pxigQ/jZWVB7Vf8qZSgLzKA1srEk8fasm72Jmr5KTDp787ydMRXH0/wfAAVi
 5uXZg5RfHCm/SrOpPykmmaZvQVoCjdUqpBqUMdqR76tT4cYUtm1Uj/9pxgB0Gm2rV5/aXBefB
 SdFk3TLF1j1L2cW356JjIK9aq/39buWAa6qwn2h3ZAGABjsh4JtZ4obe3XEZMgXZdUsmEdKLv
 lBaHn6A76O60IO+5eXcFcU7pmzyGXlasYDGeMDyewl4pxF++eITb8OfSNCPmhVntM/zkTAjaX
 XNO1Ij5EA3GF/4oB7nbkf3Qdiu/6OaNf+zeawVn5mYd+hJU5YvDizQTfCp1cpeSQlH8R9w0sz
 L8oCAIHNzUa9p16VwQOCTJMcLOWgTyFt2uDBE7UtlOYfOWki5eH6ltKaLrUjJ6HHQDCNNA6h5
 V4/wnkutuSf3qowmzP4Z11aQ8QWrlflRg74zqnVqRa7FZxwHU3B1YhLYlfEB4rGLPHayz7Gtf
 heyCtPqXv8tCWHNbwuAh50TNyObEJdikaly3GRVLtPVPs1M+WB6ZLNU9gMBX2WdwyYXXE2XdS
 5A2kAsO4N0NYt/rXYuLsKraoxkh8KXsJalCWky2tTJm88G3GIk3volj4yU/T+cifwycLnNbXm
 SFxTNFax5DgWMagXUV20LKr6O5L5NHRKz0Tvt2+nK7Ask=

A missing WQxx control method is a firmware bug and should be
marked as such using FW_BUG so that users know that the issue
is not a kernel issue.
Since get_subobj_info() might fail even if the control method
is present, we need to print the warning only if acpi_get_handle()
fails.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 drivers/platform/x86/wmi.c | 39 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 9d544c85e5a8..545d6696d7cb 100644
=2D-- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -132,26 +132,6 @@ static const void *find_guid_context(struct wmi_block=
 *wblock,
 	return NULL;
 }

-static int get_subobj_info(acpi_handle handle, const char *pathname,
-			   struct acpi_device_info **info)
-{
-	acpi_handle subobj_handle;
-	acpi_status status;
-
-	status =3D acpi_get_handle(handle, pathname, &subobj_handle);
-	if (status =3D=3D AE_NOT_FOUND)
-		return -ENOENT;
-
-	if (ACPI_FAILURE(status))
-		return -EIO;
-
-	status =3D acpi_get_object_info(subobj_handle, info);
-	if (ACPI_FAILURE(status))
-		return -EIO;
-
-	return 0;
-}
-
 static acpi_status wmi_method_enable(struct wmi_block *wblock, bool enabl=
e)
 {
 	struct guid_block *block;
@@ -979,9 +959,10 @@ static int wmi_create_device(struct device *wmi_bus_d=
ev,
 			     struct wmi_block *wblock,
 			     struct acpi_device *device)
 {
-	struct acpi_device_info *info;
 	char method[WMI_ACPI_METHOD_NAME_SIZE];
-	int result;
+	struct acpi_device_info *info;
+	acpi_handle method_handle;
+	acpi_status status;
 	uint count;

 	if (wblock->gblock.flags & ACPI_WMI_EVENT) {
@@ -1009,15 +990,19 @@ static int wmi_create_device(struct device *wmi_bus=
_dev,
 	 * we ignore this data block.
 	 */
 	get_acpi_method_name(wblock, 'Q', method);
-	result =3D get_subobj_info(device->handle, method, &info);
-
-	if (result) {
+	status =3D acpi_get_handle(device->handle, method, &method_handle);
+	if (ACPI_FAILURE(status)) {
 		dev_warn(wmi_bus_dev,
-			 "%s data block query control method not found\n",
+			 FW_BUG "%s data block query control method not found\n",
 			 method);
-		return result;
+
+		return -ENXIO;
 	}

+	status =3D acpi_get_object_info(method_handle, &info);
+	if (ACPI_FAILURE(status))
+		return -EIO;
+
 	wblock->dev.dev.type =3D &wmi_type_data;

 	/*
=2D-
2.39.2