From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f12.google.com (mail-pj2-f12.google.com [74.125.227.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE61446D2B0 for ; Wed, 16 Sep 2026 07:58:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789545551; cv=none; b=LA5i9MUwt9pWgl7OKnh3Th7Id31YHox9gy/q9P741q/Xc48BOgP8CmnJESRgF3f12ruGyElb34tr9VNwrr6V1xLJcE6xmkSecVpHImAfd2zCVwrTW67lRwsxESKZN/Ny6SJxIM/1S/g99hV8Tcyw/YoAs5L8BJys7cpYdxmQXg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789545551; c=relaxed/simple; bh=/ZoutxQ0ZJmBlGurPpdzCW+RhJfBFL4vY9B17VjHF/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B4DtBm+DlTPueVWn2KPybEoY881YYIO9xcOtC31wQ6Nc1sGZJETLktMPAvjfNsTDY7YVsFtRT/Ofda/wFEQB26WCmahI5w7eoWWQ7F1UZC2YuOVzU1oEoJj9tGW1WUt/RiyzlttUsA/0YIET3kAGKCZv1GW3qCgNCabBJhSiN2g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=iNiu3VqN; arc=none smtp.client-ip=74.125.227.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="iNiu3VqN" Received: by mail-pj2-f12.google.com with SMTP id 98e67ed59e1d1-39b5b07ec78so462018a91.3 for ; Wed, 16 Sep 2026 00:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1789545534; x=1790150334; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FWq5hvO3hBRGVn3uOxsC9S/weGAcU55UsXVnM8MhFFA=; b=iNiu3VqNOTvZ+Bg7Gf/9XYyLGWe5OSmIrrddaOZRvfq9TlYtjwh+x7PBU6bQqSCmm7 j1MlxMoKwIdKWHOeQUlZxmkB0udUyS6MxUTOdu4XmHvRpjHORXtDxD4ixQ9gIKsc/ymm nWHr9BG1FQXWhFeoJEWHyaogTCZrxBUNvI36s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789545534; x=1790150334; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FWq5hvO3hBRGVn3uOxsC9S/weGAcU55UsXVnM8MhFFA=; b=xMRZOUnkN2brWppc8OodHpFAowRQ9nUwSmwTXxQ95jE0hhflovX28Dhvdt+J7Y4o+B hcz3X8RtL2q6roMZyKTDAHhy8wHBpTLfGP7SXIpBoS5ytPZLztjsL7ch+BFI+MgxfziI ao+e83hN9QlZR9IchIHt95G69WG7QsP72oSAdk9KE21Bs5mx+kaEUNJJXRGP/FS4WKth dNx+AshEzqnmwwKf+YSYuGrhLs84hyh46hF/lJfNf6SGTihcxMOzwbGdA0CMdWB4YhLk K0SD+GNF6X0tibpxt7LreA/vtJ70tTkfxZkTuxY5VlgDj3EzOJ2VvzR3ptdhi5nMfuRT bPYQ== X-Forwarded-Encrypted: i=1; AKwUvBwAFAUDIktQZhijm2OFZanOWK1EhsJ3k0SJKMytzr+hjhj2AKeCk1zw24DCbFUzzEs69u3zRkJqxeL37A==@lists.linux.dev X-Gm-Message-State: AFuF++mfqdvjE3aSRsHMpvPp3c0f2bsLUz0tPy5S2MK7QbarawE056Ws qJOadDEBUKbWOnovuOa0bzRXfir/Je3bPESBuSsB+k+jZ3EXKz6Sz3o3HXRW3DEk/Q== X-Gm-Gg: AYBFou2FXgsnaSlrPDGE7Lcs/xSk450DTRCfK67dYxCiSAu87p15UE82iTXhcKfejOu XyGB8UvNTMOo0/7aReVmfcLQwl+iASBK0CMPJPbcGsuyqwD3sst8OM3AY/IXZZndGDYdSEeUa5U /x7n/EwjMLZBBXgrJKHeRO3h5kanPcoNC30vzTmeASvSl54yc0G7Tlt7psaSjupQCQPRqUubBVq Z021bnHi2Ar2g/rfYcwtF7dcPSNLSwkALKA/PEOMxwgKySvohFNJk+YTc/nuyRWw5jjr62oEd+D 9g0gZMhTWlFmDt85xglf8UM9Fza5p3kGLvuy5CxLPFSQJsfHzoe2zxEMLknDr7Z92pZ4zS9+m04 OcqaFMeQI0Jf5I6EAmASEhh2M87QXxsIlrIx7DG60BUxUhJJbG1kt38vzBC91m683SnKNN0soJy UkAYpV111bNOj6FQd9KvHZRij1IP+vdKiBShh3EpvKd7k3g1mfV1uNkWoM1m6IdZd7rzjXBsztA WEO4Z6JQkQdsVEVQZlMzh3XE1H7jfBmjj+7ajNITz9U56B7E68l8/do8h+ea/uqKO5j X-Received: by 2002:a17:90b:2d4f:b0:39e:1b0c:4773 with SMTP id 98e67ed59e1d1-39e1df86c10mr4199444a91.0.1789545534152; Wed, 16 Sep 2026 00:58:54 -0700 (PDT) Received: from wenst-7875.tpe.corp.google.com ([2a00:79e0:203d:7:1f62:7622:5d61:2578]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39e1b7acba2sm4348197a91.16.2026.09.16.00.58.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 00:58:53 -0700 (PDT) From: Chen-Yu Tsai To: Bartosz Golaszewski , Greg Kroah-Hartman , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Danilo Krummrich , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , linux-acpi@vger.kernel.org, driver-core@lists.linux.dev, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam , Alan Stern , Bartosz Golaszewski Subject: [PATCH v9 06/15] usb: hub: Associate port@ fwnode with USB port device Date: Wed, 16 Sep 2026 15:57:32 +0800 Message-ID: <20260916075745.3549953-7-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog In-Reply-To: <20260916075745.3549953-1-wenst@chromium.org> References: <20260916075745.3549953-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: driver-core@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When a USB hub port is connected to a connector in a firmware node graph, the port itself has a node in the graph. Associate the port's firmware node with the USB port's device, usb_port::dev. This is used in later changes for the M.2 slot power sequencing provider to match against the requesting port. To avoid potential conflicts with ACPI firmware nodes and then causing power management issues, only assign the firmware node if the hub's firmware node is not an ACPI firmware node. Reviewed-by: Andy Shevchenko Reviewed-by: Bartosz Golaszewski Signed-off-by: Chen-Yu Tsai --- Changes since v5: - Added extra |struct fwnode_handle *| local variables to shorten lines (Andy) - Added comment about passing fwnode_graph_get_port_by_id() return value directly to device_set_node() (Andy) Changes since v4: - Dropped unused |hdev| variable - Added flags for fwnode_graph_get_port_by_id() with FWNODE_GRAPH_DEVICE_DISABLED so that even incomplete ports can be connected Changes since v3: - Added missing fwnode_handle_put() Changes since v2: - Skip assignment if hub firmware node is ACPI node --- drivers/usb/core/port.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index b4452b665f59..c0a51d9b06a6 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -7,6 +7,7 @@ * Author: Lan Tianyu */ +#include #include #include #include @@ -358,6 +359,11 @@ static void usb_port_device_release(struct device *dev) { struct usb_port *port_dev = to_usb_port(dev); + /* + * At this point ACPI nodes and swnodes have been removed by + * device_platform_notify_remove() in device_del(). + */ + fwnode_handle_put(dev_fwnode(dev)); kfree(port_dev->req); kfree(port_dev); } @@ -754,6 +760,7 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) { struct usb_port *port_dev; struct usb_device *hdev = hub->hdev; + struct fwnode_handle *fwnode = dev_fwnode(&hdev->dev); int retval; port_dev = kzalloc_obj(*port_dev); @@ -782,6 +789,24 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) port_dev->dev.driver = &usb_port_driver; dev_set_name(&port_dev->dev, "%s-port%d", dev_name(&hub->hdev->dev), port1); + + /* + * ACPI FW nodes are associated later when device_register() happens. + * Skip assigning one here to avoid potential conflicts. + */ + if (!is_acpi_node(fwnode)) { + struct fwnode_handle *port; + + /* + * fwnode_graph_get_port_by_id() returns either a valid fwnode handle + * or NULL. Passing NULL to device_set_node() clears any associated + * fwnode. It is effectively a no-op here, since no fwnode has been + * assigned to the newly created device yet. + */ + port = fwnode_graph_get_port_by_id(fwnode, port1, FWNODE_GRAPH_DEVICE_DISABLED); + device_set_node(&port_dev->dev, port); + } + mutex_init(&port_dev->status_lock); retval = device_register(&port_dev->dev); if (retval) { -- 2.55.0.1032.g73a4cd73de-goog