From patchwork Wed Nov 23 14:51:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 25034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2835848wrr; Wed, 23 Nov 2022 06:52:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf4HGLmsLGObs8uISjFARsl0UoEKx8OOxdJaDE6QNVufAOOmtu9aFflz6lpk5jLTGPFeBGOk X-Received: by 2002:a17:902:e0ca:b0:188:712f:dfa5 with SMTP id e10-20020a170902e0ca00b00188712fdfa5mr9138638pla.140.1669215165229; Wed, 23 Nov 2022 06:52:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669215165; cv=none; d=google.com; s=arc-20160816; b=T2AafZKxwcwTxVPFguNnYJdmVsy96oxQaBPDNdZj4qqn+1Q8G8Pr7dgEB5cIKo8Eu3 bfVdvnv3gDyHhceKuu9Nh5ofjNfgdz+6SuHd8Kh7EiUtoyNjhSwQlpBquKnORxRUnY+t T5pxKJfm3yEVvdIAc0sCmr7ojfogW4h1ERlwpetWGfRMDupzBXbE8KOoQMqJjw0z2MNX +qdZnDXcKGpD3i7REZK5Ew+/T7FaB88UblNaSLXJnQPvfMqckLHCkNVBNUt1OVI8p2Ur LhjAYgfg0gSECJlflTu2FxI5g4RsblqQrZk5YgwmE0ayCfbcw8c5SWnA6gdoAPARjEAf I2Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=undvmwFEvRPQUPi2f8r9jtjOCibt7dyqMNuLYGsabHA=; b=Y/rzdw07XxMXktaaxDljZYdyyhAVvNJlkCxHJ/RuY8DAW6BCl/D0wKZB8Sc3x95+0s 1U1IMVfO5CTlcAzsP6YauCUvqd4VEeZO47jo0rs0FqSbAWHvW/13abLoO9kymuy5Tep9 RxiKcP0x5bGOt8najPsXCjdU7UgMfojjxMnjyfaG0NJcIO+g6Wone32mQp7Szfo/fvMT em8Ad5z5PAzJNL+laHevF39lCUKyRlO1Dni8u0bh2xscdSY+wL+sfc0HCAMa3Miyrk3n UQmwr7WcskMOM+d1mrXIfu/5cMu5ghk8tv+PvuaxjpPOEcq3Aa4xsyfUf3wOUB36MPqV yfEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="C6sKHQ//"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 8-20020a631448000000b00461c7200fafsi17344063pgu.320.2022.11.23.06.52.31; Wed, 23 Nov 2022 06:52:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="C6sKHQ//"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237777AbiKWOv6 (ORCPT + 99 others); Wed, 23 Nov 2022 09:51:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237521AbiKWOvz (ORCPT ); Wed, 23 Nov 2022 09:51:55 -0500 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC91E6CA0E for ; Wed, 23 Nov 2022 06:51:53 -0800 (PST) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ANCx7LG007136; Wed, 23 Nov 2022 08:51:42 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=undvmwFEvRPQUPi2f8r9jtjOCibt7dyqMNuLYGsabHA=; b=C6sKHQ//QyVxbzFLvfXk1hUnq9S+nLYMJOfg7WiBLunL/PUng3EtgZJtl8O5YQuJYq3y HMGjbI033aSLdkJlsReJp5HcZZDReRvo7W0uUZRAJ/JEGy9hzlk7PwYlSIgylpddrkB2 jo+maXOKAksWr18q3dMtKVbvZ3gmLnWeym7ibh+eDp4W8lgmKQ18GdQTRpIB1HeHCIsK 0G7JrT/ifYekjF9h465NbOEejQJTDEsuQ4edBBsK1ms+7bKEPNV6TBV2KrklJ5CClVgd hns8VPlqtDOcWpyNK31CGyNpreLvPH8LrRHWl08Bjj2Jy0MblIhN4UYIjWc9ZqJYdTcz PA== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3kxvet50xm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Nov 2022 08:51:41 -0600 Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Wed, 23 Nov 2022 08:51:40 -0600 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.20 via Frontend Transport; Wed, 23 Nov 2022 08:51:40 -0600 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.111]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 4C315477; Wed, 23 Nov 2022 14:51:40 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH 1/2] firmware: cs_dsp: cs_dsp_coeff_write_ctrl() should report changed Date: Wed, 23 Nov 2022 14:51:39 +0000 Message-ID: <20221123145140.2784030-2-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221123145140.2784030-1-rf@opensource.cirrus.com> References: <20221123145140.2784030-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 44NsEcHOr4WNNh2kdIeq-NZ5zx1vXxrk X-Proofpoint-GUID: 44NsEcHOr4WNNh2kdIeq-NZ5zx1vXxrk X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750298961301376015?= X-GMAIL-MSGID: =?utf-8?q?1750298961301376015?= From: Simon Trimmer ALSA callers need to know whether there was a change to the value so that they can report a control write change correctly. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald --- drivers/firmware/cirrus/cs_dsp.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index 81cc3d0f6eec..17b7198b87dc 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -752,7 +752,7 @@ static int cs_dsp_coeff_write_ctrl_raw(struct cs_dsp_coeff_ctl *ctl, * * Must be called with pwr_lock held. * - * Return: Zero for success, a negative number on error. + * Return: < 0 on error, 1 when the control value changed and 0 when it has not. */ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off, const void *buf, size_t len) @@ -767,16 +767,23 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, if (len + off * sizeof(u32) > ctl->len) return -EINVAL; - if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) + if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) { ret = -EPERM; - else if (buf != ctl->cache) - memcpy(ctl->cache + off * sizeof(u32), buf, len); + } else if (buf != ctl->cache) { + if (memcmp(ctl->cache + off * sizeof(u32), buf, len)) + memcpy(ctl->cache + off * sizeof(u32), buf, len); + else + return 0; + } ctl->set = 1; if (ctl->enabled && ctl->dsp->running) ret = cs_dsp_coeff_write_ctrl_raw(ctl, off, buf, len); - return ret; + if (ret < 0) + return ret; + + return 1; } EXPORT_SYMBOL_GPL(cs_dsp_coeff_write_ctrl); From patchwork Wed Nov 23 14:51:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 25035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2836241wrr; Wed, 23 Nov 2022 06:53:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf4yFqd1owu04Hs9qa0Or90IjWRLSfR0mMZpRDsfoEIfnwjWFklQCjBOMS+tV7FsFgADEqgG X-Received: by 2002:a63:1b60:0:b0:46f:b2a5:2e2d with SMTP id b32-20020a631b60000000b0046fb2a52e2dmr10884075pgm.400.1669215222601; Wed, 23 Nov 2022 06:53:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669215222; cv=none; d=google.com; s=arc-20160816; b=O/Njz9JRORyULeBEf9B564NihqAg3+QWd8Cz0HMFhF2k0lQk++xZFrqf+dNupPG57O te1GEPmyIbP/fR5zZXmCjI/IlxL/FEcRiH2xfqeGHLl5geplIg9RpjB19FiQXtCgVVcd tQaWE3SvJwc1GqvMlnNPprbVjfPLhHjQtN/pnums+8YTZ2SIpbgEBOECWEAu9JB/Y2Qs ym4Ef0Uj/sgh3sB6w8ZP5TNzBlZtxTALbXaOI9YSyrVptU8BPJ3lPC9g0CfZ0qoajiz/ yGzMmUdJ4LFq9fjls050FMrUVwei3eNuS3aFZUnfLAyzqjhAA62YLpY61l8Tt+I5KY7s tc4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bIfpAGBt40UBSTkshq1rt/7yCo42+WIeyjdXEHc6Y2A=; b=RENnr55VuVre1R7CW5I5OUKclDMQgc/9V1t7tDvb2MEA8VmN9sMBUtLwMPyJv4Z37W 60sOXDDNyPfv+jycTbNEhgWJq6K/qrs1kcrcBMXk/3Eg7NRmrtBQS7r/noSEBfXx5uzX d6fBukXb8VD58QnKyGUCw+8jVCipIVyQQsAmbWFuNMPKVcPiKWVOx41PzUNr9xoJd6Lr i5rnBvwLZq3v5D9E0C9t4eYBv4oKGANywF3QR98CIrKIDvV3EtdL98fycb59PblSas6h z51nkq4wYWFw95iG29vwcAcblI/pU1vgGEnKqj5KfEgo87ECBHo8tkJYI33yYXHunq1Z Gzcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="KDRQK8/+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h18-20020a170902f55200b00186b9b292dfsi17681397plf.71.2022.11.23.06.53.29; Wed, 23 Nov 2022 06:53:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="KDRQK8/+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237705AbiKWOvx (ORCPT + 99 others); Wed, 23 Nov 2022 09:51:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237521AbiKWOvv (ORCPT ); Wed, 23 Nov 2022 09:51:51 -0500 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40C296CA00 for ; Wed, 23 Nov 2022 06:51:49 -0800 (PST) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AN7beZl029400; Wed, 23 Nov 2022 08:51:43 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=bIfpAGBt40UBSTkshq1rt/7yCo42+WIeyjdXEHc6Y2A=; b=KDRQK8/+NEMLoE3/2etiJuhgA0bYTz2SmUXGb4ut+rXBrvcpGKqS1t4XxzAAdZaiY4Hz 4OPlpj8aGiewKk/BcODXAm3pwKq2V+1m4ahHlWzzY911gpeHk023nOnArr8wYZz2YUXg qRoNgqczPje+aSG6NBbonf4rAo763m3IXY5g7J2mqgEX/XNtoAyxsOmW4/OPjY5dJ063 /Zs9H/oxnNWLvqV4VB26jl+UqDi9bygYvV1ba73LVY3nXShIXKKM1+lOC4OsBGqXLfbL 8LRMElRSgIaIS9An29+N/p4X3mfqTywl0WOFotd98/o+KjcnidQkboAY+/HVbuGUm0Dz Ng== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3kxwe6w04h-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Nov 2022 08:51:43 -0600 Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Wed, 23 Nov 2022 08:51:40 -0600 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.20 via Frontend Transport; Wed, 23 Nov 2022 08:51:40 -0600 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.111]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 5F56EB10; Wed, 23 Nov 2022 14:51:40 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Simon Trimmer , Richard Fitzgerald Subject: [PATCH 2/2] ASoC: wm_adsp: Return whether changed when writing controls Date: Wed, 23 Nov 2022 14:51:40 +0000 Message-ID: <20221123145140.2784030-3-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221123145140.2784030-1-rf@opensource.cirrus.com> References: <20221123145140.2784030-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: JqgZWqMS2z8PdX-yZIPHyvOFJaxoVDVa X-Proofpoint-GUID: JqgZWqMS2z8PdX-yZIPHyvOFJaxoVDVa X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750299021215835950?= X-GMAIL-MSGID: =?utf-8?q?1750299021215835950?= From: Simon Trimmer Functions that update cs_dsp controls need to handle return codes that indicate whether the control value changed. A return code of 1 indicates a change, 0 indicates no-change and a negative value is an error condition. Acked controls implicitly change value when written so a successful write shall always report that the value changed. Signed-off-by: Simon Trimmer Signed-off-by: Richard Fitzgerald --- sound/soc/codecs/wm_adsp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 34a94b011518..9b1b522c9350 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -419,16 +419,21 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, (struct soc_bytes_ext *)kctl->private_value; struct wm_coeff_ctl *ctl = bytes_ext_to_ctl(bytes_ext); struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl; + void *scratch; int ret = 0; - mutex_lock(&cs_ctl->dsp->pwr_lock); + scratch = vmalloc(size); + if (!scratch) + return -ENOMEM; - if (copy_from_user(cs_ctl->cache, bytes, size)) + if (copy_from_user(scratch, bytes, size)) { ret = -EFAULT; - else - ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, cs_ctl->cache, size); - - mutex_unlock(&cs_ctl->dsp->pwr_lock); + } else { + mutex_lock(&cs_ctl->dsp->pwr_lock); + ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, scratch, size); + mutex_unlock(&cs_ctl->dsp->pwr_lock); + } + vfree(scratch); return ret; } @@ -455,7 +460,10 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kctl, mutex_unlock(&cs_ctl->dsp->pwr_lock); - return ret; + if (ret < 0) + return ret; + + return 1; } static int wm_coeff_get(struct snd_kcontrol *kctl, @@ -682,10 +690,10 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, int ret; ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len); - if (ret) + if (ret < 0) return ret; - if (cs_ctl->flags & WMFW_CTL_FLAG_SYS) + if (ret == 0 || (cs_ctl->flags & WMFW_CTL_FLAG_SYS)) return 0; ctl = cs_ctl->priv;