From patchwork Wed Oct 31 00:48:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10661919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9744913BF for ; Wed, 31 Oct 2018 00:48:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE0A9294D4 for ; Wed, 31 Oct 2018 00:48:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1A9D294F1; Wed, 31 Oct 2018 00:48:29 +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=-2.7 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham 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 71492294D4 for ; Wed, 31 Oct 2018 00:48:28 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 27B6C2677D1; Wed, 31 Oct 2018 01:48:26 +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 1CAC02677E2; Wed, 31 Oct 2018 01:48:23 +0100 (CET) Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01on0109.outbound.protection.outlook.com [104.47.93.109]) by alsa0.perex.cz (Postfix) with ESMTP id 4E96126770D for ; Wed, 31 Oct 2018 01:48:15 +0100 (CET) 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:X-MS-Exchange-SenderADCheck; bh=BNVqLLkLQzkSsGjhbNmQBpHAVE+I/vv/Djn7Poo/VR0=; b=TQiLArclavrHHoaaoa/wOGuyLDpFhBmDbc4D1p18nnZcXLs+s05R+oBacjmRnKGcwSOQLu107XMeo57uwZE7RPWfLWRCD2J79sQqS12EkOqBYvUCiWS8y2YOPBpbsAOvSnpg3vDxD4uTlwMKCAGPBdxWZWFb9aZt5Cu27Z+AUrw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by OSBPR01MB3317.jpnprd01.prod.outlook.com (2603:1096:604:2e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.30; Wed, 31 Oct 2018 00:48:12 +0000 Message-ID: <87ftwn0x15.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 31 Oct 2018 00:48:12 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY1PR01CA0174.jpnprd01.prod.outlook.com (2603:1096:402::26) To OSBPR01MB3317.jpnprd01.prod.outlook.com (2603:1096:604:2e::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c7ac1c2-bbf9-4f6d-136b-08d63eca8911 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:OSBPR01MB3317; X-Microsoft-Exchange-Diagnostics: 1; OSBPR01MB3317; 3:k1Jdhlxo18/NxbnMSh4yHV3zjRvGWZ/qTANeov78dQeKvoXF4vOCeBIhUYd0qbLDGkvZGmLSMMGw7uaDQ4QIQKzrPLY4C8/Y5/BPKo/OJpkmSsq4CRRnFeTlHTn4pys/NoeDd7DFR8qgMJT0i3bGBPOev7xAg4jVQzOzvT2lwc8MOultaZuo2N848Oum7G3vKcuez93U0ReDdt6ynGIObSfwMmzdMEVa7XUiXgIquWLSO0KaVJdUhIpea+pcH9I3; 25:RdO06ZNo3Ir7oSLvcpyuq5jhiGK9vhWiwrwipdj8Az5e4p/IGCK9NOmuXEJbDHdqBEcj9n2Ge4jy5bUvLBb3HNAeHDqTgPXn9pC22CZ4St7Fy/iuax1HbOTt1TXqzDNshdC29lSYDLndOZhrygJlDcd2q4JLfY3VuzoyUEH4/Bk1HChO7vI/7lIVFwx5sU6kfn8dOV6Z+Uy8uQ3zXN3fCPxigvFyF6MR0lw9KKFcNVcowy/+p6DROhIXbTBYTeiYUuNktrVn+5fmbZ0qp6SLRabPMTTyZVmG5Q+rLGBvyl6uglBroUzi+wPQdeWdZFyshiji/sVwV8Inw+6kTtd7WA==; 31:MLa9EbJkVfPmq2OK5SnrnZTWQWWPhcN/lZjWE5LzcwWoFPHv1rC13Z+zHb7tsSRqtTbm+npSU4HcqTfsMDENQu92ctDURvZhXCHDYhHm4JfFzF8TMWgwQz4sQCxzH5sFQsqbcawVrGXscRvFYmyWQ+4B2BLQyYuzbykCFrdcL+7PXTBiQi+n6LfpN1ZB4kuw92i/MNIwR35nvYtikYO1bkmzdKBrErMUfOm/rge1BEw= X-MS-TrafficTypeDiagnostic: OSBPR01MB3317: X-Microsoft-Exchange-Diagnostics: 1; OSBPR01MB3317; 20:G7xS4J61sI3pj1Wwg6x/hx6wTber/Thy4fv9Aq77WKNbqZAe+9AoR3rWwq/SaHTD6piwZOTY3aty2+PB0l9iGVOCv+ylxAyIrb6RgQE6+41eHl01nJk07HIiNPDfDhN1XQa0Pay3NZqAyf/oLODQBdU7c0IJteqFZYDwP66SxgML2OR80RgUoqLC21LM+E0lklX5B6eu/SF+9CDwsnkBwDbYJf5o5amk+GfJlJkSP7JRFyETqle6sBYgcbVVcDL2P8FTlimJiYzUBqsu7lLWrwHenVXOI330Azc1/l/jqtG8ZaqjbAKIRJDAaKADmmU/kv7w3JeL+M8/ZqTYCT0BPmVLxWOXzM+cYrrYt68LMntCJ8gwvjYU2YeYaAXUClCJjzt6jh1kVpcWaUKPoal2H1LHKjvNiavx/dy0f6SWE5JXOcpl4/fi1DxaOlbfQqtiSvF+IXv/REYI3k/KbdWIzXrWknn4+qefid1/s7dgyWseIs8DhqnoCBD4px2T7QGc; 4:jG8C1RdIYG/eSVPIFEqkiGpnVvIUZUxKCsT/gwAskaaw9k7q+JUSmhmeaOzf25Dj+icvQigo3g4pQQbRdrxpDLZsXW3Xahl3FPMR9fwdzlMYxBmvsd5z0tjp9uiChnbPX7PaDqDV/XLYuU4Z7Ij/ItZGjJojxurdF+cdvziQ6BNJDftvk1u+UTGK1wKEJzkKSJahRx2lS1COZDr+WmlqumS3rP64T5y8toOTq9Qo8Tbfug7sv6qF7zJzTM7N3TOjes+BpFaNwvGoKPGN4XI2+A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:OSBPR01MB3317; BCL:0; PCL:0; RULEID:; SRVR:OSBPR01MB3317; X-Forefront-PRVS: 084285FC5C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(396003)(39860400002)(376002)(346002)(189003)(199004)(58126008)(107886003)(2906002)(69596002)(16586007)(476003)(16526019)(53936002)(486006)(316002)(54906003)(6116002)(3846002)(186003)(956004)(2616005)(8936002)(86362001)(23726003)(81156014)(5660300001)(8676002)(81166006)(305945005)(50466002)(47776003)(66066001)(53416004)(1857600001)(14444005)(25786009)(68736007)(6916009)(478600001)(105586002)(106356001)(4326008)(386003)(26005)(52116002)(7696005)(7736002)(36756003)(97736004)(6486002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:OSBPR01MB3317; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; OSBPR01MB3317; 23:KrbLlUX3LuysFTzEcFgFK+DfvpR/exshV8v+r/iTb?= ZBzFqRy23oCEHsrs0Wzj2ahp5CgqepdmGgy7tIeqqiR4dvDp+kzQr2I/tInZsALLAebySPxS5HtmJHpzGoJq99fbP0xtxJP4hDlPVSzQdBkictV3M+TYvgn26ksZM3NuqYd2KQ/KrH0Leny8SMJCI6ja43GVhdRTddeUJzkh+p/U+yl4YWTz9hpvaP3Q8CG0C0MfOVRRvZJzx0t9TLzuTLht5Jw8xC4+4EV5axiC7IDZnt/FEq7IDzvDOsjUf3WZsd397lIRu3IR/HJ5OzvH43A0PNYBL2kb97aJ11PtdPyygPfQbOVu1Af0HLyZCICIJtGh9XCjOkDcnUcZqms1zSLS9kvmfTWy8h+CVbfOhHKcoktd5kp4muoBvxqZOTwSpItyDn9392F7VSbgZRsaJ/95ADR6R+0hlm35G37vOrG7+FxKsrG8VelqpQXpSYxMwGojJUg5BZ2IzBKnWQjLZSRMa+nl3el0YImqfWcrTe97etEmRjookTi5WrxLDaKSvq/+gJTN8xVgyKMCJcQrm5vXUZX0efEDP7pov2vMmvqc6xXY3/RbCaTWg/tqmQjz2L2xrb3E5Q7z6QZyxndzpNt9/V61o+xYUC7GTYUrjIjvr90keHMaLqAqWRqNLCM/PmJLxoMDqzQsT8pmIQ5lHZTkm/UVEE3s8MrtKn8fWatPbZ/phsXihSjTgGree8lp6K+1bTywWZ+zZD5pUuCDeAQ4i+8YQVyHF3mWC4iFgeRRCGSCRkShx+xLP9kmrYMhpuYefMu9uualxe0kvY1byZGryGxa7uTxWJjCjDBTtEA0LcWBMkMby72649LAxiD4XgVaBQQAX7wrjNy/mkkT6sSz43rF4shJXW+/QPtiDTk5sPjedUzlCXmrR01Ep0nxzukjJaunrGuGXvQW7b7SlmRWRBv1RB7d3qUfzglw8JkVE8TxEYcg95txl0kdgLlusbkoFcM0UC9LIhrRjgqXMoyTlL8zHgjfLALlOuBOLgL7Bao5PuRUVjHY/9DfqyK2kUoV533rXXnWQS8M5Z66AlvgNC++oFWAa4Eg27REgDdZKY67JyN1Po88VmxHjTiYiOsEEyzpfjwuih0uNKDY8rOsdplY6taM+yU+sUd7Ko2Kk+oHcwshjfHnzyaGsyH5M8sYUaGD9h0690oKxnLeCFi X-Microsoft-Antispam-Message-Info: aVSB4/LC62VIgKKgoVTbl5eHTbOAEuCqSV6YHTUUiMhbmQkQAbLmdOwFsECjgSMzHkRV54k9IbAzL6WTdPcDX/xRWaN1rBLSKVd+3C3LylxRcXL+CZVYpNPKAIcgnDl93S7VIlo5D4PWLq0lxYtdnbaEzYPKtss+hoGFweeL0IpBS6W1HQ0Aql8ttip/GDewsNL4MOX23BGMeULLYJFMprabvS0xY69/UZClBe6pdOFbkpoXp37fpO6olh2lWAcyhjGOzPCOrxWNTwizCKe1nD3O1l1jAnPCWKpj9t+m07w9JlKrrVyO4fwThmLTs1F3cVe3tUJhoZhFkEu3llXblloFFtURTHXKOlk2SeCHypQ= X-Microsoft-Exchange-Diagnostics: 1; OSBPR01MB3317; 6:yRKkBId1eCh7L5px8oGShYnooblc3Y9j/fy96f47xLBTa+KiAgDw3umx6ntHgyiB576l7DXzQhQxNvU5CXypz+xVlr6l/A6zZFbHfoSH5wM6Kn5cSqNRY/ovA+qmHvlvvwtSRW/9BtJXWrtTjJBrZCt2ppumJBiDxvzuWCruZUZzV6BeWkT4ZF29kHek1KvoQ03BQR1S4yavAquFDUTU3UtyPuSLFYEv7rtBHZmCVHDXFWg85I+hSSLuwOpZ3ajBelewKpkz4MSq1rrvM9mKLN8j1Wx4IPQthetKiq8tYfpGlMnSTAHaC3aILDV32QCRgSlSAdQddGbcK0sfZqhFqrkwDB2D6bT8YhDA+IjJUEKW5LN3RhSSdv4dXRBAMnHYeYqKmNa8X+qUuXg9I2nwSDx8+3SuLOu405pypUfQv5hZTKs+E1jUV+xLVO22W3oaeCmCe0UtgDbQGD+oLF2N/w==; 5:U7fDGHWpN9oi4e6LMLvkmE+ntGbxJrbCjUB8ePWcG5TB4qmRk6/waos4K3Cz4V7jMFO8pIgGTyzasb8L3qUcLgKwJMClKZ86ngZlrrMY+PDA+m8tX0aPyi4+VBAQn/Aw/tc1Ct338igULG5A7jMNvmdY5SZdqLr7cc9qlm7XPuI=; 7:tcvZaUxQ1GtViQwagqMo/aYZ15xA3S0SoI1+X/t6gLgaCS3vluS5YXYlXRRzQ19G5aBWBk3EQPQoehBJnxUvTvtQuFNr/U2U76VJTh/l5Z6LBUQuGck2jZubCRuF7weqQ/pyoDVeTn7yg2e4xbQyMxlHnosjxDtfWtEJMLPIW8jz2Zv1sL4Jo/j3b1Zpfz4hJXnnT5Jz+5ja08E/aC+IcgQRUZloZ/O8JoXn6zPpWvCLjG1H77F3F9mROc0R+eOG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; OSBPR01MB3317; 20:Nui2+lgg+3thqicBEk7IbqmsxKg/x89Q5ADks4ALwqX6aEmsN7y0hctAe0i47a++7V62lq6e2Fse7QWbj3m0g3/VBop2ZwctchFO0lL02pAKpE9a0xnElPumcOTFLn3QoQEOFfn5S/2FK8H7jrq478B+H3EG4rhTi0Zn4QzsOr8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2018 00:48:12.1105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c7ac1c2-bbf9-4f6d-136b-08d63eca8911 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB3317 Cc: Linux-ALSA , RYO KATAOKA , Kuninori Morimoto , TAKAMITSU HONDA , Ryusuke Sakato , TAKESHI KIHARA , Yusuke Goda , HIROYUKI YOKOYAMA , YOSHIYUKI ITO , YUTA WAKASAWA , Masao Nomura Subject: [alsa-devel] [PATCH] ASoC: rsnd: fixup clock start checker 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 commit 4d230d12710646 ("ASoC: rsnd: fixup not to call clk_get/set under non-atomic") fixuped clock start timing. But it exchanged clock start checker from ssi->usrcnt to ssi->rate. Current rsnd_ssi_master_clk_start() is called from .prepare, but some player (for example GStreamer) might calls it many times. In such case, the checker might returns error even though it was not error. It should check ssi->usrcnt instead of ssi->rate. This patch fixup it. Without this patch, GStreamer can't switch 48kHz / 44.1kHz. Reported-by: Yusuke Goda Signed-off-by: Kuninori Morimoto Tested-by: Yusuke Goda --- sound/soc/sh/rcar/ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 95acc8b..dc85fff 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -300,7 +300,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, if (rsnd_ssi_is_multi_slave(mod, io)) return 0; - if (ssi->rate) { + if (ssi->usrcnt > 1) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL;