| Message ID | 1408561284-18280-1-git-send-email-festevam@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
On Wed, Aug 20, 2014 at 4:01 PM, Fabio Estevam <festevam@gmail.com> 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> I'd use a static method to return the value, so you avoid some of #ifdef
On Wed, Aug 20, 2014 at 4:38 PM, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Wed, Aug 20, 2014 at 4:01 PM, Fabio Estevam <festevam@gmail.com> 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> > > I'd use a static method to return the value, so you avoid some of #ifdef Not sure I understood your suggestion. Care to provide an example?
On Wed, Aug 20, 2014 at 5:48 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Wed, Aug 20, 2014 at 4:38 PM, Otavio Salvador > <otavio@ossystems.com.br> wrote: >> On Wed, Aug 20, 2014 at 4:01 PM, Fabio Estevam <festevam@gmail.com> 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> >> >> I'd use a static method to return the value, so you avoid some of #ifdef > > Not sure I understood your suggestion. Care to provide an example? static int _rx_alignment() { #ifdef SX static int v = ??; #else static int v = ??; #endif return v; } ?
On Wed, Aug 20, 2014 at 6:11 PM, Otavio Salvador <otavio@ossystems.com.br> wrote: >> Not sure I understood your suggestion. Care to provide an example? > > static int _rx_alignment() > { > #ifdef SX > static int v = ??; > #else > static int v = ??; > #endif > > return v; Understood it now. Will do like this in v2. Thanks
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;