From patchwork Tue Apr 1 06:22:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guan-Yu Lin X-Patchwork-Id: 877659 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 12D3D19D8AC for ; Tue, 1 Apr 2025 06:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489017; cv=none; b=H0XXZJiwLcGU9HRYQPz3I28NYnIRacrlyeL18q5gTdYDrEWbbns2qBzrAGWTO9soMQ5lGaweBrwoFYbLfc4w5ql4+PgdwJwdYfC+5FXbzA8dWVANCHM0oqupbVhEhuiTJ3Z3OIjewNNoiOjXjxMw2kYvMxyx02NFkqP50mU03rY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489017; c=relaxed/simple; bh=GC8luflfFudrWld/AM+Ewt6IdxJJ4dn/4qVZvzzuEV4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TD4QctHte77pgvaRvrprJofsgM9HiQE6PxGksp5Sky2rgKSBWZOwvryqVJ7DbCNsCEKnZ0Mgb74gY+bpoXIT1cDsOFfV6cHgevaTHApQwI8mO2ejK2hILE8Xs0eE8Mb0m+8l1Ijv6Irbgsqm7WI7BTAU/llx+5xF7w/xaPwLKso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--guanyulin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=GjjG+jin; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--guanyulin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GjjG+jin" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-227ed471999so84130645ad.3 for ; Mon, 31 Mar 2025 23:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743489015; x=1744093815; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=G82tJsCWDISryXifn89lTAl+ld89TBbEQgTjv+aZOMU=; b=GjjG+jinxfMRctJUnlY1gN0XBeWH4LR2Cvvk6oBRE4CYO36dgXlbVrZqWXbwhrOXlX VeQSryjuIgLyFabAMKo6GVGfduXD1yOP338C4B2KMNPS4XEvp0cfzUdnFhxuv1fLfJcn Xflw1awjOUHzN4OQnLx9qo7yagta0KiFVAHoH0s5YDTYFYmlhTnVVDsSbU5OQkyuXi6S J5LxvhFiLDHHS0bdabyju8JgoFZ0W3eZMkUQ5is7RWTySTLBig8dqXc+byeoOe+YCM6H wQbSkEuRT5vDQt+SKlxGifVd9sZCtN1q+NzwHAND/q6kmQnz8PWlwv/UvuP9jD/OT//h 70Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489015; x=1744093815; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=G82tJsCWDISryXifn89lTAl+ld89TBbEQgTjv+aZOMU=; b=IKO1caOptx3jKkuJFMAurhcrSGNI+/XUOwUi9sxkZeIfIfv3+VC7Bh852oO4NEzs3y An7SIO547qqA2kiidAW2xVZt76p+xjyXxYCbA7LH4RIe9elM32ByULDgNY9OCuglGA5w SFh0eLhqxVecLNta0bZcr8qJzIno02bpQGCDon2QzFbWn0qPEVI9mWr2jLZAyTEP6mmt CIS7vzC8aCEqlk6N9SQGvDzdCbndiJSZCe+MWRBGPfnBKos4Zieb+kZe12t/ounjbUwo 4a52jRdayC9g2AnYKfG9+ybHlZmbVSo9hlrGbygLSYFmuG3QBVAwfcaIov4MJMBw4jRm 1S5Q== X-Gm-Message-State: AOJu0YziyLLtzhqRNE3gD+9dyISF3QAQuPYOqsB6wJr3qQnFFAmBOWsd Wt2Nwtb1y9jodW17OjYisg3qC0dW3tihd95DhAn5oRMLxiAfNb3kF7mzraum/EpIxKm99CmqWrv wu3gI28vjyPfyuw== X-Google-Smtp-Source: AGHT+IGDn4p5Vlq4+h8UmJK0+M+KvQbP0/FDSg7s54pu1Ji+HBQ1kRiqrn+pptQTrbAOX27/AgCloGelERbtwkE= X-Received: from plbm1.prod.google.com ([2002:a17:902:d181:b0:223:2747:3d22]) (user=guanyulin job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e892:b0:220:fce7:d3a6 with SMTP id d9443c01a7336-2295be92d96mr24970385ad.23.1743489015611; Mon, 31 Mar 2025 23:30:15 -0700 (PDT) Date: Tue, 1 Apr 2025 06:22:39 +0000 In-Reply-To: <20250401062951.3180871-1-guanyulin@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250401062951.3180871-1-guanyulin@google.com> X-Mailer: git-send-email 2.49.0.472.ge94155a9ec-goog Message-ID: <20250401062951.3180871-2-guanyulin@google.com> Subject: [PATCH v10 1/4] usb: xhci-plat: separate dev_pm_ops for each pm_event From: Guan-Yu Lin To: gregkh@linuxfoundation.org, mathias.nyman@intel.com, stern@rowland.harvard.edu, sumit.garg@kernel.org, kekrby@gmail.com, jeff.johnson@oss.qualcomm.com, elder@kernel.org, quic_zijuhu@quicinc.com, ben@decadent.org.uk Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Guan-Yu Lin Separate dev_pm_ops for different power events such as suspend, thaw, and hibernation. This is crucial when xhci-plat driver needs to adapt its behavior based on different power state changes. Signed-off-by: Guan-Yu Lin --- drivers/usb/host/xhci-plat.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 6dab142e7278..9843d3ad5cf4 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -453,7 +453,7 @@ void xhci_plat_remove(struct platform_device *dev) } EXPORT_SYMBOL_GPL(xhci_plat_remove); -static int xhci_plat_suspend(struct device *dev) +static int xhci_plat_suspend_common(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -481,6 +481,16 @@ static int xhci_plat_suspend(struct device *dev) return 0; } +static int xhci_plat_suspend(struct device *dev) +{ + return xhci_plat_suspend_common(dev); +} + +static int xhci_plat_freeze(struct device *dev) +{ + return xhci_plat_suspend_common(dev); +} + static int xhci_plat_resume_common(struct device *dev, bool power_lost) { struct usb_hcd *hcd = dev_get_drvdata(dev); @@ -528,6 +538,11 @@ static int xhci_plat_resume(struct device *dev) return xhci_plat_resume_common(dev, false); } +static int xhci_plat_thaw(struct device *dev) +{ + return xhci_plat_resume_common(dev, false); +} + static int xhci_plat_restore(struct device *dev) { return xhci_plat_resume_common(dev, true); @@ -557,9 +572,9 @@ static int __maybe_unused xhci_plat_runtime_resume(struct device *dev) const struct dev_pm_ops xhci_plat_pm_ops = { .suspend = pm_sleep_ptr(xhci_plat_suspend), .resume = pm_sleep_ptr(xhci_plat_resume), - .freeze = pm_sleep_ptr(xhci_plat_suspend), - .thaw = pm_sleep_ptr(xhci_plat_resume), - .poweroff = pm_sleep_ptr(xhci_plat_suspend), + .freeze = pm_sleep_ptr(xhci_plat_freeze), + .thaw = pm_sleep_ptr(xhci_plat_thaw), + .poweroff = pm_sleep_ptr(xhci_plat_freeze), .restore = pm_sleep_ptr(xhci_plat_restore), SET_RUNTIME_PM_OPS(xhci_plat_runtime_suspend, From patchwork Tue Apr 1 06:22:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guan-Yu Lin X-Patchwork-Id: 877658 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 D14CF1E5B8B for ; Tue, 1 Apr 2025 06:30:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489032; cv=none; b=s/OHDEfCPJxrBqON8wiBl9Vwiz5LW6DKIqox0c/ji4UyCnVvKyWLBrSRIUwUlyC/NdVXLU3zmbrlf7XfeipCnN2pZZgd6c0CjhcioaMxYN2rn5GKZ6O6HOg2G1/9KuGB6ezJSEzy2EYThS1DRmEQgtM8bbIniZB0n4oir4cPM40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743489032; c=relaxed/simple; bh=F/qmGUFeMu9XvOZI7bo6qPejjKCgMa/4Q+1+JmF0sio=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Hiqv6xY8rJLqWUAhRMqUVjJn1wQtQhkUEv//LuUfkNfRr4UzO8bAdqNkMVKoPkD6nhwDn1mfIrhq39Vror7avu79zFcuCeFXLDc7jxKT+Gbht5zHU+DFpopZtqDG013PNKegboT4xM4GZgb+t4IecYXN21hYL0OewbKn7SmBiAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--guanyulin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PL61WlRr; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--guanyulin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PL61WlRr" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-225429696a9so153656405ad.1 for ; Mon, 31 Mar 2025 23:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743489029; x=1744093829; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=e/hhe8fHtkZGRjGoinV849CiQfAtFCFjSq4JrlJQc5o=; b=PL61WlRrBZ83k5vthPHOnDy5CRxNcTHEc83Z+zb/sYjaLZDwaKC/JI0MQNNow2tyui uYcAL6q96NOM+8wvzxcxq8OoTcLP6S93Kd2XyHiTw4YNmTD6hL+nphYZGmL2zv5vX6tq IXYilGI0To2P1gAavP+Lb2PfbZtMx8IXgxVmbQxUFiiseQXHinThxFSfaO876aRXwoLA hrs0p3baHpWpmrIcWG1KDhvX4F2KVjqRHB+MDw2/CfMa/Od/lVa1wdOGXlNFG80JD0Wt Ondy9h6iK/qe3ajS0xnWcqHZqulzUmAC8GFETEdwKV8EQ4AGXHHDxS0H52XZrflnaJMO YESw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743489029; x=1744093829; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e/hhe8fHtkZGRjGoinV849CiQfAtFCFjSq4JrlJQc5o=; b=pFUy1Nv/uds/tPbo/4A/TIW4fIPBIMXPkpUj3xgv7pzLyFw6DeXtAVBs6STGYstaT0 IP53fKMXWPW5u1Q5eLzTvOGHIUTjZl/qQb48iu46qqNazpobbz/MNgT17u00/j3+W5Vv VFwIDIiuDqCr+BqG9U+KqUjcHTi13yxBWhLgT7rwG71PNXIfq5LGMSmxfT1a9j3cULII KTIBaqzgZ0sIwhJM5cYpilHKIjfwlU3E3PNyJc7Xf3f8roerEAoBFAE5xz3xgUCgTFlH 2rNGCfwVfx9CC12tGL2vpY38xaqMcLwBqB16xqy9SttFAw4NXCMW5IgCYIS0XW0g8vBk 5UMQ== X-Gm-Message-State: AOJu0YysoRLb6y1L+P//w0riGBdX62hLTWafPIHMkkOredTq2xdbIUJU KRL2HWhvkWbQuu3d2293eqLu+zkxJIJsKcYUQSpXFMcsCNQTFhZzEty3EhCoAOuhGRsgLc8teYG xqKG6/kM7/WSGGA== X-Google-Smtp-Source: AGHT+IH3sCEbiKXIhGq2v8KwoCB9c5CbhGko+7CXLOcauVYSMPBKmJVj1my29zrE/bSpoaO8NACdEeVe5spWsCE= X-Received: from plbjj22.prod.google.com ([2002:a17:903:496:b0:225:8a27:cd41]) (user=guanyulin job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1cb:b0:223:f928:4553 with SMTP id d9443c01a7336-2292f9f7646mr224444685ad.44.1743489029111; Mon, 31 Mar 2025 23:30:29 -0700 (PDT) Date: Tue, 1 Apr 2025 06:22:41 +0000 In-Reply-To: <20250401062951.3180871-1-guanyulin@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250401062951.3180871-1-guanyulin@google.com> X-Mailer: git-send-email 2.49.0.472.ge94155a9ec-goog Message-ID: <20250401062951.3180871-4-guanyulin@google.com> Subject: [PATCH v10 3/4] xhci: sideband: add api to trace sideband usage From: Guan-Yu Lin To: gregkh@linuxfoundation.org, mathias.nyman@intel.com, stern@rowland.harvard.edu, sumit.garg@kernel.org, kekrby@gmail.com, jeff.johnson@oss.qualcomm.com, elder@kernel.org, quic_zijuhu@quicinc.com, ben@decadent.org.uk Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Guan-Yu Lin The existing sideband driver only registers sidebands without tracking their active usage. To address this, sideband will now record its active usage when it creates/removes interrupters. In addition, a new api is introduced to provide a means for other dirvers to fetch sideband activity information on a USB host controller. Signed-off-by: Guan-Yu Lin --- drivers/usb/host/xhci-sideband.c | 43 +++++++++++++++++++++++++++++++ include/linux/usb/xhci-sideband.h | 9 +++++++ 2 files changed, 52 insertions(+) diff --git a/drivers/usb/host/xhci-sideband.c b/drivers/usb/host/xhci-sideband.c index d49f9886dd84..67f31b0ec726 100644 --- a/drivers/usb/host/xhci-sideband.c +++ b/drivers/usb/host/xhci-sideband.c @@ -266,6 +266,31 @@ xhci_sideband_get_event_buffer(struct xhci_sideband *sb) } EXPORT_SYMBOL_GPL(xhci_sideband_get_event_buffer); +#if IS_ENABLED(CONFIG_USB_XHCI_SIDEBAND_SUSPEND) +/** + * xhci_sideband_check - check the existence of active sidebands + * @hcd: the host controller driver associated with the target host controller + * + * Allow other drivers, such as usb controller driver, to check if there are + * any sideband activity on the host controller. This information could be used + * for power management or other forms of resource management. + * + * Returns true on any active sideband existence, false otherwise. + */ +bool xhci_sideband_check(struct usb_hcd *hcd) +{ + struct usb_device *udev = hcd->self.root_hub; + bool active; + + device_lock(&udev->dev); + active = usb_offload_check(udev); + device_unlock(&udev->dev); + + return active; +} +EXPORT_SYMBOL_GPL(xhci_sideband_check); +#endif /* IS_ENABLED(CONFIG_USB_XHCI_SIDEBAND_SUSPEND) */ + /** * xhci_sideband_create_interrupter - creates a new interrupter for this sideband * @sb: sideband instance for this usb device @@ -286,6 +311,7 @@ xhci_sideband_create_interrupter(struct xhci_sideband *sb, int num_seg, bool ip_autoclear, u32 imod_interval, int intr_num) { int ret = 0; + struct usb_device *udev; if (!sb || !sb->xhci) return -ENODEV; @@ -304,6 +330,11 @@ xhci_sideband_create_interrupter(struct xhci_sideband *sb, int num_seg, goto out; } + udev = sb->vdev->udev; + device_lock(&udev->dev); + ret = usb_offload_get(udev); + device_unlock(&udev->dev); + sb->ir->ip_autoclear = ip_autoclear; out: @@ -323,6 +354,8 @@ EXPORT_SYMBOL_GPL(xhci_sideband_create_interrupter); void xhci_sideband_remove_interrupter(struct xhci_sideband *sb) { + struct usb_device *udev; + if (!sb || !sb->ir) return; @@ -330,6 +363,16 @@ xhci_sideband_remove_interrupter(struct xhci_sideband *sb) xhci_remove_secondary_interrupter(xhci_to_hcd(sb->xhci), sb->ir); sb->ir = NULL; + udev = sb->vdev->udev; + + if (udev->state == USB_STATE_NOTATTACHED) { + usb_offload_put(udev); + } else { + device_lock(&udev->dev); + usb_offload_put(udev); + device_unlock(&udev->dev); + } + mutex_unlock(&sb->mutex); } EXPORT_SYMBOL_GPL(xhci_sideband_remove_interrupter); diff --git a/include/linux/usb/xhci-sideband.h b/include/linux/usb/xhci-sideband.h index 45288c392f6e..5174cc5afc98 100644 --- a/include/linux/usb/xhci-sideband.h +++ b/include/linux/usb/xhci-sideband.h @@ -11,6 +11,7 @@ #include #include +#include #define EP_CTX_PER_DEV 31 /* FIXME defined twice, from xhci.h */ @@ -83,6 +84,14 @@ xhci_sideband_get_endpoint_buffer(struct xhci_sideband *sb, struct usb_host_endpoint *host_ep); struct sg_table * xhci_sideband_get_event_buffer(struct xhci_sideband *sb); + +#if IS_ENABLED(CONFIG_USB_XHCI_SIDEBAND_SUSPEND) +bool xhci_sideband_check(struct usb_hcd *hcd); +#else +static inline bool xhci_sideband_check(struct usb_hcd *hcd) +{ return false; } +#endif /* IS_ENABLED(CONFIG_USB_XHCI_SIDEBAND_SUSPEND) */ + int xhci_sideband_create_interrupter(struct xhci_sideband *sb, int num_seg, bool ip_autoclear, u32 imod_interval, int intr_num);