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>
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 <thomas.petazzoni@bootlin.com>
Subject: [PATCH 09/26] soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans()
Date: Tue, 25 Jul 2023 11:23:45 +0200 [thread overview]
Message-ID: <20230725092417.43706-10-herve.codina@bootlin.com> (raw)
In-Reply-To: <20230725092417.43706-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>
---
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 a9aba9943ab7..658aef63505e 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
WARNING: multiple messages have this Message-ID (diff)
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>
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/26] soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans()
Date: Tue, 25 Jul 2023 11:23:45 +0200 [thread overview]
Message-ID: <20230725092417.43706-10-herve.codina@bootlin.com> (raw)
In-Reply-To: <20230725092417.43706-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>
---
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 a9aba9943ab7..658aef63505e 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-07-25 9:32 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 9:23 [PATCH 00/26] Add support for QMC HDLC, framer infrastruture and PEF2256 framer Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 01/26] soc: fsl: cpm1: qmc: Fix rx channel reset Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 02/26] soc: fsl: cpm1: qmc: Extend the API to provide Rx status Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 03/26] dt-bindings: net: Add support for QMC HDLC Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 04/26] net: wan: " Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 05/26] MAINTAINERS: Add the Freescale QMC HDLC driver entry Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 06/26] soc: fsl: cpm1: qmc: Introduce available timeslots masks Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 07/26] soc: fsl: cpm1: qmc: Rename qmc_setup_tsa* to qmc_init_tsa* Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 08/26] soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa* Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` Herve Codina [this message]
2023-07-25 9:23 ` [PATCH 09/26] soc: fsl: cpm1: qmc: Remove no more needed checks from qmc_check_chans() Herve Codina
2023-07-25 9:23 ` [PATCH 10/26] soc: fsl: cpm1: qmc: Check available timeslots in qmc_check_chans() Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 11/26] soc: fsl: cpm1: qmc: Add support for disabling channel TSA entries Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 12/26] soc: fsl: cpm1: qmc: Split Tx and Rx TSA entries setup Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 13/26] soc: fsl: cpm1: qmc: Introduce is_tsa_64rxtx flag Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 14/26] soc: fsl: cpm1: qmc: Handle timeslot entries at channel start() and stop() Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 15/26] soc: fsl: cpm1: qmc: Remove timeslots handling from setup_chan() Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 16/26] soc: fsl: cpm1: qmc: Introduce functions to change timeslots at runtime Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 17/26] wan: qmc_hdlc: Add runtime timeslots changes support Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 18/26] net: wan: Add framer framework support Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 19/26] dt-bindings: net: Add the Lantiq PEF2256 E1/T1/J1 framer Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 20/26] mfd: core: Ensure disabled devices are skiped without aborting Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 21/26] net: wan: framer: Add support for the Lantiq PEF2256 framer Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 22/26] pinctrl: Add support for the Lantic PEF2256 pinmux Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:23 ` [PATCH 23/26] MAINTAINERS: Add the Lantiq PEF2256 driver entry Herve Codina
2023-07-25 9:23 ` Herve Codina
2023-07-25 9:24 ` [PATCH 24/26] ASoC: codecs: Add support for the framer codec Herve Codina
2023-07-25 9:24 ` Herve Codina
2023-07-25 16:41 ` Randy Dunlap
2023-07-25 16:41 ` Randy Dunlap
2023-07-25 9:24 ` [PATCH 25/26] dt-bindings: net: fsl,qmc-hdlc: Add framer support Herve Codina
2023-07-25 9:24 ` Herve Codina
2023-07-25 9:24 ` [PATCH 26/26] net: wan: fsl_qmc_hdlc: " Herve Codina
2023-07-25 9:24 ` Herve Codina
2023-07-26 4:14 ` [PATCH 00/26] Add support for QMC HDLC, framer infrastruture and PEF2256 framer Jakub Kicinski
2023-07-26 4:14 ` Jakub Kicinski
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=20230725092417.43706-10-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.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=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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.