From patchwork Thu Feb 22 13:17:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129243 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp588096lja; Thu, 22 Feb 2018 05:19:28 -0800 (PST) X-Google-Smtp-Source: AH8x227RETdp/xuhaTLoK3YTHL379X7ZzBI3iW9ERAfy26M2FwmWhnaUmcYW2vMIWVFU/2EJ+qzL X-Received: by 10.223.156.193 with SMTP id h1mr5865302wre.281.1519305568248; Thu, 22 Feb 2018 05:19:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519305568; cv=none; d=google.com; s=arc-20160816; b=dJSvjo9NqIrL0RTLXCg12Z9gHfK7R9JLwZXBKiGFmpdIF7XjGZ/33VMSaSK3joJ5cA YSKDbbXT8T++H33JY03XjmpjmHtrSZoX7qvhP3RQgWoj1uet/PxUw39S/1RnvZZdKYwa NlH9uBQ+pDXD5cmqldXp3BTdQc8Wen+raBzNPNm7aZaym4i2MbzhGA7ziBPIeh2hmOTV kFRdqiBDawVPT7liElZrtEQPNRYI+OtD38b8FS6ExigcH/3bCaZxYf1MY1xL4fjw6JzD dMBh5OgeeXIycCOeVHZyu6pRvLTmhpcRfKZkRCJSboRBjMs6wzuaY0EKtejZXKMoVfT/ NMqQ== 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=46x3LbgDWebmZ0YAJ4vTPHZWDOOZ9Dhdkk5f/xqaipA=; b=P04j24ApA0Sm6G+HCff7iq3KBeWCGgRxKGZWlSi9jv13dwI9e1ObL7VBY9vhBYsfSv yg5eY3UJ/WIEzMH2jnY3TGFrf9Z9LnsYd3LOBPbZsS2Xn8/jkBItfCv6w5yutig7egKl KWk49BKZHBT2ebccwDmyxwg6Z1/4tQCqGZdgm9M0B0ZFDxRMNTz9KMfLqOCBOmk2r8MY ciX7kg9hJx+8CZZZfKr8/7ZVd0dY2zE6cKgZnle7Jivf3ZlecO2KXVc8lr3/l7pOP2m7 c4FLqpOqDg8R386kB+L/AZSnho01j9ZCKT51GdRnNYyp518BpWehR/ELJJFnht4PQ+/T Uz2g== 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=CaNsrVM5; 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 x17si241819wmh.104.2018.02.22.05.19.28; Thu, 22 Feb 2018 05:19:28 -0800 (PST) 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=CaNsrVM5; 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 4F76C267861; Thu, 22 Feb 2018 14:17:59 +0100 (CET) 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 1BFFF26785D; Thu, 22 Feb 2018 14:17:57 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 B16112677AE for ; Thu, 22 Feb 2018 14:17:10 +0100 (CET) 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=h/uiUMb6B14874MPpbbtkUqnIbtO2Fdc2/mdmS5K7Gw=; b=CaNsrVM5eSb7 pAUgkwPXF0hR7qDLTJT5Ex007H9crN/bEKDY7W3xVuFcKxoK19D+c1KgP+cb9/qtJKgD4elwSL4a5 rNUuiQzGjUx98kQRcpiXzTBmcj528BfM3xRk+XXNHePMOPs2StST9N9DI8NmupVkbIlfuDzYBUdC4 3k6/8=; 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 1eoqk9-0002Vj-0Q; Thu, 22 Feb 2018 13:17:01 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoqk8-0006Qq-HP; Thu, 22 Feb 2018 13:17:00 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1515990087-11598-5-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Thu, 22 Feb 2018 13:17:00 +0000 Cc: alsa-devel@alsa-project.org, arnaud.mouiche@invoxia.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, mail@maciej.szmigiero.name, caleb@crome.org, timur@tabi.org, broonie@kernel.org, kernel@pengutronix.de, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: Maintain a mask of active streams" 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: fsl_ssi: Maintain a mask of active streams 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 e0582731abe004163e78ad2dac4cd1196db0908f Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 12 Feb 2018 14:03:12 -0800 Subject: [PATCH] ASoC: fsl_ssi: Maintain a mask of active streams Checking TE and RE bits in SCR register doesn't work for AC97 mode which enables SSIEN, TE and RE in the fsl_ssi_setup_ac97() that's called during probe(). So when running into the trigger(), it will always get the result of both TE and RE being enabled already, even if actually there is no active stream. This patch fixes this issue by adding a variable to log the active streams manually. Signed-off-by: Nicolin Chen Tested-by: Caleb Crome Tested-by: Maciej S. Szmigiero Reviewed-by: Maciej S. Szmigiero Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_ssi.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 14046c32dc07..b277a563ff48 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -205,6 +205,7 @@ struct fsl_ssi_soc_data { * @cpu_dai_drv: CPU DAI driver for this device * * @dai_fmt: DAI configuration this device is currently used with + * @streams: Mask of current active streams: BIT(TX) and BIT(RX) * @i2s_net: I2S and Network mode configurations of SCR register * @use_dma: DMA is used or FIQ with stream filter * @use_dual_fifo: DMA with support for dual FIFO mode @@ -249,6 +250,7 @@ struct fsl_ssi { struct snd_soc_dai_driver cpu_dai_drv; unsigned int dai_fmt; + u8 streams; u8 i2s_net; bool use_dma; bool use_dual_fifo; @@ -444,15 +446,14 @@ static void fsl_ssi_fifo_clear(struct fsl_ssi *ssi, bool is_rx) static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, struct fsl_ssi_regvals *vals) { + int dir = (&ssi->regvals[TX] == vals) ? TX : RX; struct regmap *regs = ssi->regs; struct fsl_ssi_regvals *avals; int nr_active_streams; - u32 scr; int keep_active; - regmap_read(regs, REG_SSI_SCR, &scr); - - nr_active_streams = !!(scr & SSI_SCR_TE) + !!(scr & SSI_SCR_RE); + nr_active_streams = !!(ssi->streams & BIT(TX)) + + !!(ssi->streams & BIT(RX)); if (nr_active_streams - 1 > 0) keep_active = 1; @@ -474,6 +475,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, keep_active); /* Safely disable SCR register for the stream */ regmap_update_bits(regs, REG_SSI_SCR, scr, 0); + + /* Log the disabled stream to the mask */ + ssi->streams &= ~BIT(dir); } /* @@ -549,6 +553,9 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, } /* Enable all remaining bits */ regmap_update_bits(regs, REG_SSI_SCR, vals->scr, vals->scr); + + /* Log the enabled stream to the mask */ + ssi->streams |= BIT(dir); } }