[U-Boot] [PATCH v2 1/2] net: fec_mxc: Adjust RX DMA alignment for mx6solox

Li Ye-B37916
2014-08-21T03:44:53Z

Hi Fabio,

I feel the name "ARCH_DMA_MINALIGN_MX6SX" is not good here. Because the 64 bytes alignment is only required by the DMA engine in FEC controller, not a ARCH DMA value.

Best regards,
Ye Li

On 8/21/2014 5:24 AM, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> mx6solox has a requirement for 64 bytes alignment for RX DMA transfer.
>
> Adjust it accordingly.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Avoid too many ifdef's by providing a dma_rx_align() funtion as suggested
> by Otavio
>
> drivers/net/fec_mxc.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
> index 4cefda4..1a5105e 100644
> --- a/drivers/net/fec_mxc.c
> +++ b/drivers/net/fec_mxc.c
> @@ -28,6 +28,8 @@ DECLARE_GLOBAL_DATA_PTR;
> */
> #define FEC_XFER_TIMEOUT 5000
>
> +#define ARCH_DMA_MINALIGN_MX6SX 64
> +
> #ifndef CONFIG_MII
> #error "CONFIG_MII has to be defined!"
> #endif
> @@ -267,6 +269,15 @@ static int fec_tx_task_disable(struct fec_priv *fec)
> return 0;
> }
>
> +static int dma_rx_align(void)
> +{
> +#ifdef CONFIG_MX6SX
> + return ARCH_DMA_MINALIGN_MX6SX;
> +#else
> + return ARCH_DMA_MINALIGN;
> +#endif
> +}
> +
> /**
> * Initialize receive task's buffer descriptors
> * @param[in] fec all we know about the device yet
> @@ -286,7 +297,7 @@ static void fec_rbd_init(struct fec_priv *fec, int count, int dsize)
> * Reload the RX descriptors with default values and wipe
> * the RX buffers.
> */
> - size = roundup(dsize, ARCH_DMA_MINALIGN);
> + size = roundup(dsize, dma_rx_align());
> for (i = 0; i < count; i++) {
> data = (uint8_t *)fec->rbd_base[i].data_pointer;
> memset(data, 0, dsize);
> @@ -881,9 +892,9 @@ static int fec_alloc_descs(struct fec_priv *fec)
> /* Allocate RX buffers. */
>
> /* Maximum RX buffer size. */
> - size = roundup(FEC_MAX_PKT_SIZE, ARCH_DMA_MINALIGN);
> + size = roundup(FEC_MAX_PKT_SIZE, dma_rx_align());
> for (i = 0; i < FEC_RBD_NUM; i++) {
> - data = memalign(ARCH_DMA_MINALIGN, size);
> + data = memalign(dma_rx_align(), size);
> if (!data) {
> printf("%s: error allocating rxbuf %d\n", __func__, i);
> goto err_ring;