From patchwork Tue Aug 29 09:21:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Kumar X-Patchwork-Id: 719367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0960FC83F17 for ; Tue, 29 Aug 2023 09:23:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233993AbjH2JWw (ORCPT ); Tue, 29 Aug 2023 05:22:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234787AbjH2JWo (ORCPT ); Tue, 29 Aug 2023 05:22:44 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3237D1AE; Tue, 29 Aug 2023 02:22:37 -0700 (PDT) Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37T9Hwgl025427; Tue, 29 Aug 2023 09:22:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=qcppdkim1; bh=UAQsqj4bruAVadMR0RnQrL1Wc9gUtAicD6apYeSTUPY=; b=J3L8HJhNwOINbgNyGqi2c8axs07t2DIWdcGqqUADwObuvl/YFCMDAQxLclTym6yYvc3J zk7IIbKMQpryzf7R3FI58/OGIE4uW3CXH7rXsvFcM4dXfX0NnjtjfZUsvds9QpW6kUF1 io4kYzlfA+JhTv50PEXu3Q20cUocrBxbcwjgA+d4aw8nTA5KN1soPQoQcVBi1dk5HsWH 0BMDHYXu8GxAQB4jntEAMKvb9Ej3f9eajwHZEF1tvfmsNqI7NFp6b7t3ErbaPXUKUh5u /JooWpUgnk3Qq42pT6lR7uvhXeQsiGXcdTFVKvWT6gqlOEoqwY76kzaNjL72w6eTCJ2u og== Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3ss3fr1a3j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Aug 2023 09:22:28 +0000 Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 37T9MR26019162 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 29 Aug 2023 09:22:27 GMT Received: from hu-akakum-hyd.qualcomm.com (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.36; Tue, 29 Aug 2023 02:22:24 -0700 From: Akash Kumar To: Thinh Nguyen , Greg Kroah-Hartman , Jing Leng , Felipe Balbi CC: =?utf-8?q?Pratham_Pratap=C2=A0?= , Jack Pham , , , Akash Kumar Subject: [PATCH] [PATCH v3] usb: gadget: f_uac2: uevent changes for uac2 Date: Tue, 29 Aug 2023 14:51:32 +0530 Message-ID: <20230829092132.1940-1-quic_akakum@quicinc.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 9UWFhuPcuDUQ2QVuxU70gqXqSndU1rg0 X-Proofpoint-ORIG-GUID: 9UWFhuPcuDUQ2QVuxU70gqXqSndU1rg0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-29_06,2023-08-28_04,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 mlxscore=0 adultscore=0 spamscore=0 phishscore=0 bulkscore=0 mlxlogscore=805 impostorscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2308290080 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Adding uevent from usb audio gadget driver for uac2 playback/capture events, which userspace reads and later reads sysfs entry to know if playback or capture has stopped or started by host application. /config/usb_gadget/g1/functions/uac2.0 # cat c_status 1 --> capture started 0 --> capture stopped /config/usb_gadget/g1/functions/uac2.0 # cat p_status 1 --> playback started 0 --> playback stopped Signed-off-by: Akash Kumar --- Documentation/usb/gadget-testing.rst | 6 ++++ drivers/usb/gadget/function/f_uac2.c | 47 ++++++++++++++++++++++++++++ drivers/usb/gadget/function/u_uac2.h | 5 +++ 3 files changed, 58 insertions(+) diff --git a/Documentation/usb/gadget-testing.rst b/Documentation/usb/gadget-testing.rst index 2eeb3e9299e4..b2fded232ced 100644 --- a/Documentation/usb/gadget-testing.rst +++ b/Documentation/usb/gadget-testing.rst @@ -733,6 +733,12 @@ The uac2 function provides these attributes in its function directory: p_ssize playback sample size (bytes) req_number the number of pre-allocated request for both capture and playback + c_status audio capture state + (0: capture stopped, 1: capture started) + p_status audio playback state + (0: playback stopped, 1: playback started) + c_status audio capture state + p_status audio playback state =============== ==================================================== The attributes have sane default values. diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c index db2d4980cb35..f1f7631e9380 100644 --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -739,6 +739,8 @@ afunc_set_alt(struct usb_function *fn, unsigned intf, unsigned alt) struct usb_gadget *gadget = cdev->gadget; struct device *dev = &gadget->dev; int ret = 0; + struct f_uac2_opts *audio_opts = + container_of(fn->fi, struct f_uac2_opts, func_inst); /* No i/f has more than 2 alt settings */ if (alt > 1) { @@ -762,6 +764,8 @@ afunc_set_alt(struct usb_function *fn, unsigned intf, unsigned alt) ret = u_audio_start_capture(&uac2->g_audio); else u_audio_stop_capture(&uac2->g_audio); + audio_opts->c_status = alt; + schedule_work(&audio_opts->work); } else if (intf == uac2->as_in_intf) { uac2->as_in_alt = alt; @@ -769,6 +773,8 @@ afunc_set_alt(struct usb_function *fn, unsigned intf, unsigned alt) ret = u_audio_start_playback(&uac2->g_audio); else u_audio_stop_playback(&uac2->g_audio); + audio_opts->p_status = alt; + schedule_work(&audio_opts->work); } else { dev_err(dev, "%s:%d Error!\n", __func__, __LINE__); return -EINVAL; @@ -801,11 +807,16 @@ static void afunc_disable(struct usb_function *fn) { struct f_uac2 *uac2 = func_to_uac2(fn); + struct f_uac2_opts *audio_opts = + container_of(fn->fi, struct f_uac2_opts, func_inst); uac2->as_in_alt = 0; uac2->as_out_alt = 0; + audio_opts->p_status = 0;//alt; + audio_opts->c_status = 0; //alt; u_audio_stop_capture(&uac2->g_audio); u_audio_stop_playback(&uac2->g_audio); + schedule_work(&audio_opts->work); } static int @@ -1036,6 +1047,25 @@ UAC2_ATTRIBUTE(c_srate); UAC2_ATTRIBUTE(c_ssize); UAC2_ATTRIBUTE(req_number); +#define UAC2_ATTRIBUTE_RO(name) \ + static ssize_t f_uac2_opts_##name##_show( \ + struct config_item *item, \ + char *page) \ +{ \ + struct f_uac2_opts *opts = to_f_uac2_opts(item); \ + int result; \ + \ + mutex_lock(&opts->lock); \ + result = scnprintf(page, PAGE_SIZE, "%u\n", opts->name); \ + mutex_unlock(&opts->lock); \ + \ + return result; \ +} \ +CONFIGFS_ATTR_RO(f_uac2_opts_, name) + +UAC2_ATTRIBUTE_RO(c_status); +UAC2_ATTRIBUTE_RO(p_status); + static struct configfs_attribute *f_uac2_attrs[] = { &f_uac2_opts_attr_p_chmask, &f_uac2_opts_attr_p_srate, @@ -1044,6 +1074,8 @@ static struct configfs_attribute *f_uac2_attrs[] = { &f_uac2_opts_attr_c_srate, &f_uac2_opts_attr_c_ssize, &f_uac2_opts_attr_req_number, + &f_uac2_opts_attr_c_status, + &f_uac2_opts_attr_p_status, NULL, }; @@ -1053,11 +1085,23 @@ static const struct config_item_type f_uac2_func_type = { .ct_owner = THIS_MODULE, }; +static void f_uac2_audio_status_change_work(struct work_struct *data) +{ + struct f_uac2_opts *audio_opts = + container_of(data, struct f_uac2_opts, work); + char *envp[2] = { "UAC2_STATE=Changed", NULL }; + + kobject_uevent_env(&audio_opts->device->kobj, + KOBJ_CHANGE, envp); +} + static void afunc_free_inst(struct usb_function_instance *f) { struct f_uac2_opts *opts; opts = container_of(f, struct f_uac2_opts, func_inst); + device_destroy(opts->device->class, opts->device->devt); + cancel_work_sync(&opts->work); kfree(opts); } @@ -1082,6 +1126,9 @@ static struct usb_function_instance *afunc_alloc_inst(void) opts->c_srate = UAC2_DEF_CSRATE; opts->c_ssize = UAC2_DEF_CSSIZE; opts->req_number = UAC2_DEF_REQ_NUM; + INIT_WORK(&opts->work, f_uac2_audio_status_change_work); + opts->device = create_function_device("f_uac2"); + return &opts->func_inst; } diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h index b5035711172d..3ccf2eb002f1 100644 --- a/drivers/usb/gadget/function/u_uac2.h +++ b/drivers/usb/gadget/function/u_uac2.h @@ -36,6 +36,11 @@ struct f_uac2_opts { struct mutex lock; int refcnt; + int c_status; + int p_status; + struct device *device; + struct work_struct work; }; +extern struct device *create_function_device(char *name); #endif