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

Fabio Estevam
2014-08-20T19:01:23Z

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>
---
drivers/net/fec_mxc.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 4cefda4..df42b3c 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
@@ -281,12 +283,19 @@ static void fec_rbd_init(struct fec_priv *fec, int count, int dsize)
uint32_t size;
uint8_t *data;
int i;
+ int dma_rx_align;
+
+#ifdef CONFIG_MX6SX
+ dma_rx_align = ARCH_DMA_MINALIGN_MX6SX;
+#else
+ dma_rx_align = ARCH_DMA_MINALIGN;
+#endif

/*
* 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);
@@ -863,6 +872,7 @@ static int fec_alloc_descs(struct fec_priv *fec)
unsigned int size;
int i;
uint8_t *data;
+ int dma_rx_align;

/* Allocate TX descriptors. */
size = roundup(2 * sizeof(struct fec_bd), ARCH_DMA_MINALIGN);
@@ -881,9 +891,14 @@ 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);
+#ifdef CONFIG_MX6SX
+ dma_rx_align = ARCH_DMA_MINALIGN_MX6SX;
+#else
+ dma_rx_align = ARCH_DMA_MINALIGN;
+#endif
+ 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;
--
1.9.1