Re: [PATCH v2 10/28] soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa*

2023-08-08 Thread Christophe Leroy


Le 26/07/2023 à 17:02, Herve Codina a écrit :
> Introduce the qmc_chan_setup_tsa* functions to setup entries related
> to the given channel.
> Use them during QMC channels setup.
> 
> Signed-off-by: Herve Codina 

Reviewed-by: Christophe Leroy 

> ---
>   drivers/soc/fsl/qe/qmc.c | 161 ++-
>   1 file changed, 125 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/soc/fsl/qe/qmc.c b/drivers/soc/fsl/qe/qmc.c
> index 64a11f5c6f85..c5552a0b5b19 100644
> --- a/drivers/soc/fsl/qe/qmc.c
> +++ b/drivers/soc/fsl/qe/qmc.c
> @@ -240,6 +240,11 @@ static inline void qmc_clrbits16(void __iomem *addr, u16 
> clr)
>   qmc_write16(addr, qmc_read16(addr) & ~clr);
>   }
>   
> +static inline void qmc_clrsetbits16(void __iomem *addr, u16 clr, u16 set)
> +{
> + qmc_write16(addr, (qmc_read16(addr) & ~clr) | set);
> +}
> +
>   static inline void qmc_write32(void __iomem *addr, u32 val)
>   {
>   iowrite32be(val, addr);
> @@ -562,6 +567,122 @@ static void qmc_chan_read_done(struct qmc_chan *chan)
>   spin_unlock_irqrestore(>rx_lock, flags);
>   }
>   
> +static int qmc_chan_setup_tsa_64rxtx(struct qmc_chan *chan, const struct 
> tsa_serial_info *info)
> +{
> + unsigned int i;
> + u16 curr;
> + u16 val;
> +
> + /*
> +  * Use a common Tx/Rx 64 entries table.
> +  * Tx and Rx related stuffs must be identical
> +  */
> + if (chan->tx_ts_mask != chan->rx_ts_mask) {
> + dev_err(chan->qmc->dev, "chan %u uses different Rx and Tx 
> TS\n", chan->id);
> + return -EINVAL;
> + }
> +
> + val = QMC_TSA_VALID | QMC_TSA_MASK | QMC_TSA_CHANNEL(chan->id);
> +
> + /* Check entries based on Rx stuff*/
> + for (i = 0; i < info->nb_rx_ts; i++) {
> + if (!(chan->rx_ts_mask & (((u64)1) << i)))
> + continue;
> +
> + curr = qmc_read16(chan->qmc->scc_pram + QMC_GBL_TSATRX + (i * 
> 2));
> + if (curr & QMC_TSA_VALID && (curr & ~QMC_TSA_WRAP) != val) {
> + dev_err(chan->qmc->dev, "chan %u TxRx entry %d already 
> used\n",
> + chan->id, i);
> + return -EBUSY;
> + }
> + }
> +
> + /* Set entries based on Rx stuff*/
> + for (i = 0; i < info->nb_rx_ts; i++) {
> + if (!(chan->rx_ts_mask & (((u64)1) << i)))
> + continue;
> +
> + qmc_clrsetbits16(chan->qmc->scc_pram + QMC_GBL_TSATRX + (i * 2),
> +  ~QMC_TSA_WRAP, val);
> + }
> +
> + return 0;
> +}
> +
> +static int qmc_chan_setup_tsa_32rx_32tx(struct qmc_chan *chan, const struct 
> tsa_serial_info *info)
> +{
> + unsigned int i;
> + u16 curr;
> + u16 val;
> +
> + /* Use a Tx 32 entries table and a Rx 32 entries table */
> +
> + val = QMC_TSA_VALID | QMC_TSA_MASK | QMC_TSA_CHANNEL(chan->id);
> +
> + /* Check entries based on Rx stuff */
> + for (i = 0; i < info->nb_rx_ts; i++) {
> + if (!(chan->rx_ts_mask & (((u64)1) << i)))
> + continue;
> +
> + curr = qmc_read16(chan->qmc->scc_pram + QMC_GBL_TSATRX + (i * 
> 2));
> + if (curr & QMC_TSA_VALID && (curr & ~QMC_TSA_WRAP) != val) {
> + dev_err(chan->qmc->dev, "chan %u Rx entry %d already 
> used\n",
> + chan->id, i);
> + return -EBUSY;
> + }
> + }
> + /* Check entries based on Tx stuff */
> + for (i = 0; i < info->nb_tx_ts; i++) {
> + if (!(chan->tx_ts_mask & (((u64)1) << i)))
> + continue;
> +
> + curr = qmc_read16(chan->qmc->scc_pram + QMC_GBL_TSATTX + (i * 
> 2));
> + if (curr & QMC_TSA_VALID && (curr & ~QMC_TSA_WRAP) != val) {
> + dev_err(chan->qmc->dev, "chan %u Tx entry %d already 
> used\n",
> + chan->id, i);
> + return -EBUSY;
> + }
> + }
> +
> + /* Set entries based on Rx stuff */
> + for (i = 0; i < info->nb_rx_ts; i++) {
> + if (!(chan->rx_ts_mask & (((u64)1) << i)))
> + continue;
> +
> + qmc_clrsetbits16(chan->qmc->scc_pram + QMC_GBL_TSATRX + (i * 2),
> +  ~QMC_TSA_WRAP, val);
> + }
> + /* Set entries based on Tx stuff */
> + for (i = 0; i < info->nb_tx_ts; i++) {
> + if (!(chan->tx_ts_mask & (((u64)1) << i)))
> + continue;
> +
> + qmc_clrsetbits16(chan->qmc->scc_pram + QMC_GBL_TSATTX + (i * 2),
> +  ~QMC_TSA_WRAP, val);
> + }
> +
> + return 0;
> +}
> +
> +static int qmc_chan_setup_tsa(struct qmc_chan *chan)
> +{
> + struct tsa_serial_info info;
> + int ret;
> +
> + /* Retrieve info from the TSA related serial */
> + ret = tsa_serial_get_info(chan->qmc->tsa_serial, );
> + if (ret)
> + return 

Re: [PATCH v2 10/28] soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa*

2023-08-01 Thread Herve Codina
On Tue, 1 Aug 2023 11:36:43 +0200
Andrew Lunn  wrote:

> > +static inline void qmc_clrsetbits16(void __iomem *addr, u16 clr, u16 set)
> > +{
> > +   qmc_write16(addr, (qmc_read16(addr) & ~clr) | set);
> > +}
> > +  
> 
> Please don't use inline in .c files. Let the compiler decide.
> 
>Andrew

Ok, I will remove the inline in the next iteration.
I will also remove the inline of all other similar functions (probably a
separate patch in the series).

Regards,
Hervé


Re: [PATCH v2 10/28] soc: fsl: cpm1: qmc: Introduce qmc_chan_setup_tsa*

2023-08-01 Thread Andrew Lunn
> +static inline void qmc_clrsetbits16(void __iomem *addr, u16 clr, u16 set)
> +{
> + qmc_write16(addr, (qmc_read16(addr) & ~clr) | set);
> +}
> +

Please don't use inline in .c files. Let the compiler decide.

   Andrew