From patchwork Wed Feb 28 01:36:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 207611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3080644dyb; Tue, 27 Feb 2024 17:51:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWAhBdHMGGjyUmXCNKPkeLopQCdClYjDaQhYP+nIEwIXK6Uo57feWwndtdq/Ob1gxDbQ0dUi5NQEIIm3JTz1MFgSmhiKg== X-Google-Smtp-Source: AGHT+IGNV4ctZerJFLmgVFTuDTENpwrII/syQtTtMBc3xbNGI/S8XCIghGDZqw+ptKtaGeIEcaYn X-Received: by 2002:a0c:ca8e:0:b0:68f:e4a3:27ab with SMTP id a14-20020a0cca8e000000b0068fe4a327abmr3793165qvk.50.1709085078848; Tue, 27 Feb 2024 17:51:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709085078; cv=pass; d=google.com; s=arc-20160816; b=gXILGYruIjtUZ1q7Eyi1k3Mb8QRcI0PhFy9DLCcOcxe3v2MtdhsrjXk40w4EwfENL/ eqCXT9n9l6Hx/CIrTxwR9pR+5jw2LT8t8lRRUjg4oIBa+axUz0PbLMk8CaxDk4X+u562 1Uv84AcRcXDY9mqQn6ctHqhasl7tP4gYCRMwHABHX9yFEbOJY/rr50QxLLWC5tPhg38X pxtDG7GlhUyxPvlj+U6Pzx9ZA3KIHdOdC6rHSU6pVaOHBsxd3alZc53ZS1uUP7wBYjRK nDC0zYZjnLOXDUr8XksMfhfuDV0GYYwWqHgA1f9nA9OICUXXcrUVjxltrbRt9QP3WmGi ogpw== 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=NDrpeuvQzpNKSXUjYjE9Ra56mCk6MtHuqcQ0JaHaO1s=; fh=VKrp0Y7I/+wT36BfKZ6oI/4N9BIwFCn9zerObkOrgGw=; b=iwnu0a15Erm9J4Vvb24Hwtb3qPkP/8m/zqATltT9qMlmFo2CxsVzAneF4cPyUF8p+x kig7od8LFeLZUFBHU5phQt6vzWk062ZhAFzoA4PgOBiCqbgH5hYtr6EGLWovwqkJhF1S oTsmh26MlrMHjKAjzkvRt4erNRXha9pkuTJrnBF3LNrpS4svb0lrXPc3cfAOb2Hpqb8o FGjAXjH3Ii7WtQfyr29PvhGLZHySU88s+jwLn5veNODn7hdSBYA0RPlZcDLPkIdqMjME VJ2HDIHH20KRGAl9NyT1mkJVAuJHj3KpIIKxMhpDNIkQuE7seA9rlF1p6VsjnULNcKvD 4wnA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=hsFbxtVd; 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-84375-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84375-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 jv8-20020a05621429e800b0068fcc6a4593si8733830qvb.38.2024.02.27.17.51.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 17:51:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84375-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=hsFbxtVd; 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-84375-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84375-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 19D1A1C260AB for ; Wed, 28 Feb 2024 01:50:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0C6E85A11B; Wed, 28 Feb 2024 01:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="hsFbxtVd" 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 29667374FE; Wed, 28 Feb 2024 01:37:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709084224; cv=none; b=V9eQwyvSjhrww74r7Nnd0Bg+DawhsGo9wsa1YHB7zutjXpwPvP5UTdq/jS1iBBgIVo7wXJalvtQYirE0s8YF8srRpY+v5xdB2/SQEmtUE91D2TbkutaLtGRNytzRk/LEwMVfk/3V1gRaO4FrzpJRld5OH/1C9Zf0SRzudL27vt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709084224; c=relaxed/simple; bh=xS9j6x5p5jHrcgEvjcv3lSyIp2BuwyTzIcR8hTQv7Lg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=O8jflirNTR4TrNs1XKWP/T0RMd7Grmo4yKAGSOF5C+mFwWZSQv/OTR9nT2N6KnX2+8bJZs31sGUW5UEjB785HyiPlNwCAroXFTRY97DxK9Y5i0TsMU8WRJHS8vvlwmIzwo5rXkkXIRhWBLmoDc98OlZ+Phf31iqlRC/6hmwP4/M= 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=hsFbxtVd; arc=none smtp.client-ip=205.220.168.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 (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41S13VLq021934; Wed, 28 Feb 2024 01:36:41 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=NDrpeuvQzpNKSXUjYjE9 Ra56mCk6MtHuqcQ0JaHaO1s=; b=hsFbxtVdr9dge7RGedNn4iW/zGMNRpyMbBsC 3jKcUI6q0TX+TNzRuLy4sZFDQUb1o9dDQnnZVfKWQ78OIqFSjoKAwSyZXKpk+LAI qxDdvkThe4oFfpcfM/pfepeOifQ757LNzftgqdvr+YSBaLhGeOMpvLQlAJREICY1 4m0ifw+IrC6vQXsHsaQTlX+csPZZANeppKxM/vHa8iTPjSz8Cm0PtuNbXNhugjMB 5yi57FodJkSLitMJLsZCs3QblXmrGQI7SkhP0LUm+IsL0b3uPeZtnXBsz5usHeKD KBNULQhanBqNI8u9RR5I3pAdd0IypvDEqRDIxEidx5MpEuwWDA== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3whtbw8371-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Feb 2024 01:36:40 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41S1ae5A025365 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Feb 2024 01:36:40 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; Tue, 27 Feb 2024 17:36:39 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v18 38/41] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Date: Tue, 27 Feb 2024 17:36:16 -0800 Message-ID: <20240228013619.29758-39-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240228013619.29758-1-quic_wcheng@quicinc.com> References: <20240228013619.29758-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: hSurtACE96yVAaOMGBFq7xlQJe4MSM9t X-Proofpoint-ORIG-GUID: hSurtACE96yVAaOMGBFq7xlQJe4MSM9t 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-27_11,2024-02-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 lowpriorityscore=0 mlxscore=0 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2402120000 definitions=main-2402280010 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792105595349538296 X-GMAIL-MSGID: 1792105595349538296 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/qcom/qc_audio_offload.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c index 9695bf0ac1cd..5e7da9a033e5 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 { @@ -1256,7 +1254,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"); @@ -1449,8 +1447,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; @@ -1658,7 +1655,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);