From patchwork Mon Sep 3 07:07:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10585535 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 C3001139B for ; Mon, 3 Sep 2018 07:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B69E62918D for ; Mon, 3 Sep 2018 07:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB49429458; Mon, 3 Sep 2018 07:07:37 +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.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 DD1352918D for ; Mon, 3 Sep 2018 07:07:36 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C0A7E267827; Mon, 3 Sep 2018 09:07:35 +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 039BC26787A; Mon, 3 Sep 2018 09:07:34 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id EBD46267827 for ; Mon, 3 Sep 2018 09:07:30 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 03 Sep 2018 16:07:29 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 3F65F7C2EF; Mon, 3 Sep 2018 16:07:29 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,324,1531753200"; d="scan'208";a="289829160" Received: from mail-os2jpn01lp0151.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.151]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 03 Sep 2018 16:07:29 +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:X-MS-Exchange-SenderADCheck; bh=o63lBfgsf4eF7thJPhbQ8PRL4SWLVsZorUUw0aYC2lM=; b=gJ1jHIEaA9StwVghetfmu/oxw6QApPWgD4+dnJiDJshKUHZCFGUqM7OjKxaLQiGVXu0Ny2wA9sSjO3r9tHvATqbBnYO3DiRI/Epn/I6LzzXxQUZ3zeXJr7ZpwCAbtTypBuMUKN5v0VDmERr4XF3Gz8CTbdeHGX6IaSPF5ENanTw= 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 TY1PR01MB1865.jpnprd01.prod.outlook.com (2603:1096:403:2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.17; Mon, 3 Sep 2018 07:07:26 +0000 Message-ID: <8736urf4ks.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown In-Reply-To: <87d0tvf4q0.wl-kuninori.morimoto.gx@renesas.com> References: <87d0tvf4q0.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 3 Sep 2018 07:07:26 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TY2PR06CA0002.apcprd06.prod.outlook.com (2603:1096:404:42::14) To TY1PR01MB1865.jpnprd01.prod.outlook.com (2603:1096:403:2::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4987a120-58bb-4ffc-daf6-08d6116be7cd X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1865; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 3:angZgLbivMFgjqYYecWkN5lxI8WhBrKiThLaNFcM1HbkGvYa+GJZmVEyHhFLfNWSJ8f4EJ1VfCPrJtzy0C8Buii9n09HPf7GLXVhP0Bqv5b/Sp8ZaPA2lWIspRFdmcmod+BZgu179/DX7xneQGnl4lhgO2ogJSlL3WSCRDqz7x11oI8CytocIpaqlR0H+AV2gRb+/B1IpzuwbpIqpqebVZf+cEvxez802hH0mM0pkwhHAlOcPpaBBoX7e8dbD0lL; 25:YyODtn6Kw64WlRvDfdUlrDMe/+mI6mTcLx8W2YGYxw8YqgrUU2VE6Fl4kZuz2M25cJisryOHkKXMah1T4BWAFl+TL+t8VGDdd0xv0FDNPXXagImIXyMYOPHMs0/itD9WQZsn6jncd1zfCbUETB69RorROcWGFTfLzahSA5GzNH9dQg+sd5Au9u4zNsTJMox5ayBwOObpqIKn5YmqchJ2TF2kwes+K80JrWZQQjgTTo0Q4GNVdBLJtjWnv2OdEtlv7b2/wG1sOaYx05+LnLGsPUl/aWDsB7+MF9L8xYlRs3f218WkH79ICMKhRZTPDFiFGuDeTEf53QyKzPVzrrETDw==; 31:JXMhDKcGM9QYu30nfsrSfftVrl2V9xjo2px0NyPdag2NAu63JNutkIIB0PVuprIYwx3hhIrqdPBFHJtcpMwJY4JETyx+9P5cXMw5OOvmd+UAPJFb5hFnH+nhjljPXb0cjncKIhewYEOMfy+ffmuLpGwnIx67Wz0ScbZu/J5HEeTooML+umrO+FGrgcpjONf6OIewHk4af2fQuGFgFW3mEgNeKaIqSBVNyIw9IZzf7/o= X-MS-TrafficTypeDiagnostic: TY1PR01MB1865: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 20:zK65JI73dfL2sabuDt/uudkR365IDEJS301k/wxRqwyglax98TFZqDcn80mYPMGIk/GT6AfCU+SkKsBwlYIYVZXuEN4576rdlx+HxdgGP4cCPBXKQPwhyfRRLbsD3kFBDtYH7LBnrkjZ5/hUDbwc6r9YoO5+kTsyjnSI+NlwRyxq6nyoB3wHreLnj4TMol1cZCRVK+mvzAPnjOw9a+15MMRUXvk63D0A58FvnNNXc4MHj7yRIfLQVZkkt5a6WBbiUtbZzJTyIM3Hfc/TOxoYcE5iLk0/pjMbXUMT4LhP44avLQRrGHLF3Z47a+62zn2R2yyoIY4WlxEs2AXJcil+jp4kVDSTgre4ivoOKyQKxQOOoCzRAwEFsJtpZO9K6HadThHJQ4iGHJpS+O7ht9mQx5AwEjD+wT1OECIfpYDhF9D5Ow3bBJn4Q+/RhzeogXi5UWuhdN7T317IuExYyv1AevWepEnOuQo6Gdz8MIF0s2lTI7E6JM4dBsqn/K4YVw3X; 4:IyZrrBdmjVUUVoJzcbzn1mR1sMJsfLn1n6Gu+K1CJ40mPlS5AWoWXsxxD7SyzvFL7h9hgfXiRoZkX5w/BAkpTeY7jinOhWurDrBK5MCuWMHkYfG6ZNvwUJ/ywQS8XTAOPbhs5HhdfaQAbWnB3VXkYP5m2FAcUHcunQxD6UpUUAxIvPyV1iLc7sX+JoZ1BXX+1dOpUCHAL4HqXTBgDl+4GNaTQhrzywtkeFg+/U+0IzsK7TgKbOq23FpBib6zUFCcXXN6CdkxyZwUrgBmpwIJmQ== 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)(5005006)(8121501046)(823301075)(93006095)(93001095)(10201501046)(3231311)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201708071742011)(7699016); SRVR:TY1PR01MB1865; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1865; X-Forefront-PRVS: 0784C803FD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(136003)(39860400002)(189003)(199004)(2906002)(36756003)(6916009)(81156014)(47776003)(81166006)(97736004)(446003)(66066001)(69596002)(5660300001)(478600001)(6486002)(53936002)(3846002)(6116002)(50466002)(106356001)(105586002)(4326008)(23726003)(53416004)(86362001)(25786009)(58126008)(52116002)(7696005)(7736002)(476003)(486006)(186003)(16526019)(956004)(2616005)(11346002)(316002)(8676002)(16586007)(54906003)(68736007)(26005)(8936002)(305945005)(76176011)(386003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1865; 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; TY1PR01MB1865; 23:NOhBth9H6hat2hoM3wiNQvQY88HOOAq5HFEB5qJid?= ucbPR92/X0K3uFNx1G8jdX2yLaxWJyuCgbBFxnqFoonv8QEuAfsvwl8NT1Z61qgNfsCoF8TZm1j2TP2EkSwT8YBzhxDgyUqc9IJlUdUVREyka5awPzEz33F5SpOZd5vXLxVimIrNgwXLtAJXYY6gmK4Ml4c21WJ0NoIYsjhtcORUMbsqeVl0U/OfepmiGQM+m4R1RdVdHfUML23v7/jQ1axwlZjRPT+S2bfQsoR9c7D8dhY7dKf6THhxmpP5YLrCYDv/3VfLPa751C1e2XZrd0ZiKFxJLGosyUUvCYQStLWrAjil0e5HsKzyWJ2FRdomrBJhj4o/e2VpPPQlXih8y3QdHE/ev9ves/+tl4McmrP4AaodXLqEGTYtzeE4OObldVWkVYFtUi++3V6/nGNdf5bJRPH0+WUuSGZ1Cdin9BcQZVzruSUq7mJYAjAY15zeHvKOxAhKlEAsn2yQ4nz8OsXIDohZev7YdeFtC3nWGqSBrr7ZWN7NQzXylXWTkG2mY7hIiXulq1y0f6WQKcr+eq1xQ5aPPLYS3/0kj64FqTaRAqzZltnc1dZVHWgTaXV26ZpRHWF1B8IIa0+s7BhVQRs2jwtmPXGBAk3YQUAUt41l/K0npBXdhNT3ilcAl5Cx/xfMu+LJ0wETVWG9a4tJzEpHXzVr8lgUidHhYe6qBC131l0yVUqs8moBCEni3jHRPKvLZil0u5UQxrQdPgZrdoR3LToE2EPBkJ3xQBg0YOFJId4FdRK4v9zeo73ujnvUeaSjyuDQsERU3DMnLHPqJtUXPqevpM5MSkGbO0p97HueqokuoWTfhmGK1Eyq/RZEIUR0Z7GVyCfG/6RgKIFwng3zfL2EwxV55v0iRwSYQ9N1amYEa9lphsb77P/0uHIuKk1sZ2y/rELd6ZMOsTUs81oNIKHhVTiBOWOUrcmKefKSbYg3f+KDmMcTPlNuqlMfdRzTURC8ktiSts47iMaEoCq5k928u43JqL/xGBcuVM+grJUAOuEt1MuNy7gM+RxFaUWje3Mr1Sag61jT5YLHP9+oFmD0WlSNVtFSrMBEfwuJ3RsZnsmvOyM+yJU22gpKnUwuavNSoF+tNHQ8CM9Mgjofz1QVe53IKOOdS4yGwJC3Z6Upcj4D7qDhpLDwuOH3F5Zn4N15H4Ga/pM1bxdO8Yo X-Microsoft-Antispam-Message-Info: GURXGo6JZMMR/ISleAjvdcmbiVdjzBSNhfUOLhcxBovaQw6u8IPgijCDlyREvsHb/NKSe75KmkNX3Q6z9z4rtvHVSLIXlzQ3KjVd570Tn9apdXdRqQOn+olAsHI4ZI52N6Z0Hswl7BWo3QG8DSWn/jh6s6t0IaCjiHGO9FQUXglGws69WBUX7wU3Us5/4jGN3tsYjTvpS038kfdZZgsr4bzshATOgV3hzEXBhYyLN/qUshkNjPE8/Bk57iK2+b1Y9fCgtH9ZeS+9iXmhc/iIFzvQ6IXx/QzZnscn8Tvx6xayc2LKUANnbfcP3AE84U1UZcyAmgQ82cRGnCLmfQbGcTU7U8hpEam2qKloDy+diIw= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 6:i8X1EzemBYjkrGb5LEYZeibUMTRLhjCr2OfqcAj6sANVZ/3oIdY04/3gVmVUM8cfC9/meyCdT1UigpnyRXBWQrnUtp3fz0Bq7Vd01e4J2mRunjmiZOOnjG3drXu8mN7YVSzs90Bs+5jSXV6HiNQ0WcWgRjKw9hM/Tu2wj/uQKs0Gk7dNEECTJFAbDBphP2B6OGsdFpb7zzt+IGSnYcDEjk6S3VOCkDlt5oHbCSvv41kFyNjjl4KNCwWvta6RtWFHEq//Q8day7k2zdnvKTKIHW7bJ/8nTplet2XlxZZ4UNxGFkLO1nexnoBPTI9ZVWhjmaz5WAPfXhZKRM8aL2frOngLtRvmohe28yh7+BYqbU59sKmmPKS9wzEzF0VgMmb/qqiTdn1PClAjcGCFjZBul8pNc7KLN2g38QxgTYySct50TuxUOuy4itUZAbKvm/u/a/CVLnhYImDNm4Bii2l2Yg==; 5:pfCh6Qkzk2rtr1YjZWt04ZG7YxcTlasvIkJnlgP1/u0QlNDS+tudb+IPxc79LSYlaH+Z36fAT2LOsQiX92iaEKy+Ez37ocdfVDJDoGg4Kujm2v2glcyPdTCZLOAZgU1LYDUpmQWZcB1A8b7ItsYXt6mv97spbP9hnnfVI4u0yjg=; 7:15Wi3mzohHSWkTh1b1UafzYV4NhqnVn1dvJWY2wHySKTcFKlMgPjgSwJuWz7KxUpSNEmL6KMQO4yfyNAhkPhL868eqcWbE4ajipLrD2Si/cCWTS/pPimEioeffcH+3kh4UtNw0pitJeEaVoSzbaL1JKiCvrABYMGa9V6vbWwbK5+++usQefDazOjc0JE22Q34rd3F2yS/TyXSdC/X+jhnVKdN1GhTBQTDJrwm4HEoHN/i6hzk3syjegzErNtuwh6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1865; 20:85zwyRbzjk9PPUBpBWFLe04XiLOBoN6Nw6z24DRfwdSTfFR7rvPQxs+r1gy1pFZH7TbE8OBIQ7jhM+GGH10jczhInr1cbCBZtRc+5q/ZRo0u7GWtKjxFK2+ocRJlyFhJp62EeyCq8tWWp5NftpCSc9CrHtBulxveh7DOu11lzaM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2018 07:07:26.6923 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4987a120-58bb-4ffc-daf6-08d6116be7cd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1865 Cc: Jiada Wang , Timo Wischer , Linux-ALSA , Hiroyuki Yokoyama , Dragos Tarcatu Subject: [alsa-devel] [PATCH 07/13] ASoC: rsnd: ssi: Check runtime channel number rather than hw_params 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: Jiada Wang The number of channel handled by SSI maybe differs from the one set in hw_params, currently SSI checks hw_params's channel number, and constrains to use same channel number, when it is being used by multiple clients. This patch corrects to check runtime channel number rather than channel number set in hw_params. Signed-off-by: Jiada Wang Signed-off-by: Timo Wischer [kuninori: adjust to upstreaming] Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama --- sound/soc/sh/rcar/ssi.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 89cc433..3f6dd9f 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -307,6 +307,11 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, return -EINVAL; } + if (ssi->chan != chan) { + dev_err(dev, "SSI parent/child should use same chan\n"); + return -EINVAL; + } + return 0; } @@ -334,6 +339,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, SCKD | SWSD | CKDV(idx); ssi->wsr = CONT; ssi->rate = rate; + ssi->chan = chan; dev_dbg(dev, "%s[%d] outputs %u Hz\n", rsnd_mod_name(mod), @@ -359,6 +365,7 @@ static void rsnd_ssi_master_clk_stop(struct rsnd_mod *mod, ssi->cr_clk = 0; ssi->rate = 0; + ssi->chan = 0; rsnd_adg_ssi_clk_stop(mod); } @@ -511,9 +518,7 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); struct rsnd_dai *rdai = rsnd_io_to_rdai(io); - int chan = params_channels(params); unsigned int fmt_width = snd_pcm_format_width(params_format(params)); if (fmt_width > rdai->chan_width) { @@ -524,24 +529,6 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod, return -EINVAL; } - /* - * snd_pcm_ops::hw_params will be called *before* - * snd_soc_dai_ops::trigger. Thus, ssi->usrcnt is 0 - * in 1st call. - */ - if (ssi->usrcnt) { - /* - * Already working. - * It will happen if SSI has parent/child connection. - * it is error if child <-> parent SSI uses - * different channels. - */ - if (ssi->chan != chan) - return -EIO; - } - - ssi->chan = chan; - return 0; }