macb: more fixes + gem (gigabit support)
cover macb: more fixes + gem (gigabit support)
HI,
This patch serie fixe more issue on the macb and add the GEM support (gigabit support) present on Atmel sama5d3x as example
The IP version is detected as in linux
we now share more code with the kernel and will help to maintain the driver
tesed on at91 macb & gem
The following changes since commit 15c5fa0467b20c05e9ebea36e049764054a7e308:
macb: drop non used define (2013-02-08 16:55:16 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git delivery/macb
for you to fetch changes up to b7058953abdd014b9626b22d868fb29c1c563514:
macb: add cadence Gigabit GEM support (2013-02-08 16:55:41 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (7):
macb: call macb_init at probe explecitly
macb: sync remaining define with linux
macb: use the macro as in linux for tx/rx buffer ring size
macb: enable Tramsmit and Receive at open
macb: reset the IP at init
macb: fix tx ring size
macb: add cadence Gigabit GEM support
drivers/net/macb.c | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- drivers/net/macb.h | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 466 insertions(+), 107 deletions(-)
Best Regards,
J.
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/7 macb: call macb_init at probe explecitly
as eth_device init is planning for remove and we need the init before register the mdio bus
--- drivers/net/macb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/macb.c +3 -5
@@ -241,9 +241,8 @@ static int macb_open(struct eth_device *edev) macb->interface); } -static int macb_init (struct eth_device *edev) +static void macb_init (struct macb_device *macb) { -struct macb_device *macb = edev->priv;unsigned long paddr, val =0 ;int i;
@@ -284,8 +283,6 @@ static int macb_init(struct eth_device *edev)/* Enable TX and RX */ macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE )); - -return 0 ; }static void macb_halt (struct eth_device *edev)
@@ -423,7 +420,6 @@ static int macb_probe(struct device_d *dev) macb->dev = dev; - edev->init = macb_init; edev->open = macb_open; edev->send = macb_send; edev->recv = macb_recv;
@@ -474,6 +470,8 @@ static int macb_probe(struct device_d *dev)macb_writel (macb,NCFGR , ncfgr); +macb_init (macb); +mdiobus_register (&macb->miibus);eth_register (edev);
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/7 macb: sync remaining define with linux
--- drivers/net/macb.c | 71 ++++++++++++++++------------------------------------ drivers/net/macb.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 49 deletions(-)
drivers/net/macb.c +22 -49
@@ -56,29 +56,6 @@#define CFG_MACB_TX_TIMEOUT 1000#define CFG_MACB_AUTONEG_TIMEOUT 5000000 -struct macb_dma_desc { -u32 addr; -u32 ctrl; -}; - -#define RXADDR_USED 0x00000001 -#define RXADDR_WRAP 0x00000002 - -#define RXBUF_FRMLEN_MASK 0x00000fff -#define RXBUF_FRAME_START 0x00004000 -#define RXBUF_FRAME_END 0x00008000 -#define RXBUF_TYPEID_MATCH 0x00400000 -#define RXBUF_BROADCAST 0x80000000 - -#define TXBUF_FRMLEN_MASK 0x000007ff -#define TXBUF_FRAME_END 0x00008000 -#define TXBUF_NOCRC 0x00010000 -#define TXBUF_EXHAUSTED 0x08000000 -#define TXBUF_UNDERRUN 0x10000000 -#define TXBUF_MAXRETRY 0x20000000 -#define TXBUF_WRAP 0x40000000 -#define TXBUF_USED 0x80000000 -struct macb_device {void __iomem *regs;
@@ -111,8 +88,8 @@ static int macb_send(struct eth_device *edev, void *packet,dev_dbg (macb->dev,"%s\n" , __func__); - ctrl = length &TXBUF_FRMLEN_MASK ; - ctrl |=TXBUF_FRAME_END |TXBUF_WRAP ; + ctrl =MACB_BF (TX_FRMLEN , length); + ctrl |=MACB_BIT (TX_LAST ) |MACB_BIT (TX_WRAP ); macb->tx_ring[0 ].ctrl = ctrl; macb->tx_ring[0 ].addr = (ulong )packet;
@@ -121,13 +98,13 @@ static int macb_send(struct eth_device *edev, void *packet,macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE ) |MACB_BIT (TSTART )); ret =wait_on_timeout (100 *MSECOND , - !(macb->tx_ring[0 ].ctrl &TXBUF_USED )); + !(macb->tx_ring[0 ].ctrl &MACB_BIT (TX_USED ))); ctrl = macb->tx_ring[0 ].ctrl; -if (ctrl &TXBUF_UNDERRUN ) +if (ctrl &MACB_BIT (TX_UNDERRUN ))dev_err (macb->dev,"TX underrun\n" ); -if (ctrl &TXBUF_EXHAUSTED ) +if (ctrl &MACB_BIT (TX_BUF_EXHAUSTED ))dev_err (macb->dev,"TX buffers exhausted in mid frame\n" );if (ret)dev_err (macb->dev,"TX timeout\n" );
@@ -144,14 +121,14 @@ static void reclaim_rx_buffers(struct macb_device *macb, i = macb->rx_tail;while (i > new_tail) { - macb->rx_ring[i].addr &= ~RXADDR_USED ; + macb->rx_ring[i].addr &= ~MACB_BIT (RX_USED ); i++;if (i >CFG_MACB_RX_RING_SIZE ) i =0 ; }while (i < new_tail) { - macb->rx_ring[i].addr &= ~RXADDR_USED ; + macb->rx_ring[i].addr &= ~MACB_BIT (RX_USED ); i++; }
@@ -171,19 +148,19 @@ static int macb_recv(struct eth_device *edev)dev_dbg (macb->dev,"%s\n" , __func__);for (;;) { -if (!(macb->rx_ring[rx_tail].addr &RXADDR_USED )) +if (!(macb->rx_ring[rx_tail].addr &MACB_BIT (RX_USED )))return -1 ; status = macb->rx_ring[rx_tail].ctrl; -if (status &RXBUF_FRAME_START ) { +if (status &MACB_BIT (RX_SOF )) {if (rx_tail != macb->rx_tail)reclaim_rx_buffers (macb, rx_tail); wrapped =0 ; } -if (status &RXBUF_FRAME_END ) { +if (status &MACB_BIT (RX_EOF )) { buffer = macb->rx_buffer +128 * macb->rx_tail; - length = status &RXBUF_FRMLEN_MASK ; + length =MACB_BFEXT (RX_FRMLEN , status);if (wrapped) {unsigned int headlen, taillen;
@@ -257,14 +234,14 @@ static void macb_init(struct macb_device *macb) paddr = (ulong )macb->rx_buffer;for (i =0 ; i <CFG_MACB_RX_RING_SIZE ; i++) {if (i == (CFG_MACB_RX_RING_SIZE -1 )) - paddr |=RXADDR_WRAP ; + paddr |=MACB_BIT (RX_WRAP ); macb->rx_ring[i].addr = paddr; macb->rx_ring[i].ctrl =0 ; paddr +=128 ; } macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =TXBUF_USED |TXBUF_WRAP ; + macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); macb->rx_tail = macb->tx_tail =0 ;
@@ -308,7 +285,6 @@ static int macb_phy_read(struct mii_bus *bus, int addr, int reg)struct macb_device *macb = bus->priv;unsigned long netctl; -unsigned long netstat;unsigned long frame;int value;uint64_t start;
@@ -319,21 +295,20 @@ static int macb_phy_read(struct mii_bus *bus, int addr, int reg) netctl |=MACB_BIT (MPE );macb_writel (macb,NCR , netctl); - frame = (MACB_BF (SOF ,1 ) - |MACB_BF (RW ,2 ) + frame = (MACB_BF (SOF ,MACB_MAN_SOF ) + |MACB_BF (RW ,MACB_MAN_READ ) |MACB_BF (PHYA , addr) |MACB_BF (REGA , reg) - |MACB_BF (CODE ,2 )); + |MACB_BF (CODE ,MACB_MAN_CODE ));macb_writel (macb,MAN , frame); start =get_time_ns ();do { - netstat =macb_readl (macb,NSR );if (is_timeout (start,SECOND )) {dev_err (macb->dev,"phy read timed out\n" );return -1 ; } - }while (!(netstat &MACB_BIT (IDLE ))); + }while (!MACB_BFEXT (IDLE ,macb_readl (macb,NSR ))); frame =macb_readl (macb,MAN ); value =MACB_BFEXT (DATA , frame);
@@ -349,7 +324,6 @@ static int macb_phy_write(struct mii_bus *bus, int addr, int reg, u16 value) {struct macb_device *macb = bus->priv;unsigned long netctl; -unsigned long netstat;unsigned long frame;dev_dbg (macb->dev,"%s\n" , __func__);
@@ -358,17 +332,16 @@ static int macb_phy_write(struct mii_bus *bus, int addr, int reg, u16 value) netctl |=MACB_BIT (MPE );macb_writel (macb,NCR , netctl); - frame = (MACB_BF (SOF ,1 ) - |MACB_BF (RW ,1 ) + frame = (MACB_BF (SOF ,MACB_MAN_SOF ) + |MACB_BF (RW ,MACB_MAN_WRITE ) |MACB_BF (PHYA , addr) |MACB_BF (REGA , reg) - |MACB_BF (CODE ,2 ) + |MACB_BF (CODE ,MACB_MAN_CODE ) |MACB_BF (DATA , value));macb_writel (macb,MAN , frame); -do { - netstat =macb_readl (macb,NSR ); - }while (!(netstat &MACB_BIT (IDLE ))); +while (!MACB_BFEXT (IDLE ,macb_readl (macb,NSR ))) + ; netctl =macb_readl (macb,NCR ); netctl &= ~MACB_BIT (MPE );
drivers/net/macb.h +70 -0
74 lines not on this page · raw message
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/7 macb: use the macro as in linux for tx/rx buffer ring size
In reply to Jean-Christophe PLAGNIOL-VILLARD--- drivers/net/macb.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/net/macb.c +17 -16
@@ -51,10 +51,12 @@#include "macb.h" -#define CFG_MACB_RX_BUFFER_SIZE 4096 -#define CFG_MACB_RX_RING_SIZE (CFG_MACB_RX_BUFFER_SIZE / 128) -#define CFG_MACB_TX_TIMEOUT 1000 -#define CFG_MACB_AUTONEG_TIMEOUT 5000000 +#define MACB_RX_BUFFER_SIZE 128 +#define RX_BUFFER_MULTIPLE 64/* bytes */ +#define RX_RING_SIZE 32/* must be power of 2 */ +#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) + +#define TX_RING_BYTES (sizeof(struct macb_dma_desc))struct macb_device {void __iomem *regs;
@@ -123,7 +125,7 @@ static void reclaim_rx_buffers(struct macb_device *macb,while (i > new_tail) { macb->rx_ring[i].addr &= ~MACB_BIT (RX_USED ); i++; -if (i >CFG_MACB_RX_RING_SIZE ) +if (i >RX_RING_SIZE ) i =0 ; }
@@ -159,12 +161,12 @@ static int macb_recv(struct eth_device *edev) }if (status &MACB_BIT (RX_EOF )) { - buffer = macb->rx_buffer +128 * macb->rx_tail; + buffer = macb->rx_buffer +MACB_RX_BUFFER_SIZE * macb->rx_tail; length =MACB_BFEXT (RX_FRMLEN , status);if (wrapped) {unsigned int headlen, taillen; - headlen =128 * (CFG_MACB_RX_RING_SIZE + headlen =MACB_RX_BUFFER_SIZE * (RX_RING_SIZE - macb->rx_tail); taillen = length - headlen; memcpy((void *)NetRxPackets[0],
@@ -175,11 +177,11 @@ static int macb_recv(struct eth_device *edev) }net_receive (buffer, length); -if (++rx_tail >=CFG_MACB_RX_RING_SIZE ) +if (++rx_tail >=RX_RING_SIZE ) rx_tail =0 ;reclaim_rx_buffers (macb, rx_tail); }else { -if (++rx_tail >=CFG_MACB_RX_RING_SIZE ) { +if (++rx_tail >=RX_RING_SIZE ) { wrapped =1 ; rx_tail =0 ; }
@@ -232,13 +234,12 @@ static void macb_init(struct macb_device *macb)/* initialize DMA descriptors */ paddr = (ulong )macb->rx_buffer; -for (i =0 ; i <CFG_MACB_RX_RING_SIZE ; i++) { -if (i == (CFG_MACB_RX_RING_SIZE -1 )) - paddr |=MACB_BIT (RX_WRAP ); +for (i =0 ; i <RX_RING_SIZE ; i++) { macb->rx_ring[i].addr = paddr; macb->rx_ring[i].ctrl =0 ; - paddr +=128 ; + paddr +=MACB_RX_BUFFER_SIZE ; } + macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); macb->tx_ring[0 ].addr =0 ; macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP );
@@ -414,9 +415,9 @@ static int macb_probe(struct device_d *dev) macb->phy_flags = pdata->phy_flags; - macb->rx_buffer =dma_alloc_coherent (CFG_MACB_RX_BUFFER_SIZE ); - macb->rx_ring =dma_alloc_coherent (CFG_MACB_RX_RING_SIZE *sizeof (struct macb_dma_desc )); - macb->tx_ring =dma_alloc_coherent (sizeof (struct macb_dma_desc )); + macb->rx_buffer =dma_alloc_coherent (MACB_RX_BUFFER_SIZE *RX_RING_SIZE ); + macb->rx_ring =dma_alloc_coherent (RX_RING_BYTES ); + macb->tx_ring =dma_alloc_coherent (TX_RING_BYTES ); macb->regs =dev_request_mem_region (dev,0 );
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/7 macb: enable Tramsmit and Receive at open
In reply to Jean-Christophe PLAGNIOL-VILLARD--- drivers/net/macb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/macb.c +3 -2
@@ -214,6 +214,9 @@ static int macb_open(struct eth_device *edev)dev_dbg (macb->dev,"%s\n" , __func__); +/* Enable TX and RX */ +macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE )); +/* Obtain the PHY's address/id */ return phy_device_connect(edev, &macb->miibus, macb->phy_addr, macb_adjust_link, macb->phy_flags,
@@ -259,8 +262,6 @@ static void macb_init(struct macb_device *macb)#endif macb_writel (macb,USRIO , val); -/* Enable TX and RX */ -macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE )); }static void macb_halt (struct eth_device *edev)
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 5/7 macb: reset the IP at init
In reply to Jean-Christophe PLAGNIOL-VILLARD--- drivers/net/macb.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/net/macb.c +23 -0
@@ -374,6 +374,23 @@ static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr)return 0 ; } +static void macb_reset_hw (struct macb_device *bp) +{ +/* Disable RX and TX forcefully */ +macb_writel (bp,NCR ,0 ); + +/* Clear the stats registers (XXX: Update stats first?) */ +macb_writel (bp,NCR ,MACB_BIT (CLRSTAT )); + +/* Clear all status flags */ +macb_writel (bp,TSR ,-1 ); +macb_writel (bp,RSR ,-1 ); + +/* Disable all interrupts */ +macb_writel (bp,IDR ,-1 ); +macb_readl (bp,ISR ); +} +static int macb_probe (struct device_d *dev) {struct eth_device *edev;
@@ -433,6 +450,9 @@ static int macb_probe(struct device_d *dev) }clk_enable (pclk); + +macb_reset_hw (macb); + macb_hz =clk_get_rate (pclk);if (macb_hz <20000000 ) ncfgr =MACB_BF (CLK ,MACB_CLK_DIV8 );
@@ -443,6 +463,9 @@ static int macb_probe(struct device_d *dev)else ncfgr =MACB_BF (CLK ,MACB_CLK_DIV64 ); + + ncfgr |=MACB_BIT (PAE );/* PAuse Enable */ + ncfgr |=MACB_BIT (DRFCS );/* Discard Rx FCS */ macb_writel (macb,NCFGR , ncfgr);macb_init (macb);
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 6/7 macb: fix tx ring size
In reply to Jean-Christophe PLAGNIOL-VILLARDthe mininal tx ring size is 2 as if one we wrap on the same descriptor and can cause IP lock on GEM (gigabit version) this is always the case
--- drivers/net/macb.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-)
drivers/net/macb.c +34 -16
@@ -53,15 +53,17 @@#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ -#define RX_RING_SIZE 32/* must be power of 2 */ -#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) +#define RX_NB_PACKET 10 +#define TX_RING_SIZE 2/* must be power of 2 */ -#define TX_RING_BYTES (sizeof(struct macb_dma_desc)) +#define RX_RING_BYTES (bp) (sizeof(struct macb_dma_desc) * bp->rx_ring_size) +#define TX_RING_BYTES (sizeof(struct macb_dma_desc) * TX_RING_SIZE)struct macb_device {void __iomem *regs;unsigned int rx_tail; +unsigned int tx_head;unsigned int tx_tail;void *rx_buffer;
@@ -86,23 +88,36 @@ static int macb_send(struct eth_device *edev, void *packet, {struct macb_device *macb = edev->priv;unsigned long ctrl; -int ret; - -dev_dbg (macb->dev,"%s\n" , __func__); +int ret =0 ; +uint64_t start; +unsigned int tx_head = macb->tx_head; ctrl =MACB_BF (TX_FRMLEN , length); - ctrl |=MACB_BIT (TX_LAST ) |MACB_BIT (TX_WRAP ); + ctrl |=MACB_BIT (TX_LAST ); - macb->tx_ring[0 ].ctrl = ctrl; - macb->tx_ring[0 ].addr = (ulong )packet; +if (tx_head == (TX_RING_SIZE -1 )) { + ctrl |=MACB_BIT (TX_WRAP ); + macb->tx_head =0 ; + }else { + macb->tx_head++; + } + + macb->tx_ring[tx_head].ctrl = ctrl; + macb->tx_ring[tx_head].addr = (ulong )packet;barrier ();dma_flush_range ((ulong ) packet, (ulong )packet + length);macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE ) |MACB_BIT (TSTART )); - ret =wait_on_timeout (100 *MSECOND , - !(macb->tx_ring[0 ].ctrl &MACB_BIT (TX_USED ))); - - ctrl = macb->tx_ring[0 ].ctrl; + start =get_time_ns (); + ret = -ETIMEDOUT ; +do { +barrier (); + ctrl = macb->tx_ring[0 ].ctrl; +if (ctrl &MACB_BIT (TX_USED )) { + ret =0 ; +break ; + } + }while (!is_timeout (start,100 *MSECOND ));if (ctrl &MACB_BIT (TX_UNDERRUN ))dev_err (macb->dev,"TX underrun\n" );
@@ -244,10 +259,13 @@ static void macb_init(struct macb_device *macb) } macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); - macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); +for (i =0 ; i <TX_RING_SIZE ; i++) { + macb->tx_ring[i].addr =0 ; + macb->tx_ring[i].ctrl =MACB_BIT (TX_USED ); + } + macb->tx_ring[TX_RING_SIZE -1 ].addr |=MACB_BIT (TX_WRAP ); - macb->rx_tail = macb->tx_tail =0 ; + macb->rx_tail = macb->tx_head = macb->tx_tail =0 ;macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring);
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] macb: fix tx ring size
Hi,
Quoted 60 lines · Jean-Christophe PLAGNIOL-VILLARD
the mininal tx ring size is 2 as if one we wrap on the same descriptor and can cause IP lock on GEM (gigabit version) this is always the case
Signed-off-by Nicolas Ferre <[email protected]>Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- drivers/net/macb.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-)drivers/net/macb.c +18
-9@@ -53,15 +53,17 @@#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ -#define RX_RING_SIZE 32/* must be power of 2 */ -#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) +#define RX_NB_PACKET 10 +#define TX_RING_SIZE 2/* must be power of 2 */ -#define TX_RING_BYTES (sizeof(struct macb_dma_desc)) +#define RX_RING_BYTES (bp) (sizeof(struct macb_dma_desc) * bp->rx_ring_size) +#define TX_RING_BYTES (sizeof(struct macb_dma_desc) * TX_RING_SIZE)struct macb_device {void __iomem *regs;unsigned int rx_tail; +unsigned int tx_head;unsigned int tx_tail;void *rx_buffer;@@ -86,23 +88,36 @@ static int macb_send(struct eth_device *edev, void *packet, {struct macb_device *macb = edev->priv;unsigned long ctrl; -int ret; - -dev_dbg (macb->dev,"%s\n" , __func__); +int ret =0 ; +uint64_t start; +unsigned int tx_head = macb->tx_head; ctrl =MACB_BF (TX_FRMLEN , length); - ctrl |=MACB_BIT (TX_LAST ) |MACB_BIT (TX_WRAP ); + ctrl |=MACB_BIT (TX_LAST ); - macb->tx_ring[0 ].ctrl = ctrl; - macb->tx_ring[0 ].addr = (ulong )packet; +if (tx_head == (TX_RING_SIZE -1 )) { + ctrl |=MACB_BIT (TX_WRAP ); + macb->tx_head =0 ; + }else { + macb->tx_head++; + } + + macb->tx_ring[tx_head].ctrl = ctrl; + macb->tx_ring[tx_head].addr = (ulong )packet;
drivers/net/macb.c static int macb_send(struct eth_device *edev, void *packet, · line 112
Quoted 10 lines
drivers/net/macb.c +2
-4barrier ();dma_flush_range ((ulong ) packet, (ulong )packet + length);macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE ) |MACB_BIT (TSTART )); - ret =wait_on_timeout (100 *MSECOND , - !(macb->tx_ring[0 ].ctrl &MACB_BIT (TX_USED ))); - - ctrl = macb->tx_ring[0 ].ctrl; + start =get_time_ns (); + ret = -ETIMEDOUT ;
Is this ret ever used?
Quoted 36 lines
drivers/net/macb.c +14
-3+do { +barrier (); + ctrl = macb->tx_ring[0 ].ctrl; +if (ctrl &MACB_BIT (TX_USED )) { + ret =0 ; +break ; + } + }while (!is_timeout (start,100 *MSECOND ));if (ctrl &MACB_BIT (TX_UNDERRUN ))dev_err (macb->dev,"TX underrun\n" );@@ -244,10 +259,13 @@ static void macb_init(struct macb_device *macb) } macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); - macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); +for (i =0 ; i <TX_RING_SIZE ; i++) { + macb->tx_ring[i].addr =0 ; + macb->tx_ring[i].ctrl =MACB_BIT (TX_USED ); + } + macb->tx_ring[TX_RING_SIZE -1 ].addr |=MACB_BIT (TX_WRAP ); - macb->rx_tail = macb->tx_tail =0 ; + macb->rx_tail = macb->tx_head = macb->tx_tail =0 ;macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring);Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] macb: fix tx ring size
Quoted 67 lines · Alexander Aring
Hi,
Quoted 64 lines · Jean-Christophe PLAGNIOL-VILLARD
the mininal tx ring size is 2 as if one we wrap on the same descriptor and can cause IP lock on GEM (gigabit version) this is always the case
Signed-off-by Nicolas Ferre <[email protected]>Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- drivers/net/macb.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-)drivers/net/macb.c +18
-9@@ -53,15 +53,17 @@#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ -#define RX_RING_SIZE 32/* must be power of 2 */ -#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) +#define RX_NB_PACKET 10 +#define TX_RING_SIZE 2/* must be power of 2 */ -#define TX_RING_BYTES (sizeof(struct macb_dma_desc)) +#define RX_RING_BYTES (bp) (sizeof(struct macb_dma_desc) * bp->rx_ring_size) +#define TX_RING_BYTES (sizeof(struct macb_dma_desc) * TX_RING_SIZE)struct macb_device {void __iomem *regs;unsigned int rx_tail; +unsigned int tx_head;unsigned int tx_tail;void *rx_buffer;@@ -86,23 +88,36 @@ static int macb_send(struct eth_device *edev, void *packet, {struct macb_device *macb = edev->priv;unsigned long ctrl; -int ret; - -dev_dbg (macb->dev,"%s\n" , __func__); +int ret =0 ; +uint64_t start; +unsigned int tx_head = macb->tx_head; ctrl =MACB_BF (TX_FRMLEN , length); - ctrl |=MACB_BIT (TX_LAST ) |MACB_BIT (TX_WRAP ); + ctrl |=MACB_BIT (TX_LAST ); - macb->tx_ring[0 ].ctrl = ctrl; - macb->tx_ring[0 ].addr = (ulong )packet; +if (tx_head == (TX_RING_SIZE -1 )) { + ctrl |=MACB_BIT (TX_WRAP ); + macb->tx_head =0 ; + }else { + macb->tx_head++; + } + + macb->tx_ring[tx_head].ctrl = ctrl; + macb->tx_ring[tx_head].addr = (ulong )packet;barrier ();dma_flush_range ((ulong ) packet, (ulong )packet + length);macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE ) |MACB_BIT (TSTART ));
Quoted 8 lines
drivers/net/macb.c static int macb_send(struct eth_device *edev, void *packet, · line 112
Quoted 6 lines
drivers/net/macb.c +2
-4- ret =wait_on_timeout (100 *MSECOND , - !(macb->tx_ring[0 ].ctrl &MACB_BIT (TX_USED ))); - - ctrl = macb->tx_ring[0 ].ctrl; + start =get_time_ns (); + ret = -ETIMEDOUT ;Is this ret ever used?
for sure we return it if we timeout
this is the ret of the send
Best Regards,
J.
Quoted 33 lines
Quoted 33 lines
drivers/net/macb.c +14
-3+do { +barrier (); + ctrl = macb->tx_ring[0 ].ctrl; +if (ctrl &MACB_BIT (TX_USED )) { + ret =0 ; +break ; + } + }while (!is_timeout (start,100 *MSECOND ));if (ctrl &MACB_BIT (TX_UNDERRUN ))dev_err (macb->dev,"TX underrun\n" );@@ -244,10 +259,13 @@ static void macb_init(struct macb_device *macb) } macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); - macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); +for (i =0 ; i <TX_RING_SIZE ; i++) { + macb->tx_ring[i].addr =0 ; + macb->tx_ring[i].ctrl =MACB_BIT (TX_USED ); + } + macb->tx_ring[TX_RING_SIZE -1 ].addr |=MACB_BIT (TX_WRAP ); - macb->rx_tail = macb->tx_tail =0 ; + macb->rx_tail = macb->tx_head = macb->tx_tail =0 ;macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring);Signature · 1 line
1.7.10.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] macb: fix tx ring size
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 14 lines · Jean-Christophe PLAGNIOL-VILLARD
the mininal tx ring size is 2 as if one we wrap on the same descriptor and can cause IP lock on GEM (gigabit version) this is always the case
Signed-off-by Nicolas Ferre <[email protected]>Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- drivers/net/macb.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-)drivers/net/macb.c +0
-0
drivers/net/macb.c line 56
Quoted 4 lines
drivers/net/macb.c +0
-1@@ -53,15 +53,17 @@#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ -#define RX_RING_SIZE 32/* must be power of 2 */
This removes RX_RING_SIZE...
drivers/net/macb.c static void macb_init(struct macb_device *macb) · line 260
Quoted 3 lines
drivers/net/macb.c +0
-0@@ -244,10 +259,13 @@ static void macb_init(struct macb_device *macb) } macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP );
But not its users.
Dropped.
Sascha
Quoted 23 lines
drivers/net/macb.c +6
-3- macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); +for (i =0 ; i <TX_RING_SIZE ; i++) { + macb->tx_ring[i].addr =0 ; + macb->tx_ring[i].ctrl =MACB_BIT (TX_USED ); + } + macb->tx_ring[TX_RING_SIZE -1 ].addr |=MACB_BIT (TX_WRAP ); - macb->rx_tail = macb->tx_tail =0 ; + macb->rx_tail = macb->tx_head = macb->tx_tail =0 ;macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring);Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] macb: fix tx ring size
Quoted 16 lines · Sascha Hauer
Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD
the mininal tx ring size is 2 as if one we wrap on the same descriptor and can cause IP lock on GEM (gigabit version) this is always the case
Signed-off-by Nicolas Ferre <[email protected]>Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- drivers/net/macb.c | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-)drivers/net/macb.c +0
-0@@ -53,15 +53,17 @@
Quoted 5 lines
drivers/net/macb.c line 56
Quoted 3 lines
drivers/net/macb.c +0
-1#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ -#define RX_RING_SIZE 32/* must be power of 2 */ This removes
RX_RING_SIZE...
I miss split the patch with gem
I resend it
Best Regards,
J.
Quoted 29 lines
drivers/net/macb.c static void macb_init(struct macb_device *macb) · line 260
Quoted 4 lines
drivers/net/macb.c +0
-0@@ -244,10 +259,13 @@ static void macb_init(struct macb_device *macb) } macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP );But not its users.
Dropped.
Sascha
Quoted 18 lines
drivers/net/macb.c +6
-3- macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); +for (i =0 ; i <TX_RING_SIZE ; i++) { + macb->tx_ring[i].addr =0 ; + macb->tx_ring[i].ctrl =MACB_BIT (TX_USED ); + } + macb->tx_ring[TX_RING_SIZE -1 ].addr |=MACB_BIT (TX_WRAP ); - macb->rx_tail = macb->tx_tail =0 ; + macb->rx_tail = macb->tx_head = macb->tx_tail =0 ;macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring);Signature · 1 line
1.7.10.4
Quoted 11 lines
Quoted 5 lines
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/bareboxSignature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 7/7 macb: add cadence Gigabit GEM support
In reply to Jean-Christophe PLAGNIOL-VILLARDbased on the kernel code
detect it via IP version
In the GEM we can use a full packet buffer for receive but the buffer size need to be 64bit size aligned.
--- drivers/net/macb.c | 246 +++++++++++++++++++++++++++++++++++++++++++--------- drivers/net/macb.h | 109 ++++++++++++++++++++++- 2 files changed, 315 insertions(+), 40 deletions(-)
drivers/net/macb.c +207 -39
@@ -71,8 +71,12 @@ struct macb_device {struct macb_dma_desc *rx_ring;struct macb_dma_desc *tx_ring; +int rx_buffer_size; +int rx_ring_size; +int phy_addr; +struct clk *pclk;const struct device_d *dev;struct eth_device netdev;
@@ -81,8 +85,20 @@ struct macb_device {struct mii_bus miibus;unsigned int phy_flags; + +bool is_gem; }; +static inline bool macb_is_gem (struct macb_device *macb) +{ +return macb->is_gem; +} + +static inline bool read_is_gem (struct macb_device *macb) +{ +return MACB_BFEXT (IDNUM ,macb_readl (macb,MID )) ==0x2 ; +} +static int macb_send (struct eth_device *edev,void *packet,int length) {
@@ -140,7 +156,7 @@ static void reclaim_rx_buffers(struct macb_device *macb,while (i > new_tail) { macb->rx_ring[i].addr &= ~MACB_BIT (RX_USED ); i++; -if (i >RX_RING_SIZE ) +if (i > macb->rx_ring_size) i =0 ; }
@@ -153,6 +169,37 @@ static void reclaim_rx_buffers(struct macb_device *macb, macb->rx_tail = new_tail; } +static int gem_recv (struct eth_device *edev) +{ +struct macb_device *macb = edev->priv; +unsigned int rx_tail = macb->rx_tail; +void *buffer; +int length; +u32 status; + +dev_dbg (macb->dev,"%s\n" , __func__); + +for (;;) { +barrier (); +if (!(macb->rx_ring[rx_tail].addr &MACB_BIT (RX_USED ))) +return -1 ; + +barrier (); + status = macb->rx_ring[rx_tail].ctrl; + length =MACB_BFEXT (RX_FRMLEN , status); +if (status &MACB_BIT (RX_SOF )) { + buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail; +net_receive (buffer, length); + macb->rx_ring[rx_tail].ctrl &= ~MACB_BIT (RX_USED ); +barrier (); + } + rx_tail++; + macb->rx_tail++; + } + +return 0 ; +} +static int macb_recv (struct eth_device *edev) {struct macb_device *macb = edev->priv;
@@ -176,12 +223,12 @@ static int macb_recv(struct eth_device *edev) }if (status &MACB_BIT (RX_EOF )) { - buffer = macb->rx_buffer +MACB_RX_BUFFER_SIZE * macb->rx_tail; + buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail; length =MACB_BFEXT (RX_FRMLEN , status);if (wrapped) {unsigned int headlen, taillen; - headlen =MACB_RX_BUFFER_SIZE * (RX_RING_SIZE + headlen = macb->rx_buffer_size * (macb->rx_ring_size - macb->rx_tail); taillen = length - headlen; memcpy((void *)NetRxPackets[0],
@@ -192,11 +239,11 @@ static int macb_recv(struct eth_device *edev) }net_receive (buffer, length); -if (++rx_tail >=RX_RING_SIZE ) +if (++rx_tail >= macb->rx_ring_size) rx_tail =0 ;reclaim_rx_buffers (macb, rx_tail); }else { -if (++rx_tail >=RX_RING_SIZE ) { +if (++rx_tail >= macb->rx_ring_size) { wrapped =1 ; rx_tail =0 ; }
@@ -214,13 +261,17 @@ static void macb_adjust_link(struct eth_device *edev) reg =macb_readl (macb,NCFGR ); reg &= ~(MACB_BIT (SPD ) |MACB_BIT (FD )); +if (macb_is_gem (macb)) + reg &= ~GEM_BIT (GBE );if (edev->phydev->duplex) reg |=MACB_BIT (FD );if (edev->phydev->speed ==SPEED_100 ) reg |=MACB_BIT (SPD ); +if (edev->phydev->speed ==SPEED_1000 ) + reg |=GEM_BIT (GBE ); -macb_writel (macb,NCFGR , reg); +macb_or_gem_writel (macb,NCFGR , reg); }static int macb_open (struct eth_device *edev)
@@ -238,6 +289,29 @@ static int macb_open(struct eth_device *edev) macb->interface); } +/* +* Configure the receive DMA engine +* - use the correct receive buffer size +* - set the possibility to use INCR16 bursts +* (if not supported by FIFO, it will fallback to default) +* - set both rx/tx packet buffers to full memory size +* - set discard rx packets if no DMA resource +* These are configurable parameters for GEM. +*/ +static void macb_configure_dma (struct macb_device *bp) +{ +u32 dmacfg; + +if (macb_is_gem (bp)) { + dmacfg =gem_readl (bp,DMACFG ) & ~GEM_BF (RXBS ,-1L ); + dmacfg |=GEM_BF (RXBS , bp->rx_buffer_size /RX_BUFFER_MULTIPLE ); + dmacfg |=GEM_BF (FBLDO ,16 ); + dmacfg |=GEM_BIT (TXPBMS ) |GEM_BF (RXBMS ,-1L ); + dmacfg |=GEM_BIT (DDRP ); +gem_writel (bp,DMACFG , dmacfg); + } +} +static void macb_init (struct macb_device *macb) {unsigned long paddr, val =0 ;
@@ -252,12 +326,12 @@ static void macb_init(struct macb_device *macb)/* initialize DMA descriptors */ paddr = (ulong )macb->rx_buffer; -for (i =0 ; i <RX_RING_SIZE ; i++) { +for (i =0 ; i < macb->rx_ring_size; i++) { macb->rx_ring[i].addr = paddr; macb->rx_ring[i].ctrl =0 ; - paddr +=MACB_RX_BUFFER_SIZE ; + paddr += macb->rx_buffer_size; } - macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); + macb->rx_ring[macb->rx_ring_size -1 ].addr |=MACB_BIT (RX_WRAP );for (i =0 ; i <TX_RING_SIZE ; i++) { macb->tx_ring[i].addr =0 ;
@@ -267,18 +341,29 @@ static void macb_init(struct macb_device *macb) macb->rx_tail = macb->tx_head = macb->tx_tail =0 ; +macb_configure_dma (macb); +macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring); -if (macb->interface ==PHY_INTERFACE_MODE_RMII ) - val |=MACB_BIT (RMII ); -else - val &= ~MACB_BIT (RMII ); +switch (macb->interface) { +case PHY_INTERFACE_MODE_RGMII : + val =GEM_BIT (RGMII ); +break ; +case PHY_INTERFACE_MODE_RMII : +if (IS_ENABLED (CONFIG_ARCH_AT91 )) + val =MACB_BIT (RMII ) |MACB_BIT (CLKEN ); +else + val =0 ; +break ; +default : +if (IS_ENABLED (CONFIG_ARCH_AT91 )) + val =MACB_BIT (CLKEN ); +else + val =MACB_BIT (MII ); + } -#if defined(CONFIG_ARCH_AT91 ) - val |=MACB_BIT (CLKEN ); -#endif -macb_writel (macb,USRIO , val); +macb_or_gem_writel (macb,USRIO , val); }
@@ -386,12 +471,75 @@ static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr)dev_dbg (macb->dev,"%s\n" , __func__);/* set hardware address */ -macb_writel (macb,SA1B , adr[0 ] | adr[1 ] <<8 | adr[2 ] <<16 | adr[3 ] <<24 ); -macb_writel (macb,SA1T , adr[4 ] | adr[5 ] <<8 ); +macb_or_gem_writel (macb,SA1B , adr[0 ] | adr[1 ] <<8 | adr[2 ] <<16 | adr[3 ] <<24 ); +macb_or_gem_writel (macb,SA1T , adr[4 ] | adr[5 ] <<8 );return 0 ; } +static u32 gem_mdc_clk_div (struct macb_device *bp) +{ +u32 config; +unsigned long pclk_hz =clk_get_rate (bp->pclk); + +if (pclk_hz <=20000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV8 ); +else if (pclk_hz <=40000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV16 ); +else if (pclk_hz <=80000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV32 ); +else if (pclk_hz <=120000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV48 ); +else if (pclk_hz <=160000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV64 ); +else + config =GEM_BF (CLK ,GEM_CLK_DIV96 ); + +return config; +} + +static u32 macb_mdc_clk_div (struct macb_device *bp) +{ +u32 config; +unsigned long pclk_hz; + +if (macb_is_gem (bp)) +return gem_mdc_clk_div (bp); + + pclk_hz =clk_get_rate (bp->pclk); +if (pclk_hz <=20000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV8 ); +else if (pclk_hz <=40000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV16 ); +else if (pclk_hz <=80000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV32 ); +else + config =MACB_BF (CLK ,MACB_CLK_DIV64 ); + +return config; +} + +/* +* Get the DMA bus width field of the network configuration register that we +* should program. We find the width from decoding the design configuration +* register to find the maximum supported data bus width. +*/ +static u32 macb_dbw (struct macb_device *bp) +{ +if (!macb_is_gem (bp)) +return 0 ; + +switch (GEM_BFEXT (DBWDEF ,gem_readl (bp,DCFG1 ))) { +case 4 : +return GEM_BF (DBW ,GEM_DBW128 ); +case 2 : +return GEM_BF (DBW ,GEM_DBW64 ); +case 1 : +default : +return GEM_BF (DBW ,GEM_DBW32 ); + } +} +static void macb_reset_hw (struct macb_device *bp) {/* Disable RX and TX forcefully */
@@ -409,14 +557,35 @@ static void macb_reset_hw(struct macb_device *bp)macb_readl (bp,ISR ); } +static void macb_init_rx_buffer_size (struct macb_device *bp,size_t size) +{ +if (!macb_is_gem (bp)) { + bp->rx_buffer_size =MACB_RX_BUFFER_SIZE ; + bp->rx_ring_size =roundup (RX_NB_PACKET *PKTSIZE /MACB_RX_BUFFER_SIZE ,2 ); + }else { + bp->rx_buffer_size = size; + bp->rx_ring_size =RX_NB_PACKET ; + +if (bp->rx_buffer_size %RX_BUFFER_MULTIPLE ) { +dev_dbg (bp->dev, +"RX buffer must be multiple of %d bytes, expanding\n" , +RX_BUFFER_MULTIPLE ); + bp->rx_buffer_size = +roundup (bp->rx_buffer_size,RX_BUFFER_MULTIPLE ); + } + bp->rx_buffer =dma_alloc_coherent (bp->rx_buffer_size * bp->rx_ring_size); + } + +dev_dbg (bp->dev,"[%d] rx_buffer_size [%d]\n" , + size, bp->rx_buffer_size); +} +static int macb_probe (struct device_d *dev) {struct eth_device *edev;struct macb_device *macb; -unsigned long macb_hz;u32 ncfgr;struct at91_ether_platform_data *pdata; -struct clk *pclk;if (!dev->platform_data) {dev_err (dev,"macb: no platform_data\n" );
@@ -432,7 +601,6 @@ static int macb_probe(struct device_d *dev) edev->open = macb_open; edev->send = macb_send; - edev->recv = macb_recv; edev->halt = macb_halt; edev->get_ethaddr = pdata->get_ethaddr ? pdata->get_ethaddr : macb_get_ethaddr; edev->set_ethaddr = macb_set_ethaddr;
@@ -451,8 +619,9 @@ static int macb_probe(struct device_d *dev) macb->phy_flags = pdata->phy_flags; - macb->rx_buffer =dma_alloc_coherent (MACB_RX_BUFFER_SIZE *RX_RING_SIZE ); - macb->rx_ring =dma_alloc_coherent (RX_RING_BYTES ); +macb_init_rx_buffer_size (macb,PKTSIZE ); + macb->rx_buffer =dma_alloc_coherent (macb->rx_buffer_size * macb->rx_ring_size); + macb->rx_ring =dma_alloc_coherent (RX_RING_BYTES (macb)); macb->tx_ring =dma_alloc_coherent (TX_RING_BYTES ); macb->regs =dev_request_mem_region (dev,0 );
@@ -461,29 +630,25 @@ static int macb_probe(struct device_d *dev)* Do some basic initialization so that we at least can talk * to the PHY */ - pclk =clk_get (dev,"macb_clk" ); -if (IS_ERR (pclk)) { + macb->pclk =clk_get (dev,"macb_clk" ); +if (IS_ERR (macb->pclk)) {dev_err (dev,"no macb_clk\n" ); -return PTR_ERR (pclk); +return PTR_ERR (macb->pclk); } -clk_enable (pclk); - -macb_reset_hw (macb); +clk_enable (macb->pclk); - macb_hz =clk_get_rate (pclk); -if (macb_hz <20000000 ) - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV8 ); -else if (macb_hz <40000000 ) - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV16 ); -else if (macb_hz <80000000 ) - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV32 ); +if (macb_is_gem (macb)) + edev->recv = gem_recv;else - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV64 ); - + edev->recv = macb_recv; + macb->is_gem =read_is_gem (macb); +macb_reset_hw (macb); + ncfgr =macb_mdc_clk_div (macb); ncfgr |=MACB_BIT (PAE );/* PAuse Enable */ ncfgr |=MACB_BIT (DRFCS );/* Discard Rx FCS */ + ncfgr |=macb_dbw (macb);macb_writel (macb,NCFGR , ncfgr);macb_init (macb);
@@ -491,6 +656,9 @@ static int macb_probe(struct device_d *dev)mdiobus_register (&macb->miibus);eth_register (edev); +dev_info (dev,"Cadence %s at 0x%p\n" , +macb_is_gem (macb) ?"GEM" :"MACB" , macb->regs); +return 0 ; }
drivers/net/macb.h +108 -1
156 lines not on this page · raw message
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
On 02/08/2013 10:07 AM, Jean-Christophe PLAGNIOL-VILLARD :
Quoted 11 lines
HI,
This patch serie fixe more issue on the macb and add the GEM support (gigabit support) present on Atmel sama5d3x as example
The IP version is detected as in linux
we now share more code with the kernel and will help to maintain the driver
tesed on at91 macb & gem
You can add to the whole patch series:
Quoted 31 lines
The following changes since commit
15c5fa0467b20c05e9ebea36e049764054a7e308:macb: drop non used define (2013-02-08 16:55:16 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.gitdelivery/macbfor you to fetch changes up to
b7058953abdd014b9626b22d868fb29c1c563514:macb: add cadence Gigabit GEM support (2013-02-08 16:55:41 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (7):
macb: callmacb_initat probe explecitly
macb: sync remaining define with linux
macb: use the macro as in linux for tx/rx buffer ring size
macb: enable Tramsmit and Receive at open
macb: reset the IP at init
macb: fix tx ring size
macb: add cadence Gigabit GEM supportdrivers/net/macb.c | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- drivers/net/macb.h | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 466 insertions(+), 107 deletions(-)Best Regards,
J.
Signature · 6 lines
Nicolas Ferre _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
HI,
This patch serie fixe more issue on the macb and add the GEM support (gigabit support) present on Atmel sama5d3x as example
The IP version is detected as in linux
we now share more code with the kernel and will help to maintain the driver
tesed on at91 macb & gem
Quoted 7 lines
The following changes since commit
15c5fa0467b20c05e9ebea36e049764054a7e308:macb: drop non used define (2013-02-08 16:55:16 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.gitdelivery/macb
Applied, thanks
Sascha
Quoted 27 lines
for you to fetch changes up to
b7058953abdd014b9626b22d868fb29c1c563514:macb: add cadence Gigabit GEM support (2013-02-08 16:55:41 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (7):
macb: callmacb_initat probe explecitly
macb: sync remaining define with linux
macb: use the macro as in linux for tx/rx buffer ring size
macb: enable Tramsmit and Receive at open
macb: reset the IP at init
macb: fix tx ring size
macb: add cadence Gigabit GEM supportdrivers/net/macb.c | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- drivers/net/macb.h | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 466 insertions(+), 107 deletions(-)Best Regards,
J._______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 6/7 macb: fix tx ring size
In reply to Jean-Christophe PLAGNIOL-VILLARDthe mininal tx ring size is 2 as if one we wrap on the same descriptor and can cause IP lock on GEM (gigabit version) this is always the case
--- drivers/net/macb.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-)
drivers/net/macb.c +33 -15
@@ -54,14 +54,16 @@#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ #define RX_RING_SIZE 32/* must be power of 2 */ -#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) +#define TX_RING_SIZE 2/* must be power of 2 */ -#define TX_RING_BYTES (sizeof(struct macb_dma_desc)) +#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) +#define TX_RING_BYTES (sizeof(struct macb_dma_desc) * TX_RING_SIZE)struct macb_device {void __iomem *regs;unsigned int rx_tail; +unsigned int tx_head;unsigned int tx_tail;void *rx_buffer;
@@ -86,23 +88,36 @@ static int macb_send(struct eth_device *edev, void *packet, {struct macb_device *macb = edev->priv;unsigned long ctrl; -int ret; - -dev_dbg (macb->dev,"%s\n" , __func__); +int ret =0 ; +uint64_t start; +unsigned int tx_head = macb->tx_head; ctrl =MACB_BF (TX_FRMLEN , length); - ctrl |=MACB_BIT (TX_LAST ) |MACB_BIT (TX_WRAP ); + ctrl |=MACB_BIT (TX_LAST ); + +if (tx_head == (TX_RING_SIZE -1 )) { + ctrl |=MACB_BIT (TX_WRAP ); + macb->tx_head =0 ; + }else { + macb->tx_head++; + } - macb->tx_ring[0 ].ctrl = ctrl; - macb->tx_ring[0 ].addr = (ulong )packet; + macb->tx_ring[tx_head].ctrl = ctrl; + macb->tx_ring[tx_head].addr = (ulong )packet;barrier ();dma_flush_range ((ulong ) packet, (ulong )packet + length);macb_writel (macb,NCR ,MACB_BIT (TE ) |MACB_BIT (RE ) |MACB_BIT (TSTART )); - ret =wait_on_timeout (100 *MSECOND , - !(macb->tx_ring[0 ].ctrl &MACB_BIT (TX_USED ))); - - ctrl = macb->tx_ring[0 ].ctrl; + start =get_time_ns (); + ret = -ETIMEDOUT ; +do { +barrier (); + ctrl = macb->tx_ring[0 ].ctrl; +if (ctrl &MACB_BIT (TX_USED )) { + ret =0 ; +break ; + } + }while (!is_timeout (start,100 *MSECOND ));if (ctrl &MACB_BIT (TX_UNDERRUN ))dev_err (macb->dev,"TX underrun\n" );
@@ -244,10 +259,13 @@ static void macb_init(struct macb_device *macb) } macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); - macb->tx_ring[0 ].addr =0 ; - macb->tx_ring[0 ].ctrl =MACB_BIT (TX_USED ) |MACB_BIT (TX_WRAP ); +for (i =0 ; i <TX_RING_SIZE ; i++) { + macb->tx_ring[i].addr =0 ; + macb->tx_ring[i].ctrl =MACB_BIT (TX_USED ); + } + macb->tx_ring[TX_RING_SIZE -1 ].addr |=MACB_BIT (TX_WRAP ); - macb->rx_tail = macb->tx_tail =0 ; + macb->rx_tail = macb->tx_head = macb->tx_tail =0 ;macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring);
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 7/7 macb: add cadence Gigabit GEM support
based on the kernel code
detect it via IP version
In the GEM we can use a full packet buffer for receive but the buffer size need to be 64bit size aligned.
--- drivers/net/macb.c | 250 +++++++++++++++++++++++++++++++++++++++++++--------- drivers/net/macb.h | 109 ++++++++++++++++++++++- 2 files changed, 317 insertions(+), 42 deletions(-)
drivers/net/macb.c +209 -41
@@ -53,10 +53,10 @@#define MACB_RX_BUFFER_SIZE 128#define RX_BUFFER_MULTIPLE 64/* bytes */ -#define RX_RING_SIZE 32/* must be power of 2 */ +#define RX_NB_PACKET 10#define TX_RING_SIZE 2/* must be power of 2 */ -#define RX_RING_BYTES (sizeof(struct macb_dma_desc) * RX_RING_SIZE) +#define RX_RING_BYTES (bp) (sizeof(struct macb_dma_desc) * bp->rx_ring_size)#define TX_RING_BYTES (sizeof(struct macb_dma_desc) * TX_RING_SIZE)struct macb_device {
@@ -71,8 +71,12 @@ struct macb_device {struct macb_dma_desc *rx_ring;struct macb_dma_desc *tx_ring; +int rx_buffer_size; +int rx_ring_size; +int phy_addr; +struct clk *pclk;const struct device_d *dev;struct eth_device netdev;
@@ -81,8 +85,20 @@ struct macb_device {struct mii_bus miibus;unsigned int phy_flags; + +bool is_gem; }; +static inline bool macb_is_gem (struct macb_device *macb) +{ +return macb->is_gem; +} + +static inline bool read_is_gem (struct macb_device *macb) +{ +return MACB_BFEXT (IDNUM ,macb_readl (macb,MID )) ==0x2 ; +} +static int macb_send (struct eth_device *edev,void *packet,int length) {
@@ -140,7 +156,7 @@ static void reclaim_rx_buffers(struct macb_device *macb,while (i > new_tail) { macb->rx_ring[i].addr &= ~MACB_BIT (RX_USED ); i++; -if (i >RX_RING_SIZE ) +if (i > macb->rx_ring_size) i =0 ; }
@@ -153,6 +169,37 @@ static void reclaim_rx_buffers(struct macb_device *macb, macb->rx_tail = new_tail; } +static int gem_recv (struct eth_device *edev) +{ +struct macb_device *macb = edev->priv; +unsigned int rx_tail = macb->rx_tail; +void *buffer; +int length; +u32 status; + +dev_dbg (macb->dev,"%s\n" , __func__); + +for (;;) { +barrier (); +if (!(macb->rx_ring[rx_tail].addr &MACB_BIT (RX_USED ))) +return -1 ; + +barrier (); + status = macb->rx_ring[rx_tail].ctrl; + length =MACB_BFEXT (RX_FRMLEN , status); +if (status &MACB_BIT (RX_SOF )) { + buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail; +net_receive (buffer, length); + macb->rx_ring[rx_tail].ctrl &= ~MACB_BIT (RX_USED ); +barrier (); + } + rx_tail++; + macb->rx_tail++; + } + +return 0 ; +} +static int macb_recv (struct eth_device *edev) {struct macb_device *macb = edev->priv;
@@ -176,12 +223,12 @@ static int macb_recv(struct eth_device *edev) }if (status &MACB_BIT (RX_EOF )) { - buffer = macb->rx_buffer +MACB_RX_BUFFER_SIZE * macb->rx_tail; + buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail; length =MACB_BFEXT (RX_FRMLEN , status);if (wrapped) {unsigned int headlen, taillen; - headlen =MACB_RX_BUFFER_SIZE * (RX_RING_SIZE + headlen = macb->rx_buffer_size * (macb->rx_ring_size - macb->rx_tail); taillen = length - headlen; memcpy((void *)NetRxPackets[0],
@@ -192,11 +239,11 @@ static int macb_recv(struct eth_device *edev) }net_receive (buffer, length); -if (++rx_tail >=RX_RING_SIZE ) +if (++rx_tail >= macb->rx_ring_size) rx_tail =0 ;reclaim_rx_buffers (macb, rx_tail); }else { -if (++rx_tail >=RX_RING_SIZE ) { +if (++rx_tail >= macb->rx_ring_size) { wrapped =1 ; rx_tail =0 ; }
@@ -214,13 +261,17 @@ static void macb_adjust_link(struct eth_device *edev) reg =macb_readl (macb,NCFGR ); reg &= ~(MACB_BIT (SPD ) |MACB_BIT (FD )); +if (macb_is_gem (macb)) + reg &= ~GEM_BIT (GBE );if (edev->phydev->duplex) reg |=MACB_BIT (FD );if (edev->phydev->speed ==SPEED_100 ) reg |=MACB_BIT (SPD ); +if (edev->phydev->speed ==SPEED_1000 ) + reg |=GEM_BIT (GBE ); -macb_writel (macb,NCFGR , reg); +macb_or_gem_writel (macb,NCFGR , reg); }static int macb_open (struct eth_device *edev)
@@ -238,6 +289,29 @@ static int macb_open(struct eth_device *edev) macb->interface); } +/* +* Configure the receive DMA engine +* - use the correct receive buffer size +* - set the possibility to use INCR16 bursts +* (if not supported by FIFO, it will fallback to default) +* - set both rx/tx packet buffers to full memory size +* - set discard rx packets if no DMA resource +* These are configurable parameters for GEM. +*/ +static void macb_configure_dma (struct macb_device *bp) +{ +u32 dmacfg; + +if (macb_is_gem (bp)) { + dmacfg =gem_readl (bp,DMACFG ) & ~GEM_BF (RXBS ,-1L ); + dmacfg |=GEM_BF (RXBS , bp->rx_buffer_size /RX_BUFFER_MULTIPLE ); + dmacfg |=GEM_BF (FBLDO ,16 ); + dmacfg |=GEM_BIT (TXPBMS ) |GEM_BF (RXBMS ,-1L ); + dmacfg |=GEM_BIT (DDRP ); +gem_writel (bp,DMACFG , dmacfg); + } +} +static void macb_init (struct macb_device *macb) {unsigned long paddr, val =0 ;
@@ -252,12 +326,12 @@ static void macb_init(struct macb_device *macb)/* initialize DMA descriptors */ paddr = (ulong )macb->rx_buffer; -for (i =0 ; i <RX_RING_SIZE ; i++) { +for (i =0 ; i < macb->rx_ring_size; i++) { macb->rx_ring[i].addr = paddr; macb->rx_ring[i].ctrl =0 ; - paddr +=MACB_RX_BUFFER_SIZE ; + paddr += macb->rx_buffer_size; } - macb->rx_ring[RX_RING_SIZE -1 ].addr |=MACB_BIT (RX_WRAP ); + macb->rx_ring[macb->rx_ring_size -1 ].addr |=MACB_BIT (RX_WRAP );for (i =0 ; i <TX_RING_SIZE ; i++) { macb->tx_ring[i].addr =0 ;
@@ -267,18 +341,29 @@ static void macb_init(struct macb_device *macb) macb->rx_tail = macb->tx_head = macb->tx_tail =0 ; +macb_configure_dma (macb); +macb_writel (macb,RBQP , (ulong )macb->rx_ring);macb_writel (macb,TBQP , (ulong )macb->tx_ring); -if (macb->interface ==PHY_INTERFACE_MODE_RMII ) - val |=MACB_BIT (RMII ); -else - val &= ~MACB_BIT (RMII ); +switch (macb->interface) { +case PHY_INTERFACE_MODE_RGMII : + val =GEM_BIT (RGMII ); +break ; +case PHY_INTERFACE_MODE_RMII : +if (IS_ENABLED (CONFIG_ARCH_AT91 )) + val =MACB_BIT (RMII ) |MACB_BIT (CLKEN ); +else + val =0 ; +break ; +default : +if (IS_ENABLED (CONFIG_ARCH_AT91 )) + val =MACB_BIT (CLKEN ); +else + val =MACB_BIT (MII ); + } -#if defined(CONFIG_ARCH_AT91 ) - val |=MACB_BIT (CLKEN ); -#endif -macb_writel (macb,USRIO , val); +macb_or_gem_writel (macb,USRIO , val); }
@@ -386,12 +471,75 @@ static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr)dev_dbg (macb->dev,"%s\n" , __func__);/* set hardware address */ -macb_writel (macb,SA1B , adr[0 ] | adr[1 ] <<8 | adr[2 ] <<16 | adr[3 ] <<24 ); -macb_writel (macb,SA1T , adr[4 ] | adr[5 ] <<8 ); +macb_or_gem_writel (macb,SA1B , adr[0 ] | adr[1 ] <<8 | adr[2 ] <<16 | adr[3 ] <<24 ); +macb_or_gem_writel (macb,SA1T , adr[4 ] | adr[5 ] <<8 );return 0 ; } +static u32 gem_mdc_clk_div (struct macb_device *bp) +{ +u32 config; +unsigned long pclk_hz =clk_get_rate (bp->pclk); + +if (pclk_hz <=20000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV8 ); +else if (pclk_hz <=40000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV16 ); +else if (pclk_hz <=80000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV32 ); +else if (pclk_hz <=120000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV48 ); +else if (pclk_hz <=160000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV64 ); +else + config =GEM_BF (CLK ,GEM_CLK_DIV96 ); + +return config; +} + +static u32 macb_mdc_clk_div (struct macb_device *bp) +{ +u32 config; +unsigned long pclk_hz; + +if (macb_is_gem (bp)) +return gem_mdc_clk_div (bp); + + pclk_hz =clk_get_rate (bp->pclk); +if (pclk_hz <=20000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV8 ); +else if (pclk_hz <=40000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV16 ); +else if (pclk_hz <=80000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV32 ); +else + config =MACB_BF (CLK ,MACB_CLK_DIV64 ); + +return config; +} + +/* +* Get the DMA bus width field of the network configuration register that we +* should program. We find the width from decoding the design configuration +* register to find the maximum supported data bus width. +*/ +static u32 macb_dbw (struct macb_device *bp) +{ +if (!macb_is_gem (bp)) +return 0 ; + +switch (GEM_BFEXT (DBWDEF ,gem_readl (bp,DCFG1 ))) { +case 4 : +return GEM_BF (DBW ,GEM_DBW128 ); +case 2 : +return GEM_BF (DBW ,GEM_DBW64 ); +case 1 : +default : +return GEM_BF (DBW ,GEM_DBW32 ); + } +} +static void macb_reset_hw (struct macb_device *bp) {/* Disable RX and TX forcefully */
@@ -409,14 +557,35 @@ static void macb_reset_hw(struct macb_device *bp)macb_readl (bp,ISR ); } +static void macb_init_rx_buffer_size (struct macb_device *bp,size_t size) +{ +if (!macb_is_gem (bp)) { + bp->rx_buffer_size =MACB_RX_BUFFER_SIZE ; + bp->rx_ring_size =roundup (RX_NB_PACKET *PKTSIZE /MACB_RX_BUFFER_SIZE ,2 ); + }else { + bp->rx_buffer_size = size; + bp->rx_ring_size =RX_NB_PACKET ; + +if (bp->rx_buffer_size %RX_BUFFER_MULTIPLE ) { +dev_dbg (bp->dev, +"RX buffer must be multiple of %d bytes, expanding\n" , +RX_BUFFER_MULTIPLE ); + bp->rx_buffer_size = +roundup (bp->rx_buffer_size,RX_BUFFER_MULTIPLE ); + } + bp->rx_buffer =dma_alloc_coherent (bp->rx_buffer_size * bp->rx_ring_size); + } + +dev_dbg (bp->dev,"[%d] rx_buffer_size [%d]\n" , + size, bp->rx_buffer_size); +} +static int macb_probe (struct device_d *dev) {struct eth_device *edev;struct macb_device *macb; -unsigned long macb_hz;u32 ncfgr;struct at91_ether_platform_data *pdata; -struct clk *pclk;if (!dev->platform_data) {dev_err (dev,"macb: no platform_data\n" );
@@ -432,7 +601,6 @@ static int macb_probe(struct device_d *dev) edev->open = macb_open; edev->send = macb_send; - edev->recv = macb_recv; edev->halt = macb_halt; edev->get_ethaddr = pdata->get_ethaddr ? pdata->get_ethaddr : macb_get_ethaddr; edev->set_ethaddr = macb_set_ethaddr;
@@ -451,8 +619,9 @@ static int macb_probe(struct device_d *dev) macb->phy_flags = pdata->phy_flags; - macb->rx_buffer =dma_alloc_coherent (MACB_RX_BUFFER_SIZE *RX_RING_SIZE ); - macb->rx_ring =dma_alloc_coherent (RX_RING_BYTES ); +macb_init_rx_buffer_size (macb,PKTSIZE ); + macb->rx_buffer =dma_alloc_coherent (macb->rx_buffer_size * macb->rx_ring_size); + macb->rx_ring =dma_alloc_coherent (RX_RING_BYTES (macb)); macb->tx_ring =dma_alloc_coherent (TX_RING_BYTES ); macb->regs =dev_request_mem_region (dev,0 );
@@ -461,29 +630,25 @@ static int macb_probe(struct device_d *dev)* Do some basic initialization so that we at least can talk * to the PHY */ - pclk =clk_get (dev,"macb_clk" ); -if (IS_ERR (pclk)) { + macb->pclk =clk_get (dev,"macb_clk" ); +if (IS_ERR (macb->pclk)) {dev_err (dev,"no macb_clk\n" ); -return PTR_ERR (pclk); +return PTR_ERR (macb->pclk); } -clk_enable (pclk); - -macb_reset_hw (macb); +clk_enable (macb->pclk); - macb_hz =clk_get_rate (pclk); -if (macb_hz <20000000 ) - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV8 ); -else if (macb_hz <40000000 ) - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV16 ); -else if (macb_hz <80000000 ) - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV32 ); +if (macb_is_gem (macb)) + edev->recv = gem_recv;else - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV64 ); - + edev->recv = macb_recv; + macb->is_gem =read_is_gem (macb); +macb_reset_hw (macb); + ncfgr =macb_mdc_clk_div (macb); ncfgr |=MACB_BIT (PAE );/* PAuse Enable */ ncfgr |=MACB_BIT (DRFCS );/* Discard Rx FCS */ + ncfgr |=macb_dbw (macb);macb_writel (macb,NCFGR , ncfgr);macb_init (macb);
@@ -491,6 +656,9 @@ static int macb_probe(struct device_d *dev)mdiobus_register (&macb->miibus);eth_register (edev); +dev_info (dev,"Cadence %s at 0x%p\n" , +macb_is_gem (macb) ?"GEM" :"MACB" , macb->regs); +return 0 ; }
drivers/net/macb.h +108 -1
156 lines not on this page · raw message
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox