* [PATCH 1/3] davinci_emac: return 0 on successful transmit @ 2012-09-26 13:17 Jan Luebbe 2012-09-26 13:17 ` [PATCH 2/3] davinci_emac: adjust to new phylib framework Jan Luebbe 2012-09-26 13:17 ` [PATCH 3/3] davinci_emac: get rid of mdio wrapper functions Jan Luebbe 0 siblings, 2 replies; 4+ messages in thread From: Jan Luebbe @ 2012-09-26 13:17 UTC (permalink / raw) To: barebox The _send function should not return the length of the transmitted packet. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> --- drivers/net/davinci_emac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 09fcb63..7f39972 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -410,7 +410,7 @@ static int davinci_emac_send(struct eth_device *edev, void *packet, int length) { struct davinci_emac_priv *priv = (struct davinci_emac_priv *)edev->priv; uint64_t start; - int ret_status = -1; + int ret_status; dev_dbg(priv->dev, "+ emac_send (length %d)\n", length); @@ -437,7 +437,7 @@ static int davinci_emac_send(struct eth_device *edev, void *packet, int length) if (readl(priv->adap_emac + EMAC_TXINTSTATRAW) & 0x01) { /* Acknowledge the TX descriptor */ writel(BD_TO_HW(priv->emac_tx_desc), priv->adap_emac + EMAC_TX0CP); - ret_status = length; + ret_status = 0; break; } if (is_timeout(start, 100 * MSECOND)) { -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] davinci_emac: adjust to new phylib framework 2012-09-26 13:17 [PATCH 1/3] davinci_emac: return 0 on successful transmit Jan Luebbe @ 2012-09-26 13:17 ` Jan Luebbe 2012-09-26 13:59 ` Jean-Christophe PLAGNIOL-VILLARD 2012-09-26 13:17 ` [PATCH 3/3] davinci_emac: get rid of mdio wrapper functions Jan Luebbe 1 sibling, 1 reply; 4+ messages in thread From: Jan Luebbe @ 2012-09-26 13:17 UTC (permalink / raw) To: barebox Signed-off-by: Jan Luebbe <jlu@pengutronix.de> --- drivers/net/Kconfig | 2 +- drivers/net/davinci_emac.c | 45 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b0da2c5..b3e5a83 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -48,7 +48,7 @@ config DRIVER_NET_SMC91111 config DRIVER_NET_DAVINCI_EMAC bool "TI Davinci/OMAP EMAC ethernet driver" depends on ARCH_DAVINCI || ARCH_OMAP3 - select MIIDEV + select PHYLIB config DRIVER_NET_DM9K bool "Davicom dm9k[E|A|B] ethernet driver" diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 7f39972..a8b4b36 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -43,18 +43,18 @@ #include <io.h> #include <clock.h> #include <net.h> -#include <miidev.h> #include <malloc.h> #include <init.h> #include <asm/mmu.h> #include <asm/system.h> +#include <linux/phy.h> #include <mach/emac_defs.h> #include "davinci_emac.h" struct davinci_emac_priv { struct device_d *dev; struct eth_device edev; - struct mii_device miidev; + struct mii_bus miibus; /* EMAC Addresses */ void __iomem *adap_emac; /* = EMAC_BASE_ADDR */ @@ -167,16 +167,16 @@ static int davinci_eth_phy_write(struct davinci_emac_priv *priv, uint8_t phy_add return 1; } -static int davinci_miidev_read(struct mii_device *dev, int addr, int reg) +static int davinci_miibus_read(struct mii_bus *bus, int addr, int reg) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)dev->edev->priv; + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; uint16_t value = 0; return davinci_eth_phy_read(priv, addr, reg, &value) ? value : -1; } -static int davinci_miidev_write(struct mii_device *dev, int addr, int reg, int value) +static int davinci_miibus_write(struct mii_bus *bus, int addr, int reg, u16 value) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)dev->edev->priv; + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; return davinci_eth_phy_write(priv, addr, reg, value) ? 0 : -1; } @@ -318,16 +318,12 @@ static int davinci_emac_open(struct eth_device *edev) /* Start receive process */ writel(BD_TO_HW(priv->emac_rx_desc), priv->adap_emac + EMAC_RX0HDP); - ret = miidev_wait_aneg(&priv->miidev); + ret = phy_device_connect(edev, &priv->miibus, priv->active_phy_addr, NULL, + PHYLIB_FORCE_LINK, + PHY_INTERFACE_MODE_NA); if (ret) return ret; - ret = miidev_get_status(&priv->miidev); - if (ret < 0) - return ret; - - miidev_print_status(&priv->miidev); - dev_dbg(priv->dev, "- emac_open\n"); return 0; @@ -533,6 +529,7 @@ static int davinci_emac_probe(struct device_d *dev) { struct davinci_emac_priv *priv; uint64_t start; + uint32_t phy_mask; dev_dbg(dev, "+ emac_probe\n"); @@ -573,22 +570,26 @@ static int davinci_emac_probe(struct device_d *dev) start = get_time_ns(); while (1) { - if (readl(priv->adap_mdio + EMAC_MDIO_ALIVE)) + phy_mask = readl(priv->adap_mdio + EMAC_MDIO_ALIVE); + if (phy_mask) { + dev_info(dev, "detected phy mask 0x%x\n", phy_mask); + phy_mask = ~phy_mask; break; + } if (is_timeout(start, 256 * MSECOND)) { - dev_err(dev, "No ETH PHY detected!\n"); + dev_err(dev, "no live phy, scanning all\n"); + phy_mask = 0; break; } } - priv->miidev.read = davinci_miidev_read; - priv->miidev.write = davinci_miidev_write; - priv->miidev.address = 0x01; - priv->miidev.flags = MIIDEV_FORCE_LINK; - priv->miidev.edev = &priv->edev; - priv->miidev.parent = dev; + priv->miibus.read = davinci_miibus_read; + priv->miibus.write = davinci_miibus_write; + priv->miibus.priv = priv; + priv->miibus.parent = dev; + priv->miibus.phy_mask = phy_mask; - mii_register(&priv->miidev); + mdiobus_register(&priv->miibus); eth_register(&priv->edev); -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/3] davinci_emac: adjust to new phylib framework 2012-09-26 13:17 ` [PATCH 2/3] davinci_emac: adjust to new phylib framework Jan Luebbe @ 2012-09-26 13:59 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 0 replies; 4+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-26 13:59 UTC (permalink / raw) To: Jan Luebbe; +Cc: barebox On 15:17 Wed 26 Sep , Jan Luebbe wrote: > Signed-off-by: Jan Luebbe <jlu@pengutronix.de> > --- > drivers/net/Kconfig | 2 +- > drivers/net/davinci_emac.c | 45 ++++++++++++++++++++++---------------------- > 2 files changed, 24 insertions(+), 23 deletions(-) > > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index b0da2c5..b3e5a83 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -48,7 +48,7 @@ config DRIVER_NET_SMC91111 > config DRIVER_NET_DAVINCI_EMAC > bool "TI Davinci/OMAP EMAC ethernet driver" > depends on ARCH_DAVINCI || ARCH_OMAP3 > - select MIIDEV > + select PHYLIB > > config DRIVER_NET_DM9K > bool "Davicom dm9k[E|A|B] ethernet driver" > diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c > index 7f39972..a8b4b36 100644 > --- a/drivers/net/davinci_emac.c > +++ b/drivers/net/davinci_emac.c > @@ -43,18 +43,18 @@ > #include <io.h> > #include <clock.h> > #include <net.h> > -#include <miidev.h> > #include <malloc.h> > #include <init.h> > #include <asm/mmu.h> > #include <asm/system.h> > +#include <linux/phy.h> > #include <mach/emac_defs.h> > #include "davinci_emac.h" > > struct davinci_emac_priv { > struct device_d *dev; > struct eth_device edev; > - struct mii_device miidev; > + struct mii_bus miibus; > > /* EMAC Addresses */ > void __iomem *adap_emac; /* = EMAC_BASE_ADDR */ > @@ -167,16 +167,16 @@ static int davinci_eth_phy_write(struct davinci_emac_priv *priv, uint8_t phy_add > return 1; > } > > -static int davinci_miidev_read(struct mii_device *dev, int addr, int reg) > +static int davinci_miibus_read(struct mii_bus *bus, int addr, int reg) > { > - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)dev->edev->priv; > + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; you can drop the cast priv is a void* > uint16_t value = 0; > return davinci_eth_phy_read(priv, addr, reg, &value) ? value : -1; > } > > -static int davinci_miidev_write(struct mii_device *dev, int addr, int reg, int value) > +static int davinci_miibus_write(struct mii_bus *bus, int addr, int reg, u16 value) > { > - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)dev->edev->priv; > + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; > return davinci_eth_phy_write(priv, addr, reg, value) ? 0 : -1; > } > > @@ -318,16 +318,12 @@ static int davinci_emac_open(struct eth_device *edev) > /* Start receive process */ > writel(BD_TO_HW(priv->emac_rx_desc), priv->adap_emac + EMAC_RX0HDP); > > - ret = miidev_wait_aneg(&priv->miidev); > + ret = phy_device_connect(edev, &priv->miibus, priv->active_phy_addr, NULL, > + PHYLIB_FORCE_LINK, > + PHY_INTERFACE_MODE_NA); why FORCE_LINK in the driver make no sense this board config Best Regards, J. > if (ret) > return ret; > > - ret = miidev_get_status(&priv->miidev); > - if (ret < 0) > - return ret; > - > - miidev_print_status(&priv->miidev); > - > dev_dbg(priv->dev, "- emac_open\n"); > > return 0; > @@ -533,6 +529,7 @@ static int davinci_emac_probe(struct device_d *dev) > { > struct davinci_emac_priv *priv; > uint64_t start; > + uint32_t phy_mask; > > dev_dbg(dev, "+ emac_probe\n"); > > @@ -573,22 +570,26 @@ static int davinci_emac_probe(struct device_d *dev) > > start = get_time_ns(); > while (1) { > - if (readl(priv->adap_mdio + EMAC_MDIO_ALIVE)) > + phy_mask = readl(priv->adap_mdio + EMAC_MDIO_ALIVE); > + if (phy_mask) { > + dev_info(dev, "detected phy mask 0x%x\n", phy_mask); > + phy_mask = ~phy_mask; > break; > + } > if (is_timeout(start, 256 * MSECOND)) { > - dev_err(dev, "No ETH PHY detected!\n"); > + dev_err(dev, "no live phy, scanning all\n"); > + phy_mask = 0; > break; > } > } > > - priv->miidev.read = davinci_miidev_read; > - priv->miidev.write = davinci_miidev_write; > - priv->miidev.address = 0x01; > - priv->miidev.flags = MIIDEV_FORCE_LINK; > - priv->miidev.edev = &priv->edev; > - priv->miidev.parent = dev; > + priv->miibus.read = davinci_miibus_read; > + priv->miibus.write = davinci_miibus_write; > + priv->miibus.priv = priv; > + priv->miibus.parent = dev; > + priv->miibus.phy_mask = phy_mask; > > - mii_register(&priv->miidev); > + mdiobus_register(&priv->miibus); > > eth_register(&priv->edev); > > -- > 1.7.10.4 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] davinci_emac: get rid of mdio wrapper functions 2012-09-26 13:17 [PATCH 1/3] davinci_emac: return 0 on successful transmit Jan Luebbe 2012-09-26 13:17 ` [PATCH 2/3] davinci_emac: adjust to new phylib framework Jan Luebbe @ 2012-09-26 13:17 ` Jan Luebbe 1 sibling, 0 replies; 4+ messages in thread From: Jan Luebbe @ 2012-09-26 13:17 UTC (permalink / raw) To: barebox Signed-off-by: Jan Luebbe <jlu@pengutronix.de> --- drivers/net/davinci_emac.c | 52 ++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index a8b4b36..ef20611 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -119,65 +119,51 @@ static void davinci_eth_mdio_enable(struct davinci_emac_priv *priv) while (readl(priv->adap_mdio + EMAC_MDIO_CONTROL) & MDIO_CONTROL_IDLE); } -/* Read a PHY register via MDIO inteface. Returns 1 on success, 0 otherwise */ -static int davinci_eth_phy_read(struct davinci_emac_priv *priv, uint8_t phy_addr, uint8_t reg_num, uint16_t *data) +static int davinci_miibus_read(struct mii_bus *bus, int addr, int reg) { - int tmp; + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; + uint16_t value; + int tmp; while (readl(priv->adap_mdio + EMAC_MDIO_USERACCESS0) & MDIO_USERACCESS0_GO); writel(MDIO_USERACCESS0_GO | MDIO_USERACCESS0_WRITE_READ | - ((reg_num & 0x1f) << 21) | - ((phy_addr & 0x1f) << 16), + ((reg & 0x1f) << 21) | + ((addr & 0x1f) << 16), priv->adap_mdio + EMAC_MDIO_USERACCESS0); /* Wait for command to complete */ while ((tmp = readl(priv->adap_mdio + EMAC_MDIO_USERACCESS0)) & MDIO_USERACCESS0_GO); if (tmp & MDIO_USERACCESS0_ACK) { - *data = tmp & 0xffff; - dev_dbg(priv->dev, "emac_phy_read: addr=0x%02x reg=0x%02x data=0x%04x\n", - phy_addr, reg_num, *data); - return 1; + value = tmp & 0xffff; + dev_dbg(priv->dev, "davinci_miibus_read: addr=0x%02x reg=0x%02x value=0x%04x\n", + addr, reg, value); + return value; } - *data = -1; - return 0; + return -1; } -/* Write to a PHY register via MDIO inteface. Blocks until operation is complete. */ -static int davinci_eth_phy_write(struct davinci_emac_priv *priv, uint8_t phy_addr, uint8_t reg_num, uint16_t data) +static int davinci_miibus_write(struct mii_bus *bus, int addr, int reg, u16 value) { - + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; while (readl(priv->adap_mdio + EMAC_MDIO_USERACCESS0) & MDIO_USERACCESS0_GO); - dev_dbg(priv->dev, "emac_phy_write: addr=0x%02x reg=0x%02x data=0x%04x\n", - phy_addr, reg_num, data); + dev_dbg(priv->dev, "davinci_miibus_write: addr=0x%02x reg=0x%02x value=0x%04x\n", + addr, reg, value); writel(MDIO_USERACCESS0_GO | MDIO_USERACCESS0_WRITE_WRITE | - ((reg_num & 0x1f) << 21) | - ((phy_addr & 0x1f) << 16) | - (data & 0xffff), + ((reg & 0x1f) << 21) | + ((addr & 0x1f) << 16) | + (value & 0xffff), priv->adap_mdio + EMAC_MDIO_USERACCESS0); /* Wait for command to complete */ while (readl(priv->adap_mdio + EMAC_MDIO_USERACCESS0) & MDIO_USERACCESS0_GO); - return 1; -} - -static int davinci_miibus_read(struct mii_bus *bus, int addr, int reg) -{ - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; - uint16_t value = 0; - return davinci_eth_phy_read(priv, addr, reg, &value) ? value : -1; -} - -static int davinci_miibus_write(struct mii_bus *bus, int addr, int reg, u16 value) -{ - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; - return davinci_eth_phy_write(priv, addr, reg, value) ? 0 : -1; + return 0; } static int davinci_emac_get_ethaddr(struct eth_device *edev, unsigned char *adr) -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-26 14:01 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-09-26 13:17 [PATCH 1/3] davinci_emac: return 0 on successful transmit Jan Luebbe 2012-09-26 13:17 ` [PATCH 2/3] davinci_emac: adjust to new phylib framework Jan Luebbe 2012-09-26 13:59 ` Jean-Christophe PLAGNIOL-VILLARD 2012-09-26 13:17 ` [PATCH 3/3] davinci_emac: get rid of mdio wrapper functions Jan Luebbe
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox