From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD790C44507 for ; Wed, 15 Jul 2026 08:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1xsqWCH9ZpOgskGGTXJEdoztx/tMXd/WwKbk5g0tHRc=; b=ZchsjiE7Gw+LEgnOJNcaoVzt9l 0HZzGwugrGHJERHLMBv5LIXp9UaYC4b1Qf5vwf+87c4x0V5Fnyou3lvbi1IvCqsCJCiTdqWnHw6B/ nNZMEU5ZNM+hvRbQRSAbgo9Zlm7c/yzGTJnFUjDfJnAVYPFsKz4/cyBs9dA/MoBsM9yq6EQZ3u/Rp rVTrH8iDjDImsQINbBBc/pbhjZhSTtpPi9lOF6AE+HvnzMlCqz72Rmy9p4mGniEoLLeT7T6l+6rgM Hvbs4awHrG7RkQkJhkFmrgapjUT92hyvL9/WEBZve5loirdgiteGZtysigJsOQXt3mhdmiwDL1jpr jqBb6eEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjvOQ-0000000EDwF-1R4Z; Wed, 15 Jul 2026 08:55:02 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjvOK-0000000EDqL-0fuw for linux-arm-kernel@lists.infradead.org; Wed, 15 Jul 2026 08:54:57 +0000 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-8485b358552so5744649b3a.2 for ; Wed, 15 Jul 2026 01:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784105695; x=1784710495; darn=lists.infradead.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=1xsqWCH9ZpOgskGGTXJEdoztx/tMXd/WwKbk5g0tHRc=; b=U5nD3zmQjwmEqrJ3VtPzX1lY6fB5rXHtnrv04ULfLMLg0or/VHu+no8uksgOZFc21k SqApXadGHOWdmuddQR12MA4xNbjkZiJyFiMqUcJuT7xMmN/2RQh37hLnCGpUc/9GD+Mn njVqgd+YjkACQrZFj2THJlRn9KwsZczjkR5sk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784105695; x=1784710495; 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=1xsqWCH9ZpOgskGGTXJEdoztx/tMXd/WwKbk5g0tHRc=; b=pNVMQHj4myIt+vodkLxnRI0z4MEuU1rIxoBQrB7bvBFoux9czZXsb304WPhVzOC/82 Qyq8M1d0D22AK6/sTOnpFLxW1TV46VcTQkiCVQhRaEuJlQPXYvHIytoMeLA6fEOqm8gK pbyOYVW4Q9BpUOxiMAosb4tEPmweXIabrtCkszX/fjWkqIF0W5sMQUKiPOgBDh3E96PR rEzKJucH/ZShdvi7vw6j1mWixG0BUKQYt4RO8gGi+FiSK98XjWgrDwjXmnB45cyboyK7 gQej+ACtvZg781Ce1CnOcKX5jKyJJWUyIv0zxnnYBY3EbZxBBfxBLYqQSsH6D3WweJIP 0q7A== X-Forwarded-Encrypted: i=1; AHgh+RrGzPKypHUNLNSB3mnXzTyF2C6z1KGT2f4GvhIikHcJ6/2N/F2umCXxlTaLogwrUbO36dA1sXiQlZOYEIqvfwtZ@lists.infradead.org X-Gm-Message-State: AOJu0Yy6I0ilMVsWRPxBf77bdzWczJTBQ4lMZkv9/SbU0j5rGX1Aqafd LIDael/MV0hnIWTYD9WBjFnSIkblKEpfmQfcr6YdQRPlzIMlSwZRe61/A7sPvos0Ug== X-Gm-Gg: AfdE7ckVBjOECpBUL9cbiS6xBbK0SXLNKmilPJbepllj4bvYDZZ5UqYe3anqiKPAs6j ovE2NaYTuR7u95wbFzI73WF+nQUpx/EqbgH7GpTjCKx9aa0Vk/sdUtKpHE29+GTlT9Y/5Yrls8L PLkdD2Ybz3VHCrm9IGGXlMETTO8iJ00VgN1g79bOE9e4CqHSindaMuZXl9yq7vJZIIyJMz1otW2 9EaA7eiMu6f0K4IjbxY+Z0pr7tY4LKZu12uT1xBMZUakyW8R8vReQRMdWLtz8HRDprz7XBKg7yb 6+2pRN0L0rxYUSOGPCL1FuS5rvM/vY9zeZu7xqTVGBNmfr0NReNBKNgWTqnpMmqzqIP06HYW+aD qUUhaG8AfK0Zc0ibh+Ofl+uCA2Ugja9fgNTtUk5d1bdLuqgTKxm0Bnz8a5nZb8havKSf3wQJkbK KWb5cF24cPvAI8KqliwnaUaoqI9ZxqRlTYeLBbuGXSfR/W21n2bv5VNITu0CIcSyRhAlvZmA== X-Received: by 2002:a05:6a00:138b:b0:848:7f56:1e44 with SMTP id d2e1a72fcca58-84a5576f784mr6047283b3a.7.1784105695546; Wed, 15 Jul 2026 01:54:55 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:47d7:4aa5:a6f8:2279]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84a4f819117sm2757491b3a.59.2026.07.15.01.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 01:54:55 -0700 (PDT) From: Chen-Yu Tsai To: Bartosz Golaszewski , Greg Kroah-Hartman , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Danilo Krummrich , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno Cc: Wei Deng , Chen-Yu Tsai , linux-acpi@vger.kernel.org, driver-core@lists.linux.dev, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam , Alan Stern , Bartosz Golaszewski Subject: [PATCH v5 08/16] usb: hub: Pass |struct usb_port*| to usb_port_is_power_on() Date: Wed, 15 Jul 2026 16:53:38 +0800 Message-ID: <20260715085348.3457359-9-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.141.g00534a21ce-goog In-Reply-To: <20260715085348.3457359-1-wenst@chromium.org> References: <20260715085348.3457359-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260715_015456_208225_C4DE1EFD X-CRM114-Status: GOOD ( 19.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 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 e5a726dbebd0..40cdb63b5333 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3288,7 +3288,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)) { @@ -3730,12 +3730,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; } @@ -5431,7 +5432,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 8f99bce074fc..19913ad3598b 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 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) -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); -- 2.55.0.795.g602f6c329a-goog