From nobody Fri Dec 19 11:17:06 2025 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 219C32FB0AE; Tue, 4 Nov 2025 20:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289171; cv=none; b=gkMbTR5N4KnrpT8pOUMYYdUbwSCA1fdfquKo8zG8Rr0dpg1Yo+PXQlZeRlnInmD+qB5P/VWQsF444OfZTrklYpAVIhNOAn1XeWoD7kY2B2QbX5IR45EFZV6Zp05SBKT6mai7+Zr7MK17rTIvgIvIZrBHaQ+BUa8GJRcqbZ9eRJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289171; c=relaxed/simple; bh=by/Li4iSHhM1rDG8xsYwZIwe5AwgL0fSad9FXoF5WKA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NWcgibaa8zvBWyNJsVJNgepuHifsyW8Rt/lJeSz2Uwt14M6Olhky+is8RbqkTB1widZilrWGPM3ck6BV3Q6K7/7fHlA9VBtmUkyBZm1X46jUna4o2NNz/U/RNyNRvU1lzsSX+q956RGFkcJvx95egxAmsHWeMJLekVGJyXQjSZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=egsTa0mX; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="egsTa0mX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1762289152; x=1762893952; i=w_armin@gmx.de; bh=SKEe6QBDEckw6UbPK40FILVB/LXShWLeNILNZ7Iwdpg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=egsTa0mXQyviLp7yGr9XaH7E0m7kVcbMOOGhbc1p2/ZlVJNYd6U5zFld1sV0L+sq kIBtfTezaY7t+bd0yAGJ236xn9vEyp51oHV32cPLh9nlHEVWillIoB/OkDjrfrPtR nbnzhYg3U/4U9haLz0GQo8nmmFclWL73vXaiJF/372qinWvwUnNGtJFEfgE0vxUFZ cTuxnb41o20yizK4vxa2hdzj1bFkDIcLdtRe9jN91QAarehgV8siWi9D7PW0RJ6JS 1VUAmgoO9XgnD37tQWgIWgK1XPkHgwex4yO6JrngXV1Q0yOkdse7v9VjHJK8KohOK KX6OOJONICMxRzO73g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.fritz.box ([93.202.247.91]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1My32F-1wAIQR1t8R-00y6eV; Tue, 04 Nov 2025 21:45:52 +0100 From: Armin Wolf To: viro@zeniv.linux.org.uk, brauner@kernel.org, hansg@kernel.org, ilpo.jarvinen@linux.intel.com Cc: jack@suse.cz, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 1/4] fs/nls: Fix utf16 to utf8 conversion Date: Tue, 4 Nov 2025 21:45:37 +0100 Message-Id: <20251104204540.13931-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251104204540.13931-1-W_Armin@gmx.de> References: <20251104204540.13931-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:7FUHFbYyPOpM2TLAx7Z8bBcG5qHSsgvzz8rGBE9XcKOAkDvk3Xi sW9RcMJgaQmlDqhTH1Qlri7b9XaNQWiQ+1/veXkQrUn4f3BUoyN/TCXsRhbytcRWcC127p4 qcbfiXIjEL59eZkGaASFgniaEwUjg9zeEw1gCAi1bEGcAdjwupXpu4jWGp0pdVIQcWMgx8p OjhiYgO+K/c/bkMolVVRQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:6s9v6bKRXS8=;4znOSUUmIH6sFTG/Uy5RXVvFXMP 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 wQVvmAxJdzNuALs0XhW/JXPGvY= Content-Type: text/plain; charset="utf-8" Currently the function responsible for converting between utf16 and utf8 strings will ignore any characters that cannot be converted. This however also includes multi-byte characters that do not fit into the provided string buffer. This can cause problems if such a multi-byte character is followed by a single-byte character. In such a case the multi-byte character might be ignored when the provided string buffer is too small, but the single-byte character might fit and is thus still copied into the resulting string. Fix this by stop filling the provided string buffer once a character does not fit. In order to be able to do this extend utf32_to_utf8() to return useful errno codes instead of -1. Fixes: 74675a58507e ("NLS: update handling of Unicode") Signed-off-by: Armin Wolf Reviewed-by: Mario Limonciello (AMD) --- fs/nls/nls_base.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 18d597e49a19..d434c4463a8f 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -94,7 +94,7 @@ int utf32_to_utf8(unicode_t u, u8 *s, int maxout) =20 l =3D u; if (l > UNICODE_MAX || (l & SURROGATE_MASK) =3D=3D SURROGATE_PAIR) - return -1; + return -EILSEQ; =20 nc =3D 0; for (t =3D utf8_table; t->cmask && maxout; t++, maxout--) { @@ -110,7 +110,7 @@ int utf32_to_utf8(unicode_t u, u8 *s, int maxout) return nc; } } - return -1; + return -EOVERFLOW; } EXPORT_SYMBOL(utf32_to_utf8); =20 @@ -217,8 +217,16 @@ int utf16s_to_utf8s(const wchar_t *pwcs, int inlen, en= um utf16_endian endian, inlen--; } size =3D utf32_to_utf8(u, op, maxout); - if (size =3D=3D -1) { - /* Ignore character and move on */ + if (size < 0) { + if (size =3D=3D -EILSEQ) { + /* Ignore character and move on */ + continue; + } + /* + * Stop filling the buffer with data once a character + * does not fit anymore. + */ + break; } else { op +=3D size; maxout -=3D size; --=20 2.39.5 From nobody Fri Dec 19 11:17:06 2025 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EC512EB84A; Tue, 4 Nov 2025 20:45:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289159; cv=none; b=BrZpQ9xDijNyiL+TmGEHy+IBVao4rh61XrHj9ndzUHwu32dJBpH6CBMXcGt6ZvAr2COVQryihwEJBZ1gKZqZ6ZlPWNOG24fKkEL+fGtfWKLybQ9EEA2QpoCKrAhT553d4QUQ6zkPVzJ+fboWDqhDlHKA/pTkf+PfAc8fESbpY7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289159; c=relaxed/simple; bh=l6dgkwVTX+nYYUEUarUe9Z8EG8LznFvBnfy7Dit+dJs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g+poQSL5M+HNci05Ggj0//Zij/hQB2SU+w7sOekbVFFXctfCYLt+a1mAfahpq+oN34zdZjbL7bSBSmLTG2ISRUWSOHJbANn6z0fQXy6xHbD5XceFYg1gjTcXhuXUuiyd6yD7kiD29OPsmyizqQlOHKoxECqjIaOGudsoNPvdy2g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=hgmMXZ4G; arc=none smtp.client-ip=212.227.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="hgmMXZ4G" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1762289155; x=1762893955; i=w_armin@gmx.de; bh=0P/Z+v6CnKjg6IgFnYEQ2dxLZv6jFsLO3430lUKgxhA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=hgmMXZ4GJ7VDdxVSBTh+WZ4S1v0pKNZ2B2NaCkIYuu3027aqmdONDaYOkX8US0B9 VnmGVIJkBK4FvHIu9aZO6DQogkfwBEYc3NCX3fs3l2ACfYFwToipIDgh7vRIkl/do jtay5eboLjwNNrpcsQpLkL1ng+UFa2+69vbr4AIlrolO8T20lIv55BOeDgtXULkMy JuR7LdMaocKZxkzCzf5NZcP5kRn+434/XCBVlryKVTJxFhVSMIf1ECtT5Gp49WtQU 2ow3kithQ7e7XXpcR97wYhGVcqOv4auoF/541goCt4vd1eyDNmpeyUyivF5U+NrqS v4I9mEj43Ik8/l/9Hw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.fritz.box ([93.202.247.91]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MVeMG-1vhmAY2X3s-00Qiro; Tue, 04 Nov 2025 21:45:54 +0100 From: Armin Wolf To: viro@zeniv.linux.org.uk, brauner@kernel.org, hansg@kernel.org, ilpo.jarvinen@linux.intel.com Cc: jack@suse.cz, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 2/4] platform/x86: wmi: Use correct type when populating ACPI objects Date: Tue, 4 Nov 2025 21:45:38 +0100 Message-Id: <20251104204540.13931-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251104204540.13931-1-W_Armin@gmx.de> References: <20251104204540.13931-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:riXcmsvGPwJnij0HYgQlb3vy/fbUqdIVtPjkNwAHGGKPD7uJ729 hV88vx/gd4QKEUEtUFeWd4dmsn9i/8kTdiaHQGs4ZEDEGQo9b0kwMz9anq6/fVMCM9FcWGw xPBXjle/lTyza478zVTDu/hlwqmtuzzz/MAItnT8/9KWkTbklRWqRBdIE6R+Qz4gWnU7qS2 tjcdQ5WRjeg+zVV5GN/5w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:fDLqh6eH6dc=;0Osm1V+KFuENB3d5R9EVGaiTXvZ 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 ndnyFmGsXp+UPdDzuZObgiW3MmMOQDRhkdf0W5 Content-Type: text/plain; charset="utf-8" When evaluating a WMxx/WSxx ACPI control method, the data buffer either needs to be passed as an ACPI buffer or as an ACPI string. Use the correct type (buffer/string) when populating the associated ACPI object. Signed-off-by: Armin Wolf Reviewed-by: Mario Limonciello (AMD) --- drivers/platform/x86/wmi.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 4e86a422f05f..6878c4fcb0b5 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -142,14 +142,6 @@ static inline void get_acpi_method_name(const struct w= mi_block *wblock, buffer[4] =3D '\0'; } =20 -static inline acpi_object_type get_param_acpi_type(const struct wmi_block = *wblock) -{ - if (wblock->gblock.flags & ACPI_WMI_STRING) - return ACPI_TYPE_STRING; - else - return ACPI_TYPE_BUFFER; -} - static int wmidev_match_guid(struct device *dev, const void *data) { struct wmi_block *wblock =3D dev_to_wblock(dev); @@ -351,9 +343,16 @@ acpi_status wmidev_evaluate_method(struct wmi_device *= wdev, u8 instance, u32 met params[0].integer.value =3D instance; params[1].type =3D ACPI_TYPE_INTEGER; params[1].integer.value =3D method_id; - params[2].type =3D get_param_acpi_type(wblock); - params[2].buffer.length =3D in->length; - params[2].buffer.pointer =3D in->pointer; + + if (wblock->gblock.flags & ACPI_WMI_STRING) { + params[2].type =3D ACPI_TYPE_STRING; + params[2].string.length =3D in->length; + params[2].string.pointer =3D in->pointer; + } else { + params[2].type =3D ACPI_TYPE_BUFFER; + params[2].buffer.length =3D in->length; + params[2].buffer.pointer =3D in->pointer; + } =20 get_acpi_method_name(wblock, 'M', method); =20 @@ -519,9 +518,16 @@ acpi_status wmidev_block_set(struct wmi_device *wdev, = u8 instance, const struct input.pointer =3D params; params[0].type =3D ACPI_TYPE_INTEGER; params[0].integer.value =3D instance; - params[1].type =3D get_param_acpi_type(wblock); - params[1].buffer.length =3D in->length; - params[1].buffer.pointer =3D in->pointer; + + if (wblock->gblock.flags & ACPI_WMI_STRING) { + params[1].type =3D ACPI_TYPE_STRING; + params[1].string.length =3D in->length; + params[1].string.pointer =3D in->pointer; + } else { + params[1].type =3D ACPI_TYPE_BUFFER; + params[1].buffer.length =3D in->length; + params[1].buffer.pointer =3D in->pointer; + } =20 get_acpi_method_name(wblock, 'S', method); =20 --=20 2.39.5 From nobody Fri Dec 19 11:17:06 2025 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4F04224AE0; Tue, 4 Nov 2025 20:46:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289165; cv=none; b=dZf0FoIt7C5oJcwYxuRYiVaMBb8jstDOEAx5Ey81D9ANPSyVeOhH+nNUP/4sLSDK55uVdgBZcH23JFyFrGVoNTSSkVrhdsdjrvxXmMC0hHYBW9X2yWxSQ05EjvM8UMNGa7Meart+ZBaw5VIX0sFoOFCcL9nLwgyY/C4kYHpnn54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289165; c=relaxed/simple; bh=J7WqU+qFuPqY6lrI493z2xpaTkFBF79kSoAgrPIeltE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kMcFG8qN6nVUiHe1XrOt8CxYjRPaf8esfQTjxO+LgyL37vQhDvlNfYewIV8rw771G/XzJR0uDIvmxHXlZ0ISgZ/N+Y5LwNQ7wwLN50n44M8tn/2sPzeB4aTK/bZGau7a4KGQ4cRs2Z4yq+5NN4JCgHQ6JJhWV1vgONiKFaI6ATQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=GdYHzDxn; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="GdYHzDxn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1762289157; x=1762893957; i=w_armin@gmx.de; bh=7iRlyxi57atvoFWPoLQFNeWyWZNMG97YnVYPNzVDjkE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=GdYHzDxnz8X2vBe2eJXlW3ZqxNgwWX+IQ8xfF+8vis5FnrpLqf2Isbgul/sQO/ny G16tiYAY4i0SJ8T/IxNO5j3kQB9GbRl3FO+Lsv5DNz15R9YFce9LwED1moCuzHBjU iEDi0hh7Fsn9sKFHsqZJQaVPjTE/m6Uk1V7qe61thXeOZokIgSihpVjOElDsI3Zwx y3JxHwyhjTKFmo1LWFkrEiIV5epR66vjal1xz9j5BweundFD9RbwhO9w4qAFXyFEr hxQdkk1UBL1V5WvzAZ33MxdxgzNVOoIO4DhhobEdvCRjJjkIo/m5nGJz86rNpzgT1 7Wftk8D40u0OXNgV3g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.fritz.box ([93.202.247.91]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvbG2-1w7nJS40n8-00rlkA; Tue, 04 Nov 2025 21:45:57 +0100 From: Armin Wolf To: viro@zeniv.linux.org.uk, brauner@kernel.org, hansg@kernel.org, ilpo.jarvinen@linux.intel.com Cc: jack@suse.cz, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 3/4] platform/x86: wmi: Remove extern keyword from prototypes Date: Tue, 4 Nov 2025 21:45:39 +0100 Message-Id: <20251104204540.13931-4-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251104204540.13931-1-W_Armin@gmx.de> References: <20251104204540.13931-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:6//mA4fyioNXI9gg7XgdXZACMuHlKkzt00fPi2tM39xGGlRNZ+/ 6EU52+fv9+ir5Z3c09D+0PggmCnMYybtRhxgJiWKteO99FPdw8lRhKIjybn+EjeB82GZn0U Oc+P2qPJ99hGG+e5EIq/x1dTVWPchQjwqMEY3Wxqur17jjEZYPL/Zz1XZO5jT7MHNDrHHmj gLmNJvidhNkUVIRJq21gQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:iE17ucOgyCE=;dQqLgnQLC+mtTz7nb5aHLpY8PtW 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 Content-Type: text/plain; charset="utf-8" The external function definitions do not need the "extern" keyword. Remove it to silence the associated checkpatch warnings. Signed-off-by: Armin Wolf Reviewed-by: Mario Limonciello (AMD) --- include/linux/wmi.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/include/linux/wmi.h b/include/linux/wmi.h index 10751c8e5e6a..665ea7dc8a92 100644 --- a/include/linux/wmi.h +++ b/include/linux/wmi.h @@ -36,13 +36,10 @@ struct wmi_device { */ #define to_wmi_device(device) container_of_const(device, struct wmi_device= , dev) =20 -extern acpi_status wmidev_evaluate_method(struct wmi_device *wdev, - u8 instance, u32 method_id, - const struct acpi_buffer *in, - struct acpi_buffer *out); +acpi_status wmidev_evaluate_method(struct wmi_device *wdev, u8 instance, u= 32 method_id, + const struct acpi_buffer *in, struct acpi_buffer *out); =20 -extern union acpi_object *wmidev_block_query(struct wmi_device *wdev, - u8 instance); +union acpi_object *wmidev_block_query(struct wmi_device *wdev, u8 instance= ); =20 acpi_status wmidev_block_set(struct wmi_device *wdev, u8 instance, const s= truct acpi_buffer *in); =20 @@ -81,9 +78,9 @@ struct wmi_driver { */ #define to_wmi_driver(drv) container_of_const(drv, struct wmi_driver, driv= er) =20 -extern int __must_check __wmi_driver_register(struct wmi_driver *driver, - struct module *owner); -extern void wmi_driver_unregister(struct wmi_driver *driver); +int __must_check __wmi_driver_register(struct wmi_driver *driver, struct m= odule *owner); + +void wmi_driver_unregister(struct wmi_driver *driver); =20 /** * wmi_driver_register() - Helper macro to register a WMI driver --=20 2.39.5 From nobody Fri Dec 19 11:17:06 2025 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD0452ED165; Tue, 4 Nov 2025 20:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289172; cv=none; b=US+0qwnKBa+nW6kLXJS8i+NrnxknCLam9mC4H4utSqrDV0ykUVZw0s6igH/MDsy95I68KeDWThN4SPlisuCJQGI2H0zmg9Y6ctlU74I/aJQ2Py3z4dkHKNYZVurDNu7MYGYR34HyUg2B6aXzxjr42tZrScT/apTilGHQJbsmCIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762289172; c=relaxed/simple; bh=x4A52WzdsmxngpNH8+MvtYuknxjuaZpJ62kjIbeYyhc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YOwP+vKdv2yzC5GJWwn9RZZaUy3VP5DcU4zKHj+CtlxKfGPvOnwm0yraQ0Fn0k7eMoNZsVomWQSKURneXYjjbGZGYhzNbGWyS6hULZeugO2BhP5uXkxpMVf7/epAX1HdQ/FImFHOboy4Xe4VYLAQBBdpz0Ver6v6d895uG3JMu4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de; spf=pass smtp.mailfrom=gmx.de; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b=O4YLFnPF; arc=none smtp.client-ip=212.227.17.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.de header.i=w_armin@gmx.de header.b="O4YLFnPF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1762289160; x=1762893960; i=w_armin@gmx.de; bh=lzNQRY1Kb1yI7hH4FYsUrDSOUJVAglm57BSX732SI7U=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=O4YLFnPFIjiHNleHj48cIJ50PBn80L/nI6B1aXOPqOrfjTI+Di0eDqL7Two5W+MR 8/X37OexGZbWeAGWu+Kbkd3r/dMwWnUGywcDsZvwAAejZ8dwuY1YWdTaya2WIlgdr 7Y0cOVkyY0gytfBlb5DE37N7iaq5Nq2K+umzQgVVgShoz5mgOMgy3sUqWN0cEocEz WBa0Jhi881hYO2Dbsjjk4YHXmk34asF4q1wPJ/CnO/sHwHweV+DZKx5Q8u0b3pFvx VaMGzIdbuI9wYw3wTbL3TPrG2OmoSxJr0fIbu5pDb13K3TSCbJG+hxoKJfL+jMqJ/ f/8yeBe6VD0zYCKMGw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.fritz.box ([93.202.247.91]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N6sn1-1wJ3rk3SAx-00xWti; Tue, 04 Nov 2025 21:46:00 +0100 From: Armin Wolf To: viro@zeniv.linux.org.uk, brauner@kernel.org, hansg@kernel.org, ilpo.jarvinen@linux.intel.com Cc: jack@suse.cz, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH 4/4] platform/x86: wmi: Move WMI core code into a separate directory Date: Tue, 4 Nov 2025 21:45:40 +0100 Message-Id: <20251104204540.13931-5-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251104204540.13931-1-W_Armin@gmx.de> References: <20251104204540.13931-1-W_Armin@gmx.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:yfGdNrQmTknkoY6OCz3hi5tLFH0Bc518RojyonoJYRLh81dtkg6 oeFMCuXnhiQJGy6Em7myyqS8mIzXLxud5ZdqI55rDzi67+vA/jrG4XFtJX71FZm7w1siknM I67xlR/7RtnuXk2JI60P7LHtKKA3w5d9UJKuans6RGY2MzKgoayX5bpwVCk47akXaDAdGqb vnTtWGNaV29lZ742kQgxA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:599g5XI5hvw=;BIFkHj3pZjRK2/6LyAtLlpiWAbF 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 +mAd93QWv1HK7Iyqs= Content-Type: text/plain; charset="utf-8" Move the WMI core code into a separate directory to prepare for future additions to the WMI driver. Signed-off-by: Armin Wolf Reviewed-by: Mario Limonciello (AMD) --- Documentation/driver-api/wmi.rst | 2 +- MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 30 +------------------ drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/wmi/Kconfig | 34 ++++++++++++++++++++++ drivers/platform/x86/wmi/Makefile | 8 +++++ drivers/platform/x86/{wmi.c =3D> wmi/core.c} | 0 7 files changed, 46 insertions(+), 32 deletions(-) create mode 100644 drivers/platform/x86/wmi/Kconfig create mode 100644 drivers/platform/x86/wmi/Makefile rename drivers/platform/x86/{wmi.c =3D> wmi/core.c} (100%) diff --git a/Documentation/driver-api/wmi.rst b/Documentation/driver-api/wm= i.rst index 4e8dbdb1fc67..66f0dda153b0 100644 --- a/Documentation/driver-api/wmi.rst +++ b/Documentation/driver-api/wmi.rst @@ -16,5 +16,5 @@ which will be bound to compatible WMI devices by the driv= er core. .. kernel-doc:: include/linux/wmi.h :internal: =20 -.. kernel-doc:: drivers/platform/x86/wmi.c +.. kernel-doc:: drivers/platform/x86/wmi/core.c :export: diff --git a/MAINTAINERS b/MAINTAINERS index 46126ce2f968..abc0ff6769a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -402,7 +402,7 @@ S: Maintained F: Documentation/ABI/testing/sysfs-bus-wmi F: Documentation/driver-api/wmi.rst F: Documentation/wmi/ -F: drivers/platform/x86/wmi.c +F: drivers/platform/x86/wmi/ F: include/uapi/linux/wmi.h =20 ACRN HYPERVISOR SERVICE MODULE diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 46e62feeda3c..ef59425580f3 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -16,35 +16,7 @@ menuconfig X86_PLATFORM_DEVICES =20 if X86_PLATFORM_DEVICES =20 -config ACPI_WMI - tristate "WMI" - depends on ACPI - help - This driver adds support for the ACPI-WMI (Windows Management - Instrumentation) mapper device (PNP0C14) found on some systems. - - ACPI-WMI is a proprietary extension to ACPI to expose parts of the - ACPI firmware to userspace - this is done through various vendor - defined methods and data blocks in a PNP0C14 device, which are then - made available for userspace to call. - - The implementation of this in Linux currently only exposes this to - other kernel space drivers. - - This driver is a required dependency to build the firmware specific - drivers needed on many machines, including Acer and HP laptops. - - It is safe to enable this driver even if your DSDT doesn't define - any ACPI-WMI devices. - -config ACPI_WMI_LEGACY_DEVICE_NAMES - bool "Use legacy WMI device naming scheme" - depends on ACPI_WMI - help - Say Y here to force the WMI driver core to use the old WMI device naming - scheme when creating WMI devices. Doing so might be necessary for some - userspace applications but will cause the registration of WMI devices w= ith - the same GUID to fail in some corner cases. +source "drivers/platform/x86/wmi/Kconfig" =20 config WMI_BMOF tristate "WMI embedded Binary MOF driver" diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index c7db2a88c11a..c9f6e9275af8 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -5,7 +5,7 @@ # =20 # Windows Management Interface -obj-$(CONFIG_ACPI_WMI) +=3D wmi.o +obj-y +=3D wmi/ obj-$(CONFIG_WMI_BMOF) +=3D wmi-bmof.o =20 # WMI drivers diff --git a/drivers/platform/x86/wmi/Kconfig b/drivers/platform/x86/wmi/Kc= onfig new file mode 100644 index 000000000000..9e7c84876ef5 --- /dev/null +++ b/drivers/platform/x86/wmi/Kconfig @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# ACPI WMI Core +# + +config ACPI_WMI + tristate "WMI" + depends on ACPI + help + This driver adds support for the ACPI-WMI (Windows Management + Instrumentation) mapper device (PNP0C14) found on some systems. + + ACPI-WMI is a proprietary extension to ACPI to expose parts of the + ACPI firmware to userspace - this is done through various vendor + defined methods and data blocks in a PNP0C14 device, which are then + made available for userspace to call. + + The implementation of this in Linux currently only exposes this to + other kernel space drivers. + + This driver is a required dependency to build the firmware specific + drivers needed on many machines, including Acer and HP laptops. + + It is safe to enable this driver even if your DSDT doesn't define + any ACPI-WMI devices. + +config ACPI_WMI_LEGACY_DEVICE_NAMES + bool "Use legacy WMI device naming scheme" + depends on ACPI_WMI + help + Say Y here to force the WMI driver core to use the old WMI device naming + scheme when creating WMI devices. Doing so might be necessary for some + userspace applications but will cause the registration of WMI devices w= ith + the same GUID to fail in some corner cases. diff --git a/drivers/platform/x86/wmi/Makefile b/drivers/platform/x86/wmi/M= akefile new file mode 100644 index 000000000000..71b702936b59 --- /dev/null +++ b/drivers/platform/x86/wmi/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for linux/drivers/platform/x86/wmi +# ACPI WMI core +# + +wmi-y :=3D core.o +obj-$(CONFIG_ACPI_WMI) +=3D wmi.o diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi/core.c similarity index 100% rename from drivers/platform/x86/wmi.c rename to drivers/platform/x86/wmi/core.c --=20 2.39.5