From patchwork Thu Nov 28 16:50:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 180448 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp373685ile; Thu, 28 Nov 2019 08:50:38 -0800 (PST) X-Google-Smtp-Source: APXvYqyUF4+T6yTllAh3vDkszkJEv9VLFTwkJOV0fT7oDqbMxLgzyKkQMS/NAWzNq0XeJV6DR+EK X-Received: by 2002:a17:906:76cf:: with SMTP id q15mr38411755ejn.247.1574959838430; Thu, 28 Nov 2019 08:50:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574959838; cv=none; d=google.com; s=arc-20160816; b=qm3oVr82PhmwIP3SAMXFvQ2UeIeoTgpEfKW3XcWZsbzECAMRhSTjTBikfmJnD66dok SaekrMm3AHG8DrAlY1YhsegNqPNTRExYxg9A6HFQlr6V0xAcOTl3+hW1daR7NeZIBKmN lV0lDW+y4x917YGGBZTdEY3JPnmKFEQi8LyQoz0ub/qF9dznQJbaU1H05AThybCV7TxX HgiDfLo5fpKpjCLX8GqaSiKYkj8exUH35zrrDERyFKnTLld83fkc1+IBby1CfBdMFKVZ s7hVHc4XxaYppPgn0rc5a+Uoij4En5EGv2ihCagMEN55w/vewbda/StwjoPTxtyCaVN8 ifkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=j3tKRddo0sP/VNAlHyU3woPmGtLiTh7D/WlbKBjTt+o=; b=TgW51WHqOzpsr8/K1qetxjzj0s3L+L3bHNViqICWrVW547VQAzmrIyjvBAiKLfLGHv gboDFlD3ZzZ4lP09YvudGr217bi2azdW5oXJdd9Bqg/fJY3SLdljvSYuv0cO9SPasRfF UOPSKi1Kx1CbmOqNn7SpdD09Ph3NHle9w5Fv0p8s+Yrx3P5ArDeVzVVwaOorw18jEqjG DEAkCNJfxq8uZw00o0hBcsrPjAPW+jgT+kMvoGgiK0SrqUMp9tnvIAExE5B5dDDogUWx VWncgmkhVeH6vOId1ZeyqbCfJ/PRi3IS5sPrZWGgicoQB6i5gqKbJnFrseXL83h+eg36 7YYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqAF6te9; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v1si3296298ejr.0.2019.11.28.08.50.38; Thu, 28 Nov 2019 08:50:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqAF6te9; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727118AbfK1QuT (ORCPT + 15 others); Thu, 28 Nov 2019 11:50:19 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:38237 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbfK1QuT (ORCPT ); Thu, 28 Nov 2019 11:50:19 -0500 Received: by mail-pj1-f65.google.com with SMTP id l4so747321pjt.5 for ; Thu, 28 Nov 2019 08:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j3tKRddo0sP/VNAlHyU3woPmGtLiTh7D/WlbKBjTt+o=; b=rqAF6te9rthxTZcjJVMOHReLi4Ieoi1PglEBAato0h+n0Nte51no34MOFzYYTnECH7 tjTEGEoyXtjxOY9bbCX1BEZbD1S9gXhuEU3FurHraYK6FfyuLO2wnwN9spCkBk1vBXG9 oZ4ydp3GGO82nT0eUUczi+ThQKTSsyUmPY7YYKA2BdQO6VZoTO/RVjfC0I2Q6ktbxPhR IEN+Bl8Shj2G6ap1l4T2tFQAzKaxwz7/BHTdJMeslUFTaoUgFxR0BgMbPmzl4tX/My7l LLEm4c7IOb6zdU2ScOJxnZH96HtYv9IiHEGbJg/rew3s66cM6VfHq2DSxyfGyg1jzfeZ JZqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j3tKRddo0sP/VNAlHyU3woPmGtLiTh7D/WlbKBjTt+o=; b=JDxgpqtj5wFN960fo/20crO85HW/8JHdQKKXimOILNM5+od1+L34hxVZ9I1Y1BzkTJ miAL27OIRId2yjtONUG0xZYGc3IVrq4dvH+c34+YSLygR/7gOKsOU9FBtZYihGyz/VXk CqVpFXgJ6uhg60AvuIlJBdH4ErF3IXiDJJjPlPT50Nxvi2vdmO4m/sZVS/2fjCmxDeRU 3HexwMgcMLxQMukbfnkhu54Nc+Gjyz63YQLn+wei3D361RpOM5luqCK4u+aCG351MVzp P2NPbAewAby/DDqp9cTzFBST9hru8ovRxKdn9hyAsOLbjj4iFr5hl4wvMp5gXXGYQGK+ tEyA== X-Gm-Message-State: APjAAAW10nSCLMgy0d1N7cBUs/NrIoZwIYW6D/UZCBRbwtBiPjs5mH9F wgJzRDC95BFRfWryCyfrKqVyUSK0IQY= X-Received: by 2002:a17:902:ff0e:: with SMTP id f14mr10621260plj.3.1574959818336; Thu, 28 Nov 2019 08:50:18 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id a15sm2450343pfh.169.2019.11.28.08.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 08:50:17 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 15/17] ASoC: stm32: i2s: fix IRQ clearing Date: Thu, 28 Nov 2019 09:50:00 -0700 Message-Id: <20191128165002.6234-16-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191128165002.6234-1-mathieu.poirier@linaro.org> References: <20191128165002.6234-1-mathieu.poirier@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Olivier Moysan commit 8ba3c5215d69c09f5c39783ff3b78347769822ad upstream Because of regmap cache, interrupts may not be cleared as expected. Declare IFCR register as write only and make writings to IFCR register unconditional. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- sound/soc/stm/stm32_i2s.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 004d83091505..aa2b1196171a 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -246,8 +246,8 @@ static irqreturn_t stm32_i2s_isr(int irq, void *devid) return IRQ_NONE; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, flags); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, flags); if (flags & I2S_SR_OVR) { dev_dbg(&pdev->dev, "Overrun\n"); @@ -276,7 +276,6 @@ static bool stm32_i2s_readable_reg(struct device *dev, unsigned int reg) case STM32_I2S_CFG2_REG: case STM32_I2S_IER_REG: case STM32_I2S_SR_REG: - case STM32_I2S_IFCR_REG: case STM32_I2S_TXDR_REG: case STM32_I2S_RXDR_REG: case STM32_I2S_CGFR_REG: @@ -547,8 +546,8 @@ static int stm32_i2s_startup(struct snd_pcm_substream *substream, i2s->refcount++; spin_unlock(&i2s->lock_fd); - return regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + return regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); } static int stm32_i2s_hw_params(struct snd_pcm_substream *substream, @@ -603,8 +602,8 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return ret; } - regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG, - I2S_IFCR_MASK, I2S_IFCR_MASK); + regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG, + I2S_IFCR_MASK, I2S_IFCR_MASK); if (playback_flg) { ier = I2S_IER_UDRIE;