From patchwork Fri Apr 13 11:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133365 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp622213ljb; Fri, 13 Apr 2018 04:24:56 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+XvB2MY5Dnw15zIldCnshYAF6gzCh6au04T3mOYpD+MsJlQt/qvDViTWvyCmKlrExSX2j/ X-Received: by 10.223.209.72 with SMTP id b8mr3504803wri.122.1523618696144; Fri, 13 Apr 2018 04:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523618696; cv=none; d=google.com; s=arc-20160816; b=bZosr6sr6seUW07jCbCY/MqcUtx2qIk298tAy/z0AHtM0UzHVh77C59hhMzGMGn6Ui gU+byc9fYeo6lp/BeSev6Tr/pBzqaUg9U0uVEh5wvopUgObyxGnm884plJGVH7a1WwQ6 wf8cQfAqO4M2ScLge2HAHJ/B61hZ3UrMPN8i63WJeBCM+l0ELCtqrxVoji57cWARtDm3 KolaCucFl1CP6XO+yY4vHMqLAJ9nSBOoizsW2AsZR6x/f6/LHpBMnuG5QxT+4wQZII5j dpSIU0yLCvz6USlCt3DII+1bsfnHGkvmEBEuEUicxUj5bJ+Cxz3oAfeO9b5YQrJkgrMC lKVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=gW8pRV4P911mF44csaGh2AT4tW2P+kydMMSwIaeMSEQ=; b=ejcRRYrc8raL5PlWebfkbF9IKSU2ysoLsphvvb34HU1pHQQtCt1Q7O4IxEJD6Xk1sV TwjbZawSlj1rhxZTneErZxXCbc5A97W9MvcXiRfziLbsT9SjomyciuRojwsQLUMi6T1Y 8gIGtkhZoaC9cYHJoZisHxu7aHazpPXyZ6Cnt2LLfij8IS0lIqlRWf1o7tjP71Tle3TB Na66rSyB+3WW33RIj7oXPOG/ePuYQJlvuHf4kwqvsMPyV/rQHtwqaRqLgdrUWwaxHhHg 43+Ax4ZB8gFsOHsNXqI+E8tAVM7CQ48WyT+5erAYHwiqv16/dAOiTToXg6D1wFBwqgOV kI+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=jSHVrPZK; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id d15si62504wma.224.2018.04.13.04.24.55; Fri, 13 Apr 2018 04:24:56 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=jSHVrPZK; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6B8A02673EF; Fri, 13 Apr 2018 13:24:38 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0337E267637; Fri, 13 Apr 2018 13:24:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id D85002675FC for ; Fri, 13 Apr 2018 13:24:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=VkWfdkXItyC+qubunSbjNsYgii7YQOHqFIpaXx3GPrE=; b=jSHVrPZK5gxO enhWwGDxsB4u68D9V5HOyGfTcQVUSuF12WuyYxhnbbypkatbIHBQYtDPJ2sbFNAwAeDt/7dIiFXkO 29YbbZzuD51CKFsZTjIzDVhcaiGQiVqKXhczZwOVkEuocc60higHCuu60sbUB4nLuc2CAVlhVZRWB ON8hw=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f6woY-0008DD-8F; Fri, 13 Apr 2018 11:24:22 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f6woX-0000I7-PH; Fri, 13 Apr 2018 12:24:21 +0100 From: Mark Brown To: Danny Smith In-Reply-To: <20180409131336.21990-1-robert.rosengren@axis.com> Message-Id: Date: Fri, 13 Apr 2018 12:24:21 +0100 Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , Liam Girdwood , Mark Brown , Robert Rosengren , Robert Rosengren Subject: [alsa-devel] Applied "ASoC: adau17x1: Handling of DSP_RUN register during fw setup" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: adau17x1: Handling of DSP_RUN register during fw setup has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d0f8b9c5a350ca6fa842b52bfb88b77b34ee485b Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 9 Apr 2018 15:13:35 +0200 Subject: [PATCH] ASoC: adau17x1: Handling of DSP_RUN register during fw setup DSP_RUN needs to be disabled during firmware write otherwise we can end up with undefined behavior if writing to a dsp which is already running firmware. Signed-off-by: Danny Smith Signed-off-by: Robert Rosengren Acked-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- sound/soc/codecs/adau17x1.c | 26 ++++++++++++++++++++------ sound/soc/codecs/adau17x1.h | 3 ++- 2 files changed, 22 insertions(+), 7 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c index 80c2a06285bb..12bf24c26818 100644 --- a/sound/soc/codecs/adau17x1.c +++ b/sound/soc/codecs/adau17x1.c @@ -502,7 +502,7 @@ static int adau17x1_hw_params(struct snd_pcm_substream *substream, } if (adau->sigmadsp) { - ret = adau17x1_setup_firmware(adau, params_rate(params)); + ret = adau17x1_setup_firmware(component, params_rate(params)); if (ret < 0) return ret; } @@ -835,26 +835,40 @@ bool adau17x1_volatile_register(struct device *dev, unsigned int reg) } EXPORT_SYMBOL_GPL(adau17x1_volatile_register); -int adau17x1_setup_firmware(struct adau *adau, unsigned int rate) +int adau17x1_setup_firmware(struct snd_soc_component *component, + unsigned int rate) { int ret; - int dspsr; + int dspsr, dsp_run; + struct adau *adau = snd_soc_component_get_drvdata(component); + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); + + snd_soc_dapm_mutex_lock(dapm); ret = regmap_read(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, &dspsr); if (ret) - return ret; + goto err; + + ret = regmap_read(adau->regmap, ADAU17X1_DSP_RUN, &dsp_run); + if (ret) + goto err; regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 1); regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, 0xf); + regmap_write(adau->regmap, ADAU17X1_DSP_RUN, 0); ret = sigmadsp_setup(adau->sigmadsp, rate); if (ret) { regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 0); - return ret; + goto err; } regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, dspsr); + regmap_write(adau->regmap, ADAU17X1_DSP_RUN, dsp_run); - return 0; +err: + snd_soc_dapm_mutex_unlock(dapm); + + return ret; } EXPORT_SYMBOL_GPL(adau17x1_setup_firmware); diff --git a/sound/soc/codecs/adau17x1.h b/sound/soc/codecs/adau17x1.h index a7b1cb770814..e6fe87beec07 100644 --- a/sound/soc/codecs/adau17x1.h +++ b/sound/soc/codecs/adau17x1.h @@ -68,7 +68,8 @@ int adau17x1_resume(struct snd_soc_component *component); extern const struct snd_soc_dai_ops adau17x1_dai_ops; -int adau17x1_setup_firmware(struct adau *adau, unsigned int rate); +int adau17x1_setup_firmware(struct snd_soc_component *component, + unsigned int rate); bool adau17x1_has_dsp(struct adau *adau); #define ADAU17X1_CLOCK_CONTROL 0x4000