From patchwork Fri Mar 1 02:32:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 10834359 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 E59FB17E9 for ; Fri, 1 Mar 2019 02:33:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDD602F9CB for ; Fri, 1 Mar 2019 02:33:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEB1B2FA2A; Fri, 1 Mar 2019 02:33:43 +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.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 895372F9CB for ; Fri, 1 Mar 2019 02:33:42 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3ECC384D; Fri, 1 Mar 2019 03:32:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3ECC384D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551407620; bh=ixqiIl7n3zI9eS5tMuXDsctX7+1BxL+EWtjRIiaFGns=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=rFvVBWrpN6gqjk0ef2o12JsHF9CfSGK0vKbmIgoGs0llDgN73BMRm+T2WheNzyuda r/oY+IlIhmF303p65oqbSh9FsgqsPWGqeFPJvG+etYh8fJsWAK+aeqmWPo386OZCu1 FMYVvK5Hhg1q8U27to55ZkMg2Cov000w5MWZ0YvM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A3A3FF896DE; Fri, 1 Mar 2019 03:32:49 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id CC7D1F896DE; Fri, 1 Mar 2019 03:32:46 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150055.outbound.protection.outlook.com [40.107.15.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id CBD82F8073C for ; Fri, 1 Mar 2019 03:32:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CBD82F8073C Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="PMmJSZnC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Ec5/tzUrU74NIXHH3f6ma3eJeRAyv0SS40J38BP96g=; b=PMmJSZnCADwP5S87Pgh9hkN1Reu5ouOosgFt1uB+w3mNoyJO8eFDb9aj0FZeoGeONS2zFl5T4bxHk/ikrDYUOmD2q+6dQRFooMjDoauqRJWtK5HuAFK9AKvNj/5jpH6Q6sT4uVa07ZXts0nPvBRAIj+DQob9xrOhw8iUZplWDPs= Received: from VI1PR0402MB3392.eurprd04.prod.outlook.com (52.134.1.153) by VI1PR0402MB2702.eurprd04.prod.outlook.com (10.175.22.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.18; Fri, 1 Mar 2019 02:32:38 +0000 Received: from VI1PR0402MB3392.eurprd04.prod.outlook.com ([fe80::407:6e30:6a9d:2a22]) by VI1PR0402MB3392.eurprd04.prod.outlook.com ([fe80::407:6e30:6a9d:2a22%3]) with mapi id 15.20.1643.022; Fri, 1 Mar 2019 02:32:38 +0000 From: "S.j. Wang" To: "timur@kernel.org" , "nicoleotsuka@gmail.com" , "Xiubo.Lee@gmail.com" , "festevam@gmail.com" , "broonie@kernel.org" , "alsa-devel@alsa-project.org" Thread-Topic: [PATCH] ASoC: fsl_asrc: add protection for the asrc of older version Thread-Index: AQHUz9cJhoJPvCZVnE6C6u5MyrK9cA== Date: Fri, 1 Mar 2019 02:32:38 +0000 Message-ID: <1551407560-29950-1-git-send-email-shengjiu.wang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 1.9.1 x-clientproxiedby: HK0PR03CA0054.apcprd03.prod.outlook.com (2603:1096:203:52::18) To VI1PR0402MB3392.eurprd04.prod.outlook.com (2603:10a6:803:3::25) authentication-results: spf=none (sender IP is ) smtp.mailfrom=shengjiu.wang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 069613c1-f85d-42f5-10c0-08d69dee2bb2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0402MB2702; x-ms-traffictypediagnostic: VI1PR0402MB2702: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; VI1PR0402MB2702; 23:alcYpGSvM4Asidj86H2xTHjFKQPbBmEPuPHRG?= =?iso-8859-1?q?05zRxb6kMVrHuo1Fm?= =?iso-8859-1?q?7TYbKRQnp/+efEBiOA7FkTiki29DU6nZOdhRJXIxzjwHUZltBghz9pV+ezd2?= =?iso-8859-1?q?GjChd4WRAWfx3ZMQ8M4ngUT6sdzlCY3Hvb/i9mFBwEn2IibHhJVv9GyassN6?= =?iso-8859-1?q?OCPPid7XSftSjqUsg8SeQlfaWsES6M89imZDLDCm2F2rxpncUYg5LrqPRqH7?= =?iso-8859-1?q?8OGkWQ2m+fTzOwaMkXMHac7Rw7Z+qgzARu3IFoIGONpdRpp6qpWcPD3+7Yc0?= =?iso-8859-1?q?R5SL6sb59C24ueVUkaIgkRQBn8oUv0+q3hih8hnLLp/53Ct6AyPx0evCp2dz?= =?iso-8859-1?q?iLjSCG03N+QJLg60w4+D/dseMbuSY+GrleG+K8fY+scFKKymuUgMTVqzo2TW?= =?iso-8859-1?q?fIgbBANvY4YNA5v9FOu5naTI5UoT6P9/idxbxmcxh5LFS7buU1y1EC9XSm4P?= =?iso-8859-1?q?/joxInNuyEDkO3dHPRD5gr77g2M7kgK/ErFWDKvlQWtVtTfZKBB4oRUeuD3b?= =?iso-8859-1?q?GqYqthjalwqpVS0EVQFnTcQ5zZ6buT4lWeIq7o7a6/k3l9t8T2FFNaXwvHjv?= =?iso-8859-1?q?wy60jJ6naviRy9cBNHHDHnU1DLYZaVZHw67q/WBxwoZLwheH0Thv7GMWVjoW?= =?iso-8859-1?q?1NzKsAi6zYGs8UKQnQSpbuvvhOcAK1r6ePChu/NkW30rO19oI6GDj2LxeWQG?= =?iso-8859-1?q?IQrWIB1FbgB5bjNpxRlGPgWNNDHSVxeN4o/MVoMHN3jxr9Q1rM2eTWg5t/Tw?= =?iso-8859-1?q?WGS/8flSSUcH4ZlQzq1a3KObPXl0lRp3sXWeWf3sIGPlLtVQ1rjBvxnkXDRq?= =?iso-8859-1?q?iUz6WmkXgIyhxICZmE4VOF/5yhJ3t3OZiify4SGCQG1aaRWwntXSKxhwNdEB?= =?iso-8859-1?q?XROfeqz3wvuKmydTlaw0nRludwjyFxcZ9Gic/lWn+zR7fimRVSDaGFG/+Qj6?= =?iso-8859-1?q?Qnp9pA8VevjE9BDbKLaKe0LnetCeQ6tm8dbyZOie09HUlxMrL7myMUYZkDrl?= =?iso-8859-1?q?NQjQb8FLipuex/wXDvRXYp+F7dpx+3cOyV79Z8NVKxEVjtONqx7s3A7Nkpzm?= =?iso-8859-1?q?zkJWL3gWIob/lptJxMcYOjtXrdQrMUigIllN+F81Y/yZN7zAVmlDpETBze1C?= =?iso-8859-1?q?STtqqTaIzSAaG8gJGUe8MzQcPny6d3erjRIFjnPVGGkl57fmpy27g061Aywo?= =?iso-8859-1?q?0=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09634B1196 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(376002)(396003)(136003)(39860400002)(199004)(189003)(386003)(53936002)(71200400001)(50226002)(86362001)(256004)(6506007)(8936002)(14454004)(99286004)(102836004)(2906002)(36756003)(97736004)(110136005)(52116002)(6486002)(14444005)(71190400001)(66066001)(2501003)(81156014)(2201001)(81166006)(8676002)(26005)(305945005)(478600001)(6512007)(486006)(4744005)(476003)(6116002)(3846002)(186003)(5660300002)(316002)(105586002)(25786009)(68736007)(4326008)(2616005)(7736002)(6436002)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0402MB2702; H:VI1PR0402MB3392.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: oEv5sN5a4DOf4eGyYAT7E0pvRL8S1ap0a0KeCNhqziMlpCo9+m8VYy33bLZ1nZi6YomkkJQEL9bbuFmrdELNyZOnheqSwvbuSjHbASTOfXX5vijAWMYvkKO/k/mMCmtJnRBHpZAt0+eKmkX/85Q54h+lqqLtgJYh2UCxGAEgTaI5DlSwpRytyQUCfa/NT3cTtrFWy4gob8g5oNP6o/zKbgRpFaO6pwPcltQtGmsbqiozNNKdvsWlAr0dLIBWy8zKerj/2stXBdqJ/t9TvzO8YvbHRTBicvIf9J05C/Ajy7jZlEvkby3rTtWbq0vgTNcsKvNw3hxyJEheP3vPxOcvaUGeoyyibZp7cBUOExN63bkCxFhQvXQHHH4vPNvW9AlPiDdljvqVuk450fR8RaKkZirz3x6c2ipYWODrDlASWkA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 069613c1-f85d-42f5-10c0-08d69dee2bb2 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2019 02:32:35.6724 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2702 Cc: "linuxppc-dev@lists.ozlabs.org" Subject: [alsa-devel] [PATCH] ASoC: fsl_asrc: add protection for the asrc of older version X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" X-Virus-Scanned: ClamAV using ClamSMTP There is a constraint for the channel number setting on the asrc of older version (e.g. imx35), the channel number should be even, odd number isn't valid. So add protection when the asrc of older version is used. Signed-off-by: Shengjiu Wang --- sound/soc/fsl/fsl_asrc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 528e8b108422..b3b3c5e15ef1 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -109,7 +109,8 @@ static int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair) if (index == ASRC_INVALID_PAIR) { dev_err(dev, "all pairs are busy now\n"); ret = -EBUSY; - } else if (asrc_priv->channel_avail < channels) { + } else if (asrc_priv->channel_avail < channels || + (asrc_priv->channel_bits < 4 && channels % 2 != 0)) { dev_err(dev, "can't afford required channels: %d\n", channels); ret = -EINVAL; } else {