From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83D4EC4451C for ; Tue, 21 Jul 2026 06:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fHUpdIaIyIIyz0xHiffTwBnjBb2ySQuUos1Tr0diNj4=; b=uF0SawKdJqTGwoMhBy+gLM3vl/ lMVkKQ6yqb0wxNjmnGlNKLT24CeFwcMANzDp6ceaUbsJ6DyHE7YfYvjM5yy238AxyD1Fa50IQaVxK LBP9yaU/lP+s2wf2tIlmKxnZwUXuOe57BYTugIjKHASdKVy7XAjVkLC/x88yMJucoJGq+OFIWI//9 MqHbbPr1/nWOpDNrs/yFXWHU+K2+ZXXme3nVjjdNgt1gxCf/Q7wIt2YvTYWu9kQRnrJAbsBtO4W6D +EeMcc0TTHkRjGxcxwmOuhQ403enZoRDqlCnRTTIbbUSSiIYQsH+h4myc4xnJargUFvUyUK5GmsLq NlhK0bEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm4Ng-00000008aKi-1QwE; Tue, 21 Jul 2026 06:55:08 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm4Nd-00000008aGI-0IVt for linux-mediatek@lists.infradead.org; Tue, 21 Jul 2026 06:55:06 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso125894825ad.3 for ; Mon, 20 Jul 2026 23:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616904; x=1785221704; darn=lists.infradead.org; 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=fHUpdIaIyIIyz0xHiffTwBnjBb2ySQuUos1Tr0diNj4=; b=JJ5Tt7XlHKz2n2Cd5UufjY8c/P+IYJ2PvQXH/wKgHC3mViIyGikdQuKRWTWk/9JApA MDPszm2d2wlsMroOTqNH5tP3+qg6AP8MhllA/nkTEMAV3Gggg0xr9+zDPakzv4iKCu8q OrD2k14ZHYTfqEpJyS2gvUFMzOo1PjIOmv3Yw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616904; x=1785221704; 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=fHUpdIaIyIIyz0xHiffTwBnjBb2ySQuUos1Tr0diNj4=; b=AO5HvGxe2Nu9O3lmWsLian1DdGvrKA2qylGOgMki/VXTSxa2DKHm66cS0v37zWnjyG CHQK4JcVeLExaozgOAuH1QsdqkDLyCOtUTxpJ+NJuZweS28KGT+utCsrrBtXHrtK7XTE tOUmKVijKdHyOlTlNNaGj6u7BDSozRuUJ/OBljkYhrtvu/nAL7Zbtgp/GP53AOjEAo6p aHwdm83DFOR3tAHztu/xU2SwBvZGCp0Z/6qwL5enGAmIdzP/kVeNjiIo4dUkp6uluDQP 5blBB+Sax1BB9cXWjjqN5tebYr+Tbe65hDbxfN3jCFCA5FK7PLXSDjiE6RuA86EdpaRj /JIQ== X-Forwarded-Encrypted: i=1; AHgh+RqRgw6ULraHyO01kEITTvk5w+WaKD5/V7FmEr9EzVLKABwzN4Z4a8EEd6rpN5GsXlncytqBOnheyzgQM/bBQQ==@lists.infradead.org X-Gm-Message-State: AOJu0YzE0jaqFYhkzc2sYrxbEllO3lGH7jLSQC3zhHM19v1hPOMK9lZy YiUpqdXku4pYEVrmnjBSPx/ctSdAvusfsvA6z2qEBnqUPsIfUSPO6NrUqzRUzkHruQ== X-Gm-Gg: AR+sD134ZeBY4JxdwVr8aW80WTg2T+dKe9b4VgPUOFON79Lk4lbpu7nY/V1Jxi5ZX/o RMGVXTzGymtN37RagIaISgo5Vc6HUsh5OfvRqPPcK210RldsUHzc3cFN/wr7klCUkn+GJ0u/ylh yo3sUfXwAsTW8B2mgk00zSsBJ22oaTGu+nNDWWIOMb/lwk79HDlc0zTrXFR8SVmiFmkPPkA4piF pGleSFv3dXHkfOG5Td/9pYXNgIO8xNuuc8GRP9HHt/o6PfhjprQvuG6WiWAiymwvHtXOqxGdNc5 COQCEgUnOKBlFhC+kRktZnwGurc74hwt8ObMyfFRa2kAq9HhSI2bD90rhrTfjCbqTL9sdRKpuuo mAIGSlWD1ACsTKIlkZxIkGJWUHZP4lkzseURi7PD6NZazfJbFf1YYQlq8A/7MrHCyMAn8mjXvAB tpSf62BgYpCjRw2ZumF7zDLheGYCr3Yis4rafUsn4OFoNQXii6K11G+kCCaLyYuNKojoRDvw== X-Received: by 2002:a17:902:f78c:b0:2cb:3f5b:6663 with SMTP id d9443c01a7336-2cf348bee75mr185892145ad.11.1784616904541; Mon, 20 Jul 2026 23:55:04 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:3916:f048:32c3:931f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448ee77sm69716005ad.4.2026.07.20.23.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:04 -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 v6 06/16] usb: hub: Associate port@ fwnode with USB port device Date: Tue, 21 Jul 2026 14:54:01 +0800 Message-ID: <20260721065413.2306137-7-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog In-Reply-To: <20260721065413.2306137-1-wenst@chromium.org> References: <20260721065413.2306137-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260720_235505_413371_1C272ECB X-CRM114-Status: GOOD ( 18.58 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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.229.g6434b31f56-goog