From patchwork Tue Feb 13 00:54:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 200144 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp271193dyb; Mon, 12 Feb 2024 17:35:59 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU2voov8LGrP0ismVTXl1G/irAFylZJZmPjDq9lYHQ/mLz338nk+CQK+5RkFx652DKLdSudGE+6Diu2OVkpUXjASCfHsQ== X-Google-Smtp-Source: AGHT+IEJGe3U+8HaIEf70YYI9c4SUWb4VOgUv1KNYYDvXP6AOBRMMdw3hfsunP6YBOm42/649XCp X-Received: by 2002:a1f:e403:0:b0:4c0:3552:bd07 with SMTP id b3-20020a1fe403000000b004c03552bd07mr4608996vkh.9.1707788159369; Mon, 12 Feb 2024 17:35:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707788159; cv=pass; d=google.com; s=arc-20160816; b=u7hg2mJ43nsdU3PkZC0xGBfwl04pGQqyrf+pDnAsW8iq/8ydKZmHeGKVcXKk+0y3ja N98CZvDzqKoCxCkxt8wFG3rIXLmZ5ARpRfp4j5rvFf6HUDEQlg11yn1si3ltIMyW0cPh RCOXS1DfTRS+kmWZYScfEiyNg5vN701qTZ8Uz82lC1lKrLJ11v55jgyCr3zSxNv0Umzo bY/OeS0/4j6FK3A/jIUKj9rSVICRFpyRaQGz4YR7kq4fw4804XFlqEv8zgN8HqVRme+f bw1hPJuvozxYkDxmpq3jdoUdr7hlSLptpQbGCf2vB/N2iEG+uGPRTmodfJpTvRTBQ60N Fkcg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kGmHRhhHPg1MJhqR276zXmPPfA/WmrOcGcOwZw0DDOU=; fh=jXCOjJggeqiz5/sv2SPsUg2UmXf911dKXe1cDxLeyZQ=; b=sH6S0sbUOv+w6Y1x9HP+x3kL4TnGFIl5vsVgrwv46PC8UaYqVHJGN0vthq+ou2e+tF sYoEtGBi7R7cWcXnUYl+z/MEuL2LN6WU5YdozBaqBT73+2PYZ6ZjTBQgc7IybZByXgxr 5eq96a4u7lA/mBLhruhmpToybXkeK8Dgw0aVZicbW3mDoKvl2NZ+LrhLbxVUU2ZtZ3eA 27Xjbhe2tlr6PWZN7qErnTWhvAcxB7SrqOyxeQzzbfucBrSUDnfynj939niKiZoZLO+B CrGpk54FCahMpeY/3j7iAPZTGgdogH2DwxT5YhsvYv/VnCacqqXyYFtOQjBhysOZK6rO 6CXQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=VUWbPLO7; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-62814-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62814-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com X-Forwarded-Encrypted: i=2; AJvYcCVkVRcpV00W2uodEe4FSXtuhmRpWHXp4fy+9aKbEIHZqze2zPd3tTtw8lth1cgrSA4DvU/Old4OQDsFoZPxk5hTtZURrg== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id ed12-20020ad44eac000000b0068c51fc0a0asi1789153qvb.292.2024.02.12.17.35.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 17:35:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-62814-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=VUWbPLO7; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-62814-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-62814-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1F0921C24899 for ; Tue, 13 Feb 2024 01:35:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 822A462A15; Tue, 13 Feb 2024 00:55:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="VUWbPLO7" Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFAFB55C28; Tue, 13 Feb 2024 00:55:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707785707; cv=none; b=raTUnvaYI7qf+HXL+c7Mp6iK2w6dLNZnuukg7Evg3hfei65d76lJ9qj3CrM+nwjENPDldcQku5ScuD1xXf10AmquA8maaU2T82g3NufB5Inxp6ddrIf0pc9c4WBZ4jbIEJD48OcXQGxEX3Oi6lto/hXv0U71jywqocnRvxgTnoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707785707; c=relaxed/simple; bh=UFdIRekJUYcowLf9w22phEy8og3ESsOA/bUoW2JxauU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RXrFRKDx1+vr1LOovm4/g4KR/Ks3/nGs5IvzhcDdhzLZ2OQWkMhg/uOspJim+07wCMGqpjS6UO/GdmZz4DCvGw84hd5XDIvpXgbftBOkwO+Rn2Ogp3byjUuuMNl2+Sys4aWjHi1P5CDWd9n2S6IAHE7UIytRxfC2KgYReyk/bck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=VUWbPLO7; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41D0ZDdp009069; Tue, 13 Feb 2024 00:54:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=kGmHRhhHPg1MJhqR276z XmPPfA/WmrOcGcOwZw0DDOU=; b=VUWbPLO74sq3yDqFTM872VfTMXwzqlHBvtp2 xs920r9/95Y+Z6qWMN3ts2+NU8ut+8rsqEJVJevGRXNadiSIQ44uBKMu9leXYKt0 tm/Jf6PDo0PnrDZFOYLey/eSJlwpdCqKW+xsdjX71NXM+eYtTMDWLcnNrcxGK2tt s2qC4frVNmoSCwXfz1pir3wATwYZWBY+ogPpfqVabkgUHOz0XdL+IFKhnqQsmAf9 iQMi8kj9mTkuMgJURuwFfx7x6glfcws0CVcC7ekJlLm2XDZzFbUHo0s8YrBaZgvO F3auyF9nIyf0usRlt4XMO1W4+3BvTCd1HiM1m9ITS8gG/kguGQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3w7gvjhuxg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Feb 2024 00:54:47 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41D0skKQ031600 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Feb 2024 00:54:46 GMT Received: from hu-wcheng-lv.qualcomm.com (10.49.16.6) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Mon, 12 Feb 2024 16:54:45 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v15 47/50] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Date: Mon, 12 Feb 2024 16:54:19 -0800 Message-ID: <20240213005422.3121-48-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240213005422.3121-1-quic_wcheng@quicinc.com> References: <20240213005422.3121-1-quic_wcheng@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: RBZHVWgJ97wVvndign-D3alylkCyo6FK X-Proofpoint-ORIG-GUID: RBZHVWgJ97wVvndign-D3alylkCyo6FK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-12_20,2024-02-12_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402130004 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790745676882785143 X-GMAIL-MSGID: 1790745676882785143 Utilize the card and PCM index coming from the USB QMI stream request. This field follows what is set by the ASoC USB backend, and could potentially carry information about a specific device selected through the ASoC USB backend. The backend also has information about the last USB sound device plugged in, so it can choose to select the last device plugged in, accordingly. Signed-off-by: Wesley Cheng --- sound/usb/card.c | 21 +++++++++++++++++++++ sound/usb/card.h | 1 + sound/usb/qcom/qc_audio_offload.c | 10 ++++------ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 1ad99a462038..8364c5b8fbbf 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -186,6 +186,27 @@ struct snd_usb_stream *snd_usb_find_suppported_substream(int card_idx, } EXPORT_SYMBOL_GPL(snd_usb_find_suppported_substream); +/* + * in case the platform driver was not ready at the time of USB SND + * device connect, expose an API to discover all connected USB devices + * so it can populate any dependent resources/structures. + */ +void snd_usb_rediscover_devices(void) +{ + int i; + + guard(mutex)(®ister_mutex); + + if (!platform_ops || !platform_ops->connect_cb) + return; + + for (i = 0; i < SNDRV_CARDS; i++) { + if (usb_chip[i]) + platform_ops->connect_cb(usb_chip[i]); + } +} +EXPORT_SYMBOL_GPL(snd_usb_rediscover_devices); + /* * disconnect streams * called from usb_audio_disconnect() diff --git a/sound/usb/card.h b/sound/usb/card.h index 2c8c51c8b1ea..68c8c5f12c1a 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -221,4 +221,5 @@ int snd_usb_unregister_platform_ops(void); struct snd_usb_stream *snd_usb_find_suppported_substream(int card_idx, struct snd_pcm_hw_params *params, int direction); +void snd_usb_rediscover_devices(void); #endif /* __USBAUDIO_CARD_H */ diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c index 265e6d970925..e58924abe5ca 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -107,8 +107,6 @@ struct uaudio_qmi_dev { bool er_mapped; /* reference count to number of possible consumers */ atomic_t qdev_in_use; - /* idx to last udev card number plugged in */ - unsigned int last_card_num; }; struct uaudio_dev { @@ -1244,7 +1242,7 @@ static int prepare_qmi_response(struct snd_usb_substream *subs, pcm_dev_num = (req_msg->usb_token & QMI_STREAM_REQ_DEV_NUM_MASK) >> 8; xfer_buf_len = req_msg->xfer_buff_size; - card_num = uaudio_qdev->last_card_num; + card_num = (req_msg->usb_token & QMI_STREAM_REQ_CARD_NUM_MASK) >> 16; if (!uadev[card_num].ctrl_intf) { dev_err(&subs->dev->dev, "audio ctrl intf info not cached\n"); @@ -1437,8 +1435,7 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, direction = (req_msg->usb_token & QMI_STREAM_REQ_DIRECTION); pcm_dev_num = (req_msg->usb_token & QMI_STREAM_REQ_DEV_NUM_MASK) >> 8; - pcm_card_num = req_msg->enable ? uaudio_qdev->last_card_num : - ffs(uaudio_qdev->card_slot) - 1; + pcm_card_num = (req_msg->usb_token & QMI_STREAM_REQ_CARD_NUM_MASK) >> 16; if (pcm_card_num >= SNDRV_CARDS) { ret = -EINVAL; goto response; @@ -1646,7 +1643,6 @@ static void qc_usb_audio_offload_probe(struct snd_usb_audio *chip) sdev->num_capture = usb_qmi_get_pcm_num(chip, 1); uadev[chip->card->number].sdev = sdev; - uaudio_qdev->last_card_num = chip->card->number; snd_soc_usb_connect(usb_get_usb_backend(udev), sdev); snd_usb_offload_create_ctl(chip); @@ -1874,6 +1870,8 @@ static int __init qc_usb_audio_offload_init(void) if (ret < 0) goto release_qmi; + snd_usb_rediscover_devices(); + return 0; release_qmi: