Re: [PATCH v14 09/12] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul

[Lucas Stach <l.stach@xxxxxxxxxxxxxx>]

Am Mittwoch, dem 07.04.2021 um 23:30 +0800 schrieb Robin Gong:
> ECSPI issue fixed from i.mx6ul at hardware level, no need
> ERR009165 anymore on those chips such as i.mx8mq.
> 
> Signed-off-by: Robin Gong <yibin.gong@xxxxxxx>
> Acked-by: Vinod Koul <vkoul@xxxxxxxxxx>
> ---
>  drivers/dma/imx-sdma.c | 26 +++++++++++++++++++++++++-
>  1 file changed, 25 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 86bd383..af85116 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -422,6 +422,13 @@ struct sdma_driver_data {
>  	int num_events;
>  	struct sdma_script_start_addrs	*script_addrs;
>  	bool check_ratio;
> +	/*
> +	 * ecspi ERR009165 fixed should be done in sdma script
> +	 * and it has been fixed in soc from i.mx6ul.
> +	 * please get more information from the below link:
> +	 * https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf
> +	 */
> +	bool ecspi_fixed;
>  };
>  
>  struct sdma_engine {
> @@ -542,6 +549,13 @@ static struct sdma_driver_data sdma_imx6q = {
>  	.script_addrs = &sdma_script_imx6q,
>  };
>  
> +static struct sdma_driver_data sdma_imx6ul = {
> +	.chnenbl0 = SDMA_CHNENBL0_IMX35,
> +	.num_events = 48,
> +	.script_addrs = &sdma_script_imx6q,
> +	.ecspi_fixed = true,
> +};
> +
>  static struct sdma_script_start_addrs sdma_script_imx7d = {
>  	.ap_2_ap_addr = 644,
>  	.uart_2_mcu_addr = 819,
> @@ -575,6 +589,7 @@ static const struct of_device_id sdma_dt_ids[] = {
>  	{ .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, },
>  	{ .compatible = "fsl,imx25-sdma", .data = &sdma_imx25, },
>  	{ .compatible = "fsl,imx7d-sdma", .data = &sdma_imx7d, },
> +	{ .compatible = "fsl,imx6ul-sdma", .data = &sdma_imx6ul, },
>  	{ .compatible = "fsl,imx8mq-sdma", .data = &sdma_imx8mq, },
>  	{ /* sentinel */ }
>  };
> @@ -1144,8 +1159,17 @@ static int sdma_config_channel(struct dma_chan *chan)
>  			if (sdmac->peripheral_type == IMX_DMATYPE_ASRC_SP ||
>  			    sdmac->peripheral_type == IMX_DMATYPE_ASRC)
>  				sdma_set_watermarklevel_for_p2p(sdmac);
> -		} else
> +		} else {
> +			/*
> +			 * ERR009165 fixed from i.mx6ul, no errata need,
> +			 * set bit31 to let sdma script skip the errata.
> +			 */
> +			if (sdmac->peripheral_type == IMX_DMATYPE_CSPI &&
> +			    sdmac->direction == DMA_MEM_TO_DEV &&
> +			    sdmac->sdma->drvdata->ecspi_fixed)
> +				__set_bit(31, &sdmac->watermark_level);

Hm, I don't care much either way, but couldn't we just return the
regular mcu_2_app script in sdma_get_pc when ecspi_fixed == true? Seems
like this would be a simpler and more targeted code change.

Regards,
Lucas

>  			__set_bit(sdmac->event_id0, sdmac->event_mask);
> +		}
>  
>  		/* Address */
>  		sdmac->shp_addr = sdmac->per_address;