From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Thu, 28 Nov 2019 13:37:04 +0100 Subject: [U-Boot] [PATCH] net: ftgmac100: align RX/TX descriptors on ARCH_DMA_MINALIGN Message-ID: <20191128123704.7609-1-clg@kaod.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Fixes: e766849713ff ("net: ftgmac100: convert the RX/TX descriptor arrays") Signed-off-by: C=C3=A9dric Le Goater --- drivers/net/ftgmac100.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 92c38a81bd35..c14647af7844 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -71,8 +71,8 @@ enum ftgmac100_model { struct ftgmac100_data { struct ftgmac100 *iobase; =20 - struct ftgmac100_txdes txdes[PKTBUFSTX]; - struct ftgmac100_rxdes rxdes[PKTBUFSRX]; + struct ftgmac100_txdes txdes[PKTBUFSTX] __aligned(ARCH_DMA_MINALIGN); + struct ftgmac100_rxdes rxdes[PKTBUFSRX] __aligned(ARCH_DMA_MINALIGN); int tx_index; int rx_index; =20 @@ -309,7 +309,7 @@ static int ftgmac100_start(struct udevice *dev) } priv->txdes[PKTBUFSTX - 1].txdes0 =3D priv->txdes0_edotr_mask; =20 - start =3D (ulong)&priv->txdes[0]; + start =3D ((ulong)&priv->txdes[0]) & ~(ARCH_DMA_MINALIGN - 1); end =3D start + roundup(sizeof(priv->txdes), ARCH_DMA_MINALIGN); flush_dcache_range(start, end); =20 @@ -319,7 +319,7 @@ static int ftgmac100_start(struct udevice *dev) } priv->rxdes[PKTBUFSRX - 1].rxdes0 =3D priv->rxdes0_edorr_mask; =20 - start =3D (ulong)&priv->rxdes[0]; + start =3D ((ulong)&priv->rxdes[0]) & ~(ARCH_DMA_MINALIGN - 1); end =3D start + roundup(sizeof(priv->rxdes), ARCH_DMA_MINALIGN); flush_dcache_range(start, end); =20 @@ -369,7 +369,7 @@ static int ftgmac100_free_pkt(struct udevice *dev, ucha= r *packet, int length) { struct ftgmac100_data *priv =3D dev_get_priv(dev); struct ftgmac100_rxdes *curr_des =3D &priv->rxdes[priv->rx_index]; - ulong des_start =3D (ulong)curr_des; + ulong des_start =3D ((ulong)curr_des) & ~(ARCH_DMA_MINALIGN - 1); ulong des_end =3D des_start + roundup(sizeof(*curr_des), ARCH_DMA_MINALIGN); =20 @@ -391,7 +391,7 @@ static int ftgmac100_recv(struct udevice *dev, int flag= s, uchar **packetp) struct ftgmac100_data *priv =3D dev_get_priv(dev); struct ftgmac100_rxdes *curr_des =3D &priv->rxdes[priv->rx_index]; unsigned short rxlen; - ulong des_start =3D (ulong)curr_des; + ulong des_start =3D ((ulong)curr_des) & ~(ARCH_DMA_MINALIGN - 1); ulong des_end =3D des_start + roundup(sizeof(*curr_des), ARCH_DMA_MINALIGN); ulong data_start =3D curr_des->rxdes3; @@ -426,7 +426,7 @@ static int ftgmac100_recv(struct udevice *dev, int flag= s, uchar **packetp) static u32 ftgmac100_read_txdesc(const void *desc) { const struct ftgmac100_txdes *txdes =3D desc; - ulong des_start =3D (ulong)txdes; + ulong des_start =3D ((ulong)txdes) & ~(ARCH_DMA_MINALIGN - 1); ulong des_end =3D des_start + roundup(sizeof(*txdes), ARCH_DMA_MINALIGN); =20 invalidate_dcache_range(des_start, des_end); @@ -444,7 +444,7 @@ static int ftgmac100_send(struct udevice *dev, void *pa= cket, int length) struct ftgmac100_data *priv =3D dev_get_priv(dev); struct ftgmac100 *ftgmac100 =3D priv->iobase; struct ftgmac100_txdes *curr_des =3D &priv->txdes[priv->tx_index]; - ulong des_start =3D (ulong)curr_des; + ulong des_start =3D ((ulong)curr_des) & ~(ARCH_DMA_MINALIGN - 1); ulong des_end =3D des_start + roundup(sizeof(*curr_des), ARCH_DMA_MINALIGN); ulong data_start; --=20 2.21.0