From patchwork Wed Dec 20 22:45:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 181878 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp67674dyi; Wed, 20 Dec 2023 15:17:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IGbW2SXYVnJFBHh6V317dHNg1GyircC3YWxZQNrwhLeeiIOxqYBy9+ej5pAeoPIZGhLZvCr X-Received: by 2002:a05:6a21:3384:b0:18f:a271:31ac with SMTP id yy4-20020a056a21338400b0018fa27131acmr566459pzb.85.1703114250344; Wed, 20 Dec 2023 15:17:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703114250; cv=none; d=google.com; s=arc-20160816; b=z2S6olXVqfU8M5oJ2j9WQ5UkXzMoc4BOKgSP+JYddqgVVwKayA6MFpJG/eyolIzcPH x5PelFXnZ3WhXKtQfGx9YVQ60vbuniHfm2L8qPdEzq3guH3Qg8Wf4xLEMsLF0vx7I8Kv ntPl2SXgAd0nrFl3e0eoTjhs0ZuHzXTRu5LH2wG8YVAh2PdWUfJhOZ7DNmAx8EPBgOlA H9KX28fzeGYy1yFJL6bu9+ctRwAsqFy6HwUuHrgMBN7V7k4sDCuOKqrmCW/6sIL4F3DL 7XoB+Gm04XTI5px4KfBkfk93TV/cvNBIpVpunTfgvb+OVpVwLORvDY4PJnt0AdehQPP8 jVDw== 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=55ixrCvScNyoiF2MZa/Klm288e6OMTksZwvaSzERilQ=; fh=0KzismZj+xI0Z//ZGdqKIH/FO9LtSZM7Yj4P0VtrCz0=; b=J6+t6jLWBwQj6KskHqeTlEplEnwP9EZ9u68F2QaO6HDpEvHAJNUpHvEHA5H/BLCU09 6d0jPa2vfau1LZQ6LppPgfrDjLgT8khNtjHHVvLFk33JEgBqt6tMjybIHqkI397dRI5d MSLoKJFgT9Rfp01R3RKXQtDTc+Qr07inH9wYjYA//pGwZSR4+ibDWKT7uQjB7xarKdOG 9JXaVQ42y6wn00+4tEMNg3YMLLkUBPcPd6jzSvNZl2wpRdjWtZScPHHmjYD5JaeXD9fP caANW9Cns5E8HmDEtcWwgXZFeVbHNMG3A1GObhEq0SOrrjxcbVsS+9rPncYassJL0mm2 H/rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=BHi3zhPC; spf=pass (google.com: domain of linux-kernel+bounces-7594-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7594-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id s16-20020a056a00179000b006d826d1a49bsi468111pfg.280.2023.12.20.15.17.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 15:17:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7594-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=BHi3zhPC; spf=pass (google.com: domain of linux-kernel+bounces-7594-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7594-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id D84A1B28014 for ; Wed, 20 Dec 2023 23:06:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F055760AF; Wed, 20 Dec 2023 22:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="BHi3zhPC" X-Original-To: linux-kernel@vger.kernel.org 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 8D17A5576F; Wed, 20 Dec 2023 22:46:24 +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 (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BKLUIhX013826; Wed, 20 Dec 2023 22:46:07 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=55ixrCvScNyoiF2MZa/K lm288e6OMTksZwvaSzERilQ=; b=BHi3zhPC6Em33/HLyexK9uOeKhcq9fr4agjZ +ay8yp3TWTh4IijvaCb1LTpoIiRl3R3sBN08vWV7rySin0VsSqFocIg5HfBpRPHv z+mE4kIN6Sp5I74+N63d9Lz+uBb4H7PYUSXNXL75EUTGmhBcPHRvC3gpVUFZwMol Eny6SbhwzVqml39grwg18zZ4ebnY/djyE3uLXptFAfdX24nUu4rVybIrfFhiRZ0x v4am989iq04JgTfOWi5NKlhfbc9o4qZb+m4Is5HJdBOSfh7C0EcBcktnMVTtfKjq dAnCInXaMNgtMRCMYfE9XYdxTfgdm5EzYg2YbK91WDLMZJFI4Q== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3v4234h7h6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 22:46:06 +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 3BKMk57H014129 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 22:46:05 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:05 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v11 38/41] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Date: Wed, 20 Dec 2023 14:45:41 -0800 Message-ID: <20231220224544.18031-39-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-ORIG-GUID: 8XsGag1W4m2QhXM2RiUBt_Fxwlgx4IYy X-Proofpoint-GUID: 8XsGag1W4m2QhXM2RiUBt_Fxwlgx4IYy 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_02,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 bulkscore=0 mlxscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 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: 1785844728516659853 X-GMAIL-MSGID: 1785844728516659853 In case of notifying SND platform drivers of connection events, some of these use cases, such as offloading, require an ASoC USB backend device to be initialized before the events can be handled. If the USB backend device has not yet been probed, this leads to missing initial USB audio device connection events. Expose an API that traverses the usb_chip array for connected devices, and to call the respective connection callback registered to the SND platform driver. Signed-off-by: Wesley Cheng --- sound/usb/card.c | 19 +++++++++++++++++++ sound/usb/card.h | 2 ++ sound/usb/qcom/qc_audio_offload.c | 2 ++ 3 files changed, 23 insertions(+) diff --git a/sound/usb/card.c b/sound/usb/card.c index 11b827b7a2a5..995b2df676ab 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -202,6 +202,25 @@ 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; + + mutex_lock(®ister_mutex); + for (i = 0; i < SNDRV_CARDS; i++) { + if (usb_chip[i]) + if (platform_ops && platform_ops->connect_cb) + platform_ops->connect_cb(usb_chip[i]); + } + mutex_unlock(®ister_mutex); +} +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 6d59995440c3..3a0d68f453a1 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -222,11 +222,13 @@ int snd_usb_unregister_platform_ops(void); #if IS_ENABLED(CONFIG_SND_USB_AUDIO) 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); #else static struct snd_usb_stream *snd_usb_find_suppported_substream(int card_idx, struct snd_pcm_hw_params *params, int direction) { return NULL; } +static void snd_usb_rediscover_devices(void) { } #endif /* IS_ENABLED(CONFIG_SND_USB_AUDIO) */ #endif /* __USBAUDIO_CARD_H */ diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c index e0a010a40b97..60b715e48508 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -1866,6 +1866,8 @@ static int __init qc_usb_audio_offload_init(void) if (ret < 0) goto release_qmi; + snd_usb_rediscover_devices(); + return 0; release_qmi: