From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 A4F4A3F5BEC for ; Thu, 9 Jul 2026 09:58:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591086; cv=none; b=RxzBTZyua3uBdsbRNgp3m4PJoRgKUm3BtjjEKRvV0oHipCMhwlXUfn6hB1z6TsW7q44iaw7qEPZMs1b/iLmn9zzjzkiN/d/Yrx+U2+1K2nEZCCSx21nIQ/U65anfC5KFgcKjP1LR3E32GmrT+Xk88M4WjmSot9u0CB3kH2eJhjA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591086; c=relaxed/simple; bh=rkWLn0FHl7H1kHVZqLywZSX23TH3svX2tAwmJopyKUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=evvzqreaYlxVUr494m7MPhGRTeNuYQRh7jN6qzJe9567NcJ4jbl0bm/U7OpdyHyu/ROppBmMt6gz5A7uy5xVbypRoLXn2y6t3IWMVvpyrLBmiHc1gG5NHowbqXICUTrvzpzlJFihAIpyP/+9phq/eON6un2njWYbhcsnSpCzIOc= 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=L5jxihFc; arc=none smtp.client-ip=209.85.214.176 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="L5jxihFc" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2c9b1edf2bdso24395755ad.1 for ; Thu, 09 Jul 2026 02:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1783591083; x=1784195883; 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=F/uvU7sUOw7sHC5RCl/6W+zWHmjzyCxjd+jlaUCTE/Y=; b=L5jxihFcSU0E5gS3Hs4y+pFMfZWE8cap9WYFlI0EyVUUh4KYbtyiN2wnZyoSOWNkem ZkmK/XWkCmOLmxaoIbpXloKrP266Ek/jX2+xLVVFstxmFwcNeyo2M9U6U9phVJhT+wNx j/JJJ8c/NqpRchTTF1HGCz9c1Bwua0QO1hOvI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783591083; x=1784195883; 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=F/uvU7sUOw7sHC5RCl/6W+zWHmjzyCxjd+jlaUCTE/Y=; b=fuGOEWcOnm1LkvTWl4vVHVbBFROGBB/z5fQUF9/xuNvtF7SJPPOdKv+7t7fotYp+a2 9gjM9pZio2SQbmrBnC6pfruAen+4F0Yw2jsbtD2fpzoF9jJdiFGuXxuztqDfHECGiKZw lfryJXPBHDHULsYIMP64EGtnB9fMX51QarWk1JgSofw+T4JJer4JGmJTrcb6z4zQANcD chg949Igh4fMuZm235T52ik25s4FhQWp4HEi5414wcF6jcUjRL6GM3fxTCxlPOuy8B98 NM26lB2mvka/TGLI1lmsYOL2MdX/Przgkge1AP1RYUD0o/j7kNNyHPgqmv2vwVhgu0l/ ZfLg== X-Forwarded-Encrypted: i=1; AHgh+RrQIDv5xqWftP+xLpKe2YhMOvJ9jWb1NvM652eUyorMJ4XA/t56q5ZA70RKHut24OezXKDx/56kRaqj@vger.kernel.org X-Gm-Message-State: AOJu0YxBw9uVpLgJM2t/7I2iS/Gy8ROIVo93xt6vJtciYrMKCCDbyfpT 3sVnbKjAJPMOcLvcmJ1l1vlMiflfCseI7IwcPNKgaohUAO9aGQWBphBFnjAaj6zOMw== X-Gm-Gg: AfdE7cnE/T1vC4ojCVEmORbCvHfZpaCqFCucklifwPAR83bN6v5jtYtX7AjQlcShYc2 utaTSRuR3LjwNlOMC2LwCF6XEODFe+pG0OhLriv2vtszduG/1TUEZbBVlPJWq6PEY4VV7cm8yQ5 bU1Q53cA1xmjiASQZOREYbjSEKRawijr6pQa85CISWJmRTfQLN4nGh7cikInT6XYZzdhsjA/3Br 7xHJZ/BFwJmadARSfMwLLTC3FcTbJewgPjqr8oL7nkGLgAJdxXt/Iis0Y5vV+uQBJ0apC1C1Rl3 fBA4/JnAE+eKUg2ef71uxbZYnQFS2orclnitXjUtQcVKiV72/k9ear+2V2Jtcw2EOvmWTfEeqA+ rKbFEkTaOSyN8mINGu+sbP+S7sNStpSY88AjCDiNBDxff2LXw/BAltpZ7Dt5XFo9flv2ZiDglwe m1QowV216Gl5JjhVRx6R2YWVcW77RCVSFbY+FF/RShy833ottGuDZqwAbqOBE1SbkEal436Q== X-Received: by 2002:a17:902:c402:b0:2cc:df15:91de with SMTP id d9443c01a7336-2ccea47c1eamr75805365ad.42.1783591082919; Thu, 09 Jul 2026 02:58:02 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:bd09:6ddb:180a:69c5]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d5bd2fsm41082155ad.78.2026.07.09.02.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 02:58:02 -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 v4 05/14] usb: hub: Associate port@ fwnode with USB port device Date: Thu, 9 Jul 2026 17:57:10 +0800 Message-ID: <20260709095726.704448-6-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog In-Reply-To: <20260709095726.704448-1-wenst@chromium.org> References: <20260709095726.704448-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-acpi@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 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..e8fb2acd77be 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,13 @@ 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)); mutex_init(&port_dev->status_lock); retval = device_register(&port_dev->dev); if (retval) { @@ -852,6 +865,7 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) void usb_hub_remove_port_device(struct usb_hub *hub, int port1) { + struct usb_device *hdev = hub->hdev; struct usb_port *port_dev = hub->ports[port1 - 1]; struct usb_port *peer; -- 2.55.0.795.g602f6c329a-goog