From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH 2/6] ASoC: ux500: Do not clear state if already idle Date: Wed, 8 May 2013 09:04:48 +0100 Message-ID: <20130508080448.GG3102@gmail.com> References: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> <1367997261-32048-3-git-send-email-fabio.baltieri@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by alsa0.perex.cz (Postfix) with ESMTP id 08AD4261698 for ; Wed, 8 May 2013 10:04:55 +0200 (CEST) Received: by mail-wg0-f50.google.com with SMTP id m15so1512135wgh.17 for ; Wed, 08 May 2013 01:04:54 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1367997261-32048-3-git-send-email-fabio.baltieri@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Fabio Baltieri Cc: Ola Lilja , alsa-devel@alsa-project.org, Linus Walleij , Liam Girdwood , linux-kernel@vger.kernel.org, Mark Brown List-Id: alsa-devel@alsa-project.org T24gV2VkLCAwOCBNYXkgMjAxMywgRmFiaW8gQmFsdGllcmkgd3JvdGU6Cgo+IEFzIGVuYWJsZV9t c3AgZ2V0cyBjYWxsZWQgb25seSBhZnRlciBzb21lIGF1ZGlvIGRhdGEgaGFzIGJlZW4gcmVjZWl2 ZWQsCj4gaWYgdGhlIHVzZXJzcGFjZSBjbG9zZXMgdGhlIGRldmljZSBiZWZvcmUgc2VuZGluZyBh bnkgZGF0YSBpdCBjYXVzZXMKPiB1eDUwMF9tc3BfaTJzX2Nsb3NlIHRvIGNsZWFyIGRldmljZSBz dGF0ZSBldmVuIGlmIGl0IHdhcyBub3QgcHJldmlvdXNseQo+IGluaXRpYWxpemVkLgo+IAo+IFRo aXMgaW4gdHVybnMgbGVhZHMgdG8gc29tZSBub24gbmVjZXNzYXJ5IGJ1dCBoYXJtbGVzcyB3cml0 ZWwsIGJ1dCBhbHNvCiAgIFNpbmd1bGFyIF4KCj4gdG8gZGVjcmVtZW50aW5nIHRoZSBwaW5jdHJs IHVzYWdlIGNvdW50ZXIgKHBpbmN0cmxfcnh0eF9yZWYpIGJlbG93IHplcm8uCj4gCj4gVG8gcHJl dmVudCB0aGlzIGZyb20gaGFwcGVuaW5nIGFkZCBhIGNvbmRpdGlvbiB0byBza2lwIHJlZ2lzdGVy IGFuZAo+IHBpbmN0cmwgY2xlYXIgaWYgY3VycmVudCBtc3Agc3RhdGUgaXMgYWxyZWFkeSBNU1Bf U1RBVEVfSURMRS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBGYWJpbyBCYWx0aWVyaSA8ZmFiaW8uYmFs dGllcmlAbGluYXJvLm9yZz4KPiAtLS0KPiAgc291bmQvc29jL3V4NTAwL3V4NTAwX21zcF9pMnMu YyB8IDIgKy0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL3NvdW5kL3NvYy91eDUwMC91eDUwMF9tc3BfaTJzLmMgYi9zb3Vu ZC9zb2MvdXg1MDAvdXg1MDBfbXNwX2kycy5jCj4gaW5kZXggYTI2YzZiZi4uOTY0Y2ZkNiAxMDA2 NDQKPiAtLS0gYS9zb3VuZC9zb2MvdXg1MDAvdXg1MDBfbXNwX2kycy5jCj4gKysrIGIvc291bmQv c29jL3V4NTAwL3V4NTAwX21zcF9pMnMuYwo+IEBAIC02MzgsNyArNjM4LDcgQEAgaW50IHV4NTAw X21zcF9pMnNfY2xvc2Uoc3RydWN0IHV4NTAwX21zcCAqbXNwLCB1bnNpZ25lZCBpbnQgZGlyKQo+ ICAJZGV2X2RiZyhtc3AtPmRldiwgIiVzOiBFbnRlciAoZGlyID0gMHglMDF4KS5cbiIsIF9fZnVu Y19fLCBkaXIpOwo+ICAKPiAgCXN0YXR1cyA9IGRpc2FibGVfbXNwKG1zcCwgZGlyKTsKPiAtCWlm IChtc3AtPmRpcl9idXN5ID09IDApIHsKPiArCWlmIChtc3AtPmRpcl9idXN5ID09IDAgJiYgbXNw LT5tc3Bfc3RhdGUgIT0gTVNQX1NUQVRFX0lETEUpIHsKPiAgCQkvKiBkaXNhYmxlIHNhbXBsZSBy YXRlIGFuZCBmcmFtZSBnZW5lcmF0b3JzICovCj4gIAkJbXNwLT5tc3Bfc3RhdGUgPSBNU1BfU1RB VEVfSURMRTsKPiAgCQl3cml0ZWwoKHJlYWRsKG1zcC0+cmVnaXN0ZXJzICsgTVNQX0dDUikgJgoK Q29kZSBsb29rcyBnb29kIHRob3VnaDoKCkFja2VkLWJ5OiBMZWUgSm9uZXMgPGxlZS5qb25lc0Bs aW5hcm8ub3JnPgoKLS0gCkxlZSBKb25lcwpMaW5hcm8gU1QtRXJpY3Nzb24gTGFuZGluZyBUZWFt IExlYWQKTGluYXJvLm9yZyDilIIgT3BlbiBzb3VyY2Ugc29mdHdhcmUgZm9yIEFSTSBTb0NzCkZv bGxvdyBMaW5hcm86IEZhY2Vib29rIHwgVHdpdHRlciB8IEJsb2cKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWxzYS1kZXZlbCBtYWlsaW5nIGxpc3QKQWxz YS1kZXZlbEBhbHNhLXByb2plY3Qub3JnCmh0dHA6Ly9tYWlsbWFuLmFsc2EtcHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbHNhLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752434Ab3EHIFA (ORCPT ); Wed, 8 May 2013 04:05:00 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:55646 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772Ab3EHIE4 (ORCPT ); Wed, 8 May 2013 04:04:56 -0400 Date: Wed, 8 May 2013 09:04:48 +0100 From: Lee Jones To: Fabio Baltieri Cc: Mark Brown , Liam Girdwood , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Ola Lilja Subject: Re: [PATCH 2/6] ASoC: ux500: Do not clear state if already idle Message-ID: <20130508080448.GG3102@gmail.com> References: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> <1367997261-32048-3-git-send-email-fabio.baltieri@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1367997261-32048-3-git-send-email-fabio.baltieri@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 08 May 2013, Fabio Baltieri wrote: > As enable_msp gets called only after some audio data has been received, > if the userspace closes the device before sending any data it causes > ux500_msp_i2s_close to clear device state even if it was not previously > initialized. > > This in turns leads to some non necessary but harmless writel, but also Singular ^ > to decrementing the pinctrl usage counter (pinctrl_rxtx_ref) below zero. > > To prevent this from happening add a condition to skip register and > pinctrl clear if current msp state is already MSP_STATE_IDLE. > > Signed-off-by: Fabio Baltieri > --- > sound/soc/ux500/ux500_msp_i2s.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c > index a26c6bf..964cfd6 100644 > --- a/sound/soc/ux500/ux500_msp_i2s.c > +++ b/sound/soc/ux500/ux500_msp_i2s.c > @@ -638,7 +638,7 @@ int ux500_msp_i2s_close(struct ux500_msp *msp, unsigned int dir) > dev_dbg(msp->dev, "%s: Enter (dir = 0x%01x).\n", __func__, dir); > > status = disable_msp(msp, dir); > - if (msp->dir_busy == 0) { > + if (msp->dir_busy == 0 && msp->msp_state != MSP_STATE_IDLE) { > /* disable sample rate and frame generators */ > msp->msp_state = MSP_STATE_IDLE; > writel((readl(msp->registers + MSP_GCR) & Code looks good though: Acked-by: Lee Jones -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog