From nobody Wed Apr 1 22:20:19 2026 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 7CD8D408237 for ; Wed, 1 Apr 2026 12:32:53 +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=1775046774; cv=none; b=G5yhfig4ExNmQGGEAZh8YQ25qzBSrAVRx7ciC1TI1wXo8qrvy8/rTzxbZE9g4axUQvke+TacWEtVAQhL1mPEX+gRduypppWgVohs3Ua++2mp0k1YTgEuMzjoV53hMYpe1dGfkWagYlf2L88mbwrYQrCLwtwFrNtETkn+wAABWbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775046774; c=relaxed/simple; bh=KkSeBNY3hs6vZK7sLPzwlipB2goibX4NNNjln0Douo8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Xxxk6BvlwTAJi0PkdrBSgXi6g+8cXg2bFo3O6NaBgxgjYX4byYp1qFxdjhmoekvNq1SaKvjYLSzybK2j7OFQ1jBufE5541r8x95m1My64hgpnpgDgNLUjQDJfX4RsImqlQn7XD2QgKqGc3/M1WhpS36TRTcrPUOuZAmzUFfeqoo= 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=AcYnKtKc; 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="AcYnKtKc" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b24a00d12cso44085665ad.1 for ; Wed, 01 Apr 2026 05:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775046773; x=1775651573; 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=M3jgFxhL9seWFIIYjdg90uFfdQsY9zg/UC8p0KRMhkg=; b=AcYnKtKcy2dm2jNvxpv4ZFGFJVnB4W17gxSQwic7Et275ANHiLJ4fTPLWvTRlYwDzK EhvEDXaI1E5oVSCosAeAicOexQkDhMclEGCGVy3eHmn6LPeZipNb4RGMZy95OozNcPP7 6Lxp4dD0FF2wpA2sEADSIdBXy8I+UxwhphSSfdCzOg+y8zJIAIUvGGrUzPpFy6sMShEH NLa3JRAe6LWbw3AZ8fBx7P6DN1WnbOkdHmB7wHGEd+5821gR9cUlscW3/pcWRWgKRo8U rIGhT1Dwjwo5/bAjaTLfjBNTImGNGMvrFdMM9TI6V+Ci8S7UB566gTXmhzMJqF4slmKB fJwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775046773; x=1775651573; 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=M3jgFxhL9seWFIIYjdg90uFfdQsY9zg/UC8p0KRMhkg=; b=NfUHqt0nGjReFd63InOjdbNmqDva7iEPuzYF+8yY2qBZYso+tZrlD41Q4iWsvv9pmI aiG+Wmf6IxRB0mmkBxnHv2PwsrQCg38fja2HiGUrpX1QH6IIUqSY3Ox5bmXJZJjXmr9l vl2fP66pTFK6CZh5+kY9HVuc31fum9a3CndE1vBzyrG6UzfQEDimbwkN24yDRpSkFVBP ttHIllX844TQ/8NmotHQzXvk/BhOxwL5jfHaTlqFHpHAez8L34gEZBnDkNlxEBbMKQtQ 2YEiKWRJB7vktL3DOQymAeTFYiKHksKVbLD47cU3H4K1ud58U9pK2vqYCeSrmZDYBV1n 8jCA== X-Forwarded-Encrypted: i=1; AJvYcCX9F7Z9DuUTyZL6UxTNxAc2LVtQ5BImZZb+UbtyPIyTMruVWjchXnw5Ked4WiD/e2dSoKyVZQ9ahPml8Rs=@vger.kernel.org X-Gm-Message-State: AOJu0Yygd8HgLBNTBy1zBrAinO3m+3ghDaCTT2d+tSXU8sk6wrlXB9Vi 08v1lZnRpVQU1R+FWzuynJZgU4YNP4iwTHc32KoLCs1oK2jD8+C72UAh2RbBwQTGPHmahq7kP8L RSqPvsbjDSCtkzPpOIg== X-Received: from pgbdp4.prod.google.com ([2002:a05:6a02:f04:b0:c74:12b9:ee05]) (user=guanyulin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3c89:b0:35f:26b2:2f94 with SMTP id adf61e73a8af0-39ef7715fe2mr3500662637.46.1775046772582; Wed, 01 Apr 2026 05:32:52 -0700 (PDT) Date: Wed, 1 Apr 2026 12:32:18 +0000 In-Reply-To: <20260401123238.3790062-1-guanyulin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401123238.3790062-1-guanyulin@google.com> X-Mailer: git-send-email 2.53.0.1118.gaef5881109-goog Message-ID: <20260401123238.3790062-3-guanyulin@google.com> Subject: [PATCH v4 2/2] usb: host: xhci-sideband: delegate offload_usage tracking to class drivers From: Guan-Yu Lin To: gregkh@linuxfoundation.org, mathias.nyman@intel.com, perex@perex.cz, dominique.martinet@atmark-techno.com, eadavis@qq.com, hannelotta@gmail.com, tiwai@suse.com, quic_wcheng@quicinc.com, broonie@kernel.org, arnd@arndb.de, xiaopei01@kylinos.cn, wesley.cheng@oss.qualcomm.com, sakari.ailus@linux.intel.com, stern@rowland.harvard.edu, amardeep.rai@intel.com, xu.yang_2@nxp.com, andriy.shevchenko@linux.intel.com, nkapron@google.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, Guan-Yu Lin , stable@vger.kernel.org, Hailong Liu Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove usb_offload_get() and usb_offload_put() from the xHCI sideband interrupter creation and removal paths. The responsibility of manipulating offload_usage now lies entirely with the USB class drivers. They have the precise context of when an offload data stream actually starts and stops, ensuring a much more accurate representation of offload activity for power management. Cc: stable@vger.kernel.org Fixes: ef82a4803aab ("xhci: sideband: add api to trace sideband usage") Signed-off-by: Guan-Yu Lin Tested-by: Hailong Liu --- drivers/usb/host/xhci-sideband.c | 14 +------------- sound/usb/qcom/qc_audio_offload.c | 10 +++++++++- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/usb/host/xhci-sideband.c b/drivers/usb/host/xhci-sideb= and.c index 1ddb64b0a48e..651973606137 100644 --- a/drivers/usb/host/xhci-sideband.c +++ b/drivers/usb/host/xhci-sideband.c @@ -93,8 +93,6 @@ __xhci_sideband_remove_endpoint(struct xhci_sideband *sb,= struct xhci_virt_ep *e static void __xhci_sideband_remove_interrupter(struct xhci_sideband *sb) { - struct usb_device *udev; - lockdep_assert_held(&sb->mutex); =20 if (!sb->ir) @@ -102,10 +100,6 @@ __xhci_sideband_remove_interrupter(struct xhci_sideban= d *sb) =20 xhci_remove_secondary_interrupter(xhci_to_hcd(sb->xhci), sb->ir); sb->ir =3D NULL; - udev =3D sb->vdev->udev; - - if (udev->state !=3D USB_STATE_NOTATTACHED) - usb_offload_put(udev); } =20 /* sideband api functions */ @@ -328,9 +322,6 @@ int xhci_sideband_create_interrupter(struct xhci_sideband *sb, int num_seg, bool ip_autoclear, u32 imod_interval, int intr_num) { - int ret =3D 0; - struct usb_device *udev; - if (!sb || !sb->xhci) return -ENODEV; =20 @@ -348,12 +339,9 @@ xhci_sideband_create_interrupter(struct xhci_sideband = *sb, int num_seg, if (!sb->ir) return -ENOMEM; =20 - udev =3D sb->vdev->udev; - ret =3D usb_offload_get(udev); - sb->ir->ip_autoclear =3D ip_autoclear; =20 - return ret; + return 0; } EXPORT_SYMBOL_GPL(xhci_sideband_create_interrupter); =20 diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_of= fload.c index cfb30a195364..abafbc78dea9 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -699,6 +699,7 @@ static void uaudio_event_ring_cleanup_free(struct uaudi= o_dev *dev) uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE, PAGE_SIZE); xhci_sideband_remove_interrupter(uadev[dev->chip->card->number].sb); + usb_offload_put(dev->udev); } } =20 @@ -1182,12 +1183,16 @@ static int uaudio_event_ring_setup(struct snd_usb_s= ubstream *subs, dma_coherent =3D dev_is_dma_coherent(subs->dev->bus->sysdev); er_pa =3D 0; =20 + ret =3D usb_offload_get(subs->dev); + if (ret < 0) + goto exit; + /* event ring */ ret =3D xhci_sideband_create_interrupter(uadev[card_num].sb, 1, false, 0, uaudio_qdev->data->intr_num); if (ret < 0) { dev_err(&subs->dev->dev, "failed to fetch interrupter\n"); - goto exit; + goto put_offload; } =20 sgt =3D xhci_sideband_get_event_buffer(uadev[card_num].sb); @@ -1219,6 +1224,8 @@ static int uaudio_event_ring_setup(struct snd_usb_sub= stream *subs, mem_info->dma =3D 0; remove_interrupter: xhci_sideband_remove_interrupter(uadev[card_num].sb); +put_offload: + usb_offload_put(subs->dev); exit: return ret; } @@ -1483,6 +1490,7 @@ static int prepare_qmi_response(struct snd_usb_substr= eam *subs, uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE, PAGE_SIZE); free_sec_ring: xhci_sideband_remove_interrupter(uadev[card_num].sb); + usb_offload_put(subs->dev); drop_sync_ep: if (subs->sync_endpoint) { uaudio_iommu_unmap(MEM_XFER_RING, --=20 2.53.0.1018.g2bb0e51243-goog