From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 C3031405C30 for ; Thu, 9 Jul 2026 09:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591099; cv=none; b=L4Vw7mpWhywWMUkK/MzQMwksM1WjrRJXlnVDIHGKQb6ujlxbcReskc7LvybEg4K8r6ryxn0pFF6KZAfjBSmtGzHXtcioVdx8I1k5dvTqTUaXtUvpWjta4tSeTRkk+IeSNFi7RjkRkZTWEOaHmLEMBxu42QMrr7WX8BZGqc7y2f4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591099; c=relaxed/simple; bh=o5T0PAKC4bhdWYNkYeRDccEnX6iTBQ7LIFU0ggYfB28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dJ71m7PA+4Z3OciXRiioC7JdjpQmq9hQWokYqrVs3Gg0xxr4nC4J4feOSKq/+bundREqXSFjFD540c94cZw2FfkysXjeB/j/LM1jeep9udDDaizoOrxQrZl8NRh6sAtnYoQPUV5XKW4sMQPVbY0if2b8ZsytOcRYVzjGKMao1LM= 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=NdpJWF/1; arc=none smtp.client-ip=209.85.214.172 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="NdpJWF/1" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2cad4170e8eso8244425ad.3 for ; Thu, 09 Jul 2026 02:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1783591093; x=1784195893; 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=J/jD944UIyuOWk9l7jvwFyLAi8etvWVpl+Q1R2YAPVM=; b=NdpJWF/1/nSMwEktGBf2nUBSNCGNGB6vJ56QJAT4MyPLt1PzFFF56+7QxVUqcUW4bn T2B2wT1YjYxIkjeT3YTmdyOvxOrozEMNNo8Xf1PRHiOuGmJ/mXWQ/42ET3sV4C74oree FlbcSsfSj6CLgIeb7xS8jpauzhxAt6nj3BFWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783591093; x=1784195893; 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=J/jD944UIyuOWk9l7jvwFyLAi8etvWVpl+Q1R2YAPVM=; b=qwps4XF97BEfFBX+TtjnUbpljuqqUgC6zsVtSAXA0HSvJ2Mh2owUk5/Jwb1lwx6FVK uIw/+9Zzw9qLnrbwKH8sLKcThdmMfm9fRkrJ53b3YHkVdvoWDMghIU06L25DSaLn+6vX l1o4JBkgcajLNWLkQxBQ18d7EH26TONxcbI8fAmif7VjX8bTRsr1PMn03gPOjcW9J2TT jTbllaEGoZp9JayMBmrmRcUFbMTSo2sCu0XH/Y9NUoKR1HcQJhO64BstrAjHItwHxDG6 Vf68EpEkdUGc39m5T+mnYUB0dcWUZOBUjq7kedygGbdzh64TFehvsRhiCOvGBnhtBF6A yzIQ== X-Forwarded-Encrypted: i=1; AHgh+RqQ9R00a9Y0WPIXU5VVk3XXwUKXmOOzK2c5X1l6e5qLsU2BmT8VoKKiRK10lokw/1YmEoHbTDq5U9S9RuA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/nemyFO46d8yg/dbj0lqKYvNvyKOZXnAi35NuEs58YQfJhR7H 7zhYsR//ugaLin1GUpcyHWXb627tcz2+tG4eeUFndj5kpUXpc81D2fCWFpe5TNdm1Q== X-Gm-Gg: AfdE7cntyB6ghBgx/1UZeaSlhAHgO792OidYTRne7wklmkhB7+xax8V//wTSnpKKpIk wNucA0e9fR0njxe0gdc+rwq1Su7Z42kxhxDFP8p9MWAXMe+9YQYW/7q5e/xqPtvp1eyam3DDIJH mna1sh7fKnyuRY8GgreFqGRlzqGjykDETyWR/EvqOEFnK+qTT3GNXMfPBV/VLsSi6OWNlUsZ1Do ZPvULR3lExjQpf4OXzzfqVMQwiPxLESuBK/0e2TwDizqcNx2zdDXRP4qBDWbaJXuTx9qS5UoQ0H 19OOulaxDCXeGtCl5HoYaal3FY0xPUqYI8P25JCIkRYQ1qhqduLBOIFDxYsb/gGfY/nimypegrS nvxT2bdLSA+2MR+PHvX0sedpaR1y7YGe2pyeqfV/NNQqTH10IcWcA91qQNVlUaYbqlz+qYilWCA MlkIgqplOliPLAJS+Ykr/4h3lzx+KXTo0jkqHexrlnIdkgR07smG9imttktfos2+K2ukHTsXpt3 rPWb2Is X-Received: by 2002:a17:903:644:b0:2ca:cef2:dea8 with SMTP id d9443c01a7336-2ccea46aea4mr43506135ad.35.1783591093550; Thu, 09 Jul 2026 02:58:13 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:bd09:6ddb:180a:69c5]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d5bd2fsm41082155ad.78.2026.07.09.02.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 02:58: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 v4 07/14] usb: hub: Pass |struct usb_port*| to usb_port_is_power_on() Date: Thu, 9 Jul 2026 17:57:12 +0800 Message-ID: <20260709095726.704448-8-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog In-Reply-To: <20260709095726.704448-1-wenst@chromium.org> References: <20260709095726.704448-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 = 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 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 6f576efa37b1..c7fa73673582 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3290,7 +3290,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 >= 0) status = -ENODEV; } else if (!(portstatus & USB_PORT_STAT_CONNECTION)) { @@ -3732,12 +3732,13 @@ static int wait_for_connected(struct usb_device *udev, struct usb_hub *hub, int port1, u16 *portchange, u16 *portstatus) { + struct usb_port *port_dev = hub->ports[port1 - 1]; int status = 0, delay_ms = 0; 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 = -ENODEV; break; } @@ -5433,7 +5434,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); diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index 206b9f9a5807..f3e4d6a31798 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[]; /* 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 = 0; - if (hub_is_superspeed(hub->hdev)) { + if (port->is_superspeed) { if (portstatus & USB_SS_PORT_STAT_POWER) ret = 1; } else { @@ -114,7 +114,7 @@ static ssize_t disable_show(struct device *dev, } usb_hub_port_status(hub, port1, &portstatus, &unused); - disabled = !usb_port_is_power_on(hub, portstatus); + disabled = !usb_port_is_power_on(port_dev, portstatus); out_hdev_lock: usb_unlock_device(hdev); diff --git a/drivers/usb/core/port.h b/drivers/usb/core/port.h index f43f6b3b6b1f..22f9973638d7 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) -struct usb_hub; - -extern int usb_port_is_power_on(struct usb_hub *hub, unsigned int portstatus); +extern int usb_port_is_power_on(struct usb_port *port, unsigned int portstatus); -- 2.55.0.795.g602f6c329a-goog