From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 16 Oct 2018 11:22:45 +0200 Subject: [U-Boot] [PATCH v4 06/13] net: ftgmac100: convert the RX/TX descriptor arrays In-Reply-To: <20181016092252.11664-1-clg@kaod.org> References: <20181016092252.11664-1-clg@kaod.org> Message-ID: <20181016092252.11664-7-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 Use simple arrays under the device priv structure to hold the RX and TX descriptors and handle memory coherency by invalidating or flushing the d-cache when required. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Joel Stanley Acked-by: Joe Hershberger --- drivers/net/ftgmac100.c | 141 ++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 77 deletions(-) diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index b6e6f6e5ec02..bf8600814690 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -13,19 +13,17 @@ =20 #include #include -#include #include #include -#include #include =20 #include "ftgmac100.h" =20 -#define ETH_ZLEN 60 -#define CFG_XBUF_SIZE 1536 +/* Min frame ethernet frame size without FCS */ +#define ETH_ZLEN 60 =20 -/* RBSR - hw default init value is also 0x640 */ -#define RBSR_DEFAULT_VALUE 0x640 +/* Receive Buffer Size Register - HW default is 0x640 */ +#define FTGMAC100_RBSR_DEFAULT 0x640 =20 /* PKTBUFSTX/PKTBUFSRX must both be power of 2 */ #define PKTBUFSTX 4 /* must be power of 2 */ @@ -57,10 +55,8 @@ struct ftgmac100_data { struct ftgmac100 *iobase; =20 - ulong txdes_dma; - struct ftgmac100_txdes *txdes; - ulong rxdes_dma; - struct ftgmac100_rxdes *rxdes; + struct ftgmac100_txdes txdes[PKTBUFSTX]; + struct ftgmac100_rxdes rxdes[PKTBUFSRX]; int tx_index; int rx_index; =20 @@ -266,10 +262,8 @@ static int ftgmac100_start(struct udevice *dev) struct ftgmac100_data *priv =3D dev_get_priv(dev); struct ftgmac100 *ftgmac100 =3D priv->iobase; struct phy_device *phydev =3D priv->phydev; - struct ftgmac100_txdes *txdes; - struct ftgmac100_rxdes *rxdes; unsigned int maccr; - void *buf; + ulong start, end; int ret; int i; =20 @@ -277,26 +271,6 @@ static int ftgmac100_start(struct udevice *dev) =20 ftgmac100_reset(priv); =20 - if (!priv->txdes) { - txdes =3D dma_alloc_coherent( - sizeof(*txdes) * PKTBUFSTX, &priv->txdes_dma); - if (!txdes) - panic("ftgmac100: out of memory\n"); - memset(txdes, 0, sizeof(*txdes) * PKTBUFSTX); - priv->txdes =3D txdes; - } - txdes =3D priv->txdes; - - if (!priv->rxdes) { - rxdes =3D dma_alloc_coherent( - sizeof(*rxdes) * PKTBUFSRX, &priv->rxdes_dma); - if (!rxdes) - panic("ftgmac100: out of memory\n"); - memset(rxdes, 0, sizeof(*rxdes) * PKTBUFSRX); - priv->rxdes =3D rxdes; - } - rxdes =3D priv->rxdes; - /* set the ethernet address */ ftgmac100_set_mac(priv, plat->enetaddr); =20 @@ -307,42 +281,37 @@ static int ftgmac100_start(struct udevice *dev) priv->tx_index =3D 0; priv->rx_index =3D 0; =20 - txdes[PKTBUFSTX - 1].txdes0 =3D FTGMAC100_TXDES0_EDOTR; - rxdes[PKTBUFSRX - 1].rxdes0 =3D FTGMAC100_RXDES0_EDORR; - for (i =3D 0; i < PKTBUFSTX; i++) { - /* TXBUF_BADR */ - if (!txdes[i].txdes2) { - buf =3D memalign(ARCH_DMA_MINALIGN, CFG_XBUF_SIZE); - if (!buf) - panic("ftgmac100: out of memory\n"); - txdes[i].txdes3 =3D virt_to_phys(buf); - txdes[i].txdes2 =3D (uint)buf; - } - txdes[i].txdes1 =3D 0; + priv->txdes[i].txdes3 =3D 0; + priv->txdes[i].txdes0 =3D 0; } + priv->txdes[PKTBUFSTX - 1].txdes0 =3D FTGMAC100_TXDES0_EDOTR; + + start =3D (ulong)&priv->txdes[0]; + end =3D start + roundup(sizeof(priv->txdes), ARCH_DMA_MINALIGN); + flush_dcache_range(start, end); =20 for (i =3D 0; i < PKTBUFSRX; i++) { - /* RXBUF_BADR */ - if (!rxdes[i].rxdes2) { - buf =3D net_rx_packets[i]; - rxdes[i].rxdes3 =3D virt_to_phys(buf); - rxdes[i].rxdes2 =3D (uint)buf; - } - rxdes[i].rxdes0 &=3D ~FTGMAC100_RXDES0_RXPKT_RDY; + priv->rxdes[i].rxdes3 =3D (unsigned int)net_rx_packets[i]; + priv->rxdes[i].rxdes0 =3D 0; } + priv->rxdes[PKTBUFSRX - 1].rxdes0 =3D FTGMAC100_RXDES0_EDORR; + + start =3D (ulong)&priv->rxdes[0]; + end =3D start + roundup(sizeof(priv->rxdes), ARCH_DMA_MINALIGN); + flush_dcache_range(start, end); =20 /* transmit ring */ - writel(priv->txdes_dma, &ftgmac100->txr_badr); + writel((u32)priv->txdes, &ftgmac100->txr_badr); =20 /* receive ring */ - writel(priv->rxdes_dma, &ftgmac100->rxr_badr); + writel((u32)priv->rxdes, &ftgmac100->rxr_badr); =20 /* poll receive descriptor automatically */ writel(FTGMAC100_APTC_RXPOLL_CNT(1), &ftgmac100->aptc); =20 /* config receive buffer size register */ - writel(FTGMAC100_RBSR_SIZE(RBSR_DEFAULT_VALUE), &ftgmac100->rbsr); + writel(FTGMAC100_RBSR_SIZE(FTGMAC100_RBSR_DEFAULT), &ftgmac100->rbsr); =20 /* enable transmitter, receiver */ maccr =3D FTGMAC100_MACCR_TXMAC_EN | @@ -378,9 +347,13 @@ static int ftgmac100_free_pkt(struct udevice *dev, uch= ar *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_end =3D des_start + + roundup(sizeof(*curr_des), ARCH_DMA_MINALIGN); =20 - /* Release buffer to DMA */ + /* Release buffer to DMA and flush descriptor */ curr_des->rxdes0 &=3D ~FTGMAC100_RXDES0_RXPKT_RDY; + flush_dcache_range(des_start, des_end); =20 /* Move to next descriptor */ priv->rx_index =3D (priv->rx_index + 1) % PKTBUFSRX; @@ -394,20 +367,25 @@ static int ftgmac100_free_pkt(struct udevice *dev, uc= har *packet, int length) static int ftgmac100_recv(struct udevice *dev, int flags, uchar **packetp) { struct ftgmac100_data *priv =3D dev_get_priv(dev); - struct ftgmac100_rxdes *curr_des; + struct ftgmac100_rxdes *curr_des =3D &priv->rxdes[priv->rx_index]; unsigned short rxlen; + ulong des_start =3D (ulong)curr_des; + ulong des_end =3D des_start + + roundup(sizeof(*curr_des), ARCH_DMA_MINALIGN); + ulong data_start =3D curr_des->rxdes3; + ulong data_end; =20 - curr_des =3D &priv->rxdes[priv->rx_index]; + invalidate_dcache_range(des_start, des_end); =20 if (!(curr_des->rxdes0 & FTGMAC100_RXDES0_RXPKT_RDY)) - return -1; + return -EAGAIN; =20 if (curr_des->rxdes0 & (FTGMAC100_RXDES0_RX_ERR | FTGMAC100_RXDES0_CRC_ERR | FTGMAC100_RXDES0_FTL | FTGMAC100_RXDES0_RUNT | FTGMAC100_RXDES0_RX_ODD_NB)) { - return -1; + return -EAGAIN; } =20 rxlen =3D FTGMAC100_RXDES0_VDBC(curr_des->rxdes0); @@ -415,18 +393,12 @@ static int ftgmac100_recv(struct udevice *dev, int fl= ags, uchar **packetp) debug("%s(): RX buffer %d, %x received\n", __func__, priv->rx_index, rxlen); =20 - /* invalidate d-cache */ - dma_map_single((void *)curr_des->rxdes2, rxlen, DMA_FROM_DEVICE); + /* Invalidate received data */ + data_end =3D data_start + roundup(rxlen, ARCH_DMA_MINALIGN); + invalidate_dcache_range(data_start, data_end); + *packetp =3D (uchar *)data_start; =20 - /* pass the packet up to the protocol layers. */ - net_process_received_packet((void *)curr_des->rxdes2, rxlen); - - /* release buffer to DMA */ - curr_des->rxdes0 &=3D ~FTGMAC100_RXDES0_RXPKT_RDY; - - priv->rx_index =3D (priv->rx_index + 1) % PKTBUFSRX; - - return 0; + return rxlen; } =20 /* @@ -437,31 +409,46 @@ static int ftgmac100_send(struct udevice *dev, void *= packet, 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_end =3D des_start + + roundup(sizeof(*curr_des), ARCH_DMA_MINALIGN); + ulong data_start; + ulong data_end; + + invalidate_dcache_range(des_start, des_end); =20 if (curr_des->txdes0 & FTGMAC100_TXDES0_TXDMA_OWN) { - debug("%s(): no TX descriptor available\n", __func__); - return -1; + dev_err(dev, "no TX descriptor available\n"); + return -EPERM; } =20 debug("%s(%x, %x)\n", __func__, (int)packet, length); =20 length =3D (length < ETH_ZLEN) ? ETH_ZLEN : length; =20 - memcpy((void *)curr_des->txdes2, (void *)packet, length); - dma_map_single((void *)curr_des->txdes2, length, DMA_TO_DEVICE); + curr_des->txdes3 =3D (unsigned int)packet; + + /* Flush data to be sent */ + data_start =3D curr_des->txdes3; + data_end =3D data_start + roundup(length, ARCH_DMA_MINALIGN); + flush_dcache_range(data_start, data_end); =20 - /* only one descriptor on TXBUF */ + /* Only one segment on TXBUF */ curr_des->txdes0 &=3D FTGMAC100_TXDES0_EDOTR; curr_des->txdes0 |=3D FTGMAC100_TXDES0_FTS | FTGMAC100_TXDES0_LTS | FTGMAC100_TXDES0_TXBUF_SIZE(length) | FTGMAC100_TXDES0_TXDMA_OWN ; =20 - /* start transmit */ + /* Flush modified buffer descriptor */ + flush_dcache_range(des_start, des_end); + + /* Start transmit */ writel(1, &ftgmac100->txpd); =20 debug("%s(): packet sent\n", __func__); =20 + /* Move to next descriptor */ priv->tx_index =3D (priv->tx_index + 1) % PKTBUFSTX; =20 return 0; --=20 2.17.2