{"id":2175747,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2175747/?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":"<6128656.MhkbZ0Pkbq@rafael.j.wysocki>","date":"2025-12-18T20:42:32","name":"[v1,8/8] ACPI: bus: Rework the handling of \\_SB._OSC USB4 features","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b04161c040d26d4067daeeb3ee103f83e0b308a","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/6128656.MhkbZ0Pkbq@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/2175747/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=DYKq2jzd;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=linux-pci+bounces-43327-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=\"DYKq2jzd\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=10.30.226.201"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\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 4dXNHs4V9Vz1y2r\n\tfor ; Fri, 19 Dec 2025 07:56:25 +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 737D030BD9CA\n\tfor ; Thu, 18 Dec 2025 20:52:19 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id EC5FD342509;\n\tThu, 18 Dec 2025 20:43:10 +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 C125434214C;\n\tThu, 18 Dec 2025 20:43:10 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 63401C113D0;\n\tThu, 18 Dec 2025 20:43:09 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1766090590; cv=none;\n b=NKj6pQ+XlniQIyQbvHQkgJ8xN6oRxMGGrGRbhi2U9DOAM9WWjFuUZoRbMJPMIA4Lf27TfAxOawsGFqdsFlSNzy0I3FEsJR1e9igHChL6RfZ6eZORfeyFdVTVphz0VVeQxKNXEgfE4a46fxT82tqvUZ8mNTACIEuSmrmji7BZ9x4=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1766090590; c=relaxed/simple;\n\tbh=8zV4UXnuDywnt6A+/vpo61138ZySdS6R2nB/1xd4DpM=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=em/d8xhMc2R48sclrkKDeSQsK1/q0kesbF+S5uul+5gyOlCMC4rLb4C3KMDmUueszUIDkqQiQ8lidVJtJOx26oIbriIsCWdYYAX00/KYUGxYq6GrjpmzDMi3iHhGQNYi6V7GJ0+US+734+SZs+79cCFFnSAJ6ldc6BKQdefqEPo=","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=DYKq2jzd; 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=1766090590;\n\tbh=8zV4UXnuDywnt6A+/vpo61138ZySdS6R2nB/1xd4DpM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DYKq2jzdvbf6CvyJRpB7ttvEqP2MaDv7AdWjuCurmqrd06TxfyfOvf9hDIIRRqHwA\n\t D39cnT+DZRC4DIeMyjBi4zE72/RF8rOOHZooVrdlLsr8linN+qlbXucCViO7Ywhbyt\n\t 9jv/5xXQMwaEAyKhraz5UlEH0AFkfahqDLjj/HwBVWQkysvvbMeAK9KlxFsxP7ZQtD\n\t 1edGx6AvcSpazThIigNG8VMmi9j+2a5gMQ39230bwqySTbOrxEav0/JFl1LejKLUzX\n\t 29qL11p70M0coC2d006TrdQqq0WjI9BosjXHHf0f34Purx4Yor0gV91FGOmsNa1I2V\n\t 21W5zHNiH7K8A==","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 8/8] ACPI: bus: Rework the handling of \\_SB._OSC USB4 features","Date":"Thu, 18 Dec 2025 21:42:32 +0100","Message-ID":"<6128656.MhkbZ0Pkbq@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\nUse acpi_osc_handshake() introduced previously for implementing the\n\\_SB._OSC USB4 features control negotiation.\n\nSigned-off-by: Rafael J. Wysocki \n---\n drivers/acpi/bus.c | 58 ++++++++---------------------------------------------\n 1 file changed, 9 insertions(+), 49 deletions(-)","diff":"--- a/drivers/acpi/bus.c\n+++ b/drivers/acpi/bus.c\n@@ -499,19 +499,15 @@ static void acpi_bus_decode_usb_osc(cons\n \t (bits & OSC_USB_XDOMAIN) ? '+' : '-');\n }\n \n-static u8 sb_usb_uuid_str[] = \"23A0D13A-26AB-486C-9C5F-0FFA525A575A\";\n static void acpi_bus_osc_negotiate_usb_control(void)\n {\n-\tu32 capbuf[3], *capbuf_ret;\n-\tstruct acpi_osc_context context = {\n-\t\t.uuid_str = sb_usb_uuid_str,\n-\t\t.rev = 1,\n-\t\t.cap.length = sizeof(capbuf),\n-\t\t.cap.pointer = capbuf,\n+\tstatic const u8 sb_usb_uuid_str[] = \"23A0D13A-26AB-486C-9C5F-0FFA525A575A\";\n+\tu32 capbuf[3], control, granted;\n+\tstruct acpi_buffer cap = {\n+\t\t.pointer = capbuf,\n+\t\t.length = sizeof(capbuf),\n \t};\n \tacpi_handle handle;\n-\tacpi_status status;\n-\tu32 control;\n \n \tif (!osc_sb_native_usb4_support_confirmed)\n \t\treturn;\n@@ -522,54 +518,18 @@ static void acpi_bus_osc_negotiate_usb_c\n \tcontrol = OSC_USB_USB3_TUNNELING | OSC_USB_DP_TUNNELING |\n \t\t OSC_USB_PCIE_TUNNELING | OSC_USB_XDOMAIN;\n \n-\t/*\n-\t * Run _OSC first with query bit set, trying to get control over\n-\t * all tunneling. The platform can then clear out bits in the\n-\t * control dword that it does not want to grant to the OS.\n-\t */\n-\tcapbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;\n \tcapbuf[OSC_SUPPORT_DWORD] = 0;\n \tcapbuf[OSC_CONTROL_DWORD] = control;\n \n-\tstatus = acpi_run_osc(handle, &context);\n-\tif (ACPI_FAILURE(status))\n+\tif (acpi_osc_handshake(handle, sb_usb_uuid_str, 1, &cap))\n \t\treturn;\n \n-\tif (context.ret.length != sizeof(capbuf)) {\n-\t\tpr_info(\"USB4 _OSC: returned invalid length buffer\\n\");\n-\t\tgoto out_free;\n-\t}\n-\n-\t/*\n-\t * Run _OSC again now with query bit clear and the control dword\n-\t * matching what the platform granted (which may not have all\n-\t * the control bits set).\n-\t */\n-\tcapbuf_ret = context.ret.pointer;\n+\tgranted = capbuf[OSC_CONTROL_DWORD];\n \n-\tcapbuf[OSC_QUERY_DWORD] = 0;\n-\tcapbuf[OSC_CONTROL_DWORD] = capbuf_ret[OSC_CONTROL_DWORD];\n-\n-\tkfree(context.ret.pointer);\n-\n-\tstatus = acpi_run_osc(handle, &context);\n-\tif (ACPI_FAILURE(status))\n-\t\treturn;\n-\n-\tif (context.ret.length != sizeof(capbuf)) {\n-\t\tpr_info(\"USB4 _OSC: returned invalid length buffer\\n\");\n-\t\tgoto out_free;\n-\t}\n-\n-\tosc_sb_native_usb4_control =\n-\t\tcontrol & acpi_osc_ctx_get_pci_control(&context);\n+\tosc_sb_native_usb4_control = control & granted;\n \n \tacpi_bus_decode_usb_osc(\"USB4 _OSC: OS supports\", control);\n-\tacpi_bus_decode_usb_osc(\"USB4 _OSC: OS controls\",\n-\t\t\t\tosc_sb_native_usb4_control);\n-\n-out_free:\n-\tkfree(context.ret.pointer);\n+\tacpi_bus_decode_usb_osc(\"USB4 _OSC: OS controls\", granted);\n }\n \n /* --------------------------------------------------------------------------\n","prefixes":["v1","8/8"]}