From patchwork Wed Oct 11 06:14:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herve Codina X-Patchwork-Id: 13416800 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 DCCD7CD98FB for ; Wed, 11 Oct 2023 07:30:39 +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=lhvOs0o8aoqNLKYezdyNd0H+zCjx1LpvX+EM9wTzrn0=; b=GuEwFv9ne3tNjm vxl/Jq8K/zTWsIRPflC4z/O7U4er7i7EeBBQ3jKrdby7Rbm8Xk+k24fgT+A7JtOMX2jvgeHmmZprO eA9fA7+7KNKXTQ7tG23XhfQoP8Ucv5b51ALCd4ZewSs2ZqXuf+wH/xj3QPiDB+p0LoibpcMBmQFS2 0DIDieV5ZoE7iB14ZmpNe+2m2MnwndRSrZoiu9BA/J+qSrt3LJS13CbFji5YsdvxsnfhWGzkHF0tA Iwl4yu9ZKeU9Cyyy2rRoSGPRQw+JwfcmKZxkyOYOTDCT3g8hZLBge8JL/yS5bq29k4mgc1F3QLShC ouJqytZc2pR8Hp4qxubg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqTfw-00F6XI-07; Wed, 11 Oct 2023 07:30:36 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqSVd-00Ew4W-20 for linux-arm-kernel@bombadil.infradead.org; Wed, 11 Oct 2023 06:15:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=6W9oVhEO6bMU8YfnlBol3aSpzYKADclXRgrQd2t+5FA=; b=oTtE8PwSZBKbbja/x62rXjmlgJ dWUQzsIskrPbDo8+tPGNx+WXHnyroCLw7QvCN18gjVXBGbOMQgw07qvDvo2XZbTj3KZWzyYFym0wZ eb/mnX/yd6A6R2oZ1alxX+p3zUgSL5zyKMb8xiqY++lxGR+yZxvrFxX1xgi9/FwlC/xewEme/te5m TIRfyYNoNa6SWj2++RgxtRi9IVzY7H8quh20Rf1eUUNuCUfz1yYNg2Vy43O9X/lmocMpcJH2vw/SV OLItfE5Ul9fnNakS3XCf9bJ0MO/Pb8mKIhXvzmJFFr/PUhNg8pQ/ah3YtaIuAqHVMbBmIs/v3CrlI i4QMeVbA==; Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1qqSVW-0099OG-A3 for linux-arm-kernel@lists.infradead.org; Wed, 11 Oct 2023 06:15:51 +0000 Received: by mail.gandi.net (Postfix) with ESMTPA id 94768E000B; Wed, 11 Oct 2023 06:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1697004941; 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=6W9oVhEO6bMU8YfnlBol3aSpzYKADclXRgrQd2t+5FA=; b=BoGmOsqiNH9AEWafQuovB1JgA3a8Lz4o4OJZusJOAh9wramLryvPsCwZvQ9/S5iM92jKym F3jmoU0KRDZmL2v0WbKGX/qjnPN5sKmw4GQt30qjfRtM30YBA5PoB7lcpq2SsJ5QWrOFAM iCNnsGm7TrDZuTQyuJqoNjTXfERbN7XRv3/5wb5KP5shMR7rfKEH5A/8TyI3vGpCw6ZHyo 8i2pBdWr3IzXJkHJ4rHGLY0fRCC4m+gtZkYVBsrhMFk3j+drdI439lM2Gi+Wna2WTsvbAg 3qUYtbvmz0ml79eYv02JWWu9QNaV+J/kt3RUJow9DsD6ioYMaV/NYD0jGFvsdw== 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, Simon Horman , Christophe JAILLET , Thomas Petazzoni Subject: [PATCH v8 15/30] soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans() Date: Wed, 11 Oct 2023 08:14:19 +0200 Message-ID: <20231011061437.64213-16-herve.codina@bootlin.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011061437.64213-1-herve.codina@bootlin.com> References: <20231011061437.64213-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-20231011_071546_393636_255ED5B1 X-CRM114-Status: UNSURE ( 9.60 ) X-CRM114-Notice: Please train this message. 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 8e8bd1942c08..1189e6076e37 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;