{"id":2175743,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2175743/?format=json","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/1.0/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<2261695.irdbgypaU6@rafael.j.wysocki>","date":"2025-12-18T20:34:26","name":"[v1,1/8] ACPI: bus: Fix handling of _OSC errors in acpi_run_osc()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7089a159d59b19166f8d2d1e7f4a4c1eaeee2f79","submitter":{"id":64267,"url":"http://patchwork.ozlabs.org/api/1.0/people/64267/?format=json","name":"Rafael J. Wysocki","email":"rafael@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/2261695.irdbgypaU6@rafael.j.wysocki/mbox/","series":[{"id":485914,"url":"http://patchwork.ozlabs.org/api/1.0/series/485914/?format=json","date":"2025-12-18T20:37:36","name":"ACPI: bus: Rework of the \\_SB._OSC handling","version":1,"mbox":"http://patchwork.ozlabs.org/series/485914/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2175743/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-pci@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=YO3nu2E1;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=linux-pci+bounces-43334-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=\"YO3nu2E1\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4dXNCg6vgzz1xty\n\tfor ; Fri, 19 Dec 2025 07:52:47 +1100 (AEDT)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 666613050365\n\tfor ; Thu, 18 Dec 2025 20:51:55 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id BAD2734B1A4;\n\tThu, 18 Dec 2025 20:43:32 +0000 (UTC)","from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org\n [10.30.226.201])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 9191B34B19F;\n\tThu, 18 Dec 2025 20:43:32 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 46AA6C116D0;\n\tThu, 18 Dec 2025 20:43:31 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1766090612; cv=none;\n b=P4LyA5MC6sLrKFjpS2XE5bltRvJ3n7RhNRgej/B/cZAg1+mRc6SYrHhRiNj72SaYdeUoi+KpbPlObG4lZ3UVVoVSlIBLkIpwEjfkhluiNqgawn92r6zfXKTP2SM29t4QPOjvS2D1k6RYB7qKlG1DH7WXukg2QNOgx6yfVVbSfY4=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1766090612; c=relaxed/simple;\n\tbh=WiukSp8abPA7Ir/NI7fjD316gPQSi0iDAzSeRz3fYWQ=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=Y9z74qg5xA4JMFCVCd6qecKxkBa+nqfyaQc44pU7Wy+dlnXil/ycxO0KFezF4o86u7vO8DtQvjm3U9lg5lri76KW1fN11YbXlYEqVfsl3Jw0feDMWnqd6czUIWuhrlTesUNnrg9xCqDeXcT805f+qn2+//TrJVMcjPXtPRDN9iI=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org\n header.b=YO3nu2E1; arc=none smtp.client-ip=10.30.226.201","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1766090612;\n\tbh=WiukSp8abPA7Ir/NI7fjD316gPQSi0iDAzSeRz3fYWQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=YO3nu2E1kn57iq1NiVU5+RtM6p3KfYMCYH+yZNuGE/yABYxezTXIP4iHmo+imZhxp\n\t FCtfO8xbjS2gXjAmpzaFOx/ArRCw1O9P8XH93j6gR21e3w8vhd2jHdZb0tL7V5yQZr\n\t gzMA6wunGqZS8RjdrvIiwKUGDTqjM/c5ho+woFW6w0eEV260ix3XNRFHS4C1n7EhC4\n\t 7f9AgeVSfsu0qVlR7voqCU1DL+sKL34+rm/89K09vmgWpiokdWFS1ZBYNdWHf20lOr\n\t lkFJM8admHdIlLzM1oxBVU8Fj+GsxjI0LIP52VzrpFCxnNcCynW2bzjA6O5yQANOdx\n\t 3y523qjmfH+oA==","From":"\"Rafael J. Wysocki\" ","To":"Linux ACPI ","Cc":"LKML ,\n Linux PCI , Bjorn Helgaas ,\n Srinivas Pandruvada ,\n Hans de Goede ,\n Mario Limonciello ","Subject":"\n [PATCH v1 1/8] ACPI: bus: Fix handling of _OSC errors in acpi_run_osc()","Date":"Thu, 18 Dec 2025 21:34:26 +0100","Message-ID":"<2261695.irdbgypaU6@rafael.j.wysocki>","Organization":"Linux Kernel Development","In-Reply-To":"<5049211.GXAFRqVoOG@rafael.j.wysocki>","References":"<5049211.GXAFRqVoOG@rafael.j.wysocki>","Precedence":"bulk","X-Mailing-List":"linux-pci@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"7Bit","Content-Type":"text/plain; charset=\"UTF-8\""},"content":"From: Rafael J. Wysocki \n\nThe handling of _OSC errors in acpi_run_osc() is inconsistent.\n\nFor example, if OSC_CAPABILITIES_MASK_ERROR is set in the return buffer\nand OSC_QUERY_ENABLE is set in the capabilities buffer, all of the\n_OSC errors will be ignored even though some of them indicate that\n_OSC evaluation has failed. However, if OSC_QUERY_ENABLE is not set in\nthe capabilities buffer, all _OSC errors will be reported, but the error\nvalue returned by acpi_run_osc() depends on whether or not\nOSC_CAPABILITIES_MASK_ERROR is set in the return buffer.\n\nAdress this by making acpi_run_osc() clear OSC_CAPABILITIES_MASK_ERROR\nin the return buffer if OSC_QUERY_ENABLE is set in the capabilities\nbuffer and then check if any other _OSC errors have been returned. Also\nmake it use the same error return value for all _OSC errors and print\na message for OSC_CAPABILITIES_MASK_ERROR like for the other error\ntypes.\n\nMoreover, make acpi_run_osc() only take the defined _OSC error bits into\naccount when checking _OSC errors.\n\nSigned-off-by: Rafael J. Wysocki \n---\n drivers/acpi/bus.c | 25 +++++++++++++++----------\n 1 file changed, 15 insertions(+), 10 deletions(-)","diff":"--- a/drivers/acpi/bus.c\n+++ b/drivers/acpi/bus.c\n@@ -194,6 +194,10 @@ static void acpi_print_osc_error(acpi_ha\n \tpr_debug(\"\\n\");\n }\n \n+#define OSC_ERROR_MASK \t(OSC_REQUEST_ERROR | OSC_INVALID_UUID_ERROR | \\\n+\t\t\t OSC_INVALID_REVISION_ERROR | \\\n+\t\t\t OSC_CAPABILITIES_MASK_ERROR)\n+\n acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)\n {\n \tacpi_status status;\n@@ -240,8 +244,12 @@ acpi_status acpi_run_osc(acpi_handle han\n \t\tstatus = AE_TYPE;\n \t\tgoto out_kfree;\n \t}\n-\t/* Need to ignore the bit0 in result code */\n-\terrors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);\n+\t/* Only take defined error bits into account. */\n+\terrors = *((u32 *)out_obj->buffer.pointer) & OSC_ERROR_MASK;\n+\t/* If OSC_QUERY_ENABLE is set, ignore the \"capabilities masked\" bit. */\n+\tif (((u32 *)context->cap.pointer)[OSC_QUERY_DWORD] & OSC_QUERY_ENABLE)\n+\t\terrors &= ~OSC_CAPABILITIES_MASK_ERROR;\n+\n \tif (errors) {\n \t\tif (errors & OSC_REQUEST_ERROR)\n \t\t\tacpi_print_osc_error(handle, context,\n@@ -252,17 +260,14 @@ acpi_status acpi_run_osc(acpi_handle han\n \t\tif (errors & OSC_INVALID_REVISION_ERROR)\n \t\t\tacpi_print_osc_error(handle, context,\n \t\t\t\t\"_OSC invalid revision\");\n-\t\tif (errors & OSC_CAPABILITIES_MASK_ERROR) {\n-\t\t\tif (((u32 *)context->cap.pointer)[OSC_QUERY_DWORD]\n-\t\t\t & OSC_QUERY_ENABLE)\n-\t\t\t\tgoto out_success;\n-\t\t\tstatus = AE_SUPPORT;\n-\t\t\tgoto out_kfree;\n-\t\t}\n+\t\tif (errors & OSC_CAPABILITIES_MASK_ERROR)\n+\t\t\tacpi_print_osc_error(handle, context,\n+\t\t\t\t\"_OSC capability bits masked\");\n+\n \t\tstatus = AE_ERROR;\n \t\tgoto out_kfree;\n \t}\n-out_success:\n+\n \tcontext->ret.length = out_obj->buffer.length;\n \tcontext->ret.pointer = kmemdup(out_obj->buffer.pointer,\n \t\t\t\t context->ret.length, GFP_KERNEL);\n","prefixes":["v1","1/8"]}