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=1794048801; b=J0ou9VViizbkPw2KO8k0de8sXgI/0XpyjL6yEkYu1xWcpDwrQeLsSb7L8uGsD6dhA6r3 7jo1NM+ezudwNcbUEHVJTPt7tVNzwzsvuDSGddoWjWjST7MiAgxw/mIbMjrIfP//Q4i2w Zzxea03/Zty3tgfyPjL9ctJ9+jAHbqxoW8pnp26YW5LbkV/3nblap/x6qzAANHIfrjER4 MoTy/lwcLfbTmtcXGSu8nhCwhUf9x8sHOmrA5sYt5Pr+GK+6NPBxIT7/QKyhQbs9nfQ4+ AGw1wK1gD72wSn9JIcDRaRSZcCRkI6llBj/ul9j2y2uZjTz5IsPNAs5+zwjKS5utuBQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048801; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=OStKR7iPvcjhxTqcBs900mo5EW5N3deYRewiKv0lB9g=; b=hCHYtV47P4bZA6kypW2rzhwN4aw9lKJ+4YvKpc9XxZz2/xYcWZUKb41Dygoo7LAKPthN v99GS1HIPBD2/t3qd9x3h5fRIxX0oEwKWbUeGv4detEqI0c2QihfzYXI+JWBR7lKm+Ij9 KodZKE67JsMFOWPTZ1ujQsDszz04nlZ0ZfVO/AY7cwKNZce1M9GEWrg9w9UdIp2zROeEG /7Xx2xulyike8V2UPpSwBQpFPgDXMxJ4nKekEO5NVH/kkcG9e6/wj/OKsjJed0sNRINV+ RvcpzN3ShcfijyyNJqLijsNl+cJUvuwvO0zgxG8e0QRfnSV6SanfG7sW+3LodyjD5Cg== 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=FLkJaJG9; 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 BBBED606A33E for ; Sat, 7 Nov 2026 10:53: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=FLkJaJG9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D3721F008A4; Sat, 7 Nov 2026 10:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048800; bh=OStKR7iPvcjhxTqcBs900mo5EW5N3deYRewiKv0lB9g=; h=From:To:Cc:Subject:Date; b=FLkJaJG9CdbpucunIkpw4QJrjdaj0IorXcyQ8KJY149xEBIk37gDq93ulBTlCfJzv mpRjImV1ksYy97Th+Br3DpEOLXIKNFP+wqDOCkqC69QEXEiNPANEO5lz19tZRXrEzq H9sD7krcEqGxpP6xKW57AisGA6jxP1dZRLcO0CPk1vscY4jwIOSXvmXpU5+CbQ0j1c T6vsoW/CUp9k3v6B2i/ijdsCQU41d2MFLr7GJUdkrC+ipbN0vc8tnyovB/0nLR+SHI 6mXdIJoAxGzPDQOJ47/3CJNEQ8WGEojIYxG1mlIFBBptjRyizpOgH6fFnOdW8NfBDC DOYtA6uTpGVRA== From: Sasha Levin To: aliamemis@disroot.org, i@rong.moe, rafael.j.wysocki@intel.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] platform/x86: ideapad-laptop: Evaluate ACPI methods exclusively" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:53:18 -0500 Message-ID: <20261107055318-failed-6.1-f91c2cd6dbce@kernel.org> X-Mailer: git-send-email 2.53.0 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 The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x f91c2cd6dbcedf52e227b2eea8d7b99ecbac7552 # git commit -s git send-email --to '' --in-reply-to '20261107055318-failed-6.1-f91c2cd6dbce@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From f91c2cd6dbcedf52e227b2eea8d7b99ecbac7552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20Ahmet=20Memi=C5=9F?= Date: Sun, 18 Oct 2026 15:23:48 +0300 Subject: [PATCH] platform/x86: ideapad-laptop: Evaluate ACPI methods exclusively MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On some Lenovo IdeaPad and Yoga models, the battery _BIX takes the EC AML mutex and then calls the serialized RDER through RDIF, while GBMD calls RDER first and then takes the EC mutex. When the two run interleaved they deadlock until the mutex acquisition in RDER times out, and GBMD returns garbage that is reported as both charge types being enabled. Evaluate all methods with the exclusive helpers, so that GBMD never runs interleaved with the battery methods. Link: https://bugzilla.kernel.org/show_bug.cgi?id=221065 Link: https://lore.kernel.org/all/58586fa666f09c209f9d7fe8c692a8bdda6d4410.camel@rong.moe/ Signed-off-by: Ali Ahmet Memiş Reviewed-by: Rong Zhang Cc: All applicable # 80892972ff23 ACPI: utils: Add exclusive AML evaluation helpers Link: https://patch.msgid.link/20261018122348.679126-1-aliamemis@disroot.org Signed-off-by: Rafael J. Wysocki --- drivers/platform/x86/lenovo/ideapad-laptop.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/lenovo/ideapad-laptop.c b/drivers/platform/x86/lenovo/ideapad-laptop.c index 8213524504eeb..1335f4e488702 100644 --- a/drivers/platform/x86/lenovo/ideapad-laptop.c +++ b/drivers/platform/x86/lenovo/ideapad-laptop.c @@ -297,12 +297,16 @@ static void ideapad_shared_exit(struct ideapad_private *priv) #define IDEAPAD_EC_POLL_MIN_US 150 #define IDEAPAD_EC_POLL_MAX_US 300 +/* + * On some models GBMD and the battery _BIX take the EC mutex and a + * serialized method in opposite order, so evaluate all methods exclusively. + */ static int eval_int(acpi_handle handle, const char *name, unsigned long *res) { unsigned long long result; acpi_status status; - status = acpi_evaluate_integer(handle, (char *)name, NULL, &result); + status = acpi_evaluate_integer_exclusive(handle, (char *)name, NULL, &result); if (ACPI_FAILURE(status)) return -EIO; @@ -324,7 +328,7 @@ static int eval_int_with_arg(acpi_handle handle, const char *name, unsigned long in_obj.type = ACPI_TYPE_INTEGER; in_obj.integer.value = arg; - status = acpi_evaluate_integer(handle, (char *)name, ¶ms, &result); + status = acpi_evaluate_integer_exclusive(handle, (char *)name, ¶ms, &result); if (ACPI_FAILURE(status)) return -EIO; @@ -336,7 +340,7 @@ static int eval_int_with_arg(acpi_handle handle, const char *name, unsigned long static int exec_simple_method(acpi_handle handle, const char *name, unsigned long arg) { - acpi_status status = acpi_execute_simple_method(handle, (char *)name, arg); + acpi_status status = acpi_execute_simple_method_exclusive(handle, (char *)name, arg); return ACPI_FAILURE(status) ? -EIO : 0; } @@ -394,7 +398,7 @@ static int eval_vpcw(acpi_handle handle, unsigned long cmd, unsigned long data) in_obj[1].type = ACPI_TYPE_INTEGER; in_obj[1].integer.value = data; - status = acpi_evaluate_object(handle, "VPCW", ¶ms, NULL); + status = acpi_evaluate_object_exclusive(handle, "VPCW", ¶ms, NULL); if (ACPI_FAILURE(status)) return -EIO; -- 2.53.0