From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 ABF973DD879 for ; Wed, 15 Jul 2026 08:54:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784105690; cv=none; b=fEFwCwQHXj8I7jWgc80ZMNxB+iBE42HoQUybVUx6WTwgWipnq1bRq6ua6XmMwm2ufA+dOby/Ri+N4C2OdQL9tFLR0XxxYiGTLwyBZX/puZQ53VVvF2r5nIaOgPR4zhCbv0UmwgLSNX2gVNHeGu8wiCVSTiRtc2yomSOYAUYjBdc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784105690; c=relaxed/simple; bh=9nlEv+Xa1sTuFoWhPSW1h4HQ6sr9BjtVm0Twy1kDFGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SPzLRswcmFmmdxgK+6DUNshgkx154DE2sw9xdzVhQhI4X2cCdkaECS08D49ICFIsIlE42CQEVvuo39VrPmVvK5uHRIjiAeDbSG7WOpgN5QlM89iwsDJdZUUHHWcRrV7aUZaT/U/aSWMqZxRlnZjE+ZhqdxrTEE4PUayj8+0qRCw= 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=JaXwxeIo; arc=none smtp.client-ip=209.85.210.169 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="JaXwxeIo" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-8485ef63b68so4701238b3a.1 for ; Wed, 15 Jul 2026 01:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784105686; x=1784710486; 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=e3MWujHDcAo6N5pm988slASDpmZJoFPb9rC5ReM64M0=; b=JaXwxeIoPH1Ehxaem8WpFtCe2qfdOHtdNU5nZqRUhcSdoFDT1eFyCopuOkMCbg1boB y87VFGxMnykurX1NLQAuGBYaHEztZFfTfZiz8m0z39zVgmrc9uHmggdatzZ1kuY0OmMs W9Q7L3pX4CN7Ghr5fQ1EhZSgZJ6C5SE03zXMA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784105686; x=1784710486; 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=e3MWujHDcAo6N5pm988slASDpmZJoFPb9rC5ReM64M0=; b=T4b0+U+/PL47GizUYEpd2bQ4zvgt7ZoK4dgNrmEjx4zxXZxNJO0fj1J9OusyaU26zB 5C+WWMjtWHCRnVIt6meiVALXHRuzs/q6kAMnqX6ncwhP6dQSwKLmgYNC8aqHPYyqjRAp HAJf4J0/LLd1OPDhcQYK7pJGcaRqjfJtR5cDJbnvTax/kH7c56WH7Su7Qysn2qUh90Vr nMEWmlNOrM95/hgx5sBql+k1sQgIM1Bm1yKKJYwZUFzMG5HIB5eoMA9f9NXMg+5lQQbX BoL9f1V9e+03D26c4pSa8ZVXxQkE496/5BbInSNjuleBeK5cs9JyLwVKo3Jbs7I0uQm2 ryKQ== X-Forwarded-Encrypted: i=1; AHgh+RqBDfo+qMWNnlryB4QrbnzD/LGCV97OuA0DMYZNmMapgkvDESGpogHxLo0mG+CFvj4WRTN0M9YQF7MdXQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yy47aRFSXdskB680pNoQ9YF5hi/0xT1445SmLvP3z4rORWM7dGi IMUDdNRFrZ+a5iBYNkYpndfApDHmkiD094inQPHhfVWFii3tSUtHkBidQ0K/tpz8pQ== X-Gm-Gg: AfdE7clOSk7KqrJJGU+xCngnjVAkF1OnTtJnEb6jr+NswtTns0nQYNee/OCA+IpN4S4 lKFIv9Osp+ihhAzUGj/tP8/Ak2W760/CE+koRw22bjX71MG2REugxSnvAh7J70thuVEYJ5lTkVr BNnDdrcQAN2dBSHZJ/ANGAu9oKqePY4WfqU0kCxgW2afkkV2EnSQcj6tAnvx11PnvfEOldqRP5d QmdzN9plp2umVpvs4EX2Vx742Jc8BEyr95s7NWsqpYu5YJAR4Ckm3I8K46+UYSLnBonM6sAKcsh oz27JpQQM0OG5QhxhiFBehYo2eyHAD4uySW266OTUBdCK6NHPmzTbiGXpglCthHLejXBdNkJ+tr GKR9FFfLAaUQX146niPbN2Qy7emX1SL0Sv0VB3yzZg0t/jAs1wre+6g8oMXT6A+MpSjv94J/yAO xp5+tOVig+HT8IcAB0kbPOKN8vfkToLTdsMPX8TnoIHhZjcyMYkgzf5iZNOcXGNq/ra99zoQ== X-Received: by 2002:a05:6a00:94d8:b0:847:7f3c:b5f5 with SMTP id d2e1a72fcca58-84a554fa4e8mr5539619b3a.11.1784105685669; Wed, 15 Jul 2026 01:54:45 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:47d7:4aa5:a6f8:2279]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84a4f819117sm2757491b3a.59.2026.07.15.01.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 01:54:45 -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: Wei Deng , 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 v5 06/16] usb: hub: Associate port@ fwnode with USB port device Date: Wed, 15 Jul 2026 16:53:36 +0800 Message-ID: <20260715085348.3457359-7-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.141.g00534a21ce-goog In-Reply-To: <20260715085348.3457359-1-wenst@chromium.org> References: <20260715085348.3457359-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 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index b1364f0c384c..4fd0a4745741 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); } @@ -780,6 +786,14 @@ 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(dev_fwnode(&hdev->dev))) + device_set_node(&port_dev->dev, + fwnode_graph_get_port_by_id(dev_fwnode(&hdev->dev), port1, + FWNODE_GRAPH_DEVICE_DISABLED)); mutex_init(&port_dev->status_lock); retval = device_register(&port_dev->dev); if (retval) { -- 2.55.0.795.g602f6c329a-goog