Le 26/07/2023 à 17:02, Herve Codina a écrit :
Introduce qmc_chan_{get,set}_ts_info() function to allow timeslots modification at runtime.
The modification is provided using qmc_chan_set_ts_info() and will be applied on next qmc_chan_start(). qmc_chan_set_ts_info() must be called with the channel rx and/or tx stopped.
Signed-off-by: Herve Codina herve.codina@bootlin.com
Reviewed-by: Christophe Leroy christophe.leroy@csgroup.eu
drivers/soc/fsl/qe/qmc.c | 51 ++++++++++++++++++++++++++++++++++++++++ include/soc/fsl/qe/qmc.h | 10 ++++++++ 2 files changed, 61 insertions(+)
diff --git a/drivers/soc/fsl/qe/qmc.c b/drivers/soc/fsl/qe/qmc.c index b1883b9d2bae..e3953bc07b1f 100644 --- a/drivers/soc/fsl/qe/qmc.c +++ b/drivers/soc/fsl/qe/qmc.c @@ -290,6 +290,57 @@ int qmc_chan_get_info(struct qmc_chan *chan, struct qmc_chan_info *info) } EXPORT_SYMBOL(qmc_chan_get_info);
+int qmc_chan_get_ts_info(struct qmc_chan *chan, struct qmc_chan_ts_info *ts_info) +{
- unsigned long flags;
- spin_lock_irqsave(&chan->ts_lock, flags);
- ts_info->rx_ts_mask_avail = chan->rx_ts_mask_avail;
- ts_info->tx_ts_mask_avail = chan->tx_ts_mask_avail;
- ts_info->rx_ts_mask = chan->rx_ts_mask;
- ts_info->tx_ts_mask = chan->tx_ts_mask;
- spin_unlock_irqrestore(&chan->ts_lock, flags);
- return 0;
+} +EXPORT_SYMBOL(qmc_chan_get_ts_info);
+int qmc_chan_set_ts_info(struct qmc_chan *chan, const struct qmc_chan_ts_info *ts_info) +{
- unsigned long flags;
- int ret;
- /* Only a subset of available timeslots is allowed */
- if ((ts_info->rx_ts_mask & chan->rx_ts_mask_avail) != ts_info->rx_ts_mask)
return -EINVAL;- if ((ts_info->tx_ts_mask & chan->tx_ts_mask_avail) != ts_info->tx_ts_mask)
return -EINVAL;- /* In case of common rx/tx table, rx/tx masks must be identical */
- if (chan->qmc->is_tsa_64rxtx) {
if (ts_info->rx_ts_mask != ts_info->tx_ts_mask)return -EINVAL;- }
- spin_lock_irqsave(&chan->ts_lock, flags);
- if ((chan->tx_ts_mask != ts_info->tx_ts_mask && !chan->is_tx_stopped) ||
(chan->rx_ts_mask != ts_info->rx_ts_mask && !chan->is_rx_stopped)) {dev_err(chan->qmc->dev, "Channel rx and/or tx not stopped\n");ret = -EBUSY;- } else {
chan->tx_ts_mask = ts_info->tx_ts_mask;chan->rx_ts_mask = ts_info->rx_ts_mask;ret = 0;- }
- spin_unlock_irqrestore(&chan->ts_lock, flags);
- return ret;
+} +EXPORT_SYMBOL(qmc_chan_set_ts_info);
- int qmc_chan_set_param(struct qmc_chan *chan, const struct qmc_chan_param *param) { if (param->mode != chan->mode)
diff --git a/include/soc/fsl/qe/qmc.h b/include/soc/fsl/qe/qmc.h index 6f1d6cebc9fe..802c161636bd 100644 --- a/include/soc/fsl/qe/qmc.h +++ b/include/soc/fsl/qe/qmc.h @@ -38,6 +38,16 @@ struct qmc_chan_info {
int qmc_chan_get_info(struct qmc_chan *chan, struct qmc_chan_info *info);
+struct qmc_chan_ts_info {
- u64 rx_ts_mask_avail;
- u64 tx_ts_mask_avail;
- u64 rx_ts_mask;
- u64 tx_ts_mask;
+};
+int qmc_chan_get_ts_info(struct qmc_chan *chan, struct qmc_chan_ts_info *ts_info); +int qmc_chan_set_ts_info(struct qmc_chan *chan, const struct qmc_chan_ts_info *ts_info);
- struct qmc_chan_param { enum qmc_mode mode; union {