From: Herve Codina <herve.codina@bootlin.com>
To: Herve Codina <herve.codina@bootlin.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Andrew Lunn <andrew@lunn.ch>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>, Lee Jones <lee@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Qiang Zhao <qiang.zhao@nxp.com>, Li Yang <leoyang.li@nxp.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Shengjiu Wang <shengjiu.wang@gmail.com>,
Xiubo Li <Xiubo.Lee@gmail.com>,
Fabio Estevam <festevam@gmail.com>,
Nicolin Chen <nicoleotsuka@gmail.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Randy Dunlap <rdunlap@infradead.org>
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 <horms@kernel.org>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
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 [thread overview]
Message-ID: <20231011061437.64213-16-herve.codina@bootlin.com> (raw)
In-Reply-To: <20231011061437.64213-1-herve.codina@bootlin.com>
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 <herve.codina@bootlin.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
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;
--
2.41.0
next prev parent reply other threads:[~2023-10-11 6:16 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 6:14 [PATCH v8 00/30] Add support for QMC HDLC, framer infrastructure and PEF2256 framer Herve Codina
2023-10-11 6:14 ` [PATCH v8 01/30] soc: fsl: cpm1: tsa: Fix __iomem addresses declaration Herve Codina
2023-10-11 6:14 ` [PATCH v8 02/30] soc: fsl: cpm1: qmc: " Herve Codina
2023-10-11 6:14 ` [PATCH v8 03/30] soc: fsl: cpm1: qmc: Fix rx channel reset Herve Codina
2023-10-11 6:14 ` [PATCH v8 04/30] soc: fsl: cpm1: qmc: Extend the API to provide Rx status Herve Codina
2023-10-11 6:14 ` [PATCH v8 05/30] soc: fsl: cpm1: qmc: Remove inline function specifiers Herve Codina
2023-10-11 6:14 ` [PATCH v8 06/30] dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Fix example property name Herve Codina
2023-10-11 6:14 ` [PATCH v8 07/30] dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add 'additionalProperties: false' in child nodes Herve Codina
2023-10-11 6:14 ` [PATCH v8 08/30] dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add support for QMC HDLC Herve Codina
2023-10-11 6:14 ` [PATCH v8 09/30] soc: fsl: cpm1: qmc: Add support for child devices Herve Codina
2023-10-11 6:14 ` [PATCH v8 10/30] net: wan: Add support for QMC HDLC Herve Codina
2023-10-13 23:42 ` Jakub Kicinski
2023-10-11 6:14 ` [PATCH v8 11/30] MAINTAINERS: Add the Freescale QMC HDLC driver entry Herve Codina
2023-10-11 6:14 ` [PATCH v8 12/30] soc: fsl: cpm1: qmc: Introduce available timeslots masks Herve Codina
2023-10-11 6:14 ` [PATCH v8 13/30] soc: fsl: cpm1: qmc: Rename qmc_setup_tsa* to qmc_init_tsa* Herve Codina
2023-10-11 6:14 ` [PATCH v8 14/30] soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa* Herve Codina
2023-10-11 6:14 ` Herve Codina [this message]
2023-10-11 6:14 ` [PATCH v8 16/30] soc: fsl: cpm1: qmc: Check available timeslots in qmc_check_chans() Herve Codina
2023-10-11 6:14 ` [PATCH v8 17/30] soc: fsl: cpm1: qmc: Add support for disabling channel TSA entries Herve Codina
2023-10-11 6:14 ` [PATCH v8 18/30] soc: fsl: cpm1: qmc: Split Tx and Rx TSA entries setup Herve Codina
2023-10-11 6:14 ` [PATCH v8 19/30] soc: fsl: cpm1: qmc: Introduce is_tsa_64rxtx flag Herve Codina
2023-10-11 6:14 ` [PATCH v8 20/30] soc: fsl: cpm1: qmc: Handle timeslot entries at channel start() and stop() Herve Codina
2023-10-11 6:14 ` [PATCH v8 21/30] soc: fsl: cpm1: qmc: Remove timeslots handling from setup_chan() Herve Codina
2023-10-11 6:14 ` [PATCH v8 22/30] soc: fsl: cpm1: qmc: Introduce functions to change timeslots at runtime Herve Codina
2023-10-11 6:14 ` [PATCH v8 23/30] wan: qmc_hdlc: Add runtime timeslots changes support Herve Codina
2023-10-13 23:43 ` Jakub Kicinski
2023-10-11 6:14 ` [PATCH v8 24/30] net: wan: Add framer framework support Herve Codina
2023-10-13 23:43 ` Jakub Kicinski
2023-10-11 6:14 ` [PATCH v8 25/30] dt-bindings: net: Add the Lantiq PEF2256 E1/T1/J1 framer Herve Codina
2023-10-11 6:14 ` [PATCH v8 26/30] net: wan: framer: Add support for the Lantiq PEF2256 framer Herve Codina
2023-10-13 23:44 ` Jakub Kicinski
2023-10-11 6:14 ` [PATCH v8 27/30] pinctrl: Add support for the Lantic PEF2256 pinmux Herve Codina
2023-10-11 6:14 ` [PATCH v8 28/30] MAINTAINERS: Add the Lantiq PEF2256 driver entry Herve Codina
2023-10-11 6:14 ` [PATCH v8 29/30] ASoC: codecs: Add support for the framer codec Herve Codina
2023-10-11 6:14 ` [PATCH v8 30/30] net: wan: fsl_qmc_hdlc: Add framer support Herve Codina
2023-10-13 23:46 ` [PATCH v8 00/30] Add support for QMC HDLC, framer infrastructure and PEF2256 framer Jakub Kicinski
2023-10-25 15:00 ` Herve Codina
2023-10-25 19:32 ` Jakub Kicinski
2023-10-25 19:47 ` Mark Brown
2023-10-30 21:31 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231011061437.64213-16-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=andrew@lunn.ch \
--cc=broonie@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=christophe.leroy@csgroup.eu \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=festevam@gmail.com \
--cc=horms@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=lee@kernel.org \
--cc=leoyang.li@nxp.com \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=nicoleotsuka@gmail.com \
--cc=pabeni@redhat.com \
--cc=perex@perex.cz \
--cc=qiang.zhao@nxp.com \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=shengjiu.wang@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).