From nobody Tue Feb 10 08:01:21 2026 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 D2899EB64D9 for ; Mon, 19 Jun 2023 10:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231799AbjFSKRO (ORCPT ); Mon, 19 Jun 2023 06:17:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231910AbjFSKRC (ORCPT ); Mon, 19 Jun 2023 06:17:02 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 079D598 for ; Mon, 19 Jun 2023 03:17:01 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3113da5260dso773150f8f.2 for ; Mon, 19 Jun 2023 03:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687169819; x=1689761819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9JFL8jNKRrHzDOE8BEGRQfXvBY019VxhOr2ufujXe1U=; b=d5rsWEtrwYPU3hk50ll38maHjk7H4KVUW4qeJVHM1vYJkX5V703bjfz1cSBJa7GbCu ku/HpXX8X47EdUqR9aAVgJPUcWgNL4HoXh7c6jg/VqIDiL+KAOIUlH6HfFSz57C1BAkZ DSfnCsk1IKuE1efmNXIVPaSrCHBQaZdW+GDxnqZsOVaL8oWcVPrbzWu7QkZdk3+bjaL2 qbFaBwdRi77IQYgzZXnYKpPHFKBErEISKSTGtQruTlmxd+C93GGLbEO+pRkhjXRj3ytf n+u3Y+00lFj+83OJiQjCtGf1kjAaWNyDvS5Z7OVSYapfvcn60AGqPfLUo4F+BKI6F7JF Qesg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687169819; x=1689761819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9JFL8jNKRrHzDOE8BEGRQfXvBY019VxhOr2ufujXe1U=; b=TTbaQApi2aE/AfYduP0tDMQ4xF3qamriUo3MTHeVEY+VR2/PAq4AnCkoKovPdOgGsU OLZV606kAmBKlGMW5vv0iw/lemIwDzgxMRWMMXDplAjGWS1i+NqPD2RGQK9C5/Cp21y0 cRS0XgwiMEhjXLZE8jR5sj+5HXSFxtSUk3j5pVCUDNVvhPuquVW4qqbE9m4D+9+eB7vF yegBEjFyDdiItzTabqZwjqlQsHpLJnBlRhcPhBVk2HcR2Zx4Fw1lhm6Jb7GmNZo/UAMQ lwJpMkKsDkLX2yfgW8Vit/vdApyO6KXW9N7SBJKJLyYsgQH3EZ9u+vSWY/ZvuxyyuC9e 2KyA== X-Gm-Message-State: AC+VfDyKcV28vmSRUPAKh3HOCZR0nwDqm6CxVzSJqMt/8AW3lkrPikpN yYPefUm7FuSPkXGcFU5AeSFdJA== X-Google-Smtp-Source: ACHHUZ5SJqR17WP/PXrxE8kDrua5KYQ+rNQy9+Dv1AOTu9r5nypm52CrkIsN1YgJtlFhvTrDT+5VNA== X-Received: by 2002:a5d:5305:0:b0:30f:d2d3:55a8 with SMTP id e5-20020a5d5305000000b0030fd2d355a8mr5902494wrv.11.1687169819499; Mon, 19 Jun 2023 03:16:59 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id c2-20020a5d5282000000b002fae7408544sm31146922wrv.108.2023.06.19.03.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 03:16:58 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, ckeepax@opensource.cirrus.com, kuninori.morimoto.gx@renesas.com, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, Srinivas Kandagatla Subject: [PATCH v3 03/11] ASoC: q6dsp: audioreach: add helper function to set u32 param Date: Mon, 19 Jun 2023 11:16:45 +0100 Message-Id: <20230619101653.9750-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230619101653.9750-1-srinivas.kandagatla@linaro.org> References: <20230619101653.9750-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some of the Audioreach commands take a u32 value, ex: PARAM_ID_MODULE_ENABLE. It makes more sense to provide a helper function so that other new commands can reuse this. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/audioreach.c | 100 +++++++----------------------- sound/soc/qcom/qdsp6/audioreach.h | 2 + 2 files changed, 26 insertions(+), 76 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audio= reach.c index 8d9410dcbd45..0acd4a75d5cd 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -732,33 +732,32 @@ static int audioreach_codec_dma_set_media_format(stru= ct q6apm_graph *graph, return rc; } =20 -static int audioreach_sal_limiter_enable(struct q6apm_graph *graph, - struct audioreach_module *module, bool enable) +int audioreach_send_u32_param(struct q6apm_graph *graph, struct audioreach= _module *module, + uint32_t param_id, uint32_t param_val) { struct apm_module_param_data *param_data; - struct param_id_sal_limiter_enable *limiter_enable; - int payload_size; struct gpr_pkt *pkt; - int rc; + uint32_t *param; + int rc, payload_size; void *p; =20 - payload_size =3D sizeof(*limiter_enable) + APM_MODULE_PARAM_DATA_SIZE; - - pkt =3D audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0); - if (IS_ERR(pkt)) - return PTR_ERR(pkt); + payload_size =3D sizeof(uint32_t) + APM_MODULE_PARAM_DATA_SIZE; + p =3D audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0); + if (IS_ERR(p)) + return -ENOMEM; =20 - p =3D (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; + pkt =3D p; + p =3D p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; =20 param_data =3D p; param_data->module_instance_id =3D module->instance_id; param_data->error_code =3D 0; - param_data->param_id =3D PARAM_ID_SAL_LIMITER_ENABLE; - param_data->param_size =3D sizeof(*limiter_enable); - p =3D p + APM_MODULE_PARAM_DATA_SIZE; - limiter_enable =3D p; + param_data->param_id =3D param_id; + param_data->param_size =3D sizeof(uint32_t); =20 - limiter_enable->enable_lim =3D enable; + p =3D p + APM_MODULE_PARAM_DATA_SIZE; + param =3D p; + *param =3D param_val; =20 rc =3D q6apm_send_cmd_sync(graph->apm, pkt, 0); =20 @@ -766,77 +765,26 @@ static int audioreach_sal_limiter_enable(struct q6apm= _graph *graph, =20 return rc; } +EXPORT_SYMBOL_GPL(audioreach_send_u32_param); + +static int audioreach_sal_limiter_enable(struct q6apm_graph *graph, + struct audioreach_module *module, bool enable) +{ + return audioreach_send_u32_param(graph, module, PARAM_ID_SAL_LIMITER_ENAB= LE, enable); +} =20 static int audioreach_sal_set_media_format(struct q6apm_graph *graph, struct audioreach_module *module, struct audioreach_module_config *cfg) { - struct apm_module_param_data *param_data; - struct param_id_sal_output_config *media_format; - int payload_size; - struct gpr_pkt *pkt; - int rc; - void *p; - - payload_size =3D sizeof(*media_format) + APM_MODULE_PARAM_DATA_SIZE; - - pkt =3D audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0); - if (IS_ERR(pkt)) - return PTR_ERR(pkt); - - p =3D (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; - - param_data =3D p; - param_data->module_instance_id =3D module->instance_id; - param_data->error_code =3D 0; - param_data->param_id =3D PARAM_ID_SAL_OUTPUT_CFG; - param_data->param_size =3D sizeof(*media_format); - p =3D p + APM_MODULE_PARAM_DATA_SIZE; - media_format =3D p; - - media_format->bits_per_sample =3D cfg->bit_width; - - rc =3D q6apm_send_cmd_sync(graph->apm, pkt, 0); - - kfree(pkt); - - return rc; + return audioreach_send_u32_param(graph, module, PARAM_ID_SAL_OUTPUT_CFG, = cfg->bit_width); } =20 static int audioreach_module_enable(struct q6apm_graph *graph, struct audioreach_module *module, bool enable) { - struct apm_module_param_data *param_data; - struct param_id_module_enable *param; - int payload_size; - struct gpr_pkt *pkt; - int rc; - void *p; - - payload_size =3D sizeof(*param) + APM_MODULE_PARAM_DATA_SIZE; - - pkt =3D audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0); - if (IS_ERR(pkt)) - return PTR_ERR(pkt); - - p =3D (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; - - param_data =3D p; - param_data->module_instance_id =3D module->instance_id; - param_data->error_code =3D 0; - param_data->param_id =3D PARAM_ID_MODULE_ENABLE; - param_data->param_size =3D sizeof(*param); - p =3D p + APM_MODULE_PARAM_DATA_SIZE; - param =3D p; - - param->enable =3D enable; - - rc =3D q6apm_send_cmd_sync(graph->apm, pkt, 0); - - kfree(pkt); - - return rc; + return audioreach_send_u32_param(graph, module, PARAM_ID_MODULE_ENABLE, e= nable); } =20 static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audio= reach.h index 3ebb81cd7cb0..18d8d243b06b 100644 --- a/sound/soc/qcom/qdsp6/audioreach.h +++ b/sound/soc/qcom/qdsp6/audioreach.h @@ -752,4 +752,6 @@ int audioreach_set_media_format(struct q6apm_graph *gra= ph, int audioreach_shared_memory_send_eos(struct q6apm_graph *graph); int audioreach_gain_set_vol_ctrl(struct q6apm *apm, struct audioreach_module *module, int vol); +int audioreach_send_u32_param(struct q6apm_graph *graph, struct audioreach= _module *module, + uint32_t param_id, uint32_t param_val); #endif /* __AUDIOREACH_H__ */ --=20 2.21.0