From patchwork Tue Oct 25 00:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9393875 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B65F560762 for ; Tue, 25 Oct 2016 02:29:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6A7829282 for ; Tue, 25 Oct 2016 02:29:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AECB29284; Tue, 25 Oct 2016 02:29:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3E4429282 for ; Tue, 25 Oct 2016 02:29:58 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 56255266E16; Tue, 25 Oct 2016 04:29:57 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A12C7266C4B; Tue, 25 Oct 2016 04:27:39 +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 A8940266C5F; Tue, 25 Oct 2016 02:37:46 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 1CBD726683E for ; Tue, 25 Oct 2016 02:37:39 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 25 Oct 2016 09:37:38 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 8179547877; Tue, 25 Oct 2016 09:37:38 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 7061F18070; Tue, 25 Oct 2016 09:37:38 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 6B31A1806F; Tue, 25 Oct 2016 09:37:38 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id KAX21606; Tue, 25 Oct 2016 09:37:38 +0900 X-IronPort-AV: E=Sophos;i="5.31,543,1473087600"; d="scan'";a="223816512" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 25 Oct 2016 09:37:38 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dC7JTE+T5zfGtmlPbfyEhHQS40uf9CmjXl84/HpXtys=; b=TL179rr1ebXkijiuaud38mWygjL7nHvuTs/Z+kEQjZ37XF6kuvPoLs5MbXAj8qApTx5O/5plpINKDgqiCpWdqF5eqKwv7+7PMumTgmIFr/CROcuYWPPGAtCh/Z4sEmuibXQHirNNlN+MQPjOdJgqZoOWAxIVS09v6jrI4Y1Ijlw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Tue, 25 Oct 2016 00:37:35 +0000 Message-ID: <87ziltb7ch.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <878ttdcm17.wl%kuninori.morimoto.gx@renesas.com> References: <878ttdcm17.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 25 Oct 2016 00:37:35 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0030.jpnprd01.prod.outlook.com (10.164.161.140) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 787d4d61-4a3c-498d-197b-08d3fc6f1dda X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:tPDBGlU8SNOiMhj1jdGaoKwLtpa6CiU2UqksBpa1dqtk2I5oetM22fOBieLevqtDf0EoU/ITAyzY+SmCsA/NTcjWixCiuogLsX1V1icoi/3l0JPviacPe7kGqgaD5IpLEt0oDjJivsXz8DaJUE3j3ukWm/GqPmIJPuhBDooDqSF3comXNuWwN3ETaQljhD1+ZjCS5TdD9vzelSDGUTxryg==; 3:S9S7F2SUtB+7QxIVlcere4ke4Tjje3CUuSKwZWBwLbnpRFMMKtdNU6rsAJWZ7abgZqVY5DdbzArl59aJpoe/Ng9bOufp8bZ6OF/B/w/XA0kdG3OHYbT5u8UjuPbk3ESjYY4wQyGQPQuikNMdrM+qfg==; 25:k4ClIW47M9QjbRYlNHtp5hDEjp0bjDg/hqQ3Tu4mVFyoHFLs2iz3sfqeH+chweAm8Mdi3P1bRcnuQ4k7HjR+tzBOy6uM96YW/lkyHRgeqkcJk3TBhO622WImlp2j+P4QKdiC2XJl9eFMUH86kQz8BDddvpbKU9JcSwSB6rm33Ym0XYlByXaMH7n5u5iilVTZSQzDvKirs8yz2i6XNzRokhpZKXyFFtmeCXdxwh+NuiF8Bp3vFf2Ui3ZKCrx5QV3xSBTrTvukHwj1r25pUYirSFtcYXAU+m8b+9AnDlfJdUj9k5z0g7W9UJdYjndUUF3rh5tA64D8iHs5B7oJkVLGQbhTOEeQS1E2k8SqD13RG8nYndP3Wh48HMfbeMK7MsHS0Chx7rF6b9mnSSA5lpHgF40DekPiDV6+azoX4n78OlzwR4WDzCsmpz/rZxQpf5an X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:YOAPmNOCvcgQfN8nUZJNeEQYiCcG0pIcqCjWQKzoDPbhWtSAo0RRoG2uObj1/optERBS7tyE+lrhWqj91OAf9EwVBRuwAgMYDJSRv71eAd1q9a/L06Q7lWX9JsRQmtmkK/K5Cy3NWQYJmA3Gy4wrOEV7isIl25bbzGISunsLOYCNm18Uw9JCkp4v579WnRQ3DH18QPQm2snaWWpHi9sREP04C6yW9wjUNOiAr1MdObR8/XzzB1vzfQVIiAYXyw++/dD6adCV153GlSxugcnV4g==; 20:gzpm3KFjdQlhhCjLRNoufplN7mZYK6fqP5PGfRnqtu3/ncf0Ar5fRjcUMlRkeFIg7Ap5QT/uPVWE5xDcOJmsDY7UwSP5v2kTCwIKGMWrTVDFR00waFcOCzucvWs01Thgwi3V2chjRyeh/ftUbWtF7aiL6zIpu/Ir+IrGqAI1BX/9PCUFRclDgPgKL8dxL5fgjy6rs++EbWeRiN3EICS9sj04JdrqECmUX2A/RjBNBu9yFj4Wu6VsDVG3zWDUQtC+yYAg7Y0anJbkDSqkCjVjVIvcB7LZqZLHG1U2Q+ntOkxioASaL9vQz+dbb+8W85Ht0QskkSvEe54Is1GmOefn8vT144oUstDghWQR+ZS3Vsffhm2wSkqiDuE9g/6JuB2Yxkv5Th4n1LB3Hq4BxuWgE+l9mfQJ5Jk0fCMFzfQv8loX57cFk6qJ9i3WL3lVdb/Nr5viFe4V3BZwVi4PBUeH1G2aSY+fyAHefmn/TnLh5ZKby7tvCd59+Yx5WOf2phdy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:SG2PR0601MB1453; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 4:zqHkYKlCcoyrAcRICy7DQ8qj+qnpuu3DRxqVsioI9WumN6DX4i5r5mRY03elnsBKaYl2XEPwoNac64OUkxIIh0yqfqCxeCMvVOsWUH+nBUUZd97tjHumLdudtk6d3bqgJ1PPSG4stzCscg2M+GnDIzOTuk+4DUV72nl6WB/A9O4NVSqCCx2i++kZGRF40nU+Z/9WmAdEvE5M1fOfg0woNu5sw5Ngiy/YgVw2OxbGk0hKom75+XHzPkIz0E86TbRIOEFwGV/AYQZ4T3auzL2WknRG/6vBRGIjz19pD+92GyhH9HztH13hjTZJnKuq1EmRkJq3gjO9tjiL8jfYOhYUNLzKTjpKeR2lZwQ5Uin9vAVDD3YjhERgg0R4+6RMkn7/PkPqlvPQlUePIQ/KGsa0fhOc4eNuqFKHo/d5joOMRH8= X-Forefront-PRVS: 01068D0A20 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(92566002)(6916009)(2950100002)(110136003)(189998001)(4001350100001)(97736004)(5660300001)(7846002)(77096005)(305945005)(7736002)(50466002)(66066001)(47776003)(33646002)(69596002)(68736007)(229853001)(76176999)(50986999)(2906002)(54356999)(4326007)(81166006)(81156014)(42186005)(8676002)(53416004)(106356001)(101416001)(83506001)(105586002)(86362001)(3846002)(23726003)(36756003)(6116002)(586003)(19580395003)(19580405001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:wVpr+kkP/HOAb/gXuukjs48cIIb+YVg6MhsiLyn?= =?us-ascii?Q?8Tatdf+d4UaqZ1dFOhJdS6ejoZ+1+LQ7+NxrbHlSGcP4/baoaX1AjbY2dp8S?= =?us-ascii?Q?ndwNaBUhnrTkKMP1h/8wWdYEqWJPzJrhbsIkq7CfphZNYQh9nGL4NG+5DeYx?= =?us-ascii?Q?gMVNIMVNrSUioe94ldphOTom2a3En79eYwFr2W2iwt/+AD51mypcKmRWmcMP?= =?us-ascii?Q?EehqRh/n6uxh+qACi9Eddbl6HJBYcKhm4GwCT5abBnrHsNkpujIsNmiLGwMn?= =?us-ascii?Q?V25T8ZE+aeVg1kKa4eWASnmXD9sGmzsdz95dezhOuIEjosMYKZ/99xE7ncLe?= =?us-ascii?Q?A4IJsKEijy6prTmXp/JzSkoMJJQlonz/aQ8JiI4IxBlhB5W5jnYdzIepS1CV?= =?us-ascii?Q?c3btLO7WryVSVBT3JUPQ0jonYCksbrg7LwyOzgMTt7x7EuOTn4nD+gglS2FB?= =?us-ascii?Q?ru533XQc08iaAndz2pJpzSo7I6bkrZS1b+cJZfk62pwojLX6btOFDBkWxEsn?= =?us-ascii?Q?ixlBDrqdSA44IGMBctxbbAlhvo8uaqyb7mEfym8mAkAGCZCp+6edv1hyEsfI?= =?us-ascii?Q?2QtIV3efksBKKi+PSlwSiTtTF5jmKa6W3jaSuq2OySqMAAmW/vNIphvYbwvA?= =?us-ascii?Q?+1XJiT65JetyC2JfEGwHV3teLw/ss9Ez4I+1572kNKjNpGICGUPVhxBFPxse?= =?us-ascii?Q?twrojqtgUa4oN9t0zXabqtcoThqpHZOXk8mIkEMkbyTzUBMBSrwQpGaTx57W?= =?us-ascii?Q?WR95BiEGIMtZz0W2FTq0yU2MUHQkOfneQVxKCuWPiLpEg9qefV5TzLuTIbEN?= =?us-ascii?Q?GCp+TGbQYX2irdvRYhjvcxz8OGP7owHL1ZumSNIoFnrbCu+Cl7OJ0rrZoFaa?= =?us-ascii?Q?/4+lahBy/P3m51cY0SwDoy6Da5/P+JNvZXin2EXyxHfc3Of1ivKlwa98RZMK?= =?us-ascii?Q?duPiWBlYaRA6h8krpYPw8jtkVEBS6zHBGZuw3N+K65/GWE0Sarrv8q/+imPe?= =?us-ascii?Q?kmcKAKahHz3263BpOZkCRYv9bEnecShUz58FBmq/lCebydQjVJXQ8byrWvlD?= =?us-ascii?Q?qEnTUOAI3qseQPIgpi9HiNz3GF5nydNORvZRFVK50vtBpFkkprVAD0RFBqGE?= =?us-ascii?Q?P7ynaVcdwFEVsdFAqVkMdbAp7fSI/Gio+UHEePT5wBoou7BNsYlJYF+Kux2k?= =?us-ascii?Q?Nf6i423+N8IYNuJ0=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:k2EgC1owmkxoJFsrEGJ5u9bI6uemHZzDxgSPwtD+TqqjFda0fkvGbIILS4Qq5Uu16uCjKR7Qam05CaIXXOgub9PzgXJ/VsGe6xpfwCZyVT5JH3dMUAOA6f8PSslKOhCc9xb9ar3NwrX8ZWISgBqvnQ4EwbRGor3ttC6B6YnrUPa2gIPuCXY4RDz3nPBXtX1tknputfqUo2FFnnRTsJO3xYBJ3DHBA3BcUPMKxXPtoMsqaRASrIu318jzfFXaWDpocaf+ReKacJ05WQ0zoyAhDbt2tzqeAaS86eXmQH4YpcZ6ALktMY2Nzqgdg/ybVeQemC1g61FFYGEhKVm0t4yZSA==; 5:QJdd+0QMRxmurKTl//+68cDy0ZyqpvANqY7A69bM9DN238VKRjY2PLvhv3Y+rLKTDAwFM8wKV/SmAUrjqEsggCsONEmQbqYXr6MMfUAJRabPpsEoMnrZP/5izT+KUzwa1PqffxsOx2ikEgRRrtzRXyjy/Tzgpo34nQ52VwErr9Q=; 24:fLR0/VrFzWtdOF62cLPMiEh+Wxk5zIJPQ3CfkWO3jNzDbVJXwRFRoYstSTzSZrIrbWkNYz2/3XkqmBhqXXe81LI9PtG2vn8fzKzmuAUr9ew= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 7:6C6iWkhizHzTbtXpTjVVVyV7d5f9+28hJ8cE8+hOE35H0ee9AKciWE0Du2hNMEfLzx9u+3OQcYiPrAVQ8ozLDKDj2EiQB7XtzUoH3t4HvuhNHk9PcebFANJtjZhXrHwKzofBQZO8E7HluqcqkMyUiGxBVXzPbqiHZuFOnzSLzDcioivZhwWq3ONceQYYsuAPk0Nu40ENlaS4/Tih7eAGZW1EI+Tob9bmJdhQf/x7jKvtzolC/usN9YuCQKPD7ckawc8RpV4wfbAXUC13CuKzju53Z/jlJkPSAIRvwNRO6hxb/CLSuU7flWmlhINd755+CE0eMO/BqDH4A+Pol0LvCVnDt+b43tPSxoHJaqw3pbc=; 20:z7rv9RCuuJkBKsdzqw3lXblQbmueNOdc2HVSEbfNDp9hOM4kwbxFUGF/+gsqjMgTcA+Ovs/aLSO0krnIE4Gv5/Qt0JQeDmzhlZMNm5ZhOUYkcT/Knpq5e9A5pW00KK8WAS1xs15PDJOrrWHnoyMqhyXVW2aWVjv7WVh7Ckz/ps8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2016 00:37:35.7030 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 6/8] ASoC: rsnd: add nolock_start/stop callback 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current Renesas Sound driver requests DMA channel when .probe timing, and release it when .remove timing. And use DMA on .start/.stop But, Audio DMAC power ON was handled when request timing (= .probe), and power OFF was when release timing (= .remove). This means Audio DMAC power is always ON during driver was enabled. To fixup this issue, it should request/release DMA channel on each playback/recorde timing. But, DMA channel request/release function uses mutex lock inside. This means it will breaks current spinlock's interrupt protect. To solve this issue, DMA channel request/release function needs to be called from non-spinlock area. This patch adds its callback. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/core.c | 26 ++++++++++++++++++++++++++ sound/soc/sh/rcar/rsnd.h | 15 ++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index ea14a14..9ffa299 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -716,7 +716,33 @@ static int rsnd_soc_set_dai_tdm_slot(struct snd_soc_dai *dai, return 0; } +static int rsnd_soc_dai_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); + struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); + + /* + * call rsnd_dai_call without spinlock + */ + return rsnd_dai_call(nolock_start, io, priv); +} + +static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); + struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); + + /* + * call rsnd_dai_call without spinlock + */ + rsnd_dai_call(nolock_stop, io, priv); +} + static const struct snd_soc_dai_ops rsnd_soc_dai_ops = { + .startup = rsnd_soc_dai_startup, + .shutdown = rsnd_soc_dai_shutdown, .trigger = rsnd_soc_dai_trigger, .set_fmt = rsnd_soc_dai_set_fmt, .set_tdm_slot = rsnd_soc_set_dai_tdm_slot, diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index c1cee1a..422b534 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -259,6 +259,12 @@ struct rsnd_mod_ops { int (*fallback)(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv); + int (*nolock_start)(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv); + int (*nolock_stop)(struct rsnd_mod *mod, + struct rsnd_dai_stream *io, + struct rsnd_priv *priv); }; struct rsnd_dai_stream; @@ -276,8 +282,9 @@ struct rsnd_mod { /* * status * - * 0xH0000CB0 + * 0xH0000CBA * + * A 0: nolock_start 1: nolock_stop * B 0: init 1: quit * C 0: start 1: stop * @@ -287,6 +294,8 @@ struct rsnd_mod { * H 0: fallback * H 0: hw_params */ +#define __rsnd_mod_shift_nolock_start 0 +#define __rsnd_mod_shift_nolock_stop 0 #define __rsnd_mod_shift_init 4 #define __rsnd_mod_shift_quit 4 #define __rsnd_mod_shift_start 8 @@ -300,6 +309,8 @@ struct rsnd_mod { #define __rsnd_mod_add_probe 0 #define __rsnd_mod_add_remove 0 +#define __rsnd_mod_add_nolock_start 1 +#define __rsnd_mod_add_nolock_stop -1 #define __rsnd_mod_add_init 1 #define __rsnd_mod_add_quit -1 #define __rsnd_mod_add_start 1 @@ -319,6 +330,8 @@ struct rsnd_mod { #define __rsnd_mod_call_pcm_new 0 #define __rsnd_mod_call_fallback 0 #define __rsnd_mod_call_hw_params 0 +#define __rsnd_mod_call_nolock_start 0 +#define __rsnd_mod_call_nolock_stop 1 #define rsnd_mod_to_priv(mod) ((mod)->priv) #define rsnd_mod_id(mod) ((mod) ? (mod)->id : -1)