From mboxrd@z Thu Jan 1 00:00:00 1970 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 83C7F2BEFFF for ; Fri, 17 Apr 2026 05:46:45 +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=1776404806; cv=none; b=iF1na69InYTCC0aCUJHn4ZZtUv/fkCCdA5kYiYr8nMe5nbgxI54JtaZ0RDRHzYhzn4acUQ0oS9wdSzFH3Bk7smgWw6QA21v+TEqdEIJsgJGOrLlzQm7ayoTF2GjEWb3sw1qWTkCInd/qV4RzmIZV62BWnw31IpwjlQXRznhQ58U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776404806; c=relaxed/simple; bh=zuBx2lHMrOhC9tUrkOQKybW4pKf1/wASJ/MwCL932Eg=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=rz48unM997VZDszOgJzxq+S3Yw58IgHPl3El6TD9aZ3kgyuCVzgwKypTQWL3PsplbwTbFJf1wvXgAjE5jSysTBvGhL0yP2ffSFkwJkGK6JlcK1S3QrMWSrSpkv329d1VKsRcWSH1sbXxIJay/9PaDG/uya0PUvmxb9w+Cm0uoUE= 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=IRXdCqS2; 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="IRXdCqS2" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b2523e0299so8574815ad.3 for ; Thu, 16 Apr 2026 22:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776404805; x=1777009605; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=/9OCTEDZMd1ju3ghJZzcgE05vXb4dI6avT3iWmFse2Y=; b=IRXdCqS2lfugSUUx9GMkZ+Ge6EdzR3A6BjCAFGrwJGoMPuJmBWNLStlB7oDfqHIL+w O3DIdwsiumgmE+oK3W20G+QooDz/LTmkbL3jeIiqnP8w2RIn4cVTCgvufhr+HjEoMn8K ywzd0poAFlWs/rDHaViBf+2+n53VduYgzPwmERO1E2MNsovJabgk6s6RlWyd8mR9uVAu 5+ijkgYdcVgvbjwFzMwdHYkK5Rz+/Sq89tom9rn6gBXlmp1U5JscjTYtwjuM8OBZWrH9 hfj7qoqkk7y6eXKKaKBqWr/3/zh1nr/EoMYsE7H6UYqhEBC0vITyFlWJ1hQc+5tNiRrr eqVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776404805; x=1777009605; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/9OCTEDZMd1ju3ghJZzcgE05vXb4dI6avT3iWmFse2Y=; b=Q+9ivu11JUt4iMByGqvPzB3oCXGuz1/GAS/uaVJcZ6WJcKaO5lDOxMqLj+tOSChyLw Oy7qFri1br3OdEO88k4vRQMYxj92omWScn0bMyDlS82wEVuxnOfjy3nL2IR4ZShZZZZN KK6vq6KwWE+oUUla8YHmboxqYmSR5hKnBIGo1KeQs95qTKUVfc3P3ELnodQsFH4TPwY+ hCTaGV+oI5z5MxULnddn64bCiWiIH6ONXHVOXmp7yE7w/MiysM6cvI6kZ/6mT21GGDUA 3NPs/AbyGg1qdhZ1Xn2S//MTmDeQpMuWx4jW7ailG3krtjKiu4Omtal6go0IuolBiWcm 9lSw== X-Gm-Message-State: AOJu0YxjQpgZehioWWojtXwmckyOac/+aXkc45+Wh3W9y3ciWuKPsZhv 4/Vc7JGwis7hSF0B2xWiGzQ+6bidULKQDizOrqUHfWBv90tTvbNU/9bKwOHeb2+LFEHKFjo99he PpniS+89ZRivIen0htw== X-Received: from pgbcx10.prod.google.com ([2002:a05:6a02:220a:b0:c66:7f77:eb66]) (user=guanyulin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4306:b0:398:7ed3:a001 with SMTP id adf61e73a8af0-3a08d68f1f4mr1455697637.2.1776404804684; Thu, 16 Apr 2026 22:46:44 -0700 (PDT) Date: Fri, 17 Apr 2026 05:43:30 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.54.0.rc1.513.gad8abe7a5a-goog Message-ID: <20260417054641.3814385-1-guanyulin@google.com> Subject: [PATCH] ALSA: usb-audio: qcom: move offload usage counting to stream request handler From: Guan-Yu Lin To: gregkh@linuxfoundation.org, perex@perex.cz, kees@kernel.org, tiwai@suse.com, quic_wcheng@quicinc.com, arnd@arndb.de, wesley.cheng@oss.qualcomm.com, nkapron@google.com Cc: linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, Guan-Yu Lin Content-Type: text/plain; charset="UTF-8" Centralize usb_offload_get()/usb_offload_put() calls from various helper functions to handle_uaudio_stream_req(), which ensures the usage count is tied directly to the QMI stream enable/dsiable requests from audio DSP. Such design provides a clear synchronization point for the offloading lifecycle and correctly balances the count for both playback and capture paths while avoiding redundant increments during auxiliary operations. Suggested-by: Wesley Cheng Signed-off-by: Guan-Yu Lin --- sound/usb/qcom/qc_audio_offload.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c index 2ac813d57f4f..cddab55d4691 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -699,7 +699,6 @@ static void uaudio_event_ring_cleanup_free(struct uaudio_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); } } @@ -1183,16 +1182,12 @@ static int uaudio_event_ring_setup(struct snd_usb_substream *subs, dma_coherent = dev_is_dma_coherent(subs->dev->bus->sysdev); er_pa = 0; - ret = usb_offload_get(subs->dev); - if (ret < 0) - goto exit; - /* event ring */ ret = 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 put_offload; + goto exit; } sgt = xhci_sideband_get_event_buffer(uadev[card_num].sb); @@ -1224,8 +1219,6 @@ static int uaudio_event_ring_setup(struct snd_usb_substream *subs, mem_info->dma = 0; remove_interrupter: xhci_sideband_remove_interrupter(uadev[card_num].sb); -put_offload: - usb_offload_put(subs->dev); exit: return ret; } @@ -1489,7 +1482,6 @@ static int prepare_qmi_response(struct snd_usb_substream *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, @@ -1605,6 +1597,12 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, uadev[pcm_card_num].ctrl_intf = chip->ctrl_intf; if (req_msg->enable) { + ret = usb_offload_get(subs->dev); + if (ret < 0) { + guard(mutex)(&chip->mutex); + subs->opened = 0; + goto response; + } ret = enable_audio_stream(subs, map_pcm_format(req_msg->audio_format), req_msg->number_of_ch, req_msg->bit_rate, @@ -1658,9 +1656,11 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, uaudio_dev_intf_cleanup(uadev[pcm_card_num].udev, info); } - if (atomic_read(&uadev[pcm_card_num].in_use)) + if (atomic_read(&uadev[pcm_card_num].in_use)) { kref_put(&uadev[pcm_card_num].kref, uaudio_dev_release); + usb_offload_put(subs->dev); + } } mutex_unlock(&qdev_mutex); -- 2.54.0.rc1.513.gad8abe7a5a-goog