From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 D16A03D9552 for ; Wed, 15 Jul 2026 08:54:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784105691; cv=none; b=s5ARFGZOfCiUUDxEisWg3ZazVH1icPDzMMJMQB5MCGTRyNlm6DNQO2a4VpyqsgVekwsKdczumvKygrtE0fDbp8s4xtJM1iLHiypC+VHXj8Oa5CRjvikyvcr4SgZC5Djy8cYXi3S7opHGsVv3czZRcXXcm117Ib4c6YAF8An7LjY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784105691; c=relaxed/simple; bh=9nlEv+Xa1sTuFoWhPSW1h4HQ6sr9BjtVm0Twy1kDFGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j7Zzrjblwqj/R/TZsSwjDQlCQJgPsqfSA74lhzg0V4IbCkyBcyT97fpgxu7A6Z/ZH9v/vnIXVv9FUz233g6k6B2pZQU3qjCtdyLbZcpzKMVocuVc7XF82Apf7XBvpWwRUBs4RhMXmrd1+Nu2NuY8/zFtMrMN1IZztM/IEAjUbdY= 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=Px+LR3Na; arc=none smtp.client-ip=209.85.210.179 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="Px+LR3Na" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-848595b338cso6085081b3a.0 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=vger.kernel.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=e3MWujHDcAo6N5pm988slASDpmZJoFPb9rC5ReM64M0=; b=Px+LR3Na5thCg3SeVAiEA3tfSCt+rvACYsEPDHMJIG7EETxCyIyPOFfs+3jC+Sp7yw 3TY8Q8ZyVsfesqM/WRRPbpoFAMJzUDp8IjCcdWS0+4ZHXlslusKO5SPdREx8for7gXEy 7w7vJ1yShUl5gefWKwUbRDiN0pOBupC8qKVGg= 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=qlt50YzFuSnCkmtGJGJs4PNhrvEBAC8qDDtK19FHKYLhFhRJ1lMbVo819ZgMxxm/nS HGFdBzVQuzCdMDACBKxMfN5NegUkkp43yyQnX5Sdkl3f/oWXcDx50rF5L90/2STYl7j8 y/YDsyqmoXblsBVHYANXDJg1ImXswdvWlljSWpMeu0Hu3MLIQSymu81TiR74tuq3DDJX 8FttH/18GOhrdq9nijLBINIknnPlWEeawM9p8vuhkC5Jq2/eI0WyUxC+w3bD319eemy3 mn7e/J3ivC4UtjQS+gYXTfXC2YvobVlGb5HeQgenQhSs+o7mwboqMLmhBNOBwxa/LmoT tiFQ== X-Forwarded-Encrypted: i=1; AHgh+RpIJT1/8u/vVOXyIPLielavCjQ3X5AfXmo0uSZW9vtf8rBJ+VuOZWzgrQzQRp+EdiRbMEZR4PtHWiTLB3U=@vger.kernel.org X-Gm-Message-State: AOJu0YzWqBT721KAGgygf3FeTskeShezG83UHvbJJzCSbBxGcqSggTWP 37bRH/FXpCElRnDSXmUhfwL8pe9DmfYWfCb6UVUy5JDrYYpZvqbZGi+0RExzDp7WqQ== X-Gm-Gg: AfdE7ckcU2WcPNMHWCc975mubl44Qat3Pp24rCVRZWHKZU+7tMxsEAe13YxYdVuNH2r knYLzozVntynR6IznnOMHqmYOKkEkFlOwSU9+4Q+ekx6UEM350iiY/56+D1E3xGtpBoxaKOpVvT 8ssRjHOjazV1TaiFNZIvQRrAuYG6h2lNzLMZkbfTA8AOLgJ9tA3Q57Xwa49C8FyHTSwpwvOa2at +Ojx9zYieA0d6v1FNsVwAtHzx5F23owoaXSXpyAe9iG/VTIfiuKa73BoY6frc9Rbrg8v6/bfYrc YSuhPWEhkTHSBUYW2Ddj0GhblMero5J70iiut1OesPr+iKAuRD1NFQ30Pw/wLLxE3jgiVloC8t5 BMsu7XzzPatnGTKWzCsMOb4A8QwO9yzCtWZ1HZpP0iBAplflkDiHgYgSl1eRHW026npVcDP619w t32p1ZAfM3CRFNr+aFo8Ne/huj/sasIVpz7uHKNvBjeGvgYe+cJ80jznHnwxULVsfqoz+qqg== 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: linux-kernel@vger.kernel.org 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