From patchwork Wed Aug 9 13:27:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 13348084 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1515CC04A6A for ; Wed, 9 Aug 2023 14:30:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=74XVMVDcr997qGX2KRUE4HgI/8AVQzfXF6ncJH7TW+c=; b=FxQu7zksYXrEu0 mBLzackQRxx+w+4z16WYo6cJV7lXnTVz1Sibfu4kloFES7oYCjzEhTWY5OQaqebqH0bLJOXjM5MTu N0/eCRmZyvaJpMfJUw5sTc2jF8RYIsaJ2xIJ5wTQ+1t72i1lkxuffESdVrG3B5Nuhj224OZFN87KI SWMkIfg+Hd0Y/x51fEy8vY9X+mxPm2PQ6e0+J+Sj6WTs2kgRf/qiL5yJ/NmMfEM/FCs+0+vayoA0b T72s3n66e6jv+AzaABhXDUfA+v7HuWTexS8x8O4FBr9pwMVt4KnKbRTtI2h8hdXkEmcuUIgl9OJrv JEDsYxoYVaqIIhQqJpZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qTkCq-005AZ3-2c; Wed, 09 Aug 2023 14:30:36 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qTjEv-0050Q0-2n for linux-arm-kernel@bombadil.infradead.org; Wed, 09 Aug 2023 13:28:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=e3M7r5kP9BFmSEGkwYYNmaCjvt7TKrPw/eCo9cZe9TE=; b=D+y4dU4KrctHkEB4cem+LUYHM2 DDDU6gkJNftV9lmvRl6hemu8jxHoWpWznNkaGQJ/wQVjvFKp1Q7s+juzTq0Y/AV05gnk8NS/wFStm PzZDbBmWw0AyngThnPdCI1bU8M4G2iw7bX8lMP7f0Fy74cFRP0z1ZIVcAUKqzDVk+TcaA270CDwWN V/XL4V4PIPNqVJykLjZ+pQ2d+AQK46FNTAyn+6O0RMiBqhtDAmGYCwzB8g/EMKVauIfjkHKWHTuB1 E9jErT9YCRFEVfJRn3jCFS3rY3ZHOgG3B2urF7qff1pC/JK9lfnRKaKFgCkVbTkjGathi8x5iYhwq 9eI/GRKQ==; Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qTjEs-005f76-2s for linux-arm-kernel@lists.infradead.org; Wed, 09 Aug 2023 13:28:40 +0000 Received: by mail.gandi.net (Postfix) with ESMTPA id 536EC4000F; Wed, 9 Aug 2023 13:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1691587712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e3M7r5kP9BFmSEGkwYYNmaCjvt7TKrPw/eCo9cZe9TE=; b=ItleYGvxGA2aGrqoc9FCBwKTpuac/dNNasRHV7bIC4g+qMhq+3+jgkf+XdvSZFgPLKcjDR nh/0iPri4HVqoBSlJMgaxmriNacFBtE7RwyG8Oysff8LaY6NUqFCwfDVVhxMk3Qvrz8bf1 C+DWS4s0LgYc+uSKRxRZ8VdKCOH9n+9w1Iqx5eiZYrRP3CbyUf8iZzjI4yd1l6Nc/Qa5ie krFBgE3XLzhhEmwpoaXXVT5fVMHr/mso/Ly6ALF5tKr+jp3I3OvCRiS+jRrOsnSNwsdTh9 1Uh5OPYVXEHh6G2EjslIQ/bO4TTKyQQVrlkuwAZuqJQXZ/1oJ7xvIIdbKvoJ5Q== From: Herve Codina To: Herve Codina , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lee Jones , Linus Walleij , Qiang Zhao , Li Yang , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Xiubo Li , Fabio Estevam , Nicolin Chen , Christophe Leroy , Randy Dunlap Cc: netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org, Thomas Petazzoni Subject: [PATCH v3 12/28] soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans() Date: Wed, 9 Aug 2023 15:27:39 +0200 Message-ID: <20230809132757.2470544-13-herve.codina@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809132757.2470544-1-herve.codina@bootlin.com> References: <20230809132757.2470544-1-herve.codina@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: herve.codina@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230809_142839_023360_7B5832AF X-CRM114-Status: GOOD ( 10.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The newly introduced qmc_chan_setup_tsa* functions check that the channel entries are not already used. These checks are also performed by qmc_check_chans() and are no more needed. Remove them from qmc_check_chans(). Signed-off-by: Herve Codina Reviewed-by: Christophe Leroy --- drivers/soc/fsl/qe/qmc.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/soc/fsl/qe/qmc.c b/drivers/soc/fsl/qe/qmc.c index bddff0b74252..2416408bb7e7 100644 --- a/drivers/soc/fsl/qe/qmc.c +++ b/drivers/soc/fsl/qe/qmc.c @@ -884,10 +884,7 @@ EXPORT_SYMBOL(qmc_chan_reset); static int qmc_check_chans(struct qmc *qmc) { struct tsa_serial_info info; - bool is_one_table = false; struct qmc_chan *chan; - u64 tx_ts_mask = 0; - u64 rx_ts_mask = 0; u64 tx_ts_assigned_mask; u64 rx_ts_assigned_mask; int ret; @@ -911,7 +908,6 @@ static int qmc_check_chans(struct qmc *qmc) dev_err(qmc->dev, "Number of TSA Tx/Rx TS assigned are not equal\n"); return -EINVAL; } - is_one_table = true; } tx_ts_assigned_mask = info.nb_tx_ts == 64 ? U64_MAX : (((u64)1) << info.nb_tx_ts) - 1; @@ -922,27 +918,11 @@ static int qmc_check_chans(struct qmc *qmc) dev_err(qmc->dev, "chan %u uses TSA unassigned Tx TS\n", chan->id); return -EINVAL; } - if (tx_ts_mask & chan->tx_ts_mask) { - dev_err(qmc->dev, "chan %u uses an already used Tx TS\n", chan->id); - return -EINVAL; - } if (chan->rx_ts_mask > rx_ts_assigned_mask) { dev_err(qmc->dev, "chan %u uses TSA unassigned Rx TS\n", chan->id); return -EINVAL; } - if (rx_ts_mask & chan->rx_ts_mask) { - dev_err(qmc->dev, "chan %u uses an already used Rx TS\n", chan->id); - return -EINVAL; - } - - if (is_one_table && (chan->tx_ts_mask != chan->rx_ts_mask)) { - dev_err(qmc->dev, "chan %u uses different Rx and Tx TS\n", chan->id); - return -EINVAL; - } - - tx_ts_mask |= chan->tx_ts_mask; - rx_ts_mask |= chan->rx_ts_mask; } return 0;