From patchwork Wed Dec 20 22:45:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 181824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp57054dyi; Wed, 20 Dec 2023 14:55:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IG0SqbDIKRJNLf2KHIGtQG/qxkireQTHWfKxU1c1m6YjdCxnxpc8oAIXsf2hW8PP3+nWDdQ X-Received: by 2002:a05:6214:3004:b0:67a:9cd1:6b18 with SMTP id ke4-20020a056214300400b0067a9cd16b18mr24253246qvb.48.1703112931645; Wed, 20 Dec 2023 14:55:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703112931; cv=none; d=google.com; s=arc-20160816; b=g3/HTegtzwqkE/vlrvvAHuKTAdmEbF0WUsUPZAUPipPxUescpxSJoEVkVC4NiQJ8nq RwZ1YxLaWMqg62YvfXmkkIEpUMdka4d1OlZNn09AnA2kn4PwYSRHbckq4RkEdoHU6RwW AWvQcuSzYZ3RIUvyZm02uHI1yMoG3m2OM7jE9fnPNhuF73bNTpegGqqe1D0y5G3asDfT YAmrbSeQIZLtlDNMqscXO67T/8qdpCZyKETOGZQE2aRwwUvHMuVGgwJgwJYUFxXQ96uj DnriPcRl3R3Iu5JNuqz9Go/l6FVA54yMDUo7k7wmIv1A0Ohq3Ey8sCPMlriZhrIUOUci mFfA== ARC-Message-Signature: i=1; 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=7+oH4vq654e/uqtAvDV8jnspT+jzvUavpKihEBcmUog=; fh=0KzismZj+xI0Z//ZGdqKIH/FO9LtSZM7Yj4P0VtrCz0=; b=aB3qWTkAvGeJBciHw/TcR1p6RgTe7xTnCU7BkRS8ayjce3gSzGXsYRf06Fns39nGQj RviXS02h6LZWCcrS5oE39ZUCn2uhjs5QJ22VHMRHpWBYlnAq27KwITvr6MK+6D3gBloa 9a/AvPSYT0OGKPbs5W028TA4bQc3clGReVTZLTIfzFHl4wkJ+jXzGouu+FxZrPqKjL3u QRx/1q3yGepCVo65U/qxpRSDSihDH5qNCzezHGeHkmZvl9Wb/C5QcP5tRyG1H4B+C2r3 LLO0Hohh1Tm+Nqwh4zER+RjMwYEJHYc5SZ19F6JK0LgAOkWZrZvSXKkfdZMBoux1Zeuf DoWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=O4I4nd2K; spf=pass (google.com: domain of linux-kernel+bounces-7554-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7554-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id m19-20020ae9e713000000b0078112e06dc4si721701qka.590.2023.12.20.14.55.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 14:55:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7554-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=O4I4nd2K; spf=pass (google.com: domain of linux-kernel+bounces-7554-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7554-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 6CFC81C20AE5 for ; Wed, 20 Dec 2023 22:55:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 11C0F56461; Wed, 20 Dec 2023 22:46:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="O4I4nd2K" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 83E374B5A0; Wed, 20 Dec 2023 22:46:16 +0000 (UTC) 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 (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BKMZWCS017018; Wed, 20 Dec 2023 22:46:03 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=7+oH4vq654e/uqtAvDV8 jnspT+jzvUavpKihEBcmUog=; b=O4I4nd2KioONYJvQC1waktH4OiOoJQwhWO6g kivKxmCCRslN6Uly3lnaeZBKsUmS9z+Xe05Rr04RHpbVcRtqgVMXEEaU58R4PJ6Y MnrOezJSJvqQyXixGHJX+cBkCYJ34xJ4SgWXK9JFZfkECp4WlEukZtAV/MKnQM7A sHPFBAsDIoBox8L/i9hDhf+nXkxEFV5sfUmOhm+HbUCgZgtebfugBnw4/o7yP9Di HrK4ZRzm5jKohTtqX/2GYFAYMbuiMr4Y7ujIVi3W82J9zCJe6I6V3VofijCiZ3PT 3AQp7y7hsfyTvUMS17RRabV9ZEkSi3vDlF0+XpLozURjxIrswg== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3v3tmm2d5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 22:46:03 +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 3BKMk2xH016537 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 22:46:02 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; Wed, 20 Dec 2023 14:46:02 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v11 28/41] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Date: Wed, 20 Dec 2023 14:45:31 -0800 Message-ID: <20231220224544.18031-29-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231220224544.18031-1-quic_wcheng@quicinc.com> References: <20231220224544.18031-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: nalasex01a.na.qualcomm.com (10.47.209.196) 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: P8Y88QKaxXDN4LVf3KfoPteYzJi8krX5 X-Proofpoint-ORIG-GUID: P8Y88QKaxXDN4LVf3KfoPteYzJi8krX5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_01,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 impostorscore=0 mlxscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=910 adultscore=0 malwarescore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2312200163 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785843345484275361 X-GMAIL-MSGID: 1785843345484275361 The USB backend should know about which sound resources are being shared between the ASoC and USB SND paths. This can be utilized to properly select and maintain the offloading devices. Signed-off-by: Wesley Cheng --- sound/soc/qcom/qdsp6/q6usb.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c index a3893ec96fe6..0f3cf0ac28aa 100644 --- a/sound/soc/qcom/qdsp6/q6usb.c +++ b/sound/soc/qcom/qdsp6/q6usb.c @@ -27,11 +27,18 @@ #define Q6_USB_SID_MASK 0xF +struct q6usb_status { + struct snd_soc_usb_device *sdev; + unsigned int pcm_index; +}; + struct q6usb_port_data { struct q6afe_usb_cfg usb_cfg; struct snd_soc_usb *usb; struct q6usb_offload priv; int active_usb_chip_idx; + unsigned long available_card_slot; + struct q6usb_status status[SNDRV_CARDS]; }; static const struct snd_soc_dapm_widget q6usb_dai_widgets[] = { @@ -113,6 +120,12 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb, if (connected) { /* We only track the latest USB headset plugged in */ data->active_usb_chip_idx = sdev->card_idx; + + set_bit(sdev->card_idx, &data->available_card_slot); + data->status[sdev->card_idx].sdev = sdev; + } else { + clear_bit(sdev->card_idx, &data->available_card_slot); + data->status[sdev->card_idx].sdev = NULL; } return 0;