net: macb: add support for gigabit MAC
cover net: macb: add support for gigabit MAC
This patch add macb support for gigabit MAC, will be used by sama5d3. Tha patch for sama5d3 is in patchwork:
http://patchwork.ozlabs.org/patch/226795/
After this patch is applied, will add gmac support for sama5d3
Bo Shen (3):
net: macb: using AT91FAMILY replace #ifdeferry
net: macb: using phylib to configure phy device
net: macb: add support for gigabit MAC
drivers/net/macb.c | 177 +++++++++++++++++++++++++++++++++++++++------------- drivers/net/macb.h | 55 ++++++++++++++-- 2 files changed, 184 insertions(+), 48 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 net: macb: using AT91FAMILY replace #ifdeferry
Using CONFIG_AT91FAMILY replace #ifdeferry for atmel SoC
--- drivers/net/macb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/net/macb.c +2 -8
@@ -466,19 +466,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)/* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (RMII ) |MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,0 );#endif #else -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,MACB_BIT (MII ));
Signature · 1 line
1.7.9.5
PATCH 1/3 net: macb: using AT91FAMILY replace #ifdeferry
Quoted 3 lines · Bo Shen
Using
CONFIG_AT91FAMILYreplace #ifdeferry for atmel SoCSigned-off-by Bo Shen <[email protected]>
Quoted 31 lines
--- drivers/net/macb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)drivers/net/macb.c +2
-8@@ -466,19 +466,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)/* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (RMII ) |MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,0 );#endif #else -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,MACB_BIT (MII ));
PATCH 1/3 net: macb: using AT91FAMILY replace #ifdeferry
In reply to Bo ShenHi Joe,
Quoted 24 lines · Bo Shen
Using
CONFIG_AT91FAMILYreplace #ifdeferry for atmel SoCSigned-off-by Bo Shen <[email protected]>--- drivers/net/macb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)drivers/net/macb.c +1
-4@@ -466,19 +466,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)/* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (RMII ) |MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,0 );
drivers/net/macb.c static int macb_init(struct eth_device *netdev, bd_t *bd) · line 478
Quoted 10 lines
drivers/net/macb.c +1
-4#endif #else -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,MACB_BIT (MII ));
just realized that this patch is still not in u-boot/master. Will you apply it (and the rest of the series) for this release?
Best regards
Andreas Bie?mann
PATCH 1/3 net: macb: using AT91FAMILY replace #ifdeferry
Quoted 32 lines · Andreas Bie?mann
Hi Joe,
Quoted 29 lines · Bo Shen
Using
CONFIG_AT91FAMILYreplace #ifdeferry for atmel SoCSigned-off-by Bo Shen <[email protected]>--- drivers/net/macb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)drivers/net/macb.c +1
-8@@ -466,19 +466,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)/* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 ) +#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (RMII ) |MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,0 );#endif #else -#if defined(CONFIG_AT91CAP9 ) || defined(CONFIG_AT91SAM9260 ) || \ - defined(CONFIG_AT91SAM9263 ) || defined(CONFIG_AT91SAM9G20 ) || \ - defined(CONFIG_AT91SAM9G45 ) || defined(CONFIG_AT91SAM9M10G45 ) || \ - defined(CONFIG_AT91SAM9XE ) || defined(CONFIG_AT91SAM9X5 )
Quoted 8 lines
drivers/net/macb.c static int macb_init(struct eth_device *netdev, bd_t *bd) · line 478
Quoted 5 lines
drivers/net/macb.c +1
-0+#ifdef CONFIG_AT91FAMILY macb_writel (macb,USRIO ,MACB_BIT (CLKEN ));#else macb_writel (macb,USRIO ,MACB_BIT (MII ));just realized that this patch is still not in u-boot/master. Will you apply it (and the rest of the series) for this release?
Yes. I have a PR ready now.
-Joe
PATCH 2/3 net: macb: using phylib to configure phy device
In reply to Bo Shenusing phylib to configure phy device in macb driver
--- drivers/net/macb.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/macb.c +14 -2
@@ -103,6 +103,7 @@ struct macb_device {const struct device *dev;struct eth_device netdev;unsigned short phy_addr; +struct mii_dev *bus; };#define to_macb (_nd) container_of(_nd, struct macb_device, netdev)
@@ -163,7 +164,7 @@ static u16 macb_mdio_read(struct macb_device *macb, u8 reg)return MACB_BFEXT (DATA , frame); } -#if defined(CONFIG_CMD_MII ) +#if defined(CONFIG_CMD_MII ) || defined(CONFIG_PHYLIB )int macb_miiphy_read (const char *devname,u8 phy_adr,u8 reg,u16 *value) {
@@ -372,6 +373,9 @@ static int macb_phy_find(struct macb_device *macb)static int macb_phy_init (struct macb_device *macb) {struct eth_device *netdev = &macb->netdev; +#ifdef CONFIG_PHYLIB +struct phy_device *phydev; +#endif u32 ncfgr;u16 phy_id, status, adv, lpa;int media, speed, duplex;
@@ -391,6 +395,13 @@ static int macb_phy_init(struct macb_device *macb)return 0 ; } +#ifdef CONFIG_PHYLIB + phydev->bus = macb->bus; + phydev->dev = netdev; + phydev->addr = macb->phy_addr; +phy_config (phydev); +#endif + status =macb_mdio_read (macb,MII_BMSR );if (!(status &BMSR_LSTATUS )) {/* Try to re-negotiate if we don't have link already. */
@@ -574,8 +585,9 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)eth_register (netdev); -#if defined(CONFIG_CMD_MII ) +#if defined(CONFIG_CMD_MII ) || defined(CONFIG_PHYLIB )miiphy_register (netdev->name, macb_miiphy_read, macb_miiphy_write); + macb->bus =miiphy_get_dev_by_name (netdev->name);#endif return 0 ; }
Signature · 1 line
1.7.9.5
PATCH 2/3 net: macb: using phylib to configure phy device
Hi Bo,
I'm currently applying your patches. Patch 'arm: atmel: add gmac support for sama5d3xek board' shows that this particular patch is defective ... please send a fix or I will not apply the gmac for sama5.
Quoted 39 lines · Bo Shen
using phylib to configure phy device in macb driver
Signed-off-by Bo Shen <[email protected]>--- drivers/net/macb.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/net/macb.c +5
-1@@ -103,6 +103,7 @@ struct macb_device {const struct device *dev;struct eth_device netdev;unsigned short phy_addr; +struct mii_dev *bus; };#define to_macb (_nd) container_of(_nd, struct macb_device, netdev)@@ -163,7 +164,7 @@ static u16 macb_mdio_read(struct macb_device *macb, u8 reg)return MACB_BFEXT (DATA , frame); } -#if defined(CONFIG_CMD_MII ) +#if defined(CONFIG_CMD_MII ) || defined(CONFIG_PHYLIB )int macb_miiphy_read (const char *devname,u8 phy_adr,u8 reg,u16 *value) {@@ -372,6 +373,9 @@ static int macb_phy_find(struct macb_device *macb)static int macb_phy_init (struct macb_device *macb) {struct eth_device *netdev = &macb->netdev; +#ifdef CONFIG_PHYLIB +struct phy_device *phydev; +#endif u32 ncfgr;u16 phy_id, status, adv, lpa;int media, speed, duplex;
drivers/net/macb.c static int macb_phy_init(struct macb_device *macb) · line 399
Quoted 5 lines
drivers/net/macb.c +2
-0@@ -391,6 +395,13 @@ static int macb_phy_init(struct macb_device *macb)return 0 ; } +#ifdef CONFIG_PHYLIB + phydev->bus = macb->bus;
phydev is uninitialized here ...
Quoted 20 lines
drivers/net/macb.c +7
-1+ phydev->dev = netdev; + phydev->addr = macb->phy_addr; +phy_config (phydev); +#endif + status =macb_mdio_read (macb,MII_BMSR );if (!(status &BMSR_LSTATUS )) {/* Try to re-negotiate if we don't have link already. */ @@ -574,8 +585,9 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)eth_register (netdev); -#if defined(CONFIG_CMD_MII ) +#if defined(CONFIG_CMD_MII ) || defined(CONFIG_PHYLIB )miiphy_register (netdev->name, macb_miiphy_read, macb_miiphy_write); + macb->bus =miiphy_get_dev_by_name (netdev->name);#endif return 0 ; }
PATCH 2/3 net: macb: using phylib to configure phy device
Hi Andreas,
Quoted 5 lines · Andreas Bie?mann
Hi Bo,
I'm currently applying your patches. Patch 'arm: atmel: add gmac support for sama5d3xek board' shows that this particular patch is defective ... please send a fix or I will not apply the gmac for sama5.
Thanks for point out this.
The fix patch has been sent out.
More information at: http://patchwork.ozlabs.org/patch/267530/ (net:
macb: fix the building warning)
Best Regards,
Bo Shen
PATCH 3/3 net: macb: add support for gigabit MAC
In reply to Bo ShenAdd gigabit MAC support in macb driver
- using IP version to distinguish whether MAC is GMAC
--- drivers/net/macb.c | 151 +++++++++++++++++++++++++++++++++++++++++----------- drivers/net/macb.h | 55 ++++++++++++++++--- 2 files changed, 168 insertions(+), 38 deletions(-)
drivers/net/macb.c +119 -32
@@ -107,6 +107,11 @@ struct macb_device { };#define to_macb (_nd) container_of(_nd, struct macb_device, netdev) +static int macb_is_gem (struct macb_device *macb) +{ +return MACB_BFEXT (IDNUM ,macb_readl (macb,MID )) ==0x2 ; +} +static void macb_mdio_write (struct macb_device *macb,u8 reg,u16 value) {unsigned long netctl;
@@ -419,28 +424,64 @@ static int macb_phy_init(struct macb_device *macb)printf ("%s: link down (status: 0x%04x)\n" , netdev->name, status);return 0 ; - }else { - adv =macb_mdio_read (macb,MII_ADVERTISE ); - lpa =macb_mdio_read (macb,MII_LPA ); - media =mii_nway_result (lpa & adv); - speed = (media & (ADVERTISE_100FULL |ADVERTISE_100HALF ) - ?1 :0 ); - duplex = (media &ADVERTISE_FULL ) ?1 :0 ; -printf ("%s: link up, %sMbps %s-duplex (lpa: 0x%04x)\n" , - netdev->name, - speed ?"100" :"10" , - duplex ?"full" :"half" , - lpa); - - ncfgr =macb_readl (macb,NCFGR ); - ncfgr &= ~(MACB_BIT (SPD ) |MACB_BIT (FD )); -if (speed) - ncfgr |=MACB_BIT (SPD ); -if (duplex) - ncfgr |=MACB_BIT (FD ); -macb_writel (macb,NCFGR , ncfgr); -return 1 ; } + +/* First check for GMAC */ +if (macb_is_gem (macb)) { + lpa =macb_mdio_read (macb,MII_STAT1000 ); +if (lpa & (1 <<11 )) { + speed =1000 ; + duplex =1 ; + }else { +if (lpa & (1 <<10 )) { + speed =1000 ; + duplex =1 ; + }else { + speed =0 ; + } + } + +if (speed ==1000 ) { +printf ("%s: link up, %dMbps %s-duplex (lpa: 0x%04x)\n" , + netdev->name, + speed, + duplex ?"full" :"half" , + lpa); + + ncfgr =macb_readl (macb,NCFGR ); + ncfgr &= ~(GEM_BIT (GBE ) |MACB_BIT (SPD ) |MACB_BIT (FD )); +if (speed) + ncfgr |=GEM_BIT (GBE ); +if (duplex) + ncfgr |=MACB_BIT (FD ); +macb_writel (macb,NCFGR , ncfgr); + +return 1 ; + } + } + +/* fall back for EMAC checking */ + adv =macb_mdio_read (macb,MII_ADVERTISE ); + lpa =macb_mdio_read (macb,MII_LPA ); + media =mii_nway_result (lpa & adv); + speed = (media & (ADVERTISE_100FULL |ADVERTISE_100HALF ) + ?1 :0 ); + duplex = (media &ADVERTISE_FULL ) ?1 :0 ; +printf ("%s: link up, %sMbps %s-duplex (lpa: 0x%04x)\n" , + netdev->name, + speed ?"100" :"10" , + duplex ?"full" :"half" , + lpa); + + ncfgr =macb_readl (macb,NCFGR ); + ncfgr &= ~(MACB_BIT (SPD ) |MACB_BIT (FD )); +if (speed) + ncfgr |=MACB_BIT (SPD ); +if (duplex) + ncfgr |=MACB_BIT (FD ); +macb_writel (macb,NCFGR , ncfgr); + +return 1 ; }static int macb_init (struct eth_device *netdev,bd_t *bd)
@@ -475,6 +516,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)macb_writel (macb,RBQP , macb->rx_ring_dma);macb_writel (macb,TBQP , macb->tx_ring_dma); +if (macb_is_gem (macb)) { +#ifdef CONFIG_RGMII +gem_writel (macb,UR ,GEM_BIT (RGMII )); +#else +gem_writel (macb,UR ,0 ); +#endif + }else {/* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII #ifdef CONFIG_AT91FAMILY
@@ -489,6 +537,7 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)macb_writel (macb,USRIO ,MACB_BIT (MII ));#endif #endif /* CONFIG_RMII */ + }if (!macb_phy_init (macb))return -1 ;
@@ -532,11 +581,48 @@ static int macb_write_hwaddr(struct eth_device *dev)return 0 ; } +static u32 macb_mdc_clk_div (int id,struct macb_device *macb) +{ +u32 config; +unsigned long macb_hz =get_macb_pclk_rate (id); + +if (macb_hz <20000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV8 ); +else if (macb_hz <40000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV16 ); +else if (macb_hz <80000000 ) + config =MACB_BF (CLK ,MACB_CLK_DIV32 ); +else + config =MACB_BF (CLK ,MACB_CLK_DIV64 ); + +return config; +} + +static u32 gem_mdc_clk_div (int id,struct macb_device *macb) +{ +u32 config; +unsigned long macb_hz =get_macb_pclk_rate (id); + +if (macb_hz <20000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV8 ); +else if (macb_hz <40000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV16 ); +else if (macb_hz <80000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV32 ); +else if (macb_hz <120000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV48 ); +else if (macb_hz <160000000 ) + config =GEM_BF (CLK ,GEM_CLK_DIV64 ); +else + config =GEM_BF (CLK ,GEM_CLK_DIV96 ); + +return config; +} +int macb_eth_initialize (int id,void *regs,unsigned int phy_addr) {struct macb_device *macb;struct eth_device *netdev; -unsigned long macb_hz;u32 ncfgr; macb =malloc (sizeof (struct macb_device ));
@@ -560,7 +646,11 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr) macb->regs = regs; macb->phy_addr = phy_addr; -sprintf (netdev->name,"macb%d" , id); +if (macb_is_gem (macb)) +sprintf (netdev->name,"gmac%d" , id); +else +sprintf (netdev->name,"macb%d" , id); + netdev->init = macb_init; netdev->halt = macb_halt; netdev->send = macb_send;
@@ -571,15 +661,12 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)* Do some basic initialization so that we at least can talk * to the PHY */ - macb_hz =get_macb_pclk_rate (id); -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 ); -else - ncfgr =MACB_BF (CLK ,MACB_CLK_DIV64 ); +if (macb_is_gem (macb)) { + ncfgr =gem_mdc_clk_div (id, macb); + ncfgr |=GEM_BF (DBW ,1 ); + }else { + ncfgr =macb_mdc_clk_div (id, macb); + }macb_writel (macb,NCFGR , ncfgr);
drivers/net/macb.h +49 -6
106 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Joe Hershberger
Appliedcover net: macb: add support for gigabit MAC
In reply to Bo ShenQuoted 10 lines · Bo Shen
This patch add macb support for gigabit MAC, will be used by sama5d3. Tha patch for sama5d3 is in patchwork:
http://patchwork.ozlabs.org/patch/226795/After this patch is applied, will add gmac support for sama5d3
Bo Shen (3):
net: macb: using AT91FAMILY replace #ifdeferry
net: macb: using phylib to configure phy device
net: macb: add support for gigabit MAC
Applied series, Thanks.
-Joe