From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794436581; b=gGnxYDiozjTge5ormrS43FI8K31G2XUV1ztSij2BpptDV0H5VEMs5RZXxuetZLNPYWbm x5gNzvrbiQrFzo18oux9jY8RVg10aYRLghuHdnZ1pEEMOVnu32aD3McxzUJP4gXhDhro+ n+l8BiTgvlvFAp5CywkAICm+DkXYTUvSgZkR+A0E3MKJfF/tDxw2zSCb5x/5WdjVCVjzj GsSP2B1W72pFEaybJXS02wnAElLKBiv95WsEM0SLVuZ6NHClqJ1/AIkbah4LhmIbrPIrJ zTocVVrLs+y2rPPtlxXTSuaMfa3MkxqPriUoFNibmlswnk7wfJhqR519Oq1bfYcIVdQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794436581; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding; bh=W9GvVd8oVMfmBfgZySZsAO/lkmtnXqU0JtLavX5/VXg=; b=lFyj/EFYRFSmnIfKrwJMbT0CzXtR1jLEXPJLvXiSTm7p2LUbg4W1CsXtPYRGNcNNHoVb a7zDBF+ZzXGmre5e7nlr42RV+sGUV/yNZ/7uWb/I3eASBt2t5OWJTtFB3/VhwJ1jtvsbY PBPGmIv2yQN400OQVJO/NAh4srE+VjgK70nZdvy12nmRk7wrqBsUOg3n+eJkNR19rzFTO 9B02ZH2DSLPnwK6am17t08Lt6531RvNWjlO/5UxqjjWU6M03ujOO54t1ZoaZD+LzTVBmh 0sIxWqSWARrd/suAm/R8Pk0Sri+AQNFwTx768VQ1jEw+bWuXpL8GXthIFvN/LWTaD9Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=jtDM48to; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26D49606A321 for ; Wed, 11 Nov 2026 22:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=jtDM48to Received: by smtp.kernel.org (Postfix) with ESMTPSA id 152F31F00A06; Wed, 11 Nov 2026 22:36:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794436580; bh=W9GvVd8oVMfmBfgZySZsAO/lkmtnXqU0JtLavX5/VXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jtDM48toJr18BvyeTYGVy3zud3yMWa4crcPb8/+peOh1W5I3HZ5kPFv4HHDn9vf+w axsBjuqyHwuj25mRGEwVISAl1cegElGUSRwxTY0H//U74oXKVub2PSsR5312Pks8X6 EHxnseCm9yKwmq1Yz3HUAUW/Uy0pgRNW+NSJPCLkD4/HG54R8hbGFNwc/vrfcdUzDQ X+AbaTjj+TN+p14Kntk82YsRBw4cClqGsE1rYqJMP7TqcVVqIlR1w8ny7qpFFXwf2s qeLNgXjCZpNQpEhYrnZA7ldQD4KnbCaRmoXTkzMrM4pL1dZqxE8AKGGcXhVYsRAg7o 4FJ+bAY++ul4g== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Ali=20Ahmet=20Memi=C5=9F?= , "Rafael J. Wysocki" , Rong Zhang , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.12.y 1/2] ACPI: utils: Add exclusive AML evaluation helpers Date: Wed, 11 Nov 2026 17:36:17 -0500 Message-ID: <20261111223612.68828-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261107052518-failed-6.12-f91c2cd6dbce@kernel.org> References: <20261107052518-failed-6.12-f91c2cd6dbce@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Ali Ahmet Memiş [ Upstream commit 80892972ff23bf0b9049230ef0931b34163aaed3 ] ACPICA drops the interpreter lock while AML waits, for example around EC accesses, so two methods can run interleaved. Some firmware relies on methods not interleaving, for instance by switching an EC page selector without taking the AML mutex that the other users of that page hold. Add acpi_evaluate_object_exclusive(), acpi_evaluate_integer_exclusive() and acpi_execute_simple_method_exclusive() which serialize the evaluation under a global mutex, for callers that are known to be affected. Suggested-by: Rafael J. Wysocki Link: https://lore.kernel.org/all/CAJZ5v0gS4agVUkCO6M=VW4Wi2y1-s+k23bpzmX9aAZ0Rsv4z9Q@mail.gmail.com/ Signed-off-by: Ali Ahmet Memiş Reviewed-by: Rong Zhang Link: https://patch.msgid.link/20261018122220.678822-2-aliamemis@disroot.org Signed-off-by: Rafael J. Wysocki Stable-dep-of: f91c2cd6dbce ("platform/x86: ideapad-laptop: Evaluate ACPI methods exclusively") Signed-off-by: Sasha Levin --- drivers/acpi/utils.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/acpi/acpi_bus.h | 7 +++++++ 2 files changed, 48 insertions(+) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 6de542d995189..219d3d23aee8a 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -243,6 +244,28 @@ acpi_extract_package(union acpi_object *package, EXPORT_SYMBOL(acpi_extract_package); +static DEFINE_MUTEX(acpi_exclusive_eval_lock); + +/** + * acpi_evaluate_object_exclusive - Evaluate an object without interleaving + * @handle: ACPI handle of the object or its scope. + * @pathname: Path of the object relative to @handle. + * @arguments: Arguments to pass, or NULL. + * @buffer: Buffer for the return value, or NULL. + * + * Same as acpi_evaluate_object(), but serialized with other exclusive + * evaluations. Use it only for methods known to break when interleaved. + */ +acpi_status acpi_evaluate_object_exclusive(acpi_handle handle, acpi_string pathname, + struct acpi_object_list *arguments, + struct acpi_buffer *buffer) +{ + guard(mutex)(&acpi_exclusive_eval_lock); + + return acpi_evaluate_object(handle, pathname, arguments, buffer); +} +EXPORT_SYMBOL_GPL(acpi_evaluate_object_exclusive); + acpi_status acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, @@ -277,6 +300,16 @@ acpi_evaluate_integer(acpi_handle handle, EXPORT_SYMBOL(acpi_evaluate_integer); +acpi_status acpi_evaluate_integer_exclusive(acpi_handle handle, acpi_string pathname, + struct acpi_object_list *arguments, + unsigned long long *data) +{ + guard(mutex)(&acpi_exclusive_eval_lock); + + return acpi_evaluate_integer(handle, pathname, arguments, data); +} +EXPORT_SYMBOL_GPL(acpi_evaluate_integer_exclusive); + int acpi_get_local_u64_address(acpi_handle handle, u64 *addr) { acpi_status status; @@ -686,6 +719,14 @@ acpi_status acpi_execute_simple_method(acpi_handle handle, char *method, } EXPORT_SYMBOL(acpi_execute_simple_method); +acpi_status acpi_execute_simple_method_exclusive(acpi_handle handle, char *method, u64 arg) +{ + guard(mutex)(&acpi_exclusive_eval_lock); + + return acpi_execute_simple_method(handle, method, arg); +} +EXPORT_SYMBOL_GPL(acpi_execute_simple_method_exclusive); + /** * acpi_evaluate_ej0: Evaluate _EJ0 method for hotplug operations * @handle: ACPI device handle diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index b8cf06904fa20..f46464d1430a2 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -30,6 +30,12 @@ acpi_status acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments, unsigned long long *data); +acpi_status acpi_evaluate_object_exclusive(acpi_handle handle, acpi_string pathname, + struct acpi_object_list *arguments, + struct acpi_buffer *buffer); +acpi_status acpi_evaluate_integer_exclusive(acpi_handle handle, acpi_string pathname, + struct acpi_object_list *arguments, + unsigned long long *data); bool acpi_evaluate_reference(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments, struct acpi_handle_list *list); @@ -49,6 +55,7 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld bool acpi_has_method(acpi_handle handle, char *name); acpi_status acpi_execute_simple_method(acpi_handle handle, char *method, u64 arg); +acpi_status acpi_execute_simple_method_exclusive(acpi_handle handle, char *method, u64 arg); acpi_status acpi_evaluate_ej0(acpi_handle handle); acpi_status acpi_evaluate_lck(acpi_handle handle, int lock); acpi_status acpi_evaluate_reg(acpi_handle handle, u8 space_id, u32 function); -- 2.53.0