From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 286E642BC2C for ; Tue, 21 Jul 2026 06:54:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616883; cv=none; b=iylqUtCDJy8Iuf4rEWPaLYIjOOmtTizUYN9NcRyot3j9jVdea3fcUCCFfJbaddHbrqGHXQ/EOFE/3TnrkVFVSt3fOETm7SId0ksFE+luO4O0+I0wkQ7jlJJ3ApqA05RRPGfEZpXVmqg9Jf47sh/sCBFBnjEdvi/won6Jdy8GyNE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616883; c=relaxed/simple; bh=rN8bGYfPxlquy6cQeK5GYz3ym6oKo/FOx8yU0FBCzV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZQ3mueGIHvkuR0jjCLifaIur8hNLwCqggwaOmgQ4wlJhEU8PZT0w6EOUeAL8ZZW1oi6IcOQYDTPmCE5WW8f7l6EnZuPDwGmFvotgMNW4ZR14VK1pxy9Zw494hwAjBaLnzZ7uQoEld8rdtG9wWXmU60VZnWQqj13oto0A94SjgM0= 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=O37Eedr4; arc=none smtp.client-ip=209.85.214.170 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="O37Eedr4" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2ce87c7e3bbso123653135ad.1 for ; Mon, 20 Jul 2026 23:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616881; x=1785221681; 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=yZPli2S6cZzTtPxNu5kCcB+M+KQUeHMnkMABY4ADLcw=; b=O37Eedr40TOL1RWQ6QWyigzYQhZ5h6H0pxJg+gceK3/HoVfforjFkq8OceLGsaRKOe ScSbEH3/CJ1lqVjsritmG2lJvjtMZcvz1Sgejb90xiWUOFph/b6goc3ePmMBftzHJUcu VgFCsVs2w6O42y1a0Q42h7rQUFQIMfpFbWs1w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616881; x=1785221681; 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=yZPli2S6cZzTtPxNu5kCcB+M+KQUeHMnkMABY4ADLcw=; b=Qmgm8SId46akNFLkWOOckFO2bnygQWyOCieUjtX63X1lUrjL1+0UruHzTkJSz5p3fF Vfnt8TCcUQ6Ba2+q0k6xXzy0EdyWCb2lqL9BLBdw28j3/WjiETYoaEgeYNdnaIk1Vh28 JROFodDmhxm69ykSV2ArALvMN+knNzFOTGWwYtjaRgBLeaVcPfpklQWtZVw6T5JESiWJ 1JQjGsM5PLF9k4+YATfKsG3JdwNxGGGAeY7PCTsyw+9KbyAcw1uhPtqvXmS580MkZMBT TYvNf3oyh04A7D4/0XuWlOjC3u0+m4qULYPw4ALbx+VurSE+P4aGp5+JCzZpuP35nF+/ UE9Q== X-Forwarded-Encrypted: i=1; AHgh+RrSGt5cwGecL63GcMMBCUvbjOC/K3en6+5ljruAkonHc3JMJ8Z6NmB+NcIUpb+UpRy06RTZ6oYpf3Q86TM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+LUAdsd7PBthL41CVy5ZIs9yz5t58EPFAF8f6XkJ3Y1eNfM1p 7C7mXg+32VAoaEoCjZFS5YRQdJywVsg06HPlpoS5yrJW+gu8s03jzV5Dml3k1tojug== X-Gm-Gg: AR+sD10tqQ3QQx7WWC3v+4NMSMJLp/J6wy6XzchRrf8v5vfEDmPz/FGbLyFv7SU7tDN 0v4WtYFXDKLjCz1L2yDi7RaNxS22oYea2S76BhoAX+vRhjHbPfyPTRbPCRDKJV/s1cmVvpfSFme XmKJxUzHbwa5hauJe6B1W11jCAMhd3DubfzPeFTpdPNtw4t5dy/BiP/L0VnpAH8rpdNV8IaaX15 bNYRsl8t2mImE2xjsBrecIbOJDod73VfAuiDRQXRGIbBu4LFBPjANClDjqTD7fPAI+s+gGxybny 1tadMIjswnBVb5LqWLsCwwpGWnDqEN+V8y+XUz2vkzEIusHLKByjkykEzIQmDJhVEKLZary51Tv fl0OWpqG9PIg7pI41tQVJijeCff1VMXxPcKdRZM+2OkkCqL6anrhe5RWvrTVolksMEtVMgP550X vRaZIH7eZ7PakXi0wjmtKL3JuDqCoWRPp5XOzlUnMSpAijpJZNWhs2v8FhhJY= X-Received: by 2002:a17:902:ce8a:b0:2cc:61e8:5fba with SMTP id d9443c01a7336-2cf349a2153mr182756085ad.32.1784616881554; Mon, 20 Jul 2026 23:54:41 -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.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:54:41 -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 01/16] device property: Add fwnode_graph_get_port_by_id() Date: Tue, 21 Jul 2026 14:53:56 +0800 Message-ID: <20260721065413.2306137-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In some cases the driver needs a reference to the port firmware node. Once such case is the upcoming USB power sequencing integration. The USB hub port is tied to the corresponding port firmware node if it exists. Provide a helper for this. Reviewed-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Signed-off-by: Chen-Yu Tsai --- Changes since v5: - Dropped left-over declaration in header (Sashiko) Changes since v4: - Added flags parameter so users can specify whether incomplete ports are returned or not (Sashiko) Changes since v2: - Moved "Return:" kernel-doc section to the end. (Andy) Changes since v1: - New patch --- drivers/base/property.c | 29 +++++++++++++++++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 31 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 9387bb83eb54..950defc0c55a 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1346,6 +1346,35 @@ int fwnode_graph_parse_endpoint(const struct fwnode_= handle *fwnode, } EXPORT_SYMBOL(fwnode_graph_parse_endpoint); =20 +/** + * fwnode_graph_get_port_by_id - get the port matching a given id + * @fwnode: parent fwnode_handle containing the graph + * @id: id of the port + * @flags: fwnode lookup flags + * + * The caller is responsible for calling fwnode_handle_put() on the return= ed + * fwnode pointer. + * + * Does not return ports that belong to disabled devices or endpoints that + * are unconnected, unless FWNODE_GRAPH_DEVICE_DISABLED is passed in @flag= s. + * + * Return: A 'port' firmware node pointer with refcount incremented. + */ +struct fwnode_handle *fwnode_graph_get_port_by_id(struct fwnode_handle *fw= node, + u32 id, + unsigned long flags) +{ + struct fwnode_handle *ep; + + ep =3D fwnode_graph_get_endpoint_by_id(fwnode, id, 0, + flags | FWNODE_GRAPH_ENDPOINT_NEXT); + if (!ep) + return NULL; + + return fwnode_get_next_parent(ep); +} +EXPORT_SYMBOL_GPL(fwnode_graph_get_port_by_id); + const void *device_get_match_data(const struct device *dev) { return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev); diff --git a/include/linux/property.h b/include/linux/property.h index 14c304db4664..01ea010cb2f9 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -505,6 +505,8 @@ int fwnode_get_phy_mode(const struct fwnode_handle *fwn= ode); =20 void __iomem *fwnode_iomap(struct fwnode_handle *fwnode, int index); =20 +struct fwnode_handle *fwnode_graph_get_port_by_id(struct fwnode_handle *fw= node, u32 id, + unsigned long flags); struct fwnode_handle *fwnode_graph_get_next_endpoint( const struct fwnode_handle *fwnode, struct fwnode_handle *prev); struct fwnode_handle * --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 EF68442DA4E for ; Tue, 21 Jul 2026 06:54:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616888; cv=none; b=HXMg+24lzlEXBPUKoYNOyMj1d2rcYWMK3XG0JTVWxZ4fgcmH/JoX0mdN1hK07vUL0cp48pra1rqy1PAfa88dqoHHNKn+VuBM8V+GwblvRNO+g5JAyW5lQj1KEYxTdQIpS1KWX2GmVF5ifnw1MfquGXK5JTA0BOAdBqGUvNRBOSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616888; c=relaxed/simple; bh=K/CXr8sGOQIlsbuegDLGNruY8OXemH3+DJMD2gXrC6w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TZLon0hiu+/IYbIfqFG/yaY0cSTo2J4ihVbIZUkfFqcj2pvIS9htydMpreKHeNTtTtwzVjO+ee1eRDy/jNtVIEjO9Bn+1Qdqd3bm2OHHb5ncQgbOFZXUBIInMlN0o1Qn+8uLCMOIDJE0ytE1+jvE7bR+c46/Op4sn99UPAMh9v4= 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=lIx/TyVR; arc=none smtp.client-ip=209.85.214.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="lIx/TyVR" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cca0c5799eso86495415ad.0 for ; Mon, 20 Jul 2026 23:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616886; x=1785221686; 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=15QCCMJqDJvxC4OlYXPloXq3cJq1LSRVcuMMIDjVYjA=; b=lIx/TyVRtZrlwFniXWRGEHfwmAduhmlywwFuRvNQ1TbhXzyFoyXkqLMDYTqhHuGNcT u9Wa4cW6aynB4+uk90JhRPtMdmZH3lAVQpA9hAyB4Yn/VK8bklOrkI6sYeIAMA0rZ4kz FGW9iNk4/Kkb3sU/nYnZtyDt3b9ruuG7Uguq0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616886; x=1785221686; 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=15QCCMJqDJvxC4OlYXPloXq3cJq1LSRVcuMMIDjVYjA=; b=pkg/fTd59kdM35yLyVxeViOyuzn4jwjvzcYaMIUnMimOA6YC9WS1yT1528X5tkME0Y YOb5bFN5krMXWTmJLhxA1VShd4y4fblkEL2vLy5hybal19TI2GsqAWuIYdco14T0wkFW fk8Zjd7z3Fa3XHZWSRJgZ/o29eXbIYSboptv0EjYRI34pZPX2lIw7J0rnXsDupKUW6IL YMw90d+6IFrFP3G+9/zqR5//FltLKdK0Qz1PzG9zKdFH+naPZy8xJGkeVvP8CHxx1DpB pSyKuyZh+2AUEIxNC7w2GBvTwdZ8mOjFWPVKYmBuTM1CrZMb9AcCG+XMLomFScvxs7OJ 3PFA== X-Forwarded-Encrypted: i=1; AHgh+Rpw/eKB41W7vWbD5L6IRkZUBjeoSf7Rh/EOrygoXmwdH9kR0BICvJrt4xZtqXIpRyBsQcmVjh7EYG0/Vb0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzw42LuIutk9sUoKCCxVGICbJ+82jcEkkgKLMARGYrm9hAtPVo7 ilGsF5s1Q+wuiPVrzxFPxfStuRDrLe1FbllYmFCoDYGhchT1Lj8wEJiXVgMrsHejjQ== X-Gm-Gg: AR+sD13ccIlLzePFjvulrsSTfm84H5ezcYfqCzaRbkX//yrnC+mj/V4NEaphFoBVBSu rF76M+CetfA6aVlqIxG+Sq9Nfj7q3NRr1O8k8LQEARFa2Zf1QEO8RctNMRVInH0MJp1FHNO5aN+ demVuethJNuXQrwHYIrwwbUZYjl+SZkD6G4wlowvzETNeWdHzge+eby4MItianbrrsoBGJBvBBY 1tKjEh51zGR1aDKhWqG7+XhGJ4+3Kha+oOkocDzYXY1i/QeXBJmsuM17BnVidlg8lvTGkyWpo3t z+6BTYh1zSqv80lKZPuD2H50EF0yLoMa7UU9wzntQ1vu9/Dt+iWrvopzWbQi+waelDzwFb3enwb hUqqjhhe4xWnTmJ8X5ImhzQNr/COI3rchX+D1D2fJqnGILlLUOMOUum0y5cdeodzDyj8Xiyo7C4 pwZxENjeR639FBQiPTTTGTSva5Xeppk4HQBJUZBRKTSHbf/ESDT9aCp1lMofQ= X-Received: by 2002:a17:902:c412:b0:2cc:86a9:ebfb with SMTP id d9443c01a7336-2cf349b839amr193173875ad.33.1784616886249; Mon, 20 Jul 2026 23:54:46 -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.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23: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: 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 02/16] device property: Add fwnode_graph_get_next_port_endpoint() Date: Tue, 21 Jul 2026 14:53:57 +0800 Message-ID: <20260721065413.2306137-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Due to design constraints of the power sequencing API, the consumer must first be sure that the other side is actually a provider, or it will continually get -EPROBE_DEFER when requesting the power sequencing descriptor. In the upcoming USB power sequencing integration, the USB hub driver first needs to check whether a graph connection exists, and whether the other side of the connection is a supported connector type. The USB port is tied to a "port" firmware node, and this new helper will be used to get the endpoint under the known "port" firmware node. Sashiko points out that the |prev| reference put is not done if |port| is NULL. However it seems that the fwnode_*() and of_*() API design implicitly makes the functions no-ops if the passed in node is NULL. So this new addition follows the same pattern. Cc: Sakari Ailus Reviewed-by: Andy Shevchenko Reviewed-by: Bartosz Golaszewski Signed-off-by: Chen-Yu Tsai --- Changes since v2: - Dropped unused |ep| variable - Rewrote as do {} while() - Dropped WARN() use --- drivers/base/property.c | 25 +++++++++++++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 950defc0c55a..5d3993bd8fc4 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1099,6 +1099,31 @@ int fwnode_irq_get_byname(const struct fwnode_handle= *fwnode, const char *name) } EXPORT_SYMBOL(fwnode_irq_get_byname); =20 +/** + * fwnode_graph_get_next_port_endpoint - Get next endpoint firmware node i= n port + * @port: Pointer to the target port firmware node + * @prev: Previous endpoint node or %NULL to get the first + * + * The caller is responsible for calling fwnode_handle_put() on the return= ed + * fwnode pointer. Note that this function also puts a reference to @prev + * unconditionally. + * + * Return: an endpoint firmware node pointer or %NULL if no more endpoints + * are available. + */ +struct fwnode_handle *fwnode_graph_get_next_port_endpoint(const struct fwn= ode_handle *port, + struct fwnode_handle *prev) +{ + do { + prev =3D fwnode_get_next_child_node(port, prev); + if (fwnode_name_eq(prev, "endpoint")) + break; + } while (prev); + + return prev; +} +EXPORT_SYMBOL_GPL(fwnode_graph_get_next_port_endpoint); + /** * fwnode_graph_get_next_endpoint - Get next endpoint firmware node * @fwnode: Pointer to the parent firmware node diff --git a/include/linux/property.h b/include/linux/property.h index 01ea010cb2f9..9a784a856773 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -507,6 +507,8 @@ void __iomem *fwnode_iomap(struct fwnode_handle *fwnode= , int index); =20 struct fwnode_handle *fwnode_graph_get_port_by_id(struct fwnode_handle *fw= node, u32 id, unsigned long flags); +struct fwnode_handle *fwnode_graph_get_next_port_endpoint( + const struct fwnode_handle *port, struct fwnode_handle *prev); struct fwnode_handle *fwnode_graph_get_next_endpoint( const struct fwnode_handle *fwnode, struct fwnode_handle *prev); struct fwnode_handle * --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 7B98842BEBB for ; Tue, 21 Jul 2026 06:54:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616893; cv=none; b=oaNCdz38JSFPdGSGPx4IPb+gwFIOqVog8T29rbTliGdwOE1ubhm2+0iGlaeGt4htym8g+UBwOjaH2uRF+atvZ2LpnOIqVf0PNrbDJt6GfWIBRCC83RdbfrQaOWiXR0+Em3E0gT0R6N9najotke0KDQXWZ9R3x0WQWTGlNX481KA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616893; c=relaxed/simple; bh=pSLI+J3Ce2NSi66v7MACMQ5vg0khpL8PKWmu0vq92tE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tnj2q8c1dA4YknmeF9n4nY0VgcDdpg3CBkorYKf8VhxpMmfwVVZvFqdZQGuw8n2c0v8qAq7LRPyvWxmlfa7Xm17Y9fe+kW6MB9jGn15cmYp8GxjLeF0OoG3e85YmABkPtDjcLmoFUQNJc7sJbrvot+hMKtrbLlcfsV4hGm4xH+8= 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=d5wI109J; arc=none smtp.client-ip=209.85.214.182 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="d5wI109J" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2cab973140bso134349825ad.3 for ; Mon, 20 Jul 2026 23:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616891; x=1785221691; 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=KO0/oP+3FvgdEaMV/KNxdvXtHKwHJHpy3UF14nh5ieM=; b=d5wI109JpI9uzndCeN/hbKrtK0lkr482ck9FIePiDWWiXubBGNLkByGdzYy3usvtgq gQkOmbz7Zw6KJI2gVKuZMN9D+oOPGXRSGaQe7j9vnXXYsn99U6wdQQlCR0s2Tu5HGMO5 lAKWcuWMf5L+ZfNl5OzK8Ar2u31vC4eUmzuzo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616891; x=1785221691; 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=KO0/oP+3FvgdEaMV/KNxdvXtHKwHJHpy3UF14nh5ieM=; b=Wz9G2GTtyU/slTKnHJhMJ7KOdisNwdkKVHLr65U4aVx1KaJFBvKFhIsqBucF3U6y37 VW5Vo76fBY2Gj+kz+VLKQiq1X7uceyFwBgkdpxxXmwfkP9RvNVHDdLwDSri/Tf7cM3mm kKUpGNkbhyCaG5Kx9mCkQKksLbbqCLIwdnOYzB+9x7Ns8gTShRqHhNceB8TUGPlakUFq 5bmX127qHzkCXgQrkWPxwvmDnzvhBi/jr1zdkFjoP8R3OzWYMzIluaYyb/qHYd2KpuCE rsIq0CEstlmKVgCzVc9SaGoa87MqLXwDe1LXgRKEdXGn3vFt7f62fNuE23vm1rt93ux5 0udA== X-Forwarded-Encrypted: i=1; AHgh+RrrrBikxifqBPvqKcoReONSXzRJC9R/6Gz28ZP9SKHbMWHpVWYdWQFMCxjtlDVEf5TELgvLglfsMH9USRs=@vger.kernel.org X-Gm-Message-State: AOJu0YxhhiYloJDmkU7Ijsn2m2aiO6PKZ0N2bPo+nbZ44vCBRaH8AKnS rMASqJaPD6q8YBCs9v1cGa4UNdm5AmsxGSQkuGTe6ze2WHw/ea+F2Pnc/vq6rd6Qag== X-Gm-Gg: AR+sD13BK/ZMb+b7u7BGh8d7gySEcE+dVe4woVjvEEGCwHBdiMBwrIeoKpgFrwqPwZH 45SHotW2fMYtc21UH0aLKrRAybgysUJtyN5lXtUToSuFmWKBCdxDMfTiCIMACtnhDt/PzT7YGjc PIyD4p7Bhqwaorvu6nOb8SOx+DVDRHice8B8Ym+z+v+OhL2OmC52JwbjyfLezP6nPGDA/0HgEpp KDvYgcRRdi7kF2gwCgFm2631G0LYHQGN+OBmKfo1Cb858RaxgJJBT2Fq8QBG/d9vHscRMZdkre9 OHEuHhXPSalMaU42WeV9iPGfKx+pAHeTuyEGtM0yP5D1j2r0tDGUIH9aqk4BFOqz3tU0FCqd5uk nCV++RCdSi2W6cxtDRWB2Lwg1lszh3G9+7szLqf5QcUzqDOnsAMjBqgHgBIqdedN0qtffj5zsGH xEUmJ9aY9g0ug22sZsnxB58reRXu7gfZ88NjFBZFLbV9DSlMpcYFhyMbBEdAc= X-Received: by 2002:a17:902:d4c3:b0:2cf:30a9:93fb with SMTP id d9443c01a7336-2cf349cf7a8mr187361575ad.34.1784616890927; Mon, 20 Jul 2026 23:54:50 -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.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:54:50 -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 03/16] power: sequencing: Add pwrseq_power_is_on() Date: Tue, 21 Jul 2026 14:53:58 +0800 Message-ID: <20260721065413.2306137-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The power sequencing consumer API already does power on state tracking internally. Expose the state to consumers through pwrseq_power_is_on() so that they don't have to reimplement it locally. Acked-by: Bartosz Golaszewski Signed-off-by: Chen-Yu Tsai --- Changes since v5: - Reverted back to returning -EINVAL if descriptor is NULL Changes since v4: - Make pwrseq_power_is_on() return 1 if descriptor is NULL, i.e. if the descriptor is optional, matching the other pwrseq consumer APIs Changes since v3: - Added missing stub function for !POWER_SEQUENCING Changes since v2: - New patch Needs to go in with "usb: hub: Power on connected M.2 E-key connectors" as it is a build time dependency. Bartosz wants the change on an immutable branch to pull into the pwrseq tree. --- drivers/power/sequencing/core.c | 18 ++++++++++++++++++ include/linux/pwrseq/consumer.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/drivers/power/sequencing/core.c b/drivers/power/sequencing/cor= e.c index 02f42da91598..72b96d36920e 100644 --- a/drivers/power/sequencing/core.c +++ b/drivers/power/sequencing/core.c @@ -968,6 +968,24 @@ int pwrseq_power_off(struct pwrseq_desc *desc) } EXPORT_SYMBOL_GPL(pwrseq_power_off); =20 +/** + * pwrseq_power_is_on() - Queries the last requested state of the power se= quencer. + * @desc: Descriptor referencing the power sequencer. + * + * This returns the last requested state of the power sequencer. + * + * Returns: + * On success, 1 for on and 0 for off; negative error number on failure. + */ +int pwrseq_power_is_on(struct pwrseq_desc *desc) +{ + if (!desc) + return -EINVAL; + + return desc->powered_on; +} +EXPORT_SYMBOL_GPL(pwrseq_power_is_on); + /** * pwrseq_to_device() - Get the pwrseq device pointer from a descriptor. * @desc: Descriptor referencing the power sequencer. diff --git a/include/linux/pwrseq/consumer.h b/include/linux/pwrseq/consume= r.h index 3c907c9e1885..3c6122bd0205 100644 --- a/include/linux/pwrseq/consumer.h +++ b/include/linux/pwrseq/consumer.h @@ -22,6 +22,7 @@ devm_pwrseq_get(struct device *dev, const char *target); =20 int pwrseq_power_on(struct pwrseq_desc *desc); int pwrseq_power_off(struct pwrseq_desc *desc); +int pwrseq_power_is_on(struct pwrseq_desc *desc); =20 struct device *pwrseq_to_device(struct pwrseq_desc *desc); =20 @@ -53,6 +54,11 @@ static inline int pwrseq_power_off(struct pwrseq_desc *d= esc) return -ENOSYS; } =20 +static inline int pwrseq_power_is_on(struct pwrseq_desc *desc) +{ + return -ENOSYS; +} + static inline struct device *pwrseq_to_device(struct pwrseq_desc *desc) { return NULL; --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 D808042F6E1 for ; Tue, 21 Jul 2026 06:54:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616897; cv=none; b=WhW7MmbwFDoRSx7sj1MqwLh94Yk6fVqjJ4yA/jTIbYkMyAj/iVqyFmb9kTp9HfCqxCZHisflErb2KfCHWGCR8YhniXBIqqa+RI+M3G+aVG1IRqR3WDHWZI5vtMyX8tbQaLX1m2QLmaigPT2dlONJ3+Qxif4BCQcAqWeMGdMH+ZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616897; c=relaxed/simple; bh=DZukzCQ7CZkay93mS9H4jkJ+htZvTV7aL2cJyc7/2CA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fFYX0Y/CnJIVW+HMWK6dspoL7+NkyTMjSmoiaapoK0HIenoXRGfhzkovomSePkB3V29pk1pxds9fdRlf0B9cPeylGpD4ljm+iQMonayAgqqAMvIYg3e0ifWvhGs3E14LNQMuTg0/YSyswmyEP9PdzgDY73uHKlCFDSSCV1jYZPc= 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=TRp4Tdb5; arc=none smtp.client-ip=209.85.214.173 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="TRp4Tdb5" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2cf6d65d8a7so22145995ad.0 for ; Mon, 20 Jul 2026 23:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616895; x=1785221695; 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=Xc02KBsQrd1xdK8Ho0VEf5G63Rz5XQrKjQwFcbcQ37E=; b=TRp4Tdb53zpmXKorIc41xp1t8wmTayjsPM4PK5fPlj1LSUfXfcSXEPOmVz/58B7vKZ iDUEJRXDZ/SSSqXFjHvPSk3EKVH0FBDIlcx4Gx8tvzKd9kqrrAPSffOt/NAOH/u5l1pQ aKgfclmZXnBQ9fswEwto2MwK0vlbPfOyucXbo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616895; x=1785221695; 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=Xc02KBsQrd1xdK8Ho0VEf5G63Rz5XQrKjQwFcbcQ37E=; b=klVHBcD8ZdVHCSGDUlei1g9pVdMFSC6WjWW6Qj1bewcbo2RbQSqZ8xEwx/wO5OCPJI F3amoMVmdaWLuSFSrils7rTH+jT/YUzZ5wxIkXYtsEGXgr6+r1Gw0XUeXU/lUmH31r7K oVTYAEqbC+nrjQ7ugc+3ETjvEpnHWIb1d4yl5A7N+QJ4WMJFYm7j9ZKnHD82k62k8uZs BSYIH6XpVsqJAs3RNKO+xi2cKfwbmUSZKos+Wclp12LhVu3dD71K9ao2Ok2+xDjI0QJI pvL24ytbITDjiXmr6R8Fv0YST4dACF6SU0SodNMkmT7Ae0f2mjWBeFTu6f+vErdXiRJh N6VQ== X-Forwarded-Encrypted: i=1; AHgh+RoNM/vLuqEqh8k4CnXDzCI98u86tna9XzmVi8BvcbYolUBxxSGS1AR2lLNXldh0DmZWtGUbaJXICK/C1sw=@vger.kernel.org X-Gm-Message-State: AOJu0YxcXE0JW6E0q8dJ2TSoaZ9nm+QM13g0swNKoPf0S9aBppYSQArx mGJMNRXIO1rSiTOWHVNthfBI39B/07P2f5poy8vqvcdEAIuELKf3dyQPEKPNoYka+Q== X-Gm-Gg: AR+sD10t5STrFceEZ6+2mMrtwjxRVtp0N1GJRGYZyB+5HK9YVcVSp4Vom9TF54a2V4u 2ltUc91RyBmiNxOOgFc35pBRxhHwkAuampCOeW/3jJ81IQALWEuBd2E/kxB3gJthgjCp0FXNNhA 1BhliULmwfCbezhVfxGLlWBaf9IfzJLrjMopigNMEUOgyZWEWOlxiFPa163xpm+Eit9ZLsoPYZG Md2+DdmgQ3QqK6lHJOHjclN3ix62FYaHgxhRAZo3TOIgND0vnJ77sIgwK2sVQpqf2tkxlxrgf4G MEQJ9hemLMbRqhEzWIr+45Tnkt8N/Vcscbx7S5l1TklL2gWrHGKwQAPj3M0gyurm0yQviZ385Ir YNm23JN0fyxH1oYJu/Yg4quGHMRcloCgtMGxmxGvrhaI/aXmoTY2r7axckPZCRYl6osk51A5HlI xsW1e+8T854ZBz2bcnJoYDbpHhhwiKjdmW7R9B/tWI4/+6ENVVjKOdHpY4eNQ= X-Received: by 2002:a17:903:41c3:b0:2c7:1200:bd7e with SMTP id d9443c01a7336-2cf3486b0b1mr185750155ad.18.1784616895361; Mon, 20 Jul 2026 23:54:55 -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.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:54:54 -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 Subject: [PATCH v6 04/16] usb: hub: Use assign_bit() in usb_hub_set_port_power() Date: Tue, 21 Jul 2026 14:53:59 +0800 Message-ID: <20260721065413.2306137-5-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" usb_hub_set_port_power() open-codes assign_bit(). Just use the assign_bit() macro instead. This makes subsequent additions to usb_hub_set_port_power() easier to read. This change does not introduce any functional changes. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Chen-Yu Tsai Reviewed-by: Bartosz Golaszewski --- Attributing suggestion to Andy, since the change was originally requested as part of a review. Changes since v4: - New patch (split out from "usb: hub: Power on connected M.2 E-key connectors with power sequencing API") (Andy) --- drivers/usb/core/hub.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 2cfe09a141d8..715f26f05a31 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -10,6 +10,7 @@ * Released under the GPLv2 only. */ =20 +#include #include #include #include @@ -899,10 +900,7 @@ int usb_hub_set_port_power(struct usb_device *hdev, st= ruct usb_hub *hub, if (ret) return ret; =20 - if (set) - set_bit(port1, hub->power_bits); - else - clear_bit(port1, hub->power_bits); + assign_bit(port1, hub->power_bits, set); return 0; } =20 --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 B4879429CDF for ; Tue, 21 Jul 2026 06:55:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616902; cv=none; b=l8eL+r7W8IEF5KaxPbqen5vDZeHWdpxMhWjn2+utTq2/xRtqCXiMrbkj3ZQEAXIDzhMvRxTcZ/g94i+aDZP/dGu8x/27TNpne89YZ513SirZilqw0zEHYCElTugIstVNZAynGZwF97Z6jHq6hvcgc4klI7yS4EanS9FTgB8LKQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616902; c=relaxed/simple; bh=a0af6mRfXl6o/3aQ3C/YjqVxExTXT9xiwTDCu1uF7Ko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hu3+zSSj5drPq02J6XvdbWlh806Lqan/YlVaEIoMdHRvYhzPtwICwpNK4Rf33OdbkjtwukR1lPNa4bAsbQDWV4xtzlhXb3WNZSl4vorN+het6/r6O/PzySP47paZWzgNG3HmRA1132TB0q5KYtjU9dpPcfv+Y86I4dnR/EHwBZI= 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=NBBDrs/N; arc=none smtp.client-ip=209.85.214.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="NBBDrs/N" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso81982015ad.2 for ; Mon, 20 Jul 2026 23:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616900; x=1785221700; 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=qjG3+Srh1l1zMMK/k1OHJ2IZC5GaA1LItCzYqUBfaa0=; b=NBBDrs/NQavuacQelDdLBiYhlVe/vnCZtgSgZCweoqnblw2zw7vtbbK2kKVoJSCKmP Z9tnIvvap6QILEODnDzwAflKSsM3V0/Gk1ouNOJzHtWuWfT1cYPe/wPHsGrI2s7dpduP dJpZKdntutIwQsKg/AtNR+2au+rGVOJtv1lJM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616900; x=1785221700; 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=qjG3+Srh1l1zMMK/k1OHJ2IZC5GaA1LItCzYqUBfaa0=; b=J2T2S2f8m4UOOqL+mzbkWxNSvfT4KlSBedwi0OoSp0OBNPP67dqNhhgamXHjfypGAN HfSQ8+4GVTFqsJNLELEiFdLKkatiHnS0+LQ7D0krfedaQ1QsLkxhYfkDRS8VB2mwgecK v4YBo+JZsTu5JfBEtUIVGijnmgAiW1gzcbkQtKRbqP2gqGi6gT/rIFdZfxozboixi5CF yJsN5lNvsqwxkPUDL6ugjYWdGl5JrziYc00XYFpodVqAAjBssy/Kwmy/9JbLhHqapiM3 pXb9ULRbYcTbYrSmI7RrbBa+/Oiuz4w6z18e6tusXd5stZEWyZa0API5LUkk/vuZZUPx FEbA== X-Forwarded-Encrypted: i=1; AHgh+Ro8ccOM4S6fGo+OcoMpQ/psjS4eB8dW1ohq2BfFphKloEDnyfW9CauooZ1L/nNSNY0WqqPqmvWju/m+GWc=@vger.kernel.org X-Gm-Message-State: AOJu0YzJIC2P3nkS1lBMtM6VOoHKdRXFYx8bkIoK5eCHqsupO4Q4kjVI AmWsgt5JXo4hJKINwTU1Jg/cKdzc40bNKnlkKSoj46p/v2GlrmmWHW1y8qHC5Y1bEQ== X-Gm-Gg: AfdE7cn1EBI4LL6g2wAnyBYWMf+VJOsu9QnRR6DIDDqTO95LzA9mIOwRD+NG4R6LBN/ SXzCY23mx9B761iXroAsLIhL03ra8Hnry3SSxR3cR9SA2IDco+z0hQIqppH5mRTuvdHkj+uidOI DHcSaMq+GtD5KWmqB31vXgCQzhOfiYhoQqDGakgkINJ3eKjbkYwGFm3iea1gBGyPDOYUexfTsMU s2RtpPkprFiVH4NxygKeHZI58+CRLCJCaOlvita4TC/LqbNRnJEKo7VmtWbgLETaWqgRYWbjJ1z L6+xv4B2jhWHOT3F82V3H8WgouQY95Hnnmw15bBp2VZ6n1JEJT8giJtVxYF7esd835WiDnTFB0z tFBHlnPjoLrIa+if1Y7E3owvSyvVSgFeuMY8d5QKlhOoaw/csKO7zkRn4tXnBlfY27IGSfVKgvp JitVDdBDiJBTxSOrMk6rHTxOeVA4VKRxopJ8RIuDdX8VRRwnqRNCIwC4aB4mA= X-Received: by 2002:a17:903:1a90:b0:2cc:6b7a:dfcb with SMTP id d9443c01a7336-2cf349cc789mr186191295ad.33.1784616899938; Mon, 20 Jul 2026 23:54:59 -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.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:54:59 -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 05/16] usb: hub: Return actual error from hub_configure() in hub_probe() Date: Tue, 21 Jul 2026 14:54:00 +0800 Message-ID: <20260721065413.2306137-6-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The addition of power sequencing descriptor handling in the USB hub code requires dealing with deferred probing from pwrseq_get(). The power sequencing provider may not yet be available when the USB hub probes. Return the actual error code from hub_configure() when it fails, so that the driver core can notice the deferred probe request. Also rewrite this section into the standard error handling pattern: if (error) { # handle error return error; } # do more work return 0; Reviewed-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Signed-off-by: Chen-Yu Tsai --- Changes since v2: - Rewrite into standard error handling pattern Changes since v1: - Moved "int ret" declaration in hub_configure() over here from the next patch --- drivers/usb/core/hub.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 715f26f05a31..8f8624a0d36a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1875,6 +1875,7 @@ static int hub_probe(struct usb_interface *intf, cons= t struct usb_device_id *id) struct usb_host_interface *desc; struct usb_device *hdev; struct usb_hub *hub; + int ret; =20 desc =3D intf->cur_altsetting; hdev =3D interface_to_usbdev(intf); @@ -2006,14 +2007,15 @@ static int hub_probe(struct usb_interface *intf, co= nst struct usb_device_id *id) usb_set_interface(hdev, 0, 0); } =20 - if (hub_configure(hub, &desc->endpoint[0].desc) >=3D 0) { - onboard_dev_create_pdevs(hdev, &hub->onboard_devs); - - return 0; + ret =3D hub_configure(hub, &desc->endpoint[0].desc); + if (ret < 0) { + hub_disconnect(intf); + return ret; } =20 - hub_disconnect(intf); - return -ENODEV; + onboard_dev_create_pdevs(hdev, &hub->onboard_devs); + + return 0; } =20 static int --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 3E78642FCDA for ; Tue, 21 Jul 2026 06:55:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616907; cv=none; b=G68Qi4yYIJWfOYExP0/V7FDRiWF6j1qIhtiEJNRhwxIJcxIDm3PWF47YBdYAj1LE6teQ+UpFKSCzUh/Em8u8IYxJfsvv4paVnwKCFLi4Zso8eY/pC9fw7rvFumFDzlN5ILogl9ZJqcCdlZ9iKwvFvukcmo9rmuOd/IhOdFKUCiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616907; c=relaxed/simple; bh=rDxhkqymr7zNZNO5s5LLG26mVpihgtL4jhXYrXXJ+wY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D8Oqqly4+Aaq/LOd4ExMBsGplnqnNRwofwDkH8biAEU2IuzjLi5dvDWAVR4XIzkP0C72LaUMMyeuPWLVCUF4i/8pD5Q1CBmWGRFJQEfCJlRniQac//J20PKN0Hl+jxliK5VNfJQleYO0GgyJaX8Hki6ZpoLDVg7VlRkzNhg91qM= 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=NSKN9p6/; arc=none smtp.client-ip=209.85.214.175 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="NSKN9p6/" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso125894845ad.3 for ; Mon, 20 Jul 2026 23:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616904; x=1785221704; 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=fHUpdIaIyIIyz0xHiffTwBnjBb2ySQuUos1Tr0diNj4=; b=NSKN9p6/4OKlOUKnluEU5E+bpYA5Gx4ApsZ3d9ivBRylHjrig4TIeZvawbqO/C7H/5 kR2u4wm1id9hinJq3AxDqU3LDrPqIelLk0Ld9Zqp8LGydswuzyuqk3+4JS3v1CpsnCJL QOytZ0ebbuXG4ycgOmMUu/IfMcaQZ3EHCtxAA= 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=dlESKL4wPqQJL/0Z71uCb3hxuEm2WMNtmjn3v/9T+kgDo32eMh3m2VGap155ZAIs8q DevvYwSYbw69ih/mKGB+3QoLGlTKObg9pRIdsKHKMuePLKg6V2C2gjxTf/8XzL8ksQFo 7twrdj6tZlBt6vckKoVeAhQsZVKaWViRoh8SJ57jbwO4v5R+UhZdcU+ihrX9v97yOOXe b5abyvp/zrmO/TI7+YW8VRfJrvO8+5JKmccK1FFTsxnNpI10jE6eGMRgiGPkYOIxbU8C cSfpRAaF02GCPclGHX25xmBp1hmXCLI7xR9tn5+3TNx9gP6i1uD+RROPj0+p34D+CU4B YtHw== X-Forwarded-Encrypted: i=1; AHgh+RoNGKnOd6H+r+Fc1a4IVV3BDSgSfH0Px6Ogb1AQeJWQN50q/dQqxhIi4ivcvRSt3AmQEKI7HxhfNOLZV8A=@vger.kernel.org X-Gm-Message-State: AOJu0YzG0JAdcJW5cfBNKMjEtD+ycdTQl2YWvvw3D7AvYeSMlX4AO1of opOGX/wmlGgBpSnQQYlo91qks6wu9BdReN5JhjDYxvnDF/Hghm0R9OtPoBaNS8q4vw== X-Gm-Gg: AR+sD12Dxe+SDXaZJdkoADgQtbkPevJJEi3bWKzCP1dH/D8MvBXliLb/BBvhIEOzHaR Mnl5Tmdhm/KNpmUr9NtdqfRj3a4YbeCxwWhqVrTOIxN0/xHSMEZtwO+IoFWkkq1C3EshwkGqBND 8AJ7ufgHBERJ+jcCF0zoPAYCKKSScbAEy1LdNnt/TBXeqv59xPylNYDcZg5N8FGci46wwIAe/Vz c9bei9F16YYLyq4iwHq9tu02JqkRxYLKA9tpG1O7290AUKJX50RLJbEwh6ykFp1b06kr0b2UhOg +G6s6h+hOivkXkFdJTLdCvO4BJQ3j89qIztMrXMxPxXDPvK5DGMRyMC5RBSqmK1wu5fW/AEc75y xQpi3t1+8ti5dQ9zF29fCytrsOiscrsPvbV+dqgN7vkAsFwhAXztX9Fhnrw5PJvibWuMD6uzXOw xwFKbqBxXps+sg0FqyRTo4/uWfYMRwiymFqSvgPJhtZERVGCb28n9WleCK9Skz2gkDGrMoWw== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 */ =20 +#include #include #include #include @@ -358,6 +359,11 @@ static void usb_port_device_release(struct device *dev) { struct usb_port *port_dev =3D to_usb_port(dev); =20 + /* + * 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 =3D hub->hdev; + struct fwnode_handle *fwnode =3D dev_fwnode(&hdev->dev); int retval; =20 port_dev =3D kzalloc_obj(*port_dev); @@ -782,6 +789,24 @@ int usb_hub_create_port_device(struct usb_hub *hub, in= t port1) port_dev->dev.driver =3D &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 =3D 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 =3D device_register(&port_dev->dev); if (retval) { --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 CAF104314B5 for ; Tue, 21 Jul 2026 06:55:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616911; cv=none; b=ZMMUwUptSe3YYEWe8iNxug69htvek178vHbxboG/OyTTg0KdHJwxMeZOnYEwfqUrNqU1/8TDzvVbghfF1zGKjq09SwoBztzJRUkCnLwJ5PtyXSvqXxjalEpJgSZzightny/j/hdArsucQOx2mnnUq07eTvYO6pUkoXuKveU44ig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616911; c=relaxed/simple; bh=IlZ/0IeKP4mmnn6s8JCPzwMroH/vaSwiA2UpQ8RQglw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GPJ8NChR8OR++CRVN/tQBTwnRQOjg4y0iKYRL60KsRMWkDkNB/j8EZHjE4eWIn1S0VW3QYfsUfx9aqn8brk24xhcqjWthABHZtlybquRgwjvFIUIO+PHgljdLtF/PNcy9sB2afunHywguG09SITPp/bNT/lMbI0Kt6oQIex3pvI= 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=lV0YC+S4; arc=none smtp.client-ip=209.85.214.174 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="lV0YC+S4" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cce6a0c9c3so98462775ad.1 for ; Mon, 20 Jul 2026 23:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616909; x=1785221709; 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=sAcFKcy+EqEALwPe3iCzQnqqeeFK6XarTVIxswfGgCg=; b=lV0YC+S4eCJw9OKlK2hA0klB/SJhiz6WLLKZH/Gmp7BrSfQpmHysdw4h1Vms+utfHE Q7AeV73Xb9eWxTvhB6DCyv0Sq3bTdzo3dPXBOze48sem+cBK2CCzs5Y9vqz5DTVqwE4v DiCfqbG0AiSvqJLaX53bSTvGPrI2vvniF8jMo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616909; x=1785221709; 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=sAcFKcy+EqEALwPe3iCzQnqqeeFK6XarTVIxswfGgCg=; b=WjxMBhAmIZBj4IfEMl1OfjPYmWku4naCBWiIzDQEk/jXOrK0h2/3HIHLR+/4QoaSau ZW5L9gVYH8WKVFXMtoKLoGXfaRVA2dvKhl3mJUr9mmbT4KU3frVSESnooQz97ga5iuAu kYUdGFLV15T4dLpwH3zKUDDXEkYNu5jC5JDBVKA655zCadf+gl3qVbdZr4uKfJTxAlVW sSOj0u6tlTYknKaAybklQm6c6ZnvIdQsYczaTIp1iCiCzCuZHJs0wkRoKxAk+F5ENJWk qoS44avxD3+kYEATKaYboxAQOIkftjzTSW1wuaBzN9vp+ZG1FWF3hgoLHXHfKSjEElaq G+IA== X-Forwarded-Encrypted: i=1; AHgh+RrDcdTUN1/6RCnLQ/rCfoOqrETB8wjXXf9lm7JOQLwJpHTXb9VgGHcl+qCidtROWI/+wBcNyPvR690lxYA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0JSGC4IFu2QWDP8vbs5sqt1n6ONn0eDMpBomb8BOLcHb1chXm nAzMMKjz3mdALswMlPHMVPHRZl7rAkSryY6si4J5+CmCdaD08q3/gRJgwOX5CdcxccfDL0QGhrO /MXU= X-Gm-Gg: AR+sD10yUeWFSFZZLN7VzNkKE+NwXl6Q7UiXbqQMuyRKR7wkw+AAwVrb3rB5XilzPmH 8l3iMwxxPSu3yqy3rWDzPRRnJQ5R1qqSa68rR44AMSNJCfs/krWru7X8TTMof0SuvNfZZDNOT+2 W5lLgzV2u9HH0nxOeMKQxN6gM5E2/yNnMD6hLuGogEp08N0hzv39hWJdQ8PGAQuuQ9nmFX8MSIE ZZA3jfbpbcmFBn7avfXLYwjAyhA4xqltkI+Esix3ooeVung0GW6R58hy57P8+vNYd0hU52jmwXv is1fnXxDcCF5aFwGTbmEcPSNXSRiehKTgMPcJtQhtY5SX5C1OZC6Wusy0JPpmVJTmsFw/XMEE8H XYaNzRQFIYgio/hMRX2UUeffLha29YOozRQqyonRxm/4iumMo1FKBgXcO9di//19qRqWfeHuJxL qKkPx1PWRoELz3eJQyJwgzNEktK62hKG1dW4cWaSzMS9AVm9g7WwR+O2WQiC4= X-Received: by 2002:a17:903:18d:b0:2ca:619f:9733 with SMTP id d9443c01a7336-2cf348f9f5amr194323965ad.17.1784616909129; Mon, 20 Jul 2026 23:55:09 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:08 -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 07/16] usb: core: Move struct usb_port and related APIs to port.h Date: Tue, 21 Jul 2026 14:54:02 +0800 Message-ID: <20260721065413.2306137-8-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" |struct usb_port| and its matching container_of() macro should live in its own port.h, matching the split we have for .c files. Move them as described. Also move usb_port_is_power_on(), since in the next change its |struct usb_hub *| parameter will be changed to |struct usb_port *|, and becomes a non-static function that only references |struct usb_port|. port.h is only included from hub.h, as a subsequent patch will directly use fields from |struct usb_port| in a static inline helper in hub.h. The USB internal headers don't have header guards to help with this. Also drop 'extern' from the header declaration of usb_port_is_power_on(). This is not needed in modern C. Suggested-by: Andy Shevchenko Reviewed-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Signed-off-by: Chen-Yu Tsai --- Changes since v4: - Dropped 'extern' (Andy) Changes since v3: - New patch (Andy) --- drivers/usb/core/hub.c | 16 ---------- drivers/usb/core/hub.h | 48 ++--------------------------- drivers/usb/core/port.c | 16 ++++++++++ drivers/usb/core/port.h | 68 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 62 deletions(-) create mode 100644 drivers/usb/core/port.h diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 8f8624a0d36a..a6c4e4c0368a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3240,22 +3240,6 @@ static bool hub_port_stop_enumerate(struct usb_hub *= hub, int port1, int retries) return port_dev->ignore_event; } =20 -/* Check if a port is power on */ -int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstatus) -{ - int ret =3D 0; - - if (hub_is_superspeed(hub->hdev)) { - if (portstatus & USB_SS_PORT_STAT_POWER) - ret =3D 1; - } else { - if (portstatus & USB_PORT_STAT_POWER) - ret =3D 1; - } - - return ret; -} - static void usb_lock_port(struct usb_port *port_dev) __acquires(&port_dev->status_lock) { diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index 9ebc5ef54a32..de524c6da9fc 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -15,7 +15,9 @@ #include #include #include + #include "usb.h" +#include "port.h" =20 struct usb_hub { struct device *intfdev; /* the "interface" device */ @@ -78,51 +80,6 @@ struct usb_hub { struct list_head onboard_devs; }; =20 -/** - * struct usb port - kernel's representation of a usb port - * @child: usb device attached to the port - * @dev: generic device interface - * @port_owner: port's owner - * @peer: related usb2 and usb3 ports (share the same connector) - * @connector: USB Type-C connector - * @req: default pm qos request for hubs without port power control - * @connect_type: port's connect type - * @state: device state of the usb device attached to the port - * @state_kn: kernfs_node of the sysfs attribute that accesses @state - * @location: opaque representation of platform connector location - * @status_lock: synchronize port_event() vs usb_port_{suspend|resume} - * @portnum: port index num based one - * @is_superspeed cache super-speed status - * @usb3_lpm_u1_permit: whether USB3 U1 LPM is permitted. - * @usb3_lpm_u2_permit: whether USB3 U2 LPM is permitted. - * @early_stop: whether port initialization will be stopped earlier. - * @ignore_event: whether events of the port are ignored. - */ -struct usb_port { - struct usb_device *child; - struct device dev; - struct usb_dev_state *port_owner; - struct usb_port *peer; - struct typec_connector *connector; - struct dev_pm_qos_request *req; - enum usb_port_connect_type connect_type; - enum usb_device_state state; - struct kernfs_node *state_kn; - usb_port_location_t location; - struct mutex status_lock; - u32 over_current_count; - u8 portnum; - u32 quirks; - unsigned int early_stop:1; - unsigned int ignore_event:1; - unsigned int is_superspeed:1; - unsigned int usb3_lpm_u1_permit:1; - unsigned int usb3_lpm_u2_permit:1; -}; - -#define to_usb_port(_dev) \ - container_of(_dev, struct usb_port, dev) - extern int usb_hub_create_port_device(struct usb_hub *hub, int port1); extern void usb_hub_remove_port_device(struct usb_hub *hub, @@ -138,7 +95,6 @@ extern int usb_clear_port_feature(struct usb_device *hde= v, int port1, int feature); extern int usb_hub_port_status(struct usb_hub *hub, int port1, u16 *status, u16 *change); -extern int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstat= us); =20 static inline bool hub_is_port_power_switchable(struct usb_hub *hub) { diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index c0a51d9b06a6..b2e953f137f8 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -22,6 +22,22 @@ static int usb_port_block_power_off; =20 static const struct attribute_group *port_dev_group[]; =20 +/* Check if a port is power on */ +int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstatus) +{ + int ret =3D 0; + + if (hub_is_superspeed(hub->hdev)) { + if (portstatus & USB_SS_PORT_STAT_POWER) + ret =3D 1; + } else { + if (portstatus & USB_PORT_STAT_POWER) + ret =3D 1; + } + + return ret; +} + static bool usb_port_allow_power_off(struct usb_device *hdev, struct usb_hub *hub, struct usb_port *port_dev) diff --git a/drivers/usb/core/port.h b/drivers/usb/core/port.h new file mode 100644 index 000000000000..00f7500af336 --- /dev/null +++ b/drivers/usb/core/port.h @@ -0,0 +1,68 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * usb hub driver head file + * + * Copyright (C) 1999 Linus Torvalds + * Copyright (C) 1999 Johannes Erdfelt + * Copyright (C) 1999 Gregory P. Smith + * Copyright (C) 2001 Brad Hards (bhards@bigpond.net.au) + * Copyright (C) 2012 Intel Corp (tianyu.lan@intel.com) + * + * move struct usb_port to this file. + */ + +#include +#include +#include +#include + +#include + +/** + * struct usb port - kernel's representation of a usb port + * @child: usb device attached to the port + * @dev: generic device interface + * @port_owner: port's owner + * @peer: related usb2 and usb3 ports (share the same connector) + * @connector: USB Type-C connector + * @req: default pm qos request for hubs without port power control + * @connect_type: port's connect type + * @state: device state of the usb device attached to the port + * @state_kn: kernfs_node of the sysfs attribute that accesses @state + * @location: opaque representation of platform connector location + * @status_lock: synchronize port_event() vs usb_port_{suspend|resume} + * @portnum: port index num based one + * @is_superspeed cache super-speed status + * @usb3_lpm_u1_permit: whether USB3 U1 LPM is permitted. + * @usb3_lpm_u2_permit: whether USB3 U2 LPM is permitted. + * @early_stop: whether port initialization will be stopped earlier. + * @ignore_event: whether events of the port are ignored. + */ +struct usb_port { + struct usb_device *child; + struct device dev; + struct usb_dev_state *port_owner; + struct usb_port *peer; + struct typec_connector *connector; + struct dev_pm_qos_request *req; + enum usb_port_connect_type connect_type; + enum usb_device_state state; + struct kernfs_node *state_kn; + usb_port_location_t location; + struct mutex status_lock; + u32 over_current_count; + u8 portnum; + u32 quirks; + unsigned int early_stop:1; + unsigned int ignore_event:1; + unsigned int is_superspeed:1; + unsigned int usb3_lpm_u1_permit:1; + unsigned int usb3_lpm_u2_permit:1; +}; + +#define to_usb_port(_dev) \ + container_of(_dev, struct usb_port, dev) + +struct usb_hub; + +int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstatus); --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 5944B42F71D for ; Tue, 21 Jul 2026 06:55:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616916; cv=none; b=kAYZShb5ATZmTgV4nM2pgpMPSERoZRMW537YHsR9LFc9Hzmuu6wOoYd1PwXV4hOSdIZomxFEJUly2Krza+JLRX8BIKgw3IhpKgsVoqIxGkXGZ5AeKIkZbXNSZbh7QBddzr8y5LAgKASdJv/cxEtgJnGLoNWgVYdp1gy/XUH16TY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616916; c=relaxed/simple; bh=uMqpD/0Y+buNT85mCET4vOpwigIs8u3oS1rlx2XlGCc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E+t8Qvn6oUFJPdPJZz5rBhEUAahPEB1kGNQ+D66Gs1woz68Y2FEejKasSPKdPX0MHQGvZCkGOjZewEowcp7FXHphYLyAdbO18XHE8Y99TALv9tEUA+A4QJroT4FXz8NWAQd6zZ4t6II7UG1x9b+YF4ecNfb+mteW0hKboN0F3L8= 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=GRN1x4Ch; arc=none smtp.client-ip=209.85.214.178 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="GRN1x4Ch" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ceed7018c8so49940835ad.1 for ; Mon, 20 Jul 2026 23:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616914; x=1785221714; 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=rURTZ+6KnrNnBGX3zC7u+30dtH0N63AaHeGxXuU8P7M=; b=GRN1x4ChofFLUcUYIDe10xS2fMXvrfvnSH5j0tbyMpRXHyHvonGXC/P1pG64zcdfhO jRBACEWVIq7gGCnlevIAsAb8ebAbxTq/4Wf5e81azyTPvhXSLzxRj/lhDshml0lfBgJx 82rZQ8YB6mbhf8SeZoJkXvzHVBwqrRI1eiIJc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616914; x=1785221714; 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=rURTZ+6KnrNnBGX3zC7u+30dtH0N63AaHeGxXuU8P7M=; b=CnFOgWIBcyOa/xVrmbkWPQbGbMQdaBaHjVLZRz2wU2KXzRoYel4je834OZSv4CFvok QV+p1apYqrgwrG+WMqa4++91ARaK3ZaxL5JZ+Ib+h6gnXYSaA8yFqtRMqmNOoLMkRwIS vtVU0ScJ25ZOJeVTxM1j3zQ4jy36qVaQqn/mkugLCjcTa2S8RI+HSXIRr10yMKdYJQMe Hvx7k/YiLYCakInvLMl3OqdRgnske79jyavTFwWOlWWLDt2nqIlAu3vo5FYu+Pf0DhBG dQBB1AC9Kz4D2RPdjnR4h3/J9+zBfPvORFAwQ776vlTeS6EsyCFfnzoQeVheEyEjc+wb cV0g== X-Forwarded-Encrypted: i=1; AHgh+Rpf5IKEiVimZ8gpac907AWGAkvYqJm17QW9ZzPk4WIQIQY+picFawrNwUTKBA3FZDSsR6PVLhpTw9n1Vxg=@vger.kernel.org X-Gm-Message-State: AOJu0YwuRC+y62tYUqGnZjSo1j5cLjex3Pj8VreR/Dx94FSZr5xM+Nh3 d77xVG2VovjYg+7tihk8Hym/tRehFekUeABUUImxLxbTEcLURwWlsrUQd4YQG6HQbg== X-Gm-Gg: AR+sD11/rCxHMDh7+yy8ZZ7EyA/jdM07rnX29TLCfr9lgkKpZrPuLdGNT896VybJC9h fnQuK+F/+b15PBA4sYgwtSWp0gClykVskTZ3zC2L25SyzfHBZjki9dBxtBiaDU8t10JeMJCTTVn aCwz40Ynuwo/ATCczC1H1eZeyC4ftLmKN/xxtjl+/0x/9EWJaKNmUecoTEwyDRCWdku8XoHO/bY 2ft1vfXP8jmwnjrcZM4hPUuDiqvPx/D00/ifm2uXNNLg10dMFvdvFxfprn2ZGCCuR5N6zZXpG37 K/Xxvkp7lyNuS43HR/+PdVqzTbKtcCaWtrtBk94nYTvRMT3HQxu9tubzuqeaNWRlsqt6pa7lIkZ itquPzf+mUgpQbnCHTcLPYzA+YIDF26KYLn3gO6EioqudJE+Epf3G06X1gKHx4v2dmSu1wgjlmU +mmdv2UlLNH/82x8xTw1CAr5ejE40LfKZ/Nz60wnNY2sTfbHWX/8KMhEUwvVo35HG9ZKkl/Q== X-Received: by 2002:a17:903:2383:b0:2c9:97a7:f544 with SMTP id d9443c01a7336-2cf34a18cefmr188566915ad.42.1784616913792; Mon, 20 Jul 2026 23:55:13 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:13 -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 08/16] usb: hub: Pass |struct usb_port*| to usb_port_is_power_on() Date: Tue, 21 Jul 2026 14:54:03 +0800 Message-ID: <20260721065413.2306137-9-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" usb_port_is_power_on() currently takes |struct usb_hub*|, but only needs it to tell if the hub/port is SuperSpeed or not. In a subsequent change, usb_port_is_power_on() needs access to a pwrseq state tracking field in |struct usb_port|. Either structure can be used to identify whether a port/hub is SuperSpeed or not, as the field in |struct usb_port| is inherited from the hub: port->is_superspeed =3D hub_is_superspeed(hub) Replace usb_port_is_power_on()'s |struct usb_hub*| parameter with |struct usb_port*| so a subsequent change can use it. Reviewed-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Signed-off-by: Chen-Yu Tsai --- Changes since v3: - Adapted to move of usb_port_is_power_on() to port.c and port.h --- drivers/usb/core/hub.c | 7 ++++--- drivers/usb/core/port.c | 6 +++--- drivers/usb/core/port.h | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index a6c4e4c0368a..6671b5e45191 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3291,7 +3291,7 @@ static int check_port_resume_type(struct usb_device *= udev, } /* Is the device still present? */ else if (status || port_is_suspended(hub, portstatus) || - !usb_port_is_power_on(hub, portstatus)) { + !usb_port_is_power_on(port_dev, portstatus)) { if (status >=3D 0) status =3D -ENODEV; } else if (!(portstatus & USB_PORT_STAT_CONNECTION)) { @@ -3733,12 +3733,13 @@ static int wait_for_connected(struct usb_device *ud= ev, struct usb_hub *hub, int port1, u16 *portchange, u16 *portstatus) { + struct usb_port *port_dev =3D hub->ports[port1 - 1]; int status =3D 0, delay_ms =3D 0; =20 while (delay_ms < 2000) { if (status || *portstatus & USB_PORT_STAT_CONNECTION) break; - if (!usb_port_is_power_on(hub, *portstatus)) { + if (!usb_port_is_power_on(port_dev, *portstatus)) { status =3D -ENODEV; break; } @@ -5434,7 +5435,7 @@ static void hub_port_connect(struct usb_hub *hub, int= port1, u16 portstatus, * but only if the port isn't owned by someone else. */ if (hub_is_port_power_switchable(hub) - && !usb_port_is_power_on(hub, portstatus) + && !usb_port_is_power_on(port_dev, portstatus) && !port_dev->port_owner) set_port_feature(hdev, port1, USB_PORT_FEAT_POWER); =20 diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index b2e953f137f8..8d686d43e996 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -23,11 +23,11 @@ static int usb_port_block_power_off; static const struct attribute_group *port_dev_group[]; =20 /* Check if a port is power on */ -int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstatus) +int usb_port_is_power_on(struct usb_port *port, unsigned int portstatus) { int ret =3D 0; =20 - if (hub_is_superspeed(hub->hdev)) { + if (port->is_superspeed) { if (portstatus & USB_SS_PORT_STAT_POWER) ret =3D 1; } else { @@ -114,7 +114,7 @@ static ssize_t disable_show(struct device *dev, } =20 usb_hub_port_status(hub, port1, &portstatus, &unused); - disabled =3D !usb_port_is_power_on(hub, portstatus); + disabled =3D !usb_port_is_power_on(port_dev, portstatus); =20 out_hdev_lock: usb_unlock_device(hdev); diff --git a/drivers/usb/core/port.h b/drivers/usb/core/port.h index 00f7500af336..2f4349b3ce6b 100644 --- a/drivers/usb/core/port.h +++ b/drivers/usb/core/port.h @@ -63,6 +63,4 @@ struct usb_port { #define to_usb_port(_dev) \ container_of(_dev, struct usb_port, dev) =20 -struct usb_hub; - -int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstatus); +int usb_port_is_power_on(struct usb_port *port, unsigned int portstatus); --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 D724E42FCD8 for ; Tue, 21 Jul 2026 06:55:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616920; cv=none; b=Y1l50AMSepQty8Qhd5PO3kEICxWhIazfAVMjDxi7bYTELXJIArxTY3Pq57Q5KKmeG33srtbT5o+mB+c803znnEL+cv/3f4Ipjc0GRsf3L8WsklxS7JeyyalSvfkggYL4NMIr3qZnCw9ohEjalBCSteAZButffQ79MTAm52ubwgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616920; c=relaxed/simple; bh=DyEec2Z7+FSSh+lvskH9h+/zSvQpOnJC1n/aL86DbdU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p8VUz2xY0HfIGPv62CIwN0IJrhRobBMs7Wo9JBR3kA/2i4SLX5Im9ce/FdHX31bdLAHDJXWXUcaaCvRymMb6l6wRImZV68ABsQpii7mUMCHd5DS2A5ZiI7Y+Sp4TMKYaTwX+UGdPStymbqCMLVAgWY1OC35djd1/yvrJI7KKa4I= 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=Kr70JVPy; arc=none smtp.client-ip=209.85.214.174 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="Kr70JVPy" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cf50c6f235so29443785ad.0 for ; Mon, 20 Jul 2026 23:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616918; x=1785221718; 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=f0rgL0VJ5kE0g1GPB7mxKos5pVHLgytmLF2hovXGdFw=; b=Kr70JVPyDvE4ZOMszTxjcVJZp2HTNwUDsDpuPnUHjPcmunxwvoTzW49334Pv99zn8i rjuIX5eODThjRRmnpbyXCZSnpiBrBL7ZX5oB2Wa8bbRVo9xyD4IPleUwA5U8L0EzGAcb eA5nHpKqcuOilQyZX9MWvmPxkjSeV/m3wkYRk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616918; x=1785221718; 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=f0rgL0VJ5kE0g1GPB7mxKos5pVHLgytmLF2hovXGdFw=; b=gHPbJPaBGBMtMtVXmRSs4qyKlvrrbA0WX/HGS1G//iPoANIjVNZZN22w5fncvFOuLA jkXIibBAcAS7QvJzgaQzaKEM/U/N9q1Vkvte/Z59ffGKzTru1NsqCjK/RgWeVpIEUj8b nf0uGw2cRM7jJgQa5LquldgXpYgBPGzDJ2ajpt328uRqF9ELdAF5crmt2gmiCCl/fFrZ xSu5Ljyk6W7pCzAeV9emSU6sWylVIpFecvBCKHZWAGVYu+7WHxBrWW8HWTxJqqxxeMOF xdU7r1YPVo6ue6aSBqfpwsA1oLlelKSNZnlZzjh8xpc4OqhfdEQiYmDsxDxcWcPHaNB+ He+w== X-Forwarded-Encrypted: i=1; AHgh+Rogkyf6dHiuYuHXM13likh/XXlNUKEO1556b9TssP/XvpQtxlknYLgisrY0qwEPwQcSGC4q425HQnp7GDA=@vger.kernel.org X-Gm-Message-State: AOJu0YwEdnq+ITQZRKCuKdQ3InWhjs/rpo5Mey1kuXgni2wtnn25vkil XIS45/fNcLTmIcKtI0MMdul4g/5bN4hWnmf4gbRyXt4rM7LocNjeZx2S+mwv1QC3Xg== X-Gm-Gg: AR+sD12Lu76zRd8Eiauz8FoFSy4eEdVjd6ePkSrBI2fYkEN4ADYH8qZPfEdvhpI0LSr NHPnsyi8BCTJsJPwJOJOJ3qk9fSYcoPp45E1faOmUHX0fmD6xakiOwUZnGrBdZrvQlrqnrmTSIt ShAVwPl4jPJITbTtz0k/EylH75bB+38HFro43kSDzUwLOYRJrZDuxUkM2beZzVvDGQjU9CgH8ua zAVGLqzkJbhJ+KJJtAy+kCzX1kqCdqerCXvrsADiAjCEPdw6FpDxbYF/vPkDBxDt8zhsfo7ijwG dUiwPl6cs/Sp5e5J4UGuPiZnEjoYg8pChqSInyOyPNHRJ7MG2LaY1TynUrlKvo+m0YxlxbLm5qb t+ZLXRprBbmJsApFz5tZlZ9G7sk7sy5OBpitEdrJBh2ieQKrhLAemQliAQWGZCuOjQZ6nYYOSD1 XFRsblJpwRuPIRLr9GEMJo5fQyr7vCsi0Qp9uflZCVBWk9seuiZICEE/92LwfiWhd5zWPhCA== X-Received: by 2002:a17:902:f64d:b0:2cc:df15:91de with SMTP id d9443c01a7336-2cf349d30b8mr204344825ad.42.1784616918417; Mon, 20 Jul 2026 23:55:18 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:18 -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 09/16] usb: hub: Use usb_hub_set_port_power() to control port power everywhere Date: Tue, 21 Jul 2026 14:54:04 +0800 Message-ID: <20260721065413.2306137-10-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are still some instances in the USB hub driver where port power is directly controlled by toggling the USB_PORT_FEAT_POWER feature flag. Switch these instances over to usb_hub_set_port_power() so that only one unified function to do this exists. This makes adding external power control with the power sequencing API easier and consistently applied. Reviewed-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Signed-off-by: Chen-Yu Tsai --- Changes since v2: - New patch --- drivers/usb/core/hub.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 6671b5e45191..a5c5038e1604 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -976,11 +976,8 @@ static void hub_power_on(struct usb_hub *hub, bool do_= delay) dev_dbg(hub->intfdev, "trying to enable port power on " "non-switchable hub\n"); for (port1 =3D 1; port1 <=3D hub->hdev->maxchild; port1++) - if (test_bit(port1, hub->power_bits)) - set_port_feature(hub->hdev, port1, USB_PORT_FEAT_POWER); - else - usb_clear_port_feature(hub->hdev, port1, - USB_PORT_FEAT_POWER); + usb_hub_set_port_power(hub->hdev, hub, port1, + test_bit(port1, hub->power_bits)); if (do_delay) msleep(hub_power_on_good_delay(hub)); } @@ -5437,7 +5434,7 @@ static void hub_port_connect(struct usb_hub *hub, int= port1, u16 portstatus, if (hub_is_port_power_switchable(hub) && !usb_port_is_power_on(port_dev, portstatus) && !port_dev->port_owner) - set_port_feature(hdev, port1, USB_PORT_FEAT_POWER); + usb_hub_set_port_power(hdev, hub, port1, true); =20 if (portstatus & USB_PORT_STAT_ENABLE) goto done; --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 04BEC42E8F4 for ; Tue, 21 Jul 2026 06:55:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616926; cv=none; b=o7YkyoyDEmGpwdPAGqgjtgmoVitjdU62mu02bCZ8rHzkWcf7CqG3iNZaqXejX/NAAC+fczoreI8M7ggiD7SjY/mi6pP8XBD8bysAnNHrnSI0DJle1leqm0yZAkQJ5u8Wtnpl4Btii6zHifERLhg+MKkX6obZJqA5VvD7mXrlOZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616926; c=relaxed/simple; bh=BLMj8fkrUJa7Un1pSF7mTgrmFhtJrigUlp6Bcp1uaZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HnVWEL2bI7NwVv0tvmdoMwV4f5Eo6lLfq+kdlddvBFB0VAR0dYdxXH/PQ5YNLuCG+VPscBaCjiXDGQoErgDs7ZpJOGoizDJJY1H/jNDN2O4oJLlz1QUqiZjzXK8wS1QxPu7mWxD0MOfe4wQtYgDdVoVQyTuSaNOD+Nd/oWutrQ8= 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=mD9iJNkf; arc=none smtp.client-ip=209.85.214.173 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="mD9iJNkf" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2cace91f112so112319535ad.0 for ; Mon, 20 Jul 2026 23:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616923; x=1785221723; 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=xIIjCuT7H0XDo4a52csag/RVgzmsdDxQ+CvC8r4yA3M=; b=mD9iJNkfn+vAAAyX4uvttBnInHu8DxY2RDOZCk+0yGST/bieFWSLYw9JENlJo/3esn li/vkxiMICttI3LUqwe6O5iqcXhi18SqMCsA6w2cyFp7vRsh2pn4rnKarvb2Qtsaq1U0 0qf3YtDCEwhvRBJQK+nIbWGqIn95G1aw7xR3M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616923; x=1785221723; 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=xIIjCuT7H0XDo4a52csag/RVgzmsdDxQ+CvC8r4yA3M=; b=Qy7cYO+v2ywQWcCmZAKv1Rp+3Obb60d0w4Gn5Kz+aGZttvLFQbfrkyKlB1V+UfuwQ/ c52f48l07Qz1qBaoWotUpwNDVrfOf2ngxG/72hH/M18YzFFDYx1fs4sm9HXoGwBftQnP OCgJLji0AUlGZIGPp+ilZ3D/o0mcDlrAY49djHDOkAVXbRzdUoPWMYu/uwk40H/os9Ap RUOGtdIvn9opTp/pxRjzqEpZbu00nU7YQvm7R68rY7RNqjv/VjbXUWWAaCX9YxKyfO3H xERqQC/hvREplqXSQ/YZu7gZozTDMSpJ/U/kUAJBFb/5BkW/Gjss81iBxNPOBbmtE6zo ZqSA== X-Forwarded-Encrypted: i=1; AHgh+RqfKMNcSxyPKTtf7cv3ARp7kQ+OnAnXdizocc+1fbmkcfQazP6F+qaaaIHnTy4Xhwvm9HDWMUmanCvK0Mk=@vger.kernel.org X-Gm-Message-State: AOJu0YyVRLy2adC/epNjrNBBp8f48R7w1fHYVyYAcl0pnN+UE5acziXE Ctli512dSI+UDXCJ9ijZXP8IfZ3gqKNlsGi3H2hZb97+KAma3912Ru6/7O0K6fixyw== X-Gm-Gg: AR+sD11dOuYysfeEi7G7zWyzablnVv7nRdhekzzLjyFvM33l+JuEzDJbr+mugkJy1Qd gxlAfHFjUwdWj1ydqNSn06XtP0/6tY0xLeOKBzgqlBrvAgtS7fx6k05QB7Y2+CqZVI0aMsoUVFS YbI5D97t9O2SLpoRcYbiC+CYuT3TeqnO+zQug3egFNsvYCvAmbbb+pmvhvfAmPxhBkSmR/cGgt9 kc/q7h3GIIMWW12EeiaC0DdQYqJRNzpkhH3O093v2LG0iZRcPCgx+HjIdBVYkZAj5xxZcxzXhBz cWpe6lIcJ7P56DOpTgXYIgEVMl0iBy6+Z1IFN6XcEfKNu3WgivskoOEgiByhF5znTGrh0gOv6mP FOEN4uEPbWwPLcr1a8eOTtfAadOySPNL5aJyGk7JhXBQXxUml/Qga5l48u+1fvCVAXwsihK8Xsh PbLx47XBCSJX9crnvD+M7djmZ1bYxtP9CRBuJk6XT5nvGa5dY81GaD63WBMGU= X-Received: by 2002:a17:902:f542:b0:2cc:741a:ff33 with SMTP id d9443c01a7336-2cf34a39f67mr182425285ad.43.1784616923094; Mon, 20 Jul 2026 23:55:23 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:22 -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 10/16] usb: hub: Power on connected M.2 E-key connectors with power sequencing API Date: Tue, 21 Jul 2026 14:54:05 +0800 Message-ID: <20260721065413.2306137-11-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The new M.2 E-key connector can have a USB connection. For the USB device on this connector to work, its power must be enabled and the W_DISABLE2# signal deasserted. The connector driver handles this and provides a toggle over the power sequencing API. This feature currently only supports a directly connected (no mux in between) M.2 E-key connector. Existing USB connector types are not covered. The USB A connector was recently added to the onboard devices driver. USB B connectors have historically been managed by the USB gadget or dual-role device controller drivers. USB C connectors are handled by TCPM drivers. The power sequencing API does not know whether a power sequence provider is not needed or not available yet, so we only request it for connectors that we know need it, which at this time is just the E-key connector. On the USB side, the port firmware node (if present) is tied to the usb_port device. This device is used to acquire the power sequencing descriptor. This allows the provider to tell the different ports on one hub apart. This feature is not implemented in the onboard USB devices driver. The power sequencing API expects the consumer device to make the request, but there is no device node to instantiate a platform device to tie the driver to. The connector is not a child node of the USB host or hub, and the graph connection is from a USB port to the connector. And the connector itself already has a driver. Power sequencing is not directly enabled in the connector driver as that would completely decouple the timing of it from the USB subsystem. It would not be possible for the USB subsystem to toggle the power for a power cycle or to disable the port. Sashiko mentions possible use-after-free of hub->ports from the sysfs callbacks. This is actually not possible, since the sysfs callbacks acquire the hub device and its lock, and then check if it is in the process of disconnect / removal. If it is, then the callbacks just error out. Reviewed-by: Bartosz Golaszewski Signed-off-by: Chen-Yu Tsai --- Changes since v5: - Only assign port_dev->pwrseq if successfully retrieved pwrseq descriptor (Andy) - Dropped the pwrseq error pointer check in the release function (Andy) - Added check for port->pwrseq !=3D NULL before calling pwrseq_is_power_on() (API change in patch 3) Changes since v4: - Rewrote usb_port_is_power_on() to better express intent and restrictions of pwrseq API (Andy) - Switched to dev_fwnode() in port_pwrseq_is_supported() (Andy) - Added blank line separating normal variable declarations and __free() type declarations (Andy) - Split out assign_bit() rewrite (Andy) - Moved pwrseq_put() to release function to avoid UAF (Sashiko) - Added back pwrseq_power_off() call in usb_hub_remove_port_device(); otherwise power off could be delayed to object release - Don't clear hub->ports[port1 - 1] in main error path; by that time the port device is registered and sysfs attributes are available to userspace (Sashiko) Changes since v3: - Adapted to move of usb_port_is_power_on() to port.c and port.h - Simplified usb_hub_set_port_pwrseq() (Andy) - Renamed usb_hub_set_port_pwrseq()'s "set" parameter to "on" - Dropped usb_hub_restore_port_pwrseq() (use usb_hub_set_port_pwrseq() with inverted argument) - Fixed off-by-one access in hub_is_port_power_switchable() (Sashiko) - Assign retval from dev_err_probe() instead of the other way around (Andy) - Clear hub->ports[port1 - 1] in USB port error and remove paths to avoid other threads from accidental UAF while the USB hub device is being unwound (Sashiko) - Short-circuit out of helpers if !IS_ENABLED(CONFIG_POWER_SEQUENCING) to avoid errors from stub functions (Sashiko) Changes since v2: - Expanded subject to mention power sequencing API - Dropped commit message bit about power sequencing Kconfig symbol change to bool - Added optional dependency on POWER_SEQUENCING to USB - Split out pwrseq_power_*() calls into separate helpers - Rewrote set_bit() and clear_bit() branches with assign_bit() - Dropped the pwrseq_power_off() before pwrseq_put(): pwrseq_put() does it automatically. - Removed pwrseq_power_on() from usb_hub_create_port_device(); it will get called through usb_hub_set_port_power() in hub_activate(). - Added checks for port->pwrseq in hub_is_port_power_switchable() - Use separate pwrseq descriptors for HighSpeed and SuperSpeed ports. This makes things simpler. On the other hand to power cycle a port userspace needs to toggle it on both the HS and SS ports together. - Dropped pwrseq state tracking again The power sequencing consumer API already tracks the state internally; doing it again in |struct usb_port| is not necessary especially now that the descriptors aren't shared. It's unclear to me how actual hubs reconcile USB_PORT_FEAT_POWER settings from the HS side and SS side. One hub chip vendor said that VBUS_EN for a port is on if the flag is set on either side; however actually testing on one of their hubs showed that VBUS was cut as soon as the flag is cleared on the HS port. Maybe it could be different if a SS device was connected? That scenario was not tested. Testing on another retail bought hub seemed to work exactly as described though: USB_PORT_FEAT_POWER needed to be clear on both HS and SS ports to turn off VBUS. Under this scheme, I'm not sure how the power cycle in hub_port_connect() would work correctly. - Link to v2: https://lore.kernel.org/all/20260610084053.2059858-1-wenst@chromium.org/ Changes since v1: - Switch to fwnode instead of OF - Tie port@ fwnode to usb_port device - Move remote node compatible checking to separate helper - Use usb_port device to request power sequencing descriptor - Drop "index" parameter from pwrseq_get() - Do not get pwrseq descriptor for SuperSpeed port; share one for one physical port - Add pwrseq state tracking - Link to v1: https://lore.kernel.org/all/20260515090149.3169406-1-wenst@chromium.org/ --- drivers/usb/Kconfig | 1 + drivers/usb/core/hub.c | 20 ++++++++++++++- drivers/usb/core/hub.h | 8 +++++- drivers/usb/core/port.c | 57 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/core/port.h | 2 ++ 5 files changed, 86 insertions(+), 2 deletions(-) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index abf8c6cdea9e..ef1959363fb1 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -44,6 +44,7 @@ config USB_ARCH_HAS_HCD config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + depends on POWER_SEQUENCING if POWER_SEQUENCING select GENERIC_ALLOCATOR select USB_COMMON select NLS # for UTF-8 strings diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index a5c5038e1604..35e035cfeb4d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -33,6 +33,7 @@ #include #include #include +#include #include =20 #include @@ -875,6 +876,16 @@ static void hub_tt_work(struct work_struct *work) spin_unlock_irqrestore(&hub->tt.lock, flags); } =20 +static int usb_hub_set_port_pwrseq(struct usb_port *port, bool on) +{ + if (!IS_ENABLED(CONFIG_POWER_SEQUENCING)) + return 0; + + if (on) + return pwrseq_power_on(port->pwrseq); + return pwrseq_power_off(port->pwrseq); +} + /** * usb_hub_set_port_power - control hub port's power state * @hdev: USB device belonging to the usb hub @@ -890,15 +901,22 @@ static void hub_tt_work(struct work_struct *work) int usb_hub_set_port_power(struct usb_device *hdev, struct usb_hub *hub, int port1, bool set) { + struct usb_port *pwrseq_port =3D hub->ports[port1 - 1]; int ret; =20 + ret =3D usb_hub_set_port_pwrseq(pwrseq_port, set); + if (ret) + return ret; + if (set) ret =3D set_port_feature(hdev, port1, USB_PORT_FEAT_POWER); else ret =3D usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_POWER); =20 - if (ret) + if (ret) { + usb_hub_set_port_pwrseq(pwrseq_port, !set); return ret; + } =20 assign_bit(port1, hub->power_bits, set); return 0; diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index de524c6da9fc..7277c38c9e62 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -103,7 +103,13 @@ static inline bool hub_is_port_power_switchable(struct= usb_hub *hub) if (!hub) return false; hcs =3D hub->descriptor->wHubCharacteristics; - return (le16_to_cpu(hcs) & HUB_CHAR_LPSM) < HUB_CHAR_NO_LPSM; + if ((le16_to_cpu(hcs) & HUB_CHAR_LPSM) < HUB_CHAR_NO_LPSM) + return true; + /* check for controllable external power sequencers */ + for (unsigned int i =3D 0; i < hub->hdev->maxchild; i++) + if (hub->ports[i] && hub->ports[i]->pwrseq) + return true; + return false; } =20 static inline int hub_is_superspeed(struct usb_device *hdev) diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index 8d686d43e996..38da7cc24c63 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c @@ -8,11 +8,14 @@ */ =20 #include +#include #include #include #include #include #include +#include +#include #include #include =20 @@ -35,6 +38,10 @@ int usb_port_is_power_on(struct usb_port *port, unsigned= int portstatus) ret =3D 1; } =20 + /* stub functions return error */ + if (IS_ENABLED(CONFIG_POWER_SEQUENCING) && port->pwrseq) + return ret && pwrseq_power_is_on(port->pwrseq); + return ret; } =20 @@ -45,6 +52,9 @@ static bool usb_port_allow_power_off(struct usb_device *h= dev, if (hub_is_port_power_switchable(hub)) return true; =20 + if (port_dev->pwrseq) + return true; + if (!IS_ENABLED(CONFIG_ACPI)) return false; =20 @@ -380,6 +390,8 @@ static void usb_port_device_release(struct device *dev) * device_platform_notify_remove() in device_del(). */ fwnode_handle_put(dev_fwnode(dev)); + /* usb_hub_create_port_device() could leave an error value */ + pwrseq_put(port_dev->pwrseq); kfree(port_dev->req); kfree(port_dev); } @@ -772,11 +784,46 @@ static const struct component_ops connector_ops =3D { .unbind =3D connector_unbind, }; =20 +static bool port_pwrseq_is_supported(struct usb_port *port_dev) +{ + struct device *dev =3D &port_dev->dev; + struct fwnode_handle *port =3D dev_fwnode(dev); + + struct fwnode_handle *ep __free(fwnode_handle) =3D + fwnode_graph_get_next_port_endpoint(port, NULL); + if (!ep) + return false; + + struct fwnode_handle *remote __free(fwnode_handle) =3D + fwnode_graph_get_remote_port_parent(ep); + if (!remote) + return false; + + if (!fwnode_device_is_compatible(remote, "pcie-m2-e-connector")) { + dev_dbg(dev, "remote endpoint %pfw is not a supported connector", remote= ); + return false; + } + + return true; +} + +static struct pwrseq_desc *usb_hub_port_pwrseq_get(struct usb_port *port_d= ev) +{ + if (!IS_ENABLED(CONFIG_POWER_SEQUENCING)) + return NULL; + + if (!port_pwrseq_is_supported(port_dev)) + return NULL; + + return pwrseq_get(&port_dev->dev, "usb"); +} + int usb_hub_create_port_device(struct usb_hub *hub, int port1) { struct usb_port *port_dev; struct usb_device *hdev =3D hub->hdev; struct fwnode_handle *fwnode =3D dev_fwnode(&hdev->dev); + struct pwrseq_desc *pwrseq; int retval; =20 port_dev =3D kzalloc_obj(*port_dev); @@ -827,6 +874,7 @@ int usb_hub_create_port_device(struct usb_hub *hub, int= port1) retval =3D device_register(&port_dev->dev); if (retval) { put_device(&port_dev->dev); + hub->ports[port1 - 1] =3D NULL; return retval; } =20 @@ -844,6 +892,14 @@ int usb_hub_create_port_device(struct usb_hub *hub, in= t port1) goto err_put_kn; } =20 + pwrseq =3D usb_hub_port_pwrseq_get(port_dev); + if (IS_ERR(pwrseq)) { + retval =3D dev_err_probe(&port_dev->dev, PTR_ERR(pwrseq), + "failed to get power sequencing descriptor\n"); + goto err_put_kn; + } + port_dev->pwrseq =3D pwrseq; + retval =3D component_add(&port_dev->dev, &connector_ops); if (retval) { dev_warn(&port_dev->dev, "failed to add component\n"); @@ -901,6 +957,7 @@ void usb_hub_remove_port_device(struct usb_hub *hub, in= t port1) peer =3D port_dev->peer; if (peer) unlink_peers(port_dev, peer); + pwrseq_power_off(port_dev->pwrseq); component_del(&port_dev->dev, &connector_ops); sysfs_put(port_dev->state_kn); device_unregister(&port_dev->dev); diff --git a/drivers/usb/core/port.h b/drivers/usb/core/port.h index 2f4349b3ce6b..088a182332d4 100644 --- a/drivers/usb/core/port.h +++ b/drivers/usb/core/port.h @@ -25,6 +25,7 @@ * @port_owner: port's owner * @peer: related usb2 and usb3 ports (share the same connector) * @connector: USB Type-C connector + * @pwrseq: power sequencing descriptor for the port * @req: default pm qos request for hubs without port power control * @connect_type: port's connect type * @state: device state of the usb device attached to the port @@ -44,6 +45,7 @@ struct usb_port { struct usb_dev_state *port_owner; struct usb_port *peer; struct typec_connector *connector; + struct pwrseq_desc *pwrseq; struct dev_pm_qos_request *req; enum usb_port_connect_type connect_type; enum usb_device_state state; --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 8888B430CEF for ; Tue, 21 Jul 2026 06:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616931; cv=none; b=sR50LPqUvEL4di4BUPrqmT4tq7NIk114HmFXaPo+eMrO2Guql/Em5/8F98U5S0z/mlIFHI4ypx/pSyZEOZbP7BhnxOIDvYBhLUxOfbPbdu5EkcvQsG6evUJKwUTFIDZbK1+mmcN6Z8RIDF3kmJF8mKt9FvYNTs+BMPNyDKOrORw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616931; c=relaxed/simple; bh=Weo+Ui8E43MHQNrKTqB+K8VGg2TvPBPQ6D1g4YfmF4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mOoX4M6jhqxhYcnaJmbzVAX/Of1PLzoxMoJrXw9XKWSPZzJSoSiysg1Hzd74Dpxznce9Gg2g/8hp689QvMjKWVSB41+eQqu9d0SqGI8M9U57ExdqdEk2ysEn1bbCDB5YsHRV8hq2VPKW+locsIoF6vFdWwI1AnVLMonpAvYVsLI= 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=Y1JubqtR; arc=none smtp.client-ip=209.85.214.180 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="Y1JubqtR" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2ce7d2adef4so109032175ad.3 for ; Mon, 20 Jul 2026 23:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616928; x=1785221728; 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=HbHZBlGJIBZH9w4CnNEDqTFXqQ2V4R1HGaboHmDjj7s=; b=Y1JubqtRZwAsb43vVoeSY5JJjyZlmldO9NC9MH8KBHAhdY+eCt+yF8EQwu8oYh76DT MBzdt6DuPei4vUVl2ymrABNtz181vEHdUNn4eP8cU5iDmbLVB79E9XIfWUWJ0jIS9bYR 9i+IVVezSOdycmXwyGUG5mDeD+rH5aFyIXTEw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616928; x=1785221728; 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=HbHZBlGJIBZH9w4CnNEDqTFXqQ2V4R1HGaboHmDjj7s=; b=T5c3w0a74oQwYW+ICbcglieXsnl8K7sRGLu+nwVCvnwRcdU7tXcBCDYe2HP2/8Cv+U gYsORZHFef+k57AM0VRa0l4zgfj0y2fo6ca8uI8L7vtcDQhrPlkjmy5wwRCEPslz7xda /lHyYmelN9GLS2bveZRN0lwvNTk7hTyUFBJSj1HnrnR93JzEJzmAVsiL72RINFdmf/LW LEGurSYlRvoFqxgbJSpmsEeX9Cp3Il2WEeMJd1Cgj8i3OekX43ZKlhDUS6F+qmmtBBCH uQlTMwIfLnqJiRWiY7Aq2Bi9jYS63rTBgjH+raP8QfHVusyPwuP2iCWVsJna3lCvQAc8 jkpg== X-Forwarded-Encrypted: i=1; AHgh+RovuuCZp5vbfmLe+TxpO3YZ3wCjSyXiUgEb8LYSHy2gEwqTRRade3OlGkfkOnUKL8dc1kXLRpY7AVWDppY=@vger.kernel.org X-Gm-Message-State: AOJu0YyN6nii8y9rwZOzVe6m5Yd7n1sq4J+Gjyz6SHFolRHIy8x5AHwn 7D2LR6ZMxoB/rzjEY2JEr4bWxN0uwOksfdFIr9hDQt1R6AB5aKAV55cgU6s4EjORcrcmISo6EfG ieEE= X-Gm-Gg: AR+sD120KjMP8AMMiJ41tTPYGZAHy2YlSvixDjgIiBHKjI4YbMpEhVIrg1fAcJNLzbL UGQQea4ktOfI2L5XKa5kNjGc5r6WZaow/Pcx1kfJ6Kx+m8W7ZJeYK4PR9l1OV4CHUe9dQnWFyZQ CNd+TXj61yNsIJr5olsaptlKcYQ4+n+Et1xybRWKmQwd/piYKlU46pGR9GS3TIO9fNNv+jHfJIU rpduLi/fSWuqX5f2QqgcHEurHqbf3Kitt0V/tQOLOoXYlWsnKVc4uI2p0astVXCKY/LJ+1IB+Be Pn2ErfZHq+kNrXe1qRYVXmTsYT0i+yJTDkCVN95uKpd83T5ZdbKMU22mnpMX3M40jQnYMggjb+A ANBPg/Xo7qWp4TXtd/aoVgnhveZnCCrJUR72SOFzW5OvNAmXWgTh7z11691xScwJrsoKZW17YWv txFIN+RZV09tJkWeueVLAajxejjVtdch4y84i6DxqYRBoTIGEB8HranIoXyxI= X-Received: by 2002:a17:902:ef49:b0:2cc:ee78:3236 with SMTP id d9443c01a7336-2cf34997125mr195766485ad.33.1784616927898; Mon, 20 Jul 2026 23:55:27 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:27 -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 , Krzysztof Kozlowski , Bartosz Golaszewski Subject: [PATCH v6 11/16] dt-bindings: usb: mediatek,mtk-xhci: Switch to ports for USB connections Date: Tue, 21 Jul 2026 14:54:06 +0800 Message-ID: <20260721065413.2306137-12-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 454a1e3cd36c113341d7b71e8e691c6e47ab4a8a. MediaTek's XHCI implementation supports both USB 2.0 High Speed (HS) and USB 3.x Super Speed (SS). The block can also be synthesized with either HS-only capability or HS+SS capability. The SSUSB controller handles the device or gadget mode. Saying that SSUSB handles the HS portion is wrong. For example, on the MT8195, the first two instances support both HS and SS, while the latter two instances support only HS. Switch to a "ports" sub-node for describing USB connections. Port 1 is Super Speed if the controller is SS-capable, otherwise it is High Speed. Port 2 is High Speed if SS-capable. This port mapping scheme directly matches what the hardware returns in its capability registers. Fixes: 454a1e3cd36c ("dt-bindings: usb: mediatek,mtk-xhci: Add port for Sup= erSpeed EP") Cc: AngeloGioacchino Del Regno Reviewed-by: Krzysztof Kozlowski Reviewed-by: Bartosz Golaszewski Signed-off-by: Chen-Yu Tsai --- Changes since v1: - Squashed DT binding revert and addition together - Dropped reviewed-by from Bartosz --- .../bindings/usb/mediatek,mtk-xhci.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b= /Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml index 231e6f35a986..d6c75bd20b78 100644 --- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml +++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml @@ -107,10 +107,6 @@ properties: - description: USB3/SS(P) PHY - description: USB2/HS PHY =20 - port: - $ref: /schemas/graph.yaml#/properties/port - description: Super Speed (SS) Output endpoint to a Type-C connector - vusb33-supply: description: Regulator of USB AVDD3.3v =20 @@ -188,6 +184,19 @@ properties: "#size-cells": const: 0 =20 + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: Super Speed (SS) data bus if SS-capable; + otherwise High Speed (HS) data bus. + + port@2: + $ref: /schemas/graph.yaml#/properties/port + description: High Speed (HS) data bus if controller is SS-capable. + patternProperties: "@[0-9a-f]{1}$": type: object --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 ECFEC434404 for ; Tue, 21 Jul 2026 06:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616934; cv=none; b=rnRk/vTeeuoodE6W9HfeVv7hOiSpDm6Kj72DFPK1mzMhB9q/HNgYVoVtGPR3fpRuOe54o0mo6JDYmCv3bVcLVcNBC/Cbnnj1Hx58d+4ugezycgecGCOHzo8WPMr6QOnkFnpFsGmv95Bn5xMg/+PjReKqSnefaz/STrPrSUJRtJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616934; c=relaxed/simple; bh=TPxqymmswATTFY0Ts3z5ZJsgeicU9hkYXr5TZUF7F/U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LJZoWuPwo4eCmM1aBoRe7H5Spjz9Ysot1TiAbAC9VlEc2ieeaGaMc2UzKKUVKFE9UjQY9E6RxKZIpkVLiVJttPG44fDO18dIg4HmhpeNQFGDmAjer3xy1uQ62MaJeEfiyqynV/Nu8Oc9apv2R3KGGM0IzIbddllqwzj/wdN4hnE= 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=HnrE0Bfk; arc=none smtp.client-ip=209.85.214.181 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="HnrE0Bfk" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2cf52d15d88so25295235ad.2 for ; Mon, 20 Jul 2026 23:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616932; x=1785221732; 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=52TzlozFyu8oOUFzVHVO43WIZLgCMoBqx/sMPHBx7bQ=; b=HnrE0BfkJcQENp+fx6WYE1H9Xyzox5+4j72mtBwMiaYOcnFTM3sELlbFIabUtbj/Uf Z5KtAc5aXXtFdTn3pIAfgdjjUrbGm82eZ9JFz5lAP9wXJlCTnINVXZDx4eznn7uhUugw daqI5tczffyFEOFQTjOYT+Mq+KQT0rTCRx908= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616932; x=1785221732; 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=52TzlozFyu8oOUFzVHVO43WIZLgCMoBqx/sMPHBx7bQ=; b=PEgVTf8Y8vW31ChhF4hCEH/oroWSRaFc8IBl9HA27TygB0wYgTMCzXeGFISWqvUJwb suwnVzNiI6p20RmO5v90R4x6CLpbTuhJt2V9PJCNx0UxvMd6xrEn6m1ae9ge3/0Nm06A lXlMiJ7q+54FZZNLSmM96fW/B/HVIFMwUBqxIqElF66flIYtn4cvShvPD6wikLmhYEB8 YC7sWDrRLAH0EO44fJWKjdH5IwXL9sASkgmw8tEN8v8SOcPnE10RZbmfHOhTcTL23oBx s44MWqNuqh5ArqEsCAC7oSXHKed3hpqszRinFxX3VgVhNIP33S9J6/gGttyb/mqQMxDB 85nA== X-Forwarded-Encrypted: i=1; AHgh+Ro6izNfieVy2a0E9gHfT8Q72yq7r5C8BGXFsJ+Vx1Ff3DqRdXyLpxamkejM9BERCJhL0iJE4q/xALWUQcw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxq+79paakWarWleg+8+PGVSVEWoy7Pj67OI3LxmNKqPTJ+jtYB u8leD3KC4vraya/zr5JcI7w+AbgKfbfyklgsjNEWvKjPNn9EXfuFUrwd1xL1yIcXrA== X-Gm-Gg: AR+sD10iXpEVVrOTYA7Gh96nyNBJ8Tfc3qIFOSMk/e460aNDiWT9tdlZmti/2ShCLUH J22IQc2glo3j7q9MjsRvUgbTfjUWwCNNGsP/LuAmjmhqzbq/spPp8P4dxwQRTZbQp8c1E1fUodl rzUfheJZV/zOLmuO8uJ+fTUnjpAB9oHiRdM/Uel5Uh/DH6W5ka/tuTjFqkb+a2hCQKTvhjq635b DwhBx5koiufGtzLjfNpYk5qx/muWqXsae8PBF90dURaGeuyA9vHTwYt3A0lq7WsreCHkkgTJZCD ZdHFRiU1T/b1z93y3sdcBMHMijooINIfuIlmZ7zzPCYwrWbxYKQzUlDjGI4OGFRYDqx8T7scfzj 9in15HaVPB0aauQDbw8ayqRoe1dfjo+nIDkUXvEcPcnmIycTdT3MwCMy+YPNkw4ufY121qrkfLU lAtlA7JI0m841fWqEPMGS0OBW79gXkHhsy6+n7gxac6RpSZffklKpyczthqlA= X-Received: by 2002:a17:903:2287:b0:2c9:c517:d070 with SMTP id d9443c01a7336-2cf348366bfmr176522085ad.3.1784616932321; Mon, 20 Jul 2026 23:55:32 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:31 -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 Subject: [PATCH v6 12/16] power: sequencing: pcie-m2: support matching on remote "port" node Date: Tue, 21 Jul 2026 14:54:07 +0800 Message-ID: <20260721065413.2306137-13-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A USB hub can have multiple ports, and this driver needs to differentiate which port is being matched to. The USB hub driver now associates the "port" node with the usb_port device, so here we can use the remote "port" node to check for a match. Then fall back to the remote device node for the other connection types. Also rewrite the existing "remote =3D=3D dev_of_node(dev)" with device_match_of_node() for consistency. Signed-off-by: Chen-Yu Tsai --- Changes since v4: - Dropped blank line between __free() variable declaration and subsequent use of the variable in conditional Changes since v3: - Drop redundant device node validity check; device_match_of_node() does it internally Changes since v2: - Use device_match_of_node() --- drivers/power/sequencing/pwrseq-pcie-m2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/power/sequencing/pwrseq-pcie-m2.c b/drivers/power/sequ= encing/pwrseq-pcie-m2.c index 83fe6a1396bc..691cad0a6dd0 100644 --- a/drivers/power/sequencing/pwrseq-pcie-m2.c +++ b/drivers/power/sequencing/pwrseq-pcie-m2.c @@ -175,9 +175,16 @@ static int pwrseq_pcie_m2_match(struct pwrseq_device *= pwrseq, * parent matches the OF node of 'dev'. */ for_each_endpoint_of_node(ctx->of_node, endpoint) { + /* USB port devices are tied to the port nodes. */ + struct device_node *remote_port __free(device_node) =3D + of_graph_get_remote_port(endpoint); + if (device_match_of_node(dev, remote_port)) + return PWRSEQ_MATCH_OK; + + /* Try the remote port parent for other types. */ struct device_node *remote __free(device_node) =3D of_graph_get_remote_port_parent(endpoint); - if (remote && (remote =3D=3D dev_of_node(dev))) + if (device_match_of_node(dev, remote)) return PWRSEQ_MATCH_OK; } =20 --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 D788B434E4F for ; Tue, 21 Jul 2026 06:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616940; cv=none; b=vBuQ6PxxWSM/YBro4B8grzDIkyqlR9S3G2x0GEVT92CtzboIaSOdJ3frHzAFJFLBuF+9deExt5SfdsvH4AK/ytilVCvRCNMK0kihOoOjr9l9vx95XQKj+9Mana/8esY1jAVXCUUAdt4wSsQpQH0bh6bc/ZgydoRgVs8Yy9/bkak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616940; c=relaxed/simple; bh=v0+Tz2myQW41rIDpdJevWmH+Rji/Co2WNAU+Key/38U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wls3PrjpQGF2vkRGi4jEQRXoFVKrhJEpvQ9iThDxrH4V3w7xjwr/O0bq6TjetKw2FSa5CFJnBcNdE10CoS/UGkETkypbsap2+nbyKWv0+7q4p83DmPY1Q4590j6tLwnt6A3G27/ptEm+7NXTb4dl3Q0youmTOm/LsTbT2nlNIn4= 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=USn1UMH2; arc=none smtp.client-ip=209.85.214.170 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="USn1UMH2" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2cc97653887so119532245ad.1 for ; Mon, 20 Jul 2026 23:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616937; x=1785221737; 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=8fMs6AV1DB1/anefBW7A0r/4RRc6OeCs0ioieSwLEU0=; b=USn1UMH2ZKlJ+8zH4wfdTyyN1fVa7K7TE2HinyHBNrP3DmEbFF49Jkcl5vf5BNJHjc xaxv2V8O8EP2qtEBWb2DG91BbcO8rOdNN00fNidCERrJf7F9JPqvzPTovjfpTJty1f6R nY8fGTpOU3Agj/DvgDrvyDXgWmmJJg/bnnYg4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616937; x=1785221737; 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=8fMs6AV1DB1/anefBW7A0r/4RRc6OeCs0ioieSwLEU0=; b=i8ONELFBs9qWR0rqE5P38o1fX5Yn7TzL66P7JIfWZohNh+G3ZvAaR5YqUtuct1xXlH RZEOiypwNbR7ylejjjtLX09IYmCjtj5Ay202R1qbUU6lCTIED972DAKLczimjffBMla8 L9XQjSEJ+2VpdHcsjo3BVAotLDpNWKkW+4uPaoDXd3NXuam9G4nehS7s5sd5Z2wVTxrT jSS4hVrInoC6Qdl8squjL1zFYjier+0D0ek22ID+dJiIvSUwFUm3FaKoXFT0e8uEQbg2 F5Ja3mV6bHbz1d+ERoOKe9eps9EHe3bfxCQCH8ceLjw66T1DIPNgVZg5hqj9zjtuWBQd uEBg== X-Forwarded-Encrypted: i=1; AHgh+Rppz68oTuNr/EU1jBW6OK0IjHaKlP1uQ/yID/m8qTifjtujjaPotDKaqdxlTPMA3v34MfLjdChHnlToOZo=@vger.kernel.org X-Gm-Message-State: AOJu0YxCSNacLJqKcU8kaZHgINY2vWzHsBAIKs/5iMxBA90GFQ4vQEBr zjlSPiKMQjN7dUleF/lRrK1t4IOtjaKNe45pM7bb6vw1rPTR1e0aC4z7zXNbGn77nw== X-Gm-Gg: AR+sD10QgGAOrIocS8vlY9I+Ggo2m/X9jwvapylwfm+Uyp5fxWOkhHFP01ejljNgv9n 16+peRH/8NSKufEZ4xaP8mRc0dHKPFi8NdunXHkXzwU6NvGpwLb9mIbM8kEQSm3w5lKWYAj4ZET YSkB37GrlUx0VLwZ+1uCpmFvV1yybOgdRW19wWiE/7ZoEzjDAbv22zbxYpimaR0enVVSf6zXAo4 CpT4SqmcEYhb1oLb/hpErGSmd7ve/CSRfPm6VnKvJUBHw/afCLOmeB4s3ukbmQ68OzWgdp2obXp kfqkUw7XUsCULe4/Mv/dJIWkvGN4XbZCp88MuStqIYBxqY9DPccYO3OboTW7Y0ylMsI3DrFlAyG DijSn9geCZX8OpTBYtwKO9zG5LO8/chbMlFE68JnxOERyiDE1j6bq9n5KzhJwmNFqFMU4t05v63 wWrpFM7CgHv5yxsHG0OTP509K/pRTz3bW+Yt2NSet+VVM9vbcoyn2siurAm3o= X-Received: by 2002:a17:903:2c50:b0:2cf:47c4:3d1a with SMTP id d9443c01a7336-2cf47c463camr154543805ad.3.1784616937260; Mon, 20 Jul 2026 23:55:37 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:36 -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 Subject: [PATCH v6 13/16] power: sequencing: pcie-m2: Add usb and sdio targets for E-key connector Date: Tue, 21 Jul 2026 14:54:08 +0800 Message-ID: <20260721065413.2306137-14-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The M.2 E-key connector allows either PCIe or SDIO for WiFi and USB or UART for BT. Currently the driver only supports PCIe and UART. Add power sequencing targets for SDIO and USB. To avoid adding a complicated dependency tree, rename the existing power sequencing units "pcie" and "uart" to "wifi" and "bt". The existing target names are left untouched. The new "sdio" and "usb" targets just point to the renamed "wifi" and "bt" units. The "unit" names are internal to the power sequencing framework, and should be confined to a single provider. The names are only informational. Dependencies are tracked with pointers to other units. The "target" names are the strings that the consumer uses to acquire a descriptor with. As these remain the same, existing users will continue to work. Signed-off-by: Chen-Yu Tsai --- Changes since v2: - Expand commit message --- drivers/power/sequencing/pwrseq-pcie-m2.c | 41 +++++++++++++++-------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/power/sequencing/pwrseq-pcie-m2.c b/drivers/power/sequ= encing/pwrseq-pcie-m2.c index 691cad0a6dd0..693b0d33f8cf 100644 --- a/drivers/power/sequencing/pwrseq-pcie-m2.c +++ b/drivers/power/sequencing/pwrseq-pcie-m2.c @@ -69,46 +69,46 @@ static const struct pwrseq_unit_data *pwrseq_pcie_m2_un= it_deps[] =3D { NULL }; =20 -static int pwrseq_pci_m2_e_uart_enable(struct pwrseq_device *pwrseq) +static int pwrseq_pci_m2_e_bt_enable(struct pwrseq_device *pwrseq) { struct pwrseq_pcie_m2_ctx *ctx =3D pwrseq_device_get_drvdata(pwrseq); =20 return gpiod_set_value_cansleep(ctx->w_disable2_gpio, 0); } =20 -static int pwrseq_pci_m2_e_uart_disable(struct pwrseq_device *pwrseq) +static int pwrseq_pci_m2_e_bt_disable(struct pwrseq_device *pwrseq) { struct pwrseq_pcie_m2_ctx *ctx =3D pwrseq_device_get_drvdata(pwrseq); =20 return gpiod_set_value_cansleep(ctx->w_disable2_gpio, 1); } =20 -static const struct pwrseq_unit_data pwrseq_pcie_m2_e_uart_unit_data =3D { - .name =3D "uart-enable", +static const struct pwrseq_unit_data pwrseq_pcie_m2_e_bt_unit_data =3D { + .name =3D "bt-enable", .deps =3D pwrseq_pcie_m2_unit_deps, - .enable =3D pwrseq_pci_m2_e_uart_enable, - .disable =3D pwrseq_pci_m2_e_uart_disable, + .enable =3D pwrseq_pci_m2_e_bt_enable, + .disable =3D pwrseq_pci_m2_e_bt_disable, }; =20 -static int pwrseq_pci_m2_e_pcie_enable(struct pwrseq_device *pwrseq) +static int pwrseq_pci_m2_e_wifi_enable(struct pwrseq_device *pwrseq) { struct pwrseq_pcie_m2_ctx *ctx =3D pwrseq_device_get_drvdata(pwrseq); =20 return gpiod_set_value_cansleep(ctx->w_disable1_gpio, 0); } =20 -static int pwrseq_pci_m2_e_pcie_disable(struct pwrseq_device *pwrseq) +static int pwrseq_pci_m2_e_wifi_disable(struct pwrseq_device *pwrseq) { struct pwrseq_pcie_m2_ctx *ctx =3D pwrseq_device_get_drvdata(pwrseq); =20 return gpiod_set_value_cansleep(ctx->w_disable1_gpio, 1); } =20 -static const struct pwrseq_unit_data pwrseq_pcie_m2_e_pcie_unit_data =3D { - .name =3D "pcie-enable", +static const struct pwrseq_unit_data pwrseq_pcie_m2_e_wifi_unit_data =3D { + .name =3D "wifi-enable", .deps =3D pwrseq_pcie_m2_unit_deps, - .enable =3D pwrseq_pci_m2_e_pcie_enable, - .disable =3D pwrseq_pci_m2_e_pcie_disable, + .enable =3D pwrseq_pci_m2_e_wifi_enable, + .disable =3D pwrseq_pci_m2_e_wifi_disable, }; =20 static const struct pwrseq_unit_data pwrseq_pcie_m2_m_pcie_unit_data =3D { @@ -130,13 +130,24 @@ static int pwrseq_pcie_m2_e_pwup_delay(struct pwrseq_= device *pwrseq) =20 static const struct pwrseq_target_data pwrseq_pcie_m2_e_uart_target_data = =3D { .name =3D "uart", - .unit =3D &pwrseq_pcie_m2_e_uart_unit_data, + .unit =3D &pwrseq_pcie_m2_e_bt_unit_data, .post_enable =3D pwrseq_pcie_m2_e_pwup_delay, }; =20 +static const struct pwrseq_target_data pwrseq_pcie_m2_e_usb_target_data = =3D { + .name =3D "usb", + .unit =3D &pwrseq_pcie_m2_e_bt_unit_data, +}; + static const struct pwrseq_target_data pwrseq_pcie_m2_e_pcie_target_data = =3D { .name =3D "pcie", - .unit =3D &pwrseq_pcie_m2_e_pcie_unit_data, + .unit =3D &pwrseq_pcie_m2_e_wifi_unit_data, + .post_enable =3D pwrseq_pcie_m2_e_pwup_delay, +}; + +static const struct pwrseq_target_data pwrseq_pcie_m2_e_sdio_target_data = =3D { + .name =3D "sdio", + .unit =3D &pwrseq_pcie_m2_e_wifi_unit_data, .post_enable =3D pwrseq_pcie_m2_e_pwup_delay, }; =20 @@ -147,7 +158,9 @@ static const struct pwrseq_target_data pwrseq_pcie_m2_m= _pcie_target_data =3D { =20 static const struct pwrseq_target_data *pwrseq_pcie_m2_e_targets[] =3D { &pwrseq_pcie_m2_e_pcie_target_data, + &pwrseq_pcie_m2_e_sdio_target_data, &pwrseq_pcie_m2_e_uart_target_data, + &pwrseq_pcie_m2_e_usb_target_data, NULL }; =20 --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 98A02435506 for ; Tue, 21 Jul 2026 06:55:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616944; cv=none; b=F0opXivGUIZpzmnwGkE61fXCB2Z841TPdyd3QxzSWHYGjIqbIGc+LMFzOXnJsBz3KqF2FtuFhcbel6ORqcjSN3LMdx2DXu8yKP6362lcRfBfFFRfvKsJAMY8lkpz1n4OD05B4dax9SnQGnV4rp2WYTg2T5LyqwpUe443xF45Cv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616944; c=relaxed/simple; bh=2bdpJglUXNu6BBTggJFiuCLLgE+aHPv4Z4H92NilTHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HaQzh3RlLHyKBUENxPWiL3PEss39rhAeC2rqjQ8WOPzQ0RxHxx9wDWsQPmyaXxeIeV7A7sc4/DIrYLkbYTcl49W4K2c8j9Kr8f28hpsl0Zd/9hVbgI1CSxObUSEb61JZMwbVRLJQLCdhmBfE53IYMG1AbH6gLWI+vTXbsk8sb3w= 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=R55nUNqx; arc=none smtp.client-ip=209.85.214.178 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="R55nUNqx" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2cacb8416a1so75092495ad.1 for ; Mon, 20 Jul 2026 23:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616942; x=1785221742; 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=FPhOqCEBzv3eJgxR2FHq6mhzbCgxaYl9KnF0Ou483ms=; b=R55nUNqxy1xz0q5oWp8eETsmYQZhHVUPqssMTfpjqsnSt6X15i0X6RgVqGDQ59UStH TIpm9HEy9ZYiav5ptINLaMjif+lnT4C+w8BRleVW7JA1iF7GEOZUuMrH1X6HQOfyiViv Sr2S47HSNoKFtV7XdHfPPGcILPOOlykZXP6YY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616942; x=1785221742; 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=FPhOqCEBzv3eJgxR2FHq6mhzbCgxaYl9KnF0Ou483ms=; b=H5BndmSqb8VUZlE0REgLI4QtsBLcpVUA+4ugSWiBfOWSquCbl1At3aQnAXV+h5g5IC luHoCJq3RqP5WZks4qcfP+QJ5nav/5hZreU0BO0RMwrGWiRBzdnAhor72DSbzrCeYOZr 67XbkKQlr9Jrk8ZM4xG0PjqoGGdoekWPEK6oTGbiCH5AH6Lr9z7IZDRkyZOpaEXVOg22 2gelFyOTiqQsDnHlTgIc4f+bH5E4uZ7es/6m9MhcuVm0FRcqvwUMngRdKGIY5GbXJcxO zOgM66K/YqsxVGfTgSKlLv0DgjWZ6smmpTR9v0/LxjwLAJrlKvQVojb9hSxoCb0Uq813 P2Iw== X-Forwarded-Encrypted: i=1; AHgh+RqGo3RA1HRXT+TT/el/DJCSKVbTn2dwjzomicp5Xio6cl9wY3pLXoFckir3FDknm94TldVHr6Rl8wu/V2o=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/HKm58i6Xieh0taV6IRz0VGW93/FjFb2O40zpTuLJ29Poroky waOG4qNTVJcsLngt5LaX6Atcv0NqXYpa5v2MnCmL8HgRs29U4nWyHgYPm2ivZUHGlA== X-Gm-Gg: AfdE7cl3i5VcmOOzVZRO+wO8/EsOljL5XS+v+1d53OaPXJ8uAhhkHD6AhmsPiLZhcrD 6eqcErCWljZvt7rDc1PRfu7O3bYYplDwgcrOblmLVnv2KIVoOM73tH0aM0CMW/t7wPBOS0GSx9b JOUzttcpXATfq0m0YLJpg3VG7zVughGiDkCBMHdezrQRIOf/15VPCccfli+vsev6HOqBwRXGv7G Oqm1CLm4mZYqotZJ1CEp9nft1KHvsV7QmUAM+2nBl47OpKQvqGZ5EN3CYIIyw+Fd+HvVR0SzcDE 2zOr79SGXpck2V8DMQ7XALJYWw7tHgwbTuadKLZ2YJCM/HMxqVNu8zIeFn5J61v/tRkMJKEM6j4 IwWG/f1YiOpopPiyd5+7KaofKnAd0l1z+0Q6wY/et96mpjEBkEfi6tr+pqj/27d2+R3L8ZWBEw+ qdxEYXBWGfGb5ikzTcC/Lyli3zeWfzUVWeYz0LHR8OUzO2pIjNK6o4eyi36DnkyGZ6JDn5Fg== X-Received: by 2002:a17:903:3550:b0:2c9:97a8:aff1 with SMTP id d9443c01a7336-2cf349f76b7mr179989295ad.42.1784616941867; Mon, 20 Jul 2026 23:55:41 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:41 -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 , Wei Deng Subject: [PATCH v6 14/16] power: sequencing: pcie-m2: Split Bluetooth unit based on interface Date: Tue, 21 Jul 2026 14:54:09 +0800 Message-ID: <20260721065413.2306137-15-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some UART / serdev based Bluetooth drivers need to be able to reset the hardware during initialization or recovery. This is not possible with the current power sequencing API if a unit is shared between USB and UART interfaces. For now, split the Bluetooth unit into two, one for each interface. This allows either interface to independently toggle the power, with the last action prevailing, thereby unbreaking the Qualcomm Bluetooth serdev driver. This is also needed for the Realtek Bluetooth serdev driver (hci_h5). Having independent control from either interface unfortunately means that userspace is able to shut down the controller from sysfs using the USB port's "disable" setting without the serdev driver knowing about it. On the USB side, independent control is also desired, as it allows the USB core to power cycle the port/device during faults, and for userspace to initiate reset and recovery using the aforementioned "disable" setting. However when USB is used, a serdev device is not created, and there is no conflicting usage, which allows the power sequencing to work even without the split unit. Suggested-by: Wei Deng Signed-off-by: Chen-Yu Tsai --- Changes since v4: - New patch This patch is _not_ squashed into the previous to provide clear context on the change, and the less than perfect nature of it. I think what we need in this case is some sort of lockout. The serdev consumer would want "exclusive" access, locking out the USB consumer, which can tolerate "shared" access. Something similar would be needed for the WiFi if we ever add support for SDIO for toggling the state of W_DISABLE#1. At least the SDIO and PCIe reset signals are separate. --- drivers/power/sequencing/pwrseq-pcie-m2.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/power/sequencing/pwrseq-pcie-m2.c b/drivers/power/sequ= encing/pwrseq-pcie-m2.c index 693b0d33f8cf..56e4f40e0480 100644 --- a/drivers/power/sequencing/pwrseq-pcie-m2.c +++ b/drivers/power/sequencing/pwrseq-pcie-m2.c @@ -83,8 +83,22 @@ static int pwrseq_pci_m2_e_bt_disable(struct pwrseq_devi= ce *pwrseq) return gpiod_set_value_cansleep(ctx->w_disable2_gpio, 1); } =20 -static const struct pwrseq_unit_data pwrseq_pcie_m2_e_bt_unit_data =3D { - .name =3D "bt-enable", +/* + * XXX There are two Bluetooth units to allow either one to be able to pow= er + * off and thus reset the controller. In practice only one of the interfac= es + * is used, so there is no conflict. However userspace could power off the + * USB unit by disabling the associated USB port, without the UART unit or + * its consumer ever knowing. + */ +static const struct pwrseq_unit_data pwrseq_pcie_m2_e_bt_uart_unit_data = =3D { + .name =3D "bt-uart-enable", + .deps =3D pwrseq_pcie_m2_unit_deps, + .enable =3D pwrseq_pci_m2_e_bt_enable, + .disable =3D pwrseq_pci_m2_e_bt_disable, +}; + +static const struct pwrseq_unit_data pwrseq_pcie_m2_e_bt_usb_unit_data =3D= { + .name =3D "bt-usb-enable", .deps =3D pwrseq_pcie_m2_unit_deps, .enable =3D pwrseq_pci_m2_e_bt_enable, .disable =3D pwrseq_pci_m2_e_bt_disable, @@ -130,13 +144,13 @@ static int pwrseq_pcie_m2_e_pwup_delay(struct pwrseq_= device *pwrseq) =20 static const struct pwrseq_target_data pwrseq_pcie_m2_e_uart_target_data = =3D { .name =3D "uart", - .unit =3D &pwrseq_pcie_m2_e_bt_unit_data, + .unit =3D &pwrseq_pcie_m2_e_bt_uart_unit_data, .post_enable =3D pwrseq_pcie_m2_e_pwup_delay, }; =20 static const struct pwrseq_target_data pwrseq_pcie_m2_e_usb_target_data = =3D { .name =3D "usb", - .unit =3D &pwrseq_pcie_m2_e_bt_unit_data, + .unit =3D &pwrseq_pcie_m2_e_bt_usb_unit_data, }; =20 static const struct pwrseq_target_data pwrseq_pcie_m2_e_pcie_target_data = =3D { --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 132A543553E for ; Tue, 21 Jul 2026 06:55:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616948; cv=none; b=Rsd2twydLgUGoXcZv3WHdzwp8i+9iGrxY3jmkINc/y7dxuYugQiS38KDjIaUZnNg2xbd9QjEvlLzmHRG0jRC8A+3HGA1FTcfBiwGxsLEFrtpMKh9jNTFxrXS/NbnAEbxbsiDN7b6Ny3im7II9tvb2I38BIGDCkMlF+BwbR5AGzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616948; c=relaxed/simple; bh=cD7gxZbnksnsRmt5xlVgCnW9fn8tFZE5tdqpS/YKQq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eCy7dgh4tEghvwy9U1jZt3f+6IF05GDCbyWQFd9ZcG9b0VyUNTzQcKGTifTTrXRKwYi+AjsmKpkm4qFFnLcIS0bGMof/K+vpM2QLvYC7Av5YkRY+U+ktmz9m4j1WY5GgWH6RtJzx1JX5GjFC6Ps0jMTMxWiU4XQusNLeazHeWy4= 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=FPc/sQCw; arc=none smtp.client-ip=209.85.214.175 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="FPc/sQCw" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2cca0c5799eso86503825ad.0 for ; Mon, 20 Jul 2026 23:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616946; x=1785221746; 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=qpPVT8Dc4rsd7+Cy/PRWiKisx//FM/DZEFs1R+jF/Vo=; b=FPc/sQCwgDyJXu6s/HKhVc9SbB55Bwmdq3QrqdzvD0xUj6DxB8Bt3Sq29ZvXfFYCOf iEMfnd751mIi/cQ0R4QAd4Ioj2uUa7NG77xoT1kCzkD69xYRWI21l6wTOcs7A2lNX6qe y+U8woy7XAtQYiFCE3ZDuarexqZGq3KiCP8xQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616946; x=1785221746; 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=qpPVT8Dc4rsd7+Cy/PRWiKisx//FM/DZEFs1R+jF/Vo=; b=scbEJVRsvCVQCripbyd5PLg0n4/E5hePGDbqC9EICtka4y8yxTGUEeXpXf7jGsiUzl PrJtB6Aw17P1+Q3uf4V1B44ti29vlXo3APaUj4l6pk5q2Hn9nWPq25CZ/efYNaCUMkXS 4iq/kqJLKyo06plAdsvYNMqFedvdnvh6BRKbCgJknxMQArBeM1IvLSFrCcY8WO0TkETn DJpR5z8mKZV3Anedvp59GuxiWQ4CSJsfrsbwJpEwKZUihPBEW6MBC8xKIJppZTRDyjV8 FN9Wn2mB7T8DqQrOzeGOl2mhYgRW3WZKhg6w/ozzTmpZCyoo/Og8OF1C2nQACI0KFq5t W/MA== X-Forwarded-Encrypted: i=1; AHgh+Rqb6NWiEPCUm+HECMR+j3NJQQ7Je8tZZv4N6BcIDmD0dFwD16muwhUpYjl+cdqMdBPbtPA2OdFBKINzHFU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5zPpwnvOvG6Er6wPvQ97s7qedj38M5FBNMmx5nU199joveInd rXroTiJYzNyM/BKWNnM4PERBaBzCQB1QJ83HZ7W/JMqkLemGp4/r/ksDgHHk9RyGsw== X-Gm-Gg: AR+sD11SvORsqG4lnoF6QbZ152iZMdLmxFRLgiFGlIkRF3tDWP9tJB27Do808f4G2om oX1tvkci2WvAb136ihVXYwyXNDm4tk0CGlvc7jXV1lMrSuQqB4XIaI0kdnieSaUoni7tYYBy6Rg Kc0YIUzhGOqrcdJYesbx5VOeDhqUQXM6MvJDaZiZternSKx2gDGwsdr/lAB2gJC9eIw0JldqbyH lZvNyJ+bTgrwxXAvgK3hZ+kCFiN93YZvyVquzCpGo9kj6NYRFg2UMOjoVbmP9Sf3pwArOW9VZHH Jwbh36ssXFYS5IrdSScxmGhSaF5Yn8CsYAJG7CwfCfhUNfYvfrH1kxPHFFjTsR6+kNq/YWzVXvk xKxIzJMMhTb5JgEkwY8U84Z5tcVyqaGYVkTuQedjle67mi+hs+zahR2phoRir+2J+dESom61Lg4 voQlSP8GEbD9Jwk4rAd71wVtNwWpzUnxlKEd0P5XFu3fsfBuHe8W9Wm3iYLhXsTbbIA85/Bg== X-Received: by 2002:a17:902:d581:b0:2ce:d34a:5963 with SMTP id d9443c01a7336-2cf3496c380mr178033695ad.24.1784616946307; Mon, 20 Jul 2026 23:55:46 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55: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: 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 Subject: [PATCH v6 15/16] arm64: dts: mediatek: mt8195-cherry: Add M.2 E-key slot Date: Tue, 21 Jul 2026 14:54:10 +0800 Message-ID: <20260721065413.2306137-16-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Mt8195 Cherry design features an M.2 E-key slot for WiFi/BT combo cards. Only PCIe and USB are wired from the SoC to the slot, along with some auxiliary signals. Add the proper representation for it, replacing the PCIe wifi node and vpcie3v3-supply property under the PCIe controller, and the vbus-supply property under the xhci3 node. Signed-off-by: Chen-Yu Tsai Reviewed-by: Bartosz Golaszewski --- Changes since v2: - Drop default GPIO output state from kill pins pinconfig --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 73 +++++++++++++++++-- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/b= oot/dts/mediatek/mt8195-cherry.dtsi index ef7afc436aef..8d4cc30d91e4 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -266,6 +266,47 @@ tboard_thermistor2: thermal-sensor-t2 { 120000 51 125000 44>; }; + + wifi-bt-connector { + compatible =3D "pcie-m2-e-connector"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&m2_e_key_kill_pins>; + vpcie3v3-supply =3D <&pp3300_wlan>; + w-disable1-gpios =3D <&pio 61 GPIO_ACTIVE_LOW>; + w-disable2-gpios =3D <&pio 59 GPIO_ACTIVE_LOW>; + /* PCIe auxiliary signals wired to controller. */ + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + /* PCIe for WiFi */ + port@0 { + reg =3D <0>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + wifi_ep: endpoint@0 { + reg =3D <0>; + remote-endpoint =3D <&pcie1_ep>; + }; + }; + + /* USB for Bluetooth */ + port@2 { + reg =3D <2>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + bt_ep: endpoint@0 { + reg =3D <0>; + remote-endpoint =3D <&usb3_ep>; + }; + }; + + /* SDIO, UART and I2S not implemented */ + }; + }; }; =20 &adsp { @@ -791,14 +832,14 @@ pcie@0 { reg =3D <0 0 0 0 0>; device_type =3D "pci"; num-lanes =3D <1>; - vpcie3v3-supply =3D <&pp3300_wlan>; #address-cells =3D <3>; #size-cells =3D <2>; ranges; =20 - wifi@0 { - reg =3D <0 0 0 0 0>; - wakeup-source; + port { + pcie1_ep: endpoint { + remote-endpoint =3D <&wifi_ep>; + }; }; }; }; @@ -1085,6 +1126,13 @@ pins-bus { }; }; =20 + m2_e_key_kill_pins: m2-e-key-kill-pins { + pins-kill { + pinmux =3D , + ; + }; + }; + mmc0_pins_default: mmc0-default-pins { pins-cmd-dat { pinmux =3D , @@ -1637,9 +1685,24 @@ &xhci2 { &xhci3 { /* MT7921's USB Bluetooth has issues with USB2 LPM */ usb2-lpm-disable; - vbus-supply =3D <&pp3300_wlan>; vusb33-supply =3D <&mt6359_vusb_ldo_reg>; status =3D "okay"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@1 { + reg =3D <1>; + #address-cells =3D <1>; + #size-cells =3D <0>; + + usb3_ep: endpoint@0 { + reg =3D <0>; + remote-endpoint =3D <&bt_ep>; + }; + }; + }; }; =20 #include --=20 2.55.0.229.g6434b31f56-goog From nobody Sat Jul 25 01:37:31 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 4E524436377 for ; Tue, 21 Jul 2026 06:55:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616954; cv=none; b=O/C47Lt/lA3Ky0+wsOjNa/+DivnW+dkbn+ukcNLrtgLl0HiU12PqeZoRBZFoTVPp6l1Bco1pzeULqK/pdcUR5/xk4t1x+4SwAEQ/HqWcjnCLIfdFHBuizKLsXpUfp8vGyhoH3OfURr3NlCGVHFxnh/WsmpCQTRACJ4MKPoxiRCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784616954; c=relaxed/simple; bh=dQJuzRDQpj3VKXEaKtnWxM5VvaRqmUrz7HxM3N6SqEg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qh/n/8Taz/4QygWUV9TaLyPS+IVd2ac+aU+MylbMliMdqribA+dn0H0zjRkXKJiwRnc69PZBSPuzVCSIlyhF0mj+yIujr3Q5cD0YSSrB5NvZiOKMb5UVsCArumJAqJAqg/+sas6NdgzkAnDWtDR5q21ZXwpMKyForNyTpfOAKdU= 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=De69R6kl; arc=none smtp.client-ip=209.85.214.180 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="De69R6kl" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2ccf2360620so68983925ad.3 for ; Mon, 20 Jul 2026 23:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784616951; x=1785221751; 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=qD4jR5z3A5YuzPTTRZhT1+z9pUoFsNBk+NnZEFwJXQc=; b=De69R6kl/RIs4jiZEmbS7IViHEZg8GkwEo0/e/Tmzh4r5jZ4KL7xkOtt4VLtMaKqU2 AmliIv1OTxMNTiHuJ6NzZrvi/bp+1Odgyj4Ij3U59gI0jNYrldtvxbPqe+DDgA2vTVG/ HH+6KVwmxt2GfKyBtys2ml7eC4oj/894+IPyg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784616951; x=1785221751; 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=qD4jR5z3A5YuzPTTRZhT1+z9pUoFsNBk+NnZEFwJXQc=; b=c2cQB9WYvYBuLVaR+V//pt5qwTbLbZmFQ0bMsenbKfSwrDaxxVr7mGIiPTJy90MFNr 5sQKYNf/HDb9hVGC0su1mZ9edRhUamaNnAX+NK+qyI3HAjV656kFHnKyZmIVqbUGYzz7 Zv5r3J1dYjg1R4uF3FskxMwBSiSecXf0QnuZlWQ1aqtphShxqVAsQSgLROidGxM8nK90 lNQizA04qqXF8Do9pRwO7/1yxbebbnvuvYidEf5FIBfY+WrFV+ukwV2YaB1JjA++46mA +8vWTutwi2f0Bn2H6gU0dTgfCOddzn3Dy4sxQ6G7r5UFJcdHNUWFNJE/bfQywr1MdCb8 AogA== X-Forwarded-Encrypted: i=1; AHgh+RqohW7famXM0y4x4Gz/rOWOk3zy4KV6N8golEx3QHUNXkIAkEIlN6hwPD1VituvrB4qB3hWok/v1xdssxQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxXniTnqNfQPW9DbmHrb+0Uvf0XJM4CrmjQ8jPBFmX7a4k8YQZf b9zefWDi1gHUPpTWu0LtCuP1eMiOe2xmRLz3Sxx3SDipEhgwLyW6kVVnrfDKBItH6w== X-Gm-Gg: AfdE7cmALcwH3Pvpum8QUBZk8qAOTu9mEOmR5dm2WDHkm6uDalkToGfbJZBgD2ymRkR lB8wtyaOOqyU3pthfRZiwfgvsYafzRKWt9Q5OtAzbGuInL5S1C9hPBXII6gFfkSJRuAi6ZwuYgP 3i4UQF8bZWcMzhhDe05BGUJNm8y7MHqSmJmRIqNDRX3abZZuMXMEmniuMutpGQYZFQq6LEOAR7y O5KrvB7dQh2A5WPbkr74PuBY7WowNn1S1Fxv1DtUfY5xM6rUNtWpurquTPg6kiJn6qZC6XAja/w mfeQtM1uDQ6it7LaIYnhBHwBhwFpLVSv4mEer40tBImKC4GaQPFLpQZ1bsHdHrID5haStVm58UO tkRwgfSsXdZKovy1TVDUJhajxSputzt+lk/MvtnAqrFnhhrWUMGWPAaAIxmt4byhO6M8Cs+UAlH cU7udCJm0Zy12yDcNlrO4eFDQck292c9d1PBS4euVb++Lt0fMjjNLRnEQGc5HeLN8TKtHvog== X-Received: by 2002:a17:902:fc8e:b0:2cc:ed57:c7c with SMTP id d9443c01a7336-2cf349cc532mr189795135ad.32.1784616950743; Mon, 20 Jul 2026 23:55:50 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 23:55:50 -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 Subject: [PATCH v6 16/16] arm64: dts: mediatek: mt8188-geralt: Add WiFi/BT as M.2 E-key slot Date: Tue, 21 Jul 2026 14:54:11 +0800 Message-ID: <20260721065413.2306137-17-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The MT8188 Geralt design features a chip-on-board WiFi/BT solution. This is a M.2 E-key WiFi/BT board layout directly inserted into the mainboard design. The connections to the rest of the board are almost the same as if it were a separate M.2 card. The only addition is the PMU_EN pin on the chip; on M.2 cards this would be tied to the primary power source. Model the chip-on-board WiFi/BT solution as a M.2 E-key slot with PCIe, USB and auxiliary signals. The PMU_EN pin, which enables the internal power controls and regulators, is modeled as a regulator fed by the pp3300_wlan regulator. Since power sequencing is now correctly modeled using the M.2 E-key slot, drop the "regulator-always-on" property one pp3300_wlan regulator. Also drop the comment in xhci2 saying "MT7921's power is controlled by PCIe". Also drop the voltage range on the pp3300_wlan regulator. This "regulator" is just a load switch and does not provide any regulation. Signed-off-by: Chen-Yu Tsai Reviewed-by: Bartosz Golaszewski --- Changes since v2: - Drop default GPIO output state from kill pins pinconfig --- .../boot/dts/mediatek/mt8188-geralt.dtsi | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi b/arch/arm64/b= oot/dts/mediatek/mt8188-geralt.dtsi index dee946309121..73b5c0fdeae6 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi @@ -88,13 +88,11 @@ pp3300_z1: regulator-pp3300-z1 { pp3300_wlan: regulator-pp3300-wlan { compatible =3D "regulator-fixed"; regulator-name =3D "pp3300_wlan"; - regulator-always-on; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; enable-active-high; gpio =3D <&pio 12 GPIO_ACTIVE_HIGH>; pinctrl-0 =3D <&wlan_en>; pinctrl-names =3D "default"; + /* load switch */ vin-supply =3D <&pp3300_z1>; }; =20 @@ -161,6 +159,17 @@ ppvar_mipi_disp_avee: regulator-ppvar-mipi-disp-avee { vin-supply =3D <&pp5000_z1>; }; =20 + /* PMU_EN pin controls internal regulators and power sequence */ + wlan_pmu: regulator-wlan-pmu { + compatible =3D "regulator-fixed"; + regulator-name =3D "wlan-pmu"; + enable-active-high; + gpio =3D <&pio 145 GPIO_ACTIVE_HIGH>; + pinctrl-0 =3D <&wlan_pmu_en>; + pinctrl-names =3D "default"; + vin-supply =3D <&pp3300_wlan>; + }; + reserved_memory: reserved-memory { #address-cells =3D <2>; #size-cells =3D <2>; @@ -195,6 +204,39 @@ adsp_dma_mem: memory@61000000 { no-map; }; }; + + wifi-bt-connector { + compatible =3D "pcie-m2-e-connector"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&m2_e_key_kill_pins>; + vpcie1v8-supply =3D <&mt6359_vcn18_ldo_reg>; + vpcie3v3-supply =3D <&wlan_pmu>; + w-disable1-gpios =3D <&pio 13 GPIO_ACTIVE_LOW>; + w-disable2-gpios =3D <&pio 14 GPIO_ACTIVE_LOW>; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + /* PCIe for WiFi */ + port@0 { + reg =3D <0>; + + wifi_ep: endpoint { + remote-endpoint =3D <&pcie_ep>; + }; + }; + + /* USB for Bluetooth */ + port@2 { + reg =3D <2>; + + bt_ep: endpoint { + remote-endpoint =3D <&usb2_ep>; + }; + }; + }; + }; }; =20 &adsp { @@ -659,6 +701,22 @@ &pcie { pinctrl-names =3D "default"; pinctrl-0 =3D <&pcie_pins>; status =3D "okay"; + + pcie@0 { + compatible =3D "pciclass,0604"; + reg =3D <0 0 0 0 0>; + device_type =3D "pci"; + num-lanes =3D <1>; + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges; + + port { + pcie_ep: endpoint { + remote-endpoint =3D <&wifi_ep>; + }; + }; + }; }; =20 &pciephy { @@ -1002,6 +1060,13 @@ pins-bus { }; }; =20 + m2_e_key_kill_pins: m2-e-key-kill-pins { + pins-kill { + pinmux =3D , + ; + }; + }; + mipi_disp_avdd_en: mipi-disp-avdd-en-pins { pins-en-ppvar-mipi-disp { pinmux =3D ; @@ -1174,6 +1239,13 @@ pins-bus { }; }; =20 + wlan_pmu_en: wlan-pmu-en-pins { + pins-wlan-pmu-en { + pinmux =3D ; + output-low; + }; + }; + wlan_en: wlan-en-pins { pins-en-pp3300-wlan { pinmux =3D ; @@ -1417,10 +1489,22 @@ vdosys1_ep_ext: endpoint@1 { }; =20 &xhci2 { - /* no power supply since MT7921's power is controlled by PCIe */ /* MT7921's USB BT has issues with USB2 LPM */ usb2-lpm-disable; status =3D "okay"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@1 { + reg =3D <1>; + + usb2_ep: endpoint { + remote-endpoint =3D <&bt_ep>; + }; + }; + }; }; =20 #include --=20 2.55.0.229.g6434b31f56-goog