* [PATCHv2 0/5] ARM: sunxi: Add support for A10 Ethernet controller
@ 2013-03-23 22:30 ` Maxime Ripard
0 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw)
To: linux-arm-kernel
Cc: kevin, sunny, shuge, netdev, Stefan Roese, Alejandro Mery
Hi,
The Allwinner A10 SoC has an ethernet controller that seem to be specific to
Allwinner. This IP has no public documentation, so exact
details are quite sparse, and this code come from refactored Allwinner
code.
Since we don't have any clock support yet for the Allwinner SoCs, we
rely on the bootloader to enable and gate the EMAC clock.
Thanks,
Maxime
Changes from v1:
- Use phylib for the phy-related functions
- Use an optional regulator to power up the phy
- Rename the driver from Davicom Wemac to Allwinner EMAC, since it's the name
mentionned in the datasheet, and we have no strong evidence of a
relationship with Davicom
- Fix various small things around the driver: add defines for undocumented
values, fix documentation name and compatible example, etc.
Maxime Ripard (3):
ARM: sunxi: Add EMAC controller node to sun4i DTSI
ARM: sun4i: Add muxing options for the ethernet controller
ARM: hackberry: dt: Add Ethernet controller to the Hackberry device
tree
Stefan Roese (2):
net: Add EMAC ethernet driver found on Allwinner A10 SoC's
ARM: cubieboard: Enable ethernet (WEMAC) support in dts
.../bindings/net/allwinner,sun4i-emac.txt | 19 +
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 32 +
arch/arm/boot/dts/sun4i-a10.dtsi | 18 +
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/allwinner/Kconfig | 36 +
drivers/net/ethernet/allwinner/Makefile | 5 +
drivers/net/ethernet/allwinner/sun4i-emac.c | 1033 ++++++++++++++++++++
drivers/net/ethernet/allwinner/sun4i-emac.h | 114 +++
10 files changed, 1265 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
create mode 100644 drivers/net/ethernet/allwinner/Kconfig
create mode 100644 drivers/net/ethernet/allwinner/Makefile
create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c
create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h
--
1.7.10.4
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCHv2 0/5] ARM: sunxi: Add support for A10 Ethernet controller @ 2013-03-23 22:30 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Hi, The Allwinner A10 SoC has an ethernet controller that seem to be specific to Allwinner. This IP has no public documentation, so exact details are quite sparse, and this code come from refactored Allwinner code. Since we don't have any clock support yet for the Allwinner SoCs, we rely on the bootloader to enable and gate the EMAC clock. Thanks, Maxime Changes from v1: - Use phylib for the phy-related functions - Use an optional regulator to power up the phy - Rename the driver from Davicom Wemac to Allwinner EMAC, since it's the name mentionned in the datasheet, and we have no strong evidence of a relationship with Davicom - Fix various small things around the driver: add defines for undocumented values, fix documentation name and compatible example, etc. Maxime Ripard (3): ARM: sunxi: Add EMAC controller node to sun4i DTSI ARM: sun4i: Add muxing options for the ethernet controller ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree Stefan Roese (2): net: Add EMAC ethernet driver found on Allwinner A10 SoC's ARM: cubieboard: Enable ethernet (WEMAC) support in dts .../bindings/net/allwinner,sun4i-emac.txt | 19 + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 32 + arch/arm/boot/dts/sun4i-a10.dtsi | 18 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/allwinner/Kconfig | 36 + drivers/net/ethernet/allwinner/Makefile | 5 + drivers/net/ethernet/allwinner/sun4i-emac.c | 1033 ++++++++++++++++++++ drivers/net/ethernet/allwinner/sun4i-emac.h | 114 +++ 10 files changed, 1265 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt create mode 100644 drivers/net/ethernet/allwinner/Kconfig create mode 100644 drivers/net/ethernet/allwinner/Makefile create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h -- 1.7.10.4 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's 2013-03-23 22:30 ` Maxime Ripard @ 2013-03-23 22:30 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Cc: kevin, sunny, shuge, netdev, Stefan Roese, Alejandro Mery, Grant Likely, Rob Herring, Rob Landley, devicetree-discuss, linux-doc, linux-kernel From: Stefan Roese <sr@denx.de> The Allwinner A10 has an ethernet controller that seem to be developped internally by them. The exact feature set of this controller is unknown, since there is no public documentation for this IP, and this driver is mostly the one published by Allwinner that has been heavily cleaned up. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- .../bindings/net/allwinner,sun4i-emac.txt | 19 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/allwinner/Kconfig | 36 + drivers/net/ethernet/allwinner/Makefile | 5 + drivers/net/ethernet/allwinner/sun4i-emac.c | 1033 ++++++++++++++++++++ drivers/net/ethernet/allwinner/sun4i-emac.h | 114 +++ 7 files changed, 1209 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt create mode 100644 drivers/net/ethernet/allwinner/Kconfig create mode 100644 drivers/net/ethernet/allwinner/Makefile create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt new file mode 100644 index 0000000..aaf5013 --- /dev/null +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt @@ -0,0 +1,19 @@ +* Allwinner EMAC ethernet controller + +Required properties: +- compatible: should be "allwinner,sun4i-emac". +- reg: address and length of the register set for the device. +- interrupts: interrupt for the device + +Optional properties: +- phy-supply: phandle to a regulator if the PHY needs one +- (local-)mac-address: mac address to be used by this driver + +Example: + +emac: ethernet@01c0b000 { + compatible = "allwinner,sun4i-emac"; + reg = <0x01c0b000 0x1000>; + phy-supply = <®_emac_3v3>; + interrupts = <55>; +}; diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index ed956e0..18fd6fb 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -20,6 +20,7 @@ config SUNGEM_PHY source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/adaptec/Kconfig" source "drivers/net/ethernet/aeroflex/Kconfig" +source "drivers/net/ethernet/allwinner/Kconfig" source "drivers/net/ethernet/alteon/Kconfig" source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/apple/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 8268d85..009da27 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ obj-$(CONFIG_GRETH) += aeroflex/ +obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig new file mode 100644 index 0000000..5d20fb0 --- /dev/null +++ b/drivers/net/ethernet/allwinner/Kconfig @@ -0,0 +1,36 @@ +# +# Allwinner device configuration +# + +config NET_VENDOR_ALLWINNER + bool "Allwinner devices" + default y + depends on ARCH_SUNXI + ---help--- + If you have a network (Ethernet) card belonging to this + class, say Y and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly + affect the kernel: saying N will just cause the configurator + to skip all the questions about Davicom cards. If you say Y, + you will be asked for your specific card in the following + questions. + +if NET_VENDOR_ALLWINNER + +config SUN4I_EMAC + tristate "Allwinner A10 EMAC support" + depends on ARCH_SUNXI + depends on OF + select CRC32 + select NET_CORE + select MII + select REGULATOR_FIXED_VOLTAGE + ---help--- + Support for Allwinner A10 EMAC ethernet driver. + + To compile this driver as a module, choose M here. The module + will be called sun4i-emac. + +endif # NET_VENDOR_ALLWINNER diff --git a/drivers/net/ethernet/allwinner/Makefile b/drivers/net/ethernet/allwinner/Makefile new file mode 100644 index 0000000..03129f7 --- /dev/null +++ b/drivers/net/ethernet/allwinner/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Allwinner device drivers. +# + +obj-$(CONFIG_SUN4I_EMAC) += sun4i-emac.o diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c new file mode 100644 index 0000000..66bc089 --- /dev/null +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -0,0 +1,1033 @@ +/* + * Allwinner EMAC Fast Ethernet driver for Linux. + * + * Copyright 2012-2013 Stefan Roese <sr@denx.de> + * Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com> + * + * Based on the Linux driver provided by Allwinner: + * Copyright (C) 1997 Sten Wang + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include <linux/clk.h> +#include <linux/etherdevice.h> +#include <linux/ethtool.h> +#include <linux/gpio.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/mii.h> +#include <linux/module.h> +#include <linux/netdevice.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_net.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/phy.h> +#include <linux/regulator/consumer.h> + +#include "sun4i-emac.h" + +#define DRV_NAME "sun4i-emac" +#define DRV_VERSION "1.02" + +#define EMAC_MAX_FRAME_LEN 0x0600 + +/* Transmit timeout, default 5 seconds. */ +static int watchdog = 5000; +module_param(watchdog, int, 0400); +MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds"); + +/* EMAC register address locking. + * + * The EMAC uses an address register to control where data written + * to the data register goes. This means that the address register + * must be preserved over interrupts or similar calls. + * + * During interrupt and other critical calls, a spinlock is used to + * protect the system, but the calls themselves save the address + * in the address register in case they are interrupting another + * access to the device. + * + * For general accesses a lock is provided so that calls which are + * allowed to sleep are serialised so that the address register does + * not need to be saved. This lock also serves to serialise access + * to the EEPROM and PHY access registers which are shared between + * these two devices. + */ + +/* The driver supports the original EMACE, and now the two newer + * devices, EMACA and EMACB. + */ + +struct emac_board_info { + struct clk *clk; + struct device *dev; + struct platform_device *pdev; + spinlock_t lock; + void __iomem *membase; + u32 msg_enable; + struct net_device *ndev; + struct regulator *regulator; + struct sk_buff *skb_last; + u16 tx_fifo_stat; + + int emacrx_completed_flag; + + struct mii_bus *mii_bus; + struct phy_device *phy_dev; + unsigned int link; + unsigned int speed; + unsigned int duplex; + + phy_interface_t phy_interface; +}; + +static int emac_mdio_read(struct mii_bus *bus, int mii_id, int regnum) +{ + struct emac_board_info *db = bus->priv; + int value; + + /* issue the phy address and reg */ + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); + /* pull up the phy io line */ + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); + + /* Wait read complete */ + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) + cpu_relax(); + + /* push down the phy io line */ + writel(0x0, db->membase + EMAC_MAC_MCMD_REG); + /* and read data */ + value = readl(db->membase + EMAC_MAC_MRDD_REG); + + return value; +} + +static int emac_mdio_write(struct mii_bus *bus, int mii_id, int regnum, + u16 value) +{ + struct emac_board_info *db = bus->priv; + + /* issue the phy address and reg */ + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); + /* pull up the phy io line */ + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); + + /* Wait read complete */ + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) + cpu_relax(); + + /* push down the phy io line */ + writel(0x0, db->membase + EMAC_MAC_MCMD_REG); + /* and write data */ + writel(value, db->membase + EMAC_MAC_MWTD_REG); + + return 0; +} + +static int emac_mdio_reset(struct mii_bus *bus) +{ + return 0; +} + + +static void emac_init_emac(struct net_device *dev); +static void emac_handle_link_change(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + struct phy_device *phydev = db->phy_dev; + unsigned long flags; + int status_change = 0; + + spin_lock_irqsave(&db->lock, flags); + + if (phydev->link) { + if ((db->speed != phydev->speed) || + (db->duplex != phydev->duplex)) { + /* Re-init EMAC with new settings */ + emac_init_emac(dev); + + db->speed = phydev->speed; + db->duplex = phydev->duplex; + status_change = 1; + } + } + + if (phydev->link != db->link) { + if (!phydev->link) { + db->speed = 0; + db->duplex = -1; + } + db->link = phydev->link; + + status_change = 1; + } + + spin_unlock_irqrestore(&db->lock, flags); + + if (status_change) + phy_print_status(phydev); +} + +static int emac_mii_probe(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + struct phy_device *phydev; + int ret; + + phydev = phy_find_first(db->mii_bus); + if (!phydev) { + netdev_err(dev, "no PHY found\n"); + return -1; + } + + /* to-do: PHY interrupts are currently not supported */ + + /* attach the mac to the phy */ + ret = phy_connect_direct(dev, phydev, &emac_handle_link_change, + db->phy_interface); + if (ret) { + netdev_err(dev, "Could not attach to PHY\n"); + return ret; + } + + /* mask with MAC supported features */ + phydev->supported &= PHY_BASIC_FEATURES; + phydev->advertising = phydev->supported; + + db->link = 0; + db->speed = 0; + db->duplex = -1; + db->phy_dev = phydev; + + return 0; +} + +int emac_mii_init(struct emac_board_info *db) +{ + int err = -ENXIO; + int i; + + if (!IS_ERR(db->regulator)) + regulator_enable(db->regulator); + + db->mii_bus = mdiobus_alloc(); + if (db->mii_bus == NULL) { + err = -ENOMEM; + goto err_out; + } + + db->mii_bus->name = "EMAC_mii_bus"; + db->mii_bus->read = &emac_mdio_read; + db->mii_bus->write = &emac_mdio_write; + db->mii_bus->reset = &emac_mdio_reset; + snprintf(db->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", + db->pdev->name, db->pdev->id); + db->mii_bus->priv = db; + db->mii_bus->parent = &db->pdev->dev; + + db->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); + if (!db->mii_bus->irq) { + err = -ENOMEM; + goto err_out_free_mdiobus; + } + + for (i = 0; i < PHY_MAX_ADDR; i++) + db->mii_bus->irq[i] = PHY_POLL; + + if (mdiobus_register(db->mii_bus)) + goto err_out_free_mdio_irq; + + if (emac_mii_probe(db->ndev) != 0) + goto err_out_unregister_bus; + + return 0; + +err_out_unregister_bus: + mdiobus_unregister(db->mii_bus); +err_out_free_mdio_irq: + kfree(db->mii_bus->irq); +err_out_free_mdiobus: + mdiobus_free(db->mii_bus); +err_out: + return err; +} + +static void emac_reset(struct emac_board_info *db) +{ + dev_dbg(db->dev, "resetting device\n"); + + /* RESET device */ + writel(0, db->membase + EMAC_CTL_REG); + udelay(200); + writel(EMAC_CTL_RESET, db->membase + EMAC_CTL_REG); + udelay(200); +} + +static void emac_outblk_32bit(void __iomem *reg, void *data, int count) +{ + writesl(reg, data, round_up(count, 4) / 4); +} + +static void emac_inblk_32bit(void __iomem *reg, void *data, int count) +{ + readsl(reg, data, round_up(count, 4) / 4); +} + +static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +{ + struct emac_board_info *dm = netdev_priv(dev); + struct phy_device *phydev = dm->phy_dev; + + if (!netif_running(dev)) + return -EINVAL; + + if (!phydev) + return -ENODEV; + + return phy_mii_ioctl(phydev, rq, cmd); +} + +/* ethtool ops */ +static void emac_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info) +{ + strlcpy(info->driver, DRV_NAME, sizeof(DRV_NAME)); + strlcpy(info->version, DRV_VERSION, sizeof(DRV_VERSION)); + strlcpy(info->bus_info, dev_name(&dev->dev), sizeof(info->bus_info)); +} + +static int emac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +{ + struct emac_board_info *dm = netdev_priv(dev); + struct phy_device *phydev = dm->phy_dev; + + if (!phydev) + return -ENODEV; + + return phy_ethtool_gset(phydev, cmd); +} + +static int emac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +{ + struct emac_board_info *dm = netdev_priv(dev); + struct phy_device *phydev = dm->phy_dev; + + if (!phydev) + return -ENODEV; + + return phy_ethtool_sset(phydev, cmd); +} + +static const struct ethtool_ops emac_ethtool_ops = { + .get_drvinfo = emac_get_drvinfo, + .get_settings = emac_get_settings, + .set_settings = emac_set_settings, + .get_link = ethtool_op_get_link, +}; + +unsigned int emac_setup(struct net_device *ndev) +{ + unsigned int reg_val; + struct emac_board_info *db = netdev_priv(ndev); + + /* set up TX */ + reg_val = readl(db->membase + EMAC_TX_MODE_REG); + + writel(reg_val | EMAC_TX_MODE_ABORTED_FRAME_EN, + db->membase + EMAC_TX_MODE_REG); + + /* set up RX */ + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + + writel(reg_val | EMAC_RX_CTL_PASS_LEN_OOR_EN | + EMAC_RX_CTL_ACCEPT_UNICAST_EN | EMAC_RX_CTL_DA_FILTER_EN | + EMAC_RX_CTL_ACCEPT_MULTICAST_EN | + EMAC_RX_CTL_ACCEPT_BROADCAST_EN, + db->membase + EMAC_RX_CTL_REG); + + /* set MAC */ + /* set MAC CTL0 */ + reg_val = readl(db->membase + EMAC_MAC_CTL0_REG); + writel(reg_val | EMAC_MAC_CTL0_RX_FLOW_CTL_EN | + EMAC_MAC_CTL0_TX_FLOW_CTL_EN, + db->membase + EMAC_MAC_CTL0_REG); + + /* set MAC CTL1 */ + reg_val = readl(db->membase + EMAC_MAC_CTL1_REG); + reg_val |= EMAC_MAC_CTL1_LEN_CHECK_EN; + reg_val |= EMAC_MAC_CTL1_CRC_EN; + reg_val |= EMAC_MAC_CTL1_PAD_EN; + writel(reg_val, db->membase + EMAC_MAC_CTL1_REG); + + /* set up IPGT */ + writel(EMAC_MAC_IPGT_FULL_DUPLEX, db->membase + EMAC_MAC_IPGT_REG); + + /* set up IPGR */ + writel((EMAC_MAC_IPGR_IPG1 << 8) | EMAC_MAC_IPGR_IPG2, + db->membase + EMAC_MAC_IPGR_REG); + + /* set up Collison window */ + writel((EMAC_MAC_CLRT_COLLISION_WINDOW << 8) | EMAC_MAC_CLRT_RM, + db->membase + EMAC_MAC_CLRT_REG); + + /* set up Max Frame Length */ + writel(EMAC_MAX_FRAME_LEN, + db->membase + EMAC_MAC_MAXF_REG); + + return 0; +} + +unsigned int emac_powerup(struct net_device *ndev) +{ + struct emac_board_info *db = netdev_priv(ndev); + unsigned int reg_val; + + /* initial EMAC */ + /* flush RX FIFO */ + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + reg_val |= 0x8; + writel(reg_val, db->membase + EMAC_RX_CTL_REG); + udelay(1); + + /* initial MAC */ + /* soft reset MAC */ + reg_val = readl(db->membase + EMAC_MAC_CTL0_REG); + reg_val &= ~EMAC_MAC_CTL0_SOFT_RESET; + writel(reg_val, db->membase + EMAC_MAC_CTL0_REG); + + /* set MII clock */ + reg_val = readl(db->membase + EMAC_MAC_MCFG_REG); + reg_val &= (~(0xf << 2)); + reg_val |= (0xD << 2); + writel(reg_val, db->membase + EMAC_MAC_MCFG_REG); + + /* clear RX counter */ + writel(0x0, db->membase + EMAC_RX_FBC_REG); + + /* disable all interrupt and clear interrupt status */ + writel(0, db->membase + EMAC_INT_CTL_REG); + reg_val = readl(db->membase + EMAC_INT_STA_REG); + writel(reg_val, db->membase + EMAC_INT_STA_REG); + + udelay(1); + + /* set up EMAC */ + emac_setup(ndev); + + /* set mac_address to chip */ + writel(ndev->dev_addr[0] << 16 | ndev->dev_addr[1] << 8 | ndev-> + dev_addr[2], db->membase + EMAC_MAC_A1_REG); + writel(ndev->dev_addr[3] << 16 | ndev->dev_addr[4] << 8 | ndev-> + dev_addr[5], db->membase + EMAC_MAC_A0_REG); + + mdelay(1); + + return 1; +} + +static int emac_set_mac_address(struct net_device *dev, void *p) +{ + struct sockaddr *addr = p; + struct emac_board_info *db = netdev_priv(dev); + + if (netif_running(dev)) + return -EBUSY; + + memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + + writel(dev->dev_addr[0] << 16 | dev->dev_addr[1] << 8 | dev-> + dev_addr[2], db->membase + EMAC_MAC_A1_REG); + writel(dev->dev_addr[3] << 16 | dev->dev_addr[4] << 8 | dev-> + dev_addr[5], db->membase + EMAC_MAC_A0_REG); + + return 0; +} + +/* Initialize emac board */ +static void emac_init_emac(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + unsigned int reg_val; + + /* set EMAC SPEED, depend on PHY */ + reg_val = readl(db->membase + EMAC_MAC_SUPP_REG); + reg_val &= ~(0x1 << 8); + if (db->speed == SPEED_100) + reg_val |= 1 << 8; + writel(reg_val, db->membase + EMAC_MAC_SUPP_REG); + + /* set duplex depend on phy */ + reg_val = readl(db->membase + EMAC_MAC_CTL1_REG); + reg_val &= ~EMAC_MAC_CTL1_DUPLEX_EN; + if (db->duplex) + reg_val |= EMAC_MAC_CTL1_DUPLEX_EN; + writel(reg_val, db->membase + EMAC_MAC_CTL1_REG); + + /* enable RX/TX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + writel(reg_val | EMAC_CTL_RESET | EMAC_CTL_TX_EN | EMAC_CTL_RX_EN, + db->membase + EMAC_CTL_REG); + + /* enable RX/TX0/RX Hlevel interrup */ + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); +} + +/* Our watchdog timed out. Called by the networking layer */ +static void emac_timeout(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + unsigned long flags; + + if (netif_msg_timer(db)) + dev_err(db->dev, "tx time out.\n"); + + /* Save previous register address */ + spin_lock_irqsave(&db->lock, flags); + + netif_stop_queue(dev); + emac_reset(db); + emac_init_emac(dev); + /* We can accept TX packets again */ + dev->trans_start = jiffies; + netif_wake_queue(dev); + + /* Restore previous register address */ + spin_unlock_irqrestore(&db->lock, flags); +} + +/* Hardware start transmission. + * Send a packet to media from the upper layer. + */ +static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + unsigned long channel; + unsigned long flags; + + channel = db->tx_fifo_stat & 3; + if (channel == 3) + return NETDEV_TX_BUSY; + + channel = (channel == 1 ? 1 : 0); + + spin_lock_irqsave(&db->lock, flags); + + writel(channel, db->membase + EMAC_TX_INS_REG); + + emac_outblk_32bit(db->membase + EMAC_TX_IO_DATA_REG, + skb->data, skb->len); + dev->stats.tx_bytes += skb->len; + + db->tx_fifo_stat |= 1 << channel; + /* TX control: First packet immediately send, second packet queue */ + if (channel == 0) { + /* set TX len */ + writel(skb->len, db->membase + EMAC_TX_PL0_REG); + /* start translate from fifo to phy */ + writel(readl(db->membase + EMAC_TX_CTL0_REG) | 1, + db->membase + EMAC_TX_CTL0_REG); + + /* save the time stamp */ + dev->trans_start = jiffies; + } else if (channel == 1) { + /* set TX len */ + writel(skb->len, db->membase + EMAC_TX_PL1_REG); + /* start translate from fifo to phy */ + writel(readl(db->membase + EMAC_TX_CTL1_REG) | 1, + db->membase + EMAC_TX_CTL1_REG); + + /* save the time stamp */ + dev->trans_start = jiffies; + } + + if ((db->tx_fifo_stat & 3) == 3) { + /* Second packet */ + netif_stop_queue(dev); + } + + spin_unlock_irqrestore(&db->lock, flags); + + /* free this SKB */ + dev_kfree_skb(skb); + + return NETDEV_TX_OK; +} + +/* EMAC interrupt handler + * receive the packet to upper layer, free the transmitted packet + */ +static void emac_tx_done(struct net_device *dev, struct emac_board_info *db, + unsigned int tx_status) +{ + /* One packet sent complete */ + db->tx_fifo_stat &= ~(tx_status & 3); + if (3 == (tx_status & 3)) + dev->stats.tx_packets += 2; + else + dev->stats.tx_packets++; + + if (netif_msg_tx_done(db)) + dev_dbg(db->dev, "tx done, NSR %02x\n", tx_status); + + netif_wake_queue(dev); +} + +/* Received a packet and pass to upper layer + */ +static void emac_rx(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + struct sk_buff *skb; + u8 *rdptr; + bool good_packet; + static int rxlen_last; + unsigned int reg_val; + u32 rxhdr, rxstatus, rxcount, rxlen; + + /* Check packet ready or not */ + while (1) { + /* race warning: the first packet might arrive with + * the interrupts disabled, but the second will fix + * it + */ + rxcount = readl(db->membase + EMAC_RX_FBC_REG); + + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "RXCount: %x\n", rxcount); + + if ((db->skb_last != NULL) && (rxlen_last > 0)) { + dev->stats.rx_bytes += rxlen_last; + + /* Pass to upper layer */ + db->skb_last->protocol = eth_type_trans(db->skb_last, + dev); + netif_rx(db->skb_last); + dev->stats.rx_packets++; + db->skb_last = NULL; + rxlen_last = 0; + + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + reg_val &= ~EMAC_RX_CTL_DMA_EN; + writel(reg_val, db->membase + EMAC_RX_CTL_REG); + } + + if (!rxcount) { + db->emacrx_completed_flag = 1; + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); + + /* had one stuck? */ + rxcount = readl(db->membase + EMAC_RX_FBC_REG); + if (!rxcount) + return; + } + + reg_val = readl(db->membase + EMAC_RX_IO_DATA_REG); + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "receive header: %x\n", reg_val); + if (reg_val != EMAC_UNDOCUMENTED_MAGIC) { + /* disable RX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + writel(reg_val & ~EMAC_CTL_RX_EN, + db->membase + EMAC_CTL_REG); + + /* Flush RX FIFO */ + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + writel(reg_val | (1 << 3), + db->membase + EMAC_RX_CTL_REG); + + do { + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + } while (reg_val & (1 << 3)); + + /* enable RX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + writel(reg_val | EMAC_CTL_RX_EN, + db->membase + EMAC_CTL_REG); + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); + + db->emacrx_completed_flag = 1; + + return; + } + + /* A packet ready now & Get status/length */ + good_packet = true; + + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, + &rxhdr, sizeof(rxhdr)); + + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "rxhdr: %x\n", *((int *)(&rxhdr))); + + rxlen = EMAC_RX_IO_DATA_LEN(rxhdr); + rxstatus = EMAC_RX_IO_DATA_STATUS(rxhdr); + + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "RX: status %02x, length %04x\n", + rxstatus, rxlen); + + /* Packet Status check */ + if (rxlen < 0x40) { + good_packet = false; + if (netif_msg_rx_err(db)) + dev_dbg(db->dev, "RX: Bad Packet (runt)\n"); + } + + if (unlikely(!(rxstatus & EMAC_RX_IO_DATA_STATUS_OK))) { + good_packet = false; + + if (rxstatus & EMAC_RX_IO_DATA_STATUS_CRC_ERR) { + if (netif_msg_rx_err(db)) + dev_dbg(db->dev, "crc error\n"); + dev->stats.rx_crc_errors++; + } + + if (rxstatus & EMAC_RX_IO_DATA_STATUS_LEN_ERR) { + if (netif_msg_rx_err(db)) + dev_dbg(db->dev, "length error\n"); + dev->stats.rx_length_errors++; + } + } + + /* Move data from EMAC */ + skb = dev_alloc_skb(rxlen + 4); + if (good_packet && skb) { + skb_reserve(skb, 2); + rdptr = (u8 *) skb_put(skb, rxlen - 4); + + /* Read received packet from RX SRAM */ + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "RxLen %x\n", rxlen); + + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, + rdptr, rxlen); + dev->stats.rx_bytes += rxlen; + + /* Pass to upper layer */ + skb->protocol = eth_type_trans(skb, dev); + netif_rx(skb); + dev->stats.rx_packets++; + } + } +} + +static irqreturn_t emac_interrupt(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct emac_board_info *db = netdev_priv(dev); + int int_status; + unsigned long flags; + unsigned int reg_val; + + /* A real interrupt coming */ + + /* holders of db->lock must always block IRQs */ + spin_lock_irqsave(&db->lock, flags); + + /* Disable all interrupts */ + writel(0, db->membase + EMAC_INT_CTL_REG); + + /* Got EMAC interrupt status */ + /* Got ISR */ + int_status = readl(db->membase + EMAC_INT_STA_REG); + /* Clear ISR status */ + writel(int_status, db->membase + EMAC_INT_STA_REG); + + if (netif_msg_intr(db)) + dev_dbg(db->dev, "emac interrupt %02x\n", int_status); + + /* Received the coming packet */ + if ((int_status & 0x100) && (db->emacrx_completed_flag == 1)) { + /* carrier lost */ + db->emacrx_completed_flag = 0; + emac_rx(dev); + } + + /* Transmit Interrupt check */ + if (int_status & (0x01 | 0x02)) + emac_tx_done(dev, db, int_status); + + if (int_status & (0x04 | 0x08)) + netdev_info(dev, " ab : %x\n", int_status); + + /* Re-enable interrupt mask */ + if (db->emacrx_completed_flag == 1) { + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); + } + spin_unlock_irqrestore(&db->lock, flags); + + return IRQ_HANDLED; +} + +#ifdef CONFIG_NET_POLL_CONTROLLER +/* + * Used by netconsole + */ +static void emac_poll_controller(struct net_device *dev) +{ + disable_irq(dev->irq); + emac_interrupt(dev->irq, dev); + enable_irq(dev->irq); +} +#endif + +/* Open the interface. + * The interface is opened whenever "ifconfig" actives it. + */ +static int emac_open(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + + if (netif_msg_ifup(db)) + dev_dbg(db->dev, "enabling %s\n", dev->name); + + if (devm_request_irq(db->dev, dev->irq, &emac_interrupt, + 0, dev->name, dev)) + return -EAGAIN; + + /* Initialize EMAC board */ + emac_reset(db); + emac_init_emac(dev); + + phy_start(db->phy_dev); + netif_start_queue(dev); + + return 0; +} + +static void emac_shutdown(struct net_device *dev) +{ + unsigned int reg_val; + struct emac_board_info *db = netdev_priv(dev); + + /* Disable all interrupt */ + writel(0, db->membase + EMAC_INT_CTL_REG); + + /* clear interupt status */ + reg_val = readl(db->membase + EMAC_INT_STA_REG); + writel(reg_val, db->membase + EMAC_INT_STA_REG); + + /* Disable RX/TX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + reg_val &= ~(EMAC_CTL_TX_EN | EMAC_CTL_RX_EN | EMAC_CTL_RESET); + writel(reg_val, db->membase + EMAC_CTL_REG); +} + +/* Stop the interface. + * The interface is stopped when it is brought. + */ +static int emac_stop(struct net_device *ndev) +{ + struct emac_board_info *db = netdev_priv(ndev); + + if (netif_msg_ifdown(db)) + dev_dbg(db->dev, "shutting down %s\n", ndev->name); + + netif_stop_queue(ndev); + netif_carrier_off(ndev); + + emac_shutdown(ndev); + + return 0; +} + +static const struct net_device_ops emac_netdev_ops = { + .ndo_open = emac_open, + .ndo_stop = emac_stop, + .ndo_start_xmit = emac_start_xmit, + .ndo_tx_timeout = emac_timeout, + .ndo_do_ioctl = emac_ioctl, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = emac_set_mac_address, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = emac_poll_controller, +#endif +}; + +/* Search EMAC board, allocate space and register it + */ +static int emac_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct emac_board_info *db; + struct net_device *ndev; + int ret = 0; + const char *mac_addr; + + ndev = alloc_etherdev(sizeof(struct emac_board_info)); + if (!ndev) { + dev_err(&pdev->dev, "could not allocate device.\n"); + return -ENOMEM; + } + + SET_NETDEV_DEV(ndev, &pdev->dev); + + db = netdev_priv(ndev); + memset(db, 0, sizeof(*db)); + + db->dev = &pdev->dev; + db->ndev = ndev; + db->pdev = pdev; + + spin_lock_init(&db->lock); + + db->membase = of_iomap(np, 0); + if (!db->membase) { + dev_err(&pdev->dev, "failed to remap registers\n"); + return -ENOMEM; + goto out; + } + + /* fill in parameters for net-dev structure */ + ndev->base_addr = (unsigned long)db->membase; + ndev->irq = irq_of_parse_and_map(np, 0); + if (ndev->irq == -ENXIO) { + netdev_err(ndev, "No irq resource\n"); + ret = ndev->irq; + goto out; + } + + /* Read MAC-address from DT */ + mac_addr = of_get_mac_address(np); + if (mac_addr) + memcpy(ndev->dev_addr, mac_addr, ETH_ALEN); + + /* Check if the MAC address is valid, if not get a random one */ + if (!is_valid_ether_addr(ndev->dev_addr)) { + eth_hw_addr_random(ndev); + dev_warn(&pdev->dev, "using random MAC address %pM\n", + ndev->dev_addr); + } + + db->regulator = devm_regulator_get(&pdev->dev, "phy"); + if(IS_ERR(db->regulator)) { + if(PTR_ERR(db->regulator) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + dev_info(&pdev->dev, "no regulator found\n"); + } + + db->emacrx_completed_flag = 1; + emac_powerup(ndev); + emac_reset(db); + + ether_setup(ndev); + + ndev->netdev_ops = &emac_netdev_ops; + ndev->watchdog_timeo = msecs_to_jiffies(watchdog); + ndev->ethtool_ops = &emac_ethtool_ops; + +#ifdef CONFIG_NET_POLL_CONTROLLER + ndev->poll_controller = &emac_poll_controller; +#endif + + platform_set_drvdata(pdev, ndev); + + ret = emac_mii_init(db); + if (ret) { + dev_err(&pdev->dev, "MII init failed!\n"); + goto out; + } + + /* Carrier starts down, phylib will bring it up */ + netif_carrier_off(ndev); + + ret = register_netdev(ndev); + if (ret) { + dev_err(&pdev->dev, "Registering netdev failed!\n"); + ret = -ENODEV; + goto out; + } + + dev_info(&pdev->dev, "%s: at %p, IRQ %d MAC: %pM\n", + ndev->name, db->membase, ndev->irq, ndev->dev_addr); + + return 0; + +out: + dev_err(db->dev, "not found (%d).\n", ret); + + free_netdev(ndev); + + return ret; +} + +static int emac_remove(struct platform_device *pdev) +{ + struct net_device *ndev = platform_get_drvdata(pdev); + struct emac_board_info *db = netdev_priv(ndev); + + platform_set_drvdata(pdev, NULL); + + regulator_disable(db->regulator); + + unregister_netdev(ndev); + free_netdev(ndev); + + dev_dbg(&pdev->dev, "released and freed device\n"); + return 0; +} + +static int emac_suspend(struct platform_device *dev, pm_message_t state) +{ + struct net_device *ndev = platform_get_drvdata(dev); + + netif_carrier_off(ndev); + netif_device_detach(ndev); + emac_shutdown(ndev); + + return 0; +} + +static int emac_resume(struct platform_device *dev) +{ + struct net_device *ndev = platform_get_drvdata(dev); + struct emac_board_info *db = netdev_priv(ndev); + + emac_reset(db); + emac_init_emac(ndev); + netif_device_attach(ndev); + + return 0; +} + +static const struct of_device_id emac_of_match[] = { + {.compatible = "allwinner,sun4i-emac",}, + {}, +}; + +MODULE_DEVICE_TABLE(of, emac_of_match); + +static struct platform_driver emac_driver = { + .driver = { + .name = "sun4i-emac", + .of_match_table = emac_of_match, + }, + .probe = emac_probe, + .remove = emac_remove, + .suspend = emac_suspend, + .resume = emac_resume, +}; + +module_platform_driver(emac_driver); + +MODULE_AUTHOR("Stefan Roese <sr@denx.de>"); +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>"); +MODULE_DESCRIPTION("Allwinner A10 emac network driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.h b/drivers/net/ethernet/allwinner/sun4i-emac.h new file mode 100644 index 0000000..f1b262c --- /dev/null +++ b/drivers/net/ethernet/allwinner/sun4i-emac.h @@ -0,0 +1,114 @@ +/* + * Allwinner EMAC Fast Ethernet driver for Linux. + * + * Copyright 2012 Stefan Roese <sr@denx.de> + * Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com> + * + * Based on the Linux driver provided by Allwinner: + * Copyright (C) 1997 Sten Wang + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#ifndef _SUN4I_EMAC_H_ +#define _SUN4I_EMAC_H_ + +#define EMAC_CTL_REG (0x00) +#define EMAC_CTL_RESET (1 << 0) +#define EMAC_CTL_TX_EN (1 << 1) +#define EMAC_CTL_RX_EN (1 << 2) +#define EMAC_TX_MODE_REG (0x04) +#define EMAC_TX_MODE_ABORTED_FRAME_EN (1 << 0) +#define EMAC_TX_MODE_DMA_EN (1 << 1) +#define EMAC_TX_FLOW_REG (0x08) +#define EMAC_TX_CTL0_REG (0x0c) +#define EMAC_TX_CTL1_REG (0x10) +#define EMAC_TX_INS_REG (0x14) +#define EMAC_TX_PL0_REG (0x18) +#define EMAC_TX_PL1_REG (0x1c) +#define EMAC_TX_STA_REG (0x20) +#define EMAC_TX_IO_DATA_REG (0x24) +#define EMAC_TX_IO_DATA1_REG (0x28) +#define EMAC_TX_TSVL0_REG (0x2c) +#define EMAC_TX_TSVH0_REG (0x30) +#define EMAC_TX_TSVL1_REG (0x34) +#define EMAC_TX_TSVH1_REG (0x38) +#define EMAC_RX_CTL_REG (0x3c) +#define EMAC_RX_CTL_AUTO_DRQ_EN (1 << 1) +#define EMAC_RX_CTL_DMA_EN (1 << 2) +#define EMAC_RX_CTL_PASS_ALL_EN (1 << 4) +#define EMAC_RX_CTL_PASS_CTL_EN (1 << 5) +#define EMAC_RX_CTL_PASS_CRC_ERR_EN (1 << 6) +#define EMAC_RX_CTL_PASS_LEN_ERR_EN (1 << 7) +#define EMAC_RX_CTL_PASS_LEN_OOR_EN (1 << 8) +#define EMAC_RX_CTL_ACCEPT_UNICAST_EN (1 << 16) +#define EMAC_RX_CTL_DA_FILTER_EN (1 << 17) +#define EMAC_RX_CTL_ACCEPT_MULTICAST_EN (1 << 20) +#define EMAC_RX_CTL_HASH_FILTER_EN (1 << 21) +#define EMAC_RX_CTL_ACCEPT_BROADCAST_EN (1 << 22) +#define EMAC_RX_CTL_SA_FILTER_EN (1 << 24) +#define EMAC_RX_CTL_SA_FILTER_INVERT_EN (1 << 25) +#define EMAC_RX_HASH0_REG (0x40) +#define EMAC_RX_HASH1_REG (0x44) +#define EMAC_RX_STA_REG (0x48) +#define EMAC_RX_IO_DATA_REG (0x4c) +#define EMAC_RX_IO_DATA_LEN(x) (x & 0xffff) +#define EMAC_RX_IO_DATA_STATUS(x) ((x >> 16) & 0xffff) +#define EMAC_RX_IO_DATA_STATUS_CRC_ERR (1 << 4) +#define EMAC_RX_IO_DATA_STATUS_LEN_ERR (3 << 5) +#define EMAC_RX_IO_DATA_STATUS_OK (1 << 7) +#define EMAC_RX_FBC_REG (0x50) +#define EMAC_INT_CTL_REG (0x54) +#define EMAC_INT_STA_REG (0x58) +#define EMAC_MAC_CTL0_REG (0x5c) +#define EMAC_MAC_CTL0_RX_FLOW_CTL_EN (1 << 2) +#define EMAC_MAC_CTL0_TX_FLOW_CTL_EN (1 << 3) +#define EMAC_MAC_CTL0_SOFT_RESET (1 << 15) +#define EMAC_MAC_CTL1_REG (0x60) +#define EMAC_MAC_CTL1_DUPLEX_EN (1 << 0) +#define EMAC_MAC_CTL1_LEN_CHECK_EN (1 << 1) +#define EMAC_MAC_CTL1_HUGE_FRAME_EN (1 << 2) +#define EMAC_MAC_CTL1_DELAYED_CRC_EN (1 << 3) +#define EMAC_MAC_CTL1_CRC_EN (1 << 4) +#define EMAC_MAC_CTL1_PAD_EN (1 << 5) +#define EMAC_MAC_CTL1_PAD_CRC_EN (1 << 6) +#define EMAC_MAC_CTL1_AD_SHORT_FRAME_EN (1 << 7) +#define EMAC_MAC_CTL1_BACKOFF_DIS (1 << 12) +#define EMAC_MAC_IPGT_REG (0x64) +#define EMAC_MAC_IPGT_HALF_DUPLEX (0x12) +#define EMAC_MAC_IPGT_FULL_DUPLEX (0x15) +#define EMAC_MAC_IPGR_REG (0x68) +#define EMAC_MAC_IPGR_IPG1 (0x0c) +#define EMAC_MAC_IPGR_IPG2 (0x12) +#define EMAC_MAC_CLRT_REG (0x6c) +#define EMAC_MAC_CLRT_COLLISION_WINDOW (0x37) +#define EMAC_MAC_CLRT_RM (0x0f) +#define EMAC_MAC_MAXF_REG (0x70) +#define EMAC_MAC_SUPP_REG (0x74) +#define EMAC_MAC_TEST_REG (0x78) +#define EMAC_MAC_MCFG_REG (0x7c) +#define EMAC_MAC_MCMD_REG (0x80) +#define EMAC_MAC_MADR_REG (0x84) +#define EMAC_MAC_MWTD_REG (0x88) +#define EMAC_MAC_MRDD_REG (0x8c) +#define EMAC_MAC_MIND_REG (0x90) +#define EMAC_MAC_SSRR_REG (0x94) +#define EMAC_MAC_A0_REG (0x98) +#define EMAC_MAC_A1_REG (0x9c) +#define EMAC_MAC_A2_REG (0xa0) +#define EMAC_SAFX_L_REG0 (0xa4) +#define EMAC_SAFX_H_REG0 (0xa8) +#define EMAC_SAFX_L_REG1 (0xac) +#define EMAC_SAFX_H_REG1 (0xb0) +#define EMAC_SAFX_L_REG2 (0xb4) +#define EMAC_SAFX_H_REG2 (0xb8) +#define EMAC_SAFX_L_REG3 (0xbc) +#define EMAC_SAFX_H_REG3 (0xc0) + +#define EMAC_PHY_DUPLEX (1 << 8) + +#define EMAC_EEPROM_MAGIC (0x444d394b) +#define EMAC_UNDOCUMENTED_MAGIC (0x0143414d) +#endif /* _SUN4I_EMAC_H_ */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's @ 2013-03-23 22:30 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel From: Stefan Roese <sr@denx.de> The Allwinner A10 has an ethernet controller that seem to be developped internally by them. The exact feature set of this controller is unknown, since there is no public documentation for this IP, and this driver is mostly the one published by Allwinner that has been heavily cleaned up. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- .../bindings/net/allwinner,sun4i-emac.txt | 19 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/allwinner/Kconfig | 36 + drivers/net/ethernet/allwinner/Makefile | 5 + drivers/net/ethernet/allwinner/sun4i-emac.c | 1033 ++++++++++++++++++++ drivers/net/ethernet/allwinner/sun4i-emac.h | 114 +++ 7 files changed, 1209 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt create mode 100644 drivers/net/ethernet/allwinner/Kconfig create mode 100644 drivers/net/ethernet/allwinner/Makefile create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt new file mode 100644 index 0000000..aaf5013 --- /dev/null +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt @@ -0,0 +1,19 @@ +* Allwinner EMAC ethernet controller + +Required properties: +- compatible: should be "allwinner,sun4i-emac". +- reg: address and length of the register set for the device. +- interrupts: interrupt for the device + +Optional properties: +- phy-supply: phandle to a regulator if the PHY needs one +- (local-)mac-address: mac address to be used by this driver + +Example: + +emac: ethernet at 01c0b000 { + compatible = "allwinner,sun4i-emac"; + reg = <0x01c0b000 0x1000>; + phy-supply = <®_emac_3v3>; + interrupts = <55>; +}; diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index ed956e0..18fd6fb 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -20,6 +20,7 @@ config SUNGEM_PHY source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/adaptec/Kconfig" source "drivers/net/ethernet/aeroflex/Kconfig" +source "drivers/net/ethernet/allwinner/Kconfig" source "drivers/net/ethernet/alteon/Kconfig" source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/apple/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 8268d85..009da27 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ obj-$(CONFIG_GRETH) += aeroflex/ +obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig new file mode 100644 index 0000000..5d20fb0 --- /dev/null +++ b/drivers/net/ethernet/allwinner/Kconfig @@ -0,0 +1,36 @@ +# +# Allwinner device configuration +# + +config NET_VENDOR_ALLWINNER + bool "Allwinner devices" + default y + depends on ARCH_SUNXI + ---help--- + If you have a network (Ethernet) card belonging to this + class, say Y and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly + affect the kernel: saying N will just cause the configurator + to skip all the questions about Davicom cards. If you say Y, + you will be asked for your specific card in the following + questions. + +if NET_VENDOR_ALLWINNER + +config SUN4I_EMAC + tristate "Allwinner A10 EMAC support" + depends on ARCH_SUNXI + depends on OF + select CRC32 + select NET_CORE + select MII + select REGULATOR_FIXED_VOLTAGE + ---help--- + Support for Allwinner A10 EMAC ethernet driver. + + To compile this driver as a module, choose M here. The module + will be called sun4i-emac. + +endif # NET_VENDOR_ALLWINNER diff --git a/drivers/net/ethernet/allwinner/Makefile b/drivers/net/ethernet/allwinner/Makefile new file mode 100644 index 0000000..03129f7 --- /dev/null +++ b/drivers/net/ethernet/allwinner/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Allwinner device drivers. +# + +obj-$(CONFIG_SUN4I_EMAC) += sun4i-emac.o diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c new file mode 100644 index 0000000..66bc089 --- /dev/null +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -0,0 +1,1033 @@ +/* + * Allwinner EMAC Fast Ethernet driver for Linux. + * + * Copyright 2012-2013 Stefan Roese <sr@denx.de> + * Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com> + * + * Based on the Linux driver provided by Allwinner: + * Copyright (C) 1997 Sten Wang + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include <linux/clk.h> +#include <linux/etherdevice.h> +#include <linux/ethtool.h> +#include <linux/gpio.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/mii.h> +#include <linux/module.h> +#include <linux/netdevice.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_net.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/phy.h> +#include <linux/regulator/consumer.h> + +#include "sun4i-emac.h" + +#define DRV_NAME "sun4i-emac" +#define DRV_VERSION "1.02" + +#define EMAC_MAX_FRAME_LEN 0x0600 + +/* Transmit timeout, default 5 seconds. */ +static int watchdog = 5000; +module_param(watchdog, int, 0400); +MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds"); + +/* EMAC register address locking. + * + * The EMAC uses an address register to control where data written + * to the data register goes. This means that the address register + * must be preserved over interrupts or similar calls. + * + * During interrupt and other critical calls, a spinlock is used to + * protect the system, but the calls themselves save the address + * in the address register in case they are interrupting another + * access to the device. + * + * For general accesses a lock is provided so that calls which are + * allowed to sleep are serialised so that the address register does + * not need to be saved. This lock also serves to serialise access + * to the EEPROM and PHY access registers which are shared between + * these two devices. + */ + +/* The driver supports the original EMACE, and now the two newer + * devices, EMACA and EMACB. + */ + +struct emac_board_info { + struct clk *clk; + struct device *dev; + struct platform_device *pdev; + spinlock_t lock; + void __iomem *membase; + u32 msg_enable; + struct net_device *ndev; + struct regulator *regulator; + struct sk_buff *skb_last; + u16 tx_fifo_stat; + + int emacrx_completed_flag; + + struct mii_bus *mii_bus; + struct phy_device *phy_dev; + unsigned int link; + unsigned int speed; + unsigned int duplex; + + phy_interface_t phy_interface; +}; + +static int emac_mdio_read(struct mii_bus *bus, int mii_id, int regnum) +{ + struct emac_board_info *db = bus->priv; + int value; + + /* issue the phy address and reg */ + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); + /* pull up the phy io line */ + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); + + /* Wait read complete */ + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) + cpu_relax(); + + /* push down the phy io line */ + writel(0x0, db->membase + EMAC_MAC_MCMD_REG); + /* and read data */ + value = readl(db->membase + EMAC_MAC_MRDD_REG); + + return value; +} + +static int emac_mdio_write(struct mii_bus *bus, int mii_id, int regnum, + u16 value) +{ + struct emac_board_info *db = bus->priv; + + /* issue the phy address and reg */ + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); + /* pull up the phy io line */ + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); + + /* Wait read complete */ + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) + cpu_relax(); + + /* push down the phy io line */ + writel(0x0, db->membase + EMAC_MAC_MCMD_REG); + /* and write data */ + writel(value, db->membase + EMAC_MAC_MWTD_REG); + + return 0; +} + +static int emac_mdio_reset(struct mii_bus *bus) +{ + return 0; +} + + +static void emac_init_emac(struct net_device *dev); +static void emac_handle_link_change(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + struct phy_device *phydev = db->phy_dev; + unsigned long flags; + int status_change = 0; + + spin_lock_irqsave(&db->lock, flags); + + if (phydev->link) { + if ((db->speed != phydev->speed) || + (db->duplex != phydev->duplex)) { + /* Re-init EMAC with new settings */ + emac_init_emac(dev); + + db->speed = phydev->speed; + db->duplex = phydev->duplex; + status_change = 1; + } + } + + if (phydev->link != db->link) { + if (!phydev->link) { + db->speed = 0; + db->duplex = -1; + } + db->link = phydev->link; + + status_change = 1; + } + + spin_unlock_irqrestore(&db->lock, flags); + + if (status_change) + phy_print_status(phydev); +} + +static int emac_mii_probe(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + struct phy_device *phydev; + int ret; + + phydev = phy_find_first(db->mii_bus); + if (!phydev) { + netdev_err(dev, "no PHY found\n"); + return -1; + } + + /* to-do: PHY interrupts are currently not supported */ + + /* attach the mac to the phy */ + ret = phy_connect_direct(dev, phydev, &emac_handle_link_change, + db->phy_interface); + if (ret) { + netdev_err(dev, "Could not attach to PHY\n"); + return ret; + } + + /* mask with MAC supported features */ + phydev->supported &= PHY_BASIC_FEATURES; + phydev->advertising = phydev->supported; + + db->link = 0; + db->speed = 0; + db->duplex = -1; + db->phy_dev = phydev; + + return 0; +} + +int emac_mii_init(struct emac_board_info *db) +{ + int err = -ENXIO; + int i; + + if (!IS_ERR(db->regulator)) + regulator_enable(db->regulator); + + db->mii_bus = mdiobus_alloc(); + if (db->mii_bus == NULL) { + err = -ENOMEM; + goto err_out; + } + + db->mii_bus->name = "EMAC_mii_bus"; + db->mii_bus->read = &emac_mdio_read; + db->mii_bus->write = &emac_mdio_write; + db->mii_bus->reset = &emac_mdio_reset; + snprintf(db->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", + db->pdev->name, db->pdev->id); + db->mii_bus->priv = db; + db->mii_bus->parent = &db->pdev->dev; + + db->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); + if (!db->mii_bus->irq) { + err = -ENOMEM; + goto err_out_free_mdiobus; + } + + for (i = 0; i < PHY_MAX_ADDR; i++) + db->mii_bus->irq[i] = PHY_POLL; + + if (mdiobus_register(db->mii_bus)) + goto err_out_free_mdio_irq; + + if (emac_mii_probe(db->ndev) != 0) + goto err_out_unregister_bus; + + return 0; + +err_out_unregister_bus: + mdiobus_unregister(db->mii_bus); +err_out_free_mdio_irq: + kfree(db->mii_bus->irq); +err_out_free_mdiobus: + mdiobus_free(db->mii_bus); +err_out: + return err; +} + +static void emac_reset(struct emac_board_info *db) +{ + dev_dbg(db->dev, "resetting device\n"); + + /* RESET device */ + writel(0, db->membase + EMAC_CTL_REG); + udelay(200); + writel(EMAC_CTL_RESET, db->membase + EMAC_CTL_REG); + udelay(200); +} + +static void emac_outblk_32bit(void __iomem *reg, void *data, int count) +{ + writesl(reg, data, round_up(count, 4) / 4); +} + +static void emac_inblk_32bit(void __iomem *reg, void *data, int count) +{ + readsl(reg, data, round_up(count, 4) / 4); +} + +static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +{ + struct emac_board_info *dm = netdev_priv(dev); + struct phy_device *phydev = dm->phy_dev; + + if (!netif_running(dev)) + return -EINVAL; + + if (!phydev) + return -ENODEV; + + return phy_mii_ioctl(phydev, rq, cmd); +} + +/* ethtool ops */ +static void emac_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info) +{ + strlcpy(info->driver, DRV_NAME, sizeof(DRV_NAME)); + strlcpy(info->version, DRV_VERSION, sizeof(DRV_VERSION)); + strlcpy(info->bus_info, dev_name(&dev->dev), sizeof(info->bus_info)); +} + +static int emac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +{ + struct emac_board_info *dm = netdev_priv(dev); + struct phy_device *phydev = dm->phy_dev; + + if (!phydev) + return -ENODEV; + + return phy_ethtool_gset(phydev, cmd); +} + +static int emac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +{ + struct emac_board_info *dm = netdev_priv(dev); + struct phy_device *phydev = dm->phy_dev; + + if (!phydev) + return -ENODEV; + + return phy_ethtool_sset(phydev, cmd); +} + +static const struct ethtool_ops emac_ethtool_ops = { + .get_drvinfo = emac_get_drvinfo, + .get_settings = emac_get_settings, + .set_settings = emac_set_settings, + .get_link = ethtool_op_get_link, +}; + +unsigned int emac_setup(struct net_device *ndev) +{ + unsigned int reg_val; + struct emac_board_info *db = netdev_priv(ndev); + + /* set up TX */ + reg_val = readl(db->membase + EMAC_TX_MODE_REG); + + writel(reg_val | EMAC_TX_MODE_ABORTED_FRAME_EN, + db->membase + EMAC_TX_MODE_REG); + + /* set up RX */ + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + + writel(reg_val | EMAC_RX_CTL_PASS_LEN_OOR_EN | + EMAC_RX_CTL_ACCEPT_UNICAST_EN | EMAC_RX_CTL_DA_FILTER_EN | + EMAC_RX_CTL_ACCEPT_MULTICAST_EN | + EMAC_RX_CTL_ACCEPT_BROADCAST_EN, + db->membase + EMAC_RX_CTL_REG); + + /* set MAC */ + /* set MAC CTL0 */ + reg_val = readl(db->membase + EMAC_MAC_CTL0_REG); + writel(reg_val | EMAC_MAC_CTL0_RX_FLOW_CTL_EN | + EMAC_MAC_CTL0_TX_FLOW_CTL_EN, + db->membase + EMAC_MAC_CTL0_REG); + + /* set MAC CTL1 */ + reg_val = readl(db->membase + EMAC_MAC_CTL1_REG); + reg_val |= EMAC_MAC_CTL1_LEN_CHECK_EN; + reg_val |= EMAC_MAC_CTL1_CRC_EN; + reg_val |= EMAC_MAC_CTL1_PAD_EN; + writel(reg_val, db->membase + EMAC_MAC_CTL1_REG); + + /* set up IPGT */ + writel(EMAC_MAC_IPGT_FULL_DUPLEX, db->membase + EMAC_MAC_IPGT_REG); + + /* set up IPGR */ + writel((EMAC_MAC_IPGR_IPG1 << 8) | EMAC_MAC_IPGR_IPG2, + db->membase + EMAC_MAC_IPGR_REG); + + /* set up Collison window */ + writel((EMAC_MAC_CLRT_COLLISION_WINDOW << 8) | EMAC_MAC_CLRT_RM, + db->membase + EMAC_MAC_CLRT_REG); + + /* set up Max Frame Length */ + writel(EMAC_MAX_FRAME_LEN, + db->membase + EMAC_MAC_MAXF_REG); + + return 0; +} + +unsigned int emac_powerup(struct net_device *ndev) +{ + struct emac_board_info *db = netdev_priv(ndev); + unsigned int reg_val; + + /* initial EMAC */ + /* flush RX FIFO */ + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + reg_val |= 0x8; + writel(reg_val, db->membase + EMAC_RX_CTL_REG); + udelay(1); + + /* initial MAC */ + /* soft reset MAC */ + reg_val = readl(db->membase + EMAC_MAC_CTL0_REG); + reg_val &= ~EMAC_MAC_CTL0_SOFT_RESET; + writel(reg_val, db->membase + EMAC_MAC_CTL0_REG); + + /* set MII clock */ + reg_val = readl(db->membase + EMAC_MAC_MCFG_REG); + reg_val &= (~(0xf << 2)); + reg_val |= (0xD << 2); + writel(reg_val, db->membase + EMAC_MAC_MCFG_REG); + + /* clear RX counter */ + writel(0x0, db->membase + EMAC_RX_FBC_REG); + + /* disable all interrupt and clear interrupt status */ + writel(0, db->membase + EMAC_INT_CTL_REG); + reg_val = readl(db->membase + EMAC_INT_STA_REG); + writel(reg_val, db->membase + EMAC_INT_STA_REG); + + udelay(1); + + /* set up EMAC */ + emac_setup(ndev); + + /* set mac_address to chip */ + writel(ndev->dev_addr[0] << 16 | ndev->dev_addr[1] << 8 | ndev-> + dev_addr[2], db->membase + EMAC_MAC_A1_REG); + writel(ndev->dev_addr[3] << 16 | ndev->dev_addr[4] << 8 | ndev-> + dev_addr[5], db->membase + EMAC_MAC_A0_REG); + + mdelay(1); + + return 1; +} + +static int emac_set_mac_address(struct net_device *dev, void *p) +{ + struct sockaddr *addr = p; + struct emac_board_info *db = netdev_priv(dev); + + if (netif_running(dev)) + return -EBUSY; + + memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + + writel(dev->dev_addr[0] << 16 | dev->dev_addr[1] << 8 | dev-> + dev_addr[2], db->membase + EMAC_MAC_A1_REG); + writel(dev->dev_addr[3] << 16 | dev->dev_addr[4] << 8 | dev-> + dev_addr[5], db->membase + EMAC_MAC_A0_REG); + + return 0; +} + +/* Initialize emac board */ +static void emac_init_emac(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + unsigned int reg_val; + + /* set EMAC SPEED, depend on PHY */ + reg_val = readl(db->membase + EMAC_MAC_SUPP_REG); + reg_val &= ~(0x1 << 8); + if (db->speed == SPEED_100) + reg_val |= 1 << 8; + writel(reg_val, db->membase + EMAC_MAC_SUPP_REG); + + /* set duplex depend on phy */ + reg_val = readl(db->membase + EMAC_MAC_CTL1_REG); + reg_val &= ~EMAC_MAC_CTL1_DUPLEX_EN; + if (db->duplex) + reg_val |= EMAC_MAC_CTL1_DUPLEX_EN; + writel(reg_val, db->membase + EMAC_MAC_CTL1_REG); + + /* enable RX/TX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + writel(reg_val | EMAC_CTL_RESET | EMAC_CTL_TX_EN | EMAC_CTL_RX_EN, + db->membase + EMAC_CTL_REG); + + /* enable RX/TX0/RX Hlevel interrup */ + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); +} + +/* Our watchdog timed out. Called by the networking layer */ +static void emac_timeout(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + unsigned long flags; + + if (netif_msg_timer(db)) + dev_err(db->dev, "tx time out.\n"); + + /* Save previous register address */ + spin_lock_irqsave(&db->lock, flags); + + netif_stop_queue(dev); + emac_reset(db); + emac_init_emac(dev); + /* We can accept TX packets again */ + dev->trans_start = jiffies; + netif_wake_queue(dev); + + /* Restore previous register address */ + spin_unlock_irqrestore(&db->lock, flags); +} + +/* Hardware start transmission. + * Send a packet to media from the upper layer. + */ +static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + unsigned long channel; + unsigned long flags; + + channel = db->tx_fifo_stat & 3; + if (channel == 3) + return NETDEV_TX_BUSY; + + channel = (channel == 1 ? 1 : 0); + + spin_lock_irqsave(&db->lock, flags); + + writel(channel, db->membase + EMAC_TX_INS_REG); + + emac_outblk_32bit(db->membase + EMAC_TX_IO_DATA_REG, + skb->data, skb->len); + dev->stats.tx_bytes += skb->len; + + db->tx_fifo_stat |= 1 << channel; + /* TX control: First packet immediately send, second packet queue */ + if (channel == 0) { + /* set TX len */ + writel(skb->len, db->membase + EMAC_TX_PL0_REG); + /* start translate from fifo to phy */ + writel(readl(db->membase + EMAC_TX_CTL0_REG) | 1, + db->membase + EMAC_TX_CTL0_REG); + + /* save the time stamp */ + dev->trans_start = jiffies; + } else if (channel == 1) { + /* set TX len */ + writel(skb->len, db->membase + EMAC_TX_PL1_REG); + /* start translate from fifo to phy */ + writel(readl(db->membase + EMAC_TX_CTL1_REG) | 1, + db->membase + EMAC_TX_CTL1_REG); + + /* save the time stamp */ + dev->trans_start = jiffies; + } + + if ((db->tx_fifo_stat & 3) == 3) { + /* Second packet */ + netif_stop_queue(dev); + } + + spin_unlock_irqrestore(&db->lock, flags); + + /* free this SKB */ + dev_kfree_skb(skb); + + return NETDEV_TX_OK; +} + +/* EMAC interrupt handler + * receive the packet to upper layer, free the transmitted packet + */ +static void emac_tx_done(struct net_device *dev, struct emac_board_info *db, + unsigned int tx_status) +{ + /* One packet sent complete */ + db->tx_fifo_stat &= ~(tx_status & 3); + if (3 == (tx_status & 3)) + dev->stats.tx_packets += 2; + else + dev->stats.tx_packets++; + + if (netif_msg_tx_done(db)) + dev_dbg(db->dev, "tx done, NSR %02x\n", tx_status); + + netif_wake_queue(dev); +} + +/* Received a packet and pass to upper layer + */ +static void emac_rx(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + struct sk_buff *skb; + u8 *rdptr; + bool good_packet; + static int rxlen_last; + unsigned int reg_val; + u32 rxhdr, rxstatus, rxcount, rxlen; + + /* Check packet ready or not */ + while (1) { + /* race warning: the first packet might arrive with + * the interrupts disabled, but the second will fix + * it + */ + rxcount = readl(db->membase + EMAC_RX_FBC_REG); + + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "RXCount: %x\n", rxcount); + + if ((db->skb_last != NULL) && (rxlen_last > 0)) { + dev->stats.rx_bytes += rxlen_last; + + /* Pass to upper layer */ + db->skb_last->protocol = eth_type_trans(db->skb_last, + dev); + netif_rx(db->skb_last); + dev->stats.rx_packets++; + db->skb_last = NULL; + rxlen_last = 0; + + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + reg_val &= ~EMAC_RX_CTL_DMA_EN; + writel(reg_val, db->membase + EMAC_RX_CTL_REG); + } + + if (!rxcount) { + db->emacrx_completed_flag = 1; + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); + + /* had one stuck? */ + rxcount = readl(db->membase + EMAC_RX_FBC_REG); + if (!rxcount) + return; + } + + reg_val = readl(db->membase + EMAC_RX_IO_DATA_REG); + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "receive header: %x\n", reg_val); + if (reg_val != EMAC_UNDOCUMENTED_MAGIC) { + /* disable RX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + writel(reg_val & ~EMAC_CTL_RX_EN, + db->membase + EMAC_CTL_REG); + + /* Flush RX FIFO */ + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + writel(reg_val | (1 << 3), + db->membase + EMAC_RX_CTL_REG); + + do { + reg_val = readl(db->membase + EMAC_RX_CTL_REG); + } while (reg_val & (1 << 3)); + + /* enable RX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + writel(reg_val | EMAC_CTL_RX_EN, + db->membase + EMAC_CTL_REG); + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); + + db->emacrx_completed_flag = 1; + + return; + } + + /* A packet ready now & Get status/length */ + good_packet = true; + + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, + &rxhdr, sizeof(rxhdr)); + + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "rxhdr: %x\n", *((int *)(&rxhdr))); + + rxlen = EMAC_RX_IO_DATA_LEN(rxhdr); + rxstatus = EMAC_RX_IO_DATA_STATUS(rxhdr); + + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "RX: status %02x, length %04x\n", + rxstatus, rxlen); + + /* Packet Status check */ + if (rxlen < 0x40) { + good_packet = false; + if (netif_msg_rx_err(db)) + dev_dbg(db->dev, "RX: Bad Packet (runt)\n"); + } + + if (unlikely(!(rxstatus & EMAC_RX_IO_DATA_STATUS_OK))) { + good_packet = false; + + if (rxstatus & EMAC_RX_IO_DATA_STATUS_CRC_ERR) { + if (netif_msg_rx_err(db)) + dev_dbg(db->dev, "crc error\n"); + dev->stats.rx_crc_errors++; + } + + if (rxstatus & EMAC_RX_IO_DATA_STATUS_LEN_ERR) { + if (netif_msg_rx_err(db)) + dev_dbg(db->dev, "length error\n"); + dev->stats.rx_length_errors++; + } + } + + /* Move data from EMAC */ + skb = dev_alloc_skb(rxlen + 4); + if (good_packet && skb) { + skb_reserve(skb, 2); + rdptr = (u8 *) skb_put(skb, rxlen - 4); + + /* Read received packet from RX SRAM */ + if (netif_msg_rx_status(db)) + dev_dbg(db->dev, "RxLen %x\n", rxlen); + + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, + rdptr, rxlen); + dev->stats.rx_bytes += rxlen; + + /* Pass to upper layer */ + skb->protocol = eth_type_trans(skb, dev); + netif_rx(skb); + dev->stats.rx_packets++; + } + } +} + +static irqreturn_t emac_interrupt(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct emac_board_info *db = netdev_priv(dev); + int int_status; + unsigned long flags; + unsigned int reg_val; + + /* A real interrupt coming */ + + /* holders of db->lock must always block IRQs */ + spin_lock_irqsave(&db->lock, flags); + + /* Disable all interrupts */ + writel(0, db->membase + EMAC_INT_CTL_REG); + + /* Got EMAC interrupt status */ + /* Got ISR */ + int_status = readl(db->membase + EMAC_INT_STA_REG); + /* Clear ISR status */ + writel(int_status, db->membase + EMAC_INT_STA_REG); + + if (netif_msg_intr(db)) + dev_dbg(db->dev, "emac interrupt %02x\n", int_status); + + /* Received the coming packet */ + if ((int_status & 0x100) && (db->emacrx_completed_flag == 1)) { + /* carrier lost */ + db->emacrx_completed_flag = 0; + emac_rx(dev); + } + + /* Transmit Interrupt check */ + if (int_status & (0x01 | 0x02)) + emac_tx_done(dev, db, int_status); + + if (int_status & (0x04 | 0x08)) + netdev_info(dev, " ab : %x\n", int_status); + + /* Re-enable interrupt mask */ + if (db->emacrx_completed_flag == 1) { + reg_val = readl(db->membase + EMAC_INT_CTL_REG); + reg_val |= (0xf << 0) | (0x01 << 8); + writel(reg_val, db->membase + EMAC_INT_CTL_REG); + } + spin_unlock_irqrestore(&db->lock, flags); + + return IRQ_HANDLED; +} + +#ifdef CONFIG_NET_POLL_CONTROLLER +/* + * Used by netconsole + */ +static void emac_poll_controller(struct net_device *dev) +{ + disable_irq(dev->irq); + emac_interrupt(dev->irq, dev); + enable_irq(dev->irq); +} +#endif + +/* Open the interface. + * The interface is opened whenever "ifconfig" actives it. + */ +static int emac_open(struct net_device *dev) +{ + struct emac_board_info *db = netdev_priv(dev); + + if (netif_msg_ifup(db)) + dev_dbg(db->dev, "enabling %s\n", dev->name); + + if (devm_request_irq(db->dev, dev->irq, &emac_interrupt, + 0, dev->name, dev)) + return -EAGAIN; + + /* Initialize EMAC board */ + emac_reset(db); + emac_init_emac(dev); + + phy_start(db->phy_dev); + netif_start_queue(dev); + + return 0; +} + +static void emac_shutdown(struct net_device *dev) +{ + unsigned int reg_val; + struct emac_board_info *db = netdev_priv(dev); + + /* Disable all interrupt */ + writel(0, db->membase + EMAC_INT_CTL_REG); + + /* clear interupt status */ + reg_val = readl(db->membase + EMAC_INT_STA_REG); + writel(reg_val, db->membase + EMAC_INT_STA_REG); + + /* Disable RX/TX */ + reg_val = readl(db->membase + EMAC_CTL_REG); + reg_val &= ~(EMAC_CTL_TX_EN | EMAC_CTL_RX_EN | EMAC_CTL_RESET); + writel(reg_val, db->membase + EMAC_CTL_REG); +} + +/* Stop the interface. + * The interface is stopped when it is brought. + */ +static int emac_stop(struct net_device *ndev) +{ + struct emac_board_info *db = netdev_priv(ndev); + + if (netif_msg_ifdown(db)) + dev_dbg(db->dev, "shutting down %s\n", ndev->name); + + netif_stop_queue(ndev); + netif_carrier_off(ndev); + + emac_shutdown(ndev); + + return 0; +} + +static const struct net_device_ops emac_netdev_ops = { + .ndo_open = emac_open, + .ndo_stop = emac_stop, + .ndo_start_xmit = emac_start_xmit, + .ndo_tx_timeout = emac_timeout, + .ndo_do_ioctl = emac_ioctl, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = emac_set_mac_address, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = emac_poll_controller, +#endif +}; + +/* Search EMAC board, allocate space and register it + */ +static int emac_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct emac_board_info *db; + struct net_device *ndev; + int ret = 0; + const char *mac_addr; + + ndev = alloc_etherdev(sizeof(struct emac_board_info)); + if (!ndev) { + dev_err(&pdev->dev, "could not allocate device.\n"); + return -ENOMEM; + } + + SET_NETDEV_DEV(ndev, &pdev->dev); + + db = netdev_priv(ndev); + memset(db, 0, sizeof(*db)); + + db->dev = &pdev->dev; + db->ndev = ndev; + db->pdev = pdev; + + spin_lock_init(&db->lock); + + db->membase = of_iomap(np, 0); + if (!db->membase) { + dev_err(&pdev->dev, "failed to remap registers\n"); + return -ENOMEM; + goto out; + } + + /* fill in parameters for net-dev structure */ + ndev->base_addr = (unsigned long)db->membase; + ndev->irq = irq_of_parse_and_map(np, 0); + if (ndev->irq == -ENXIO) { + netdev_err(ndev, "No irq resource\n"); + ret = ndev->irq; + goto out; + } + + /* Read MAC-address from DT */ + mac_addr = of_get_mac_address(np); + if (mac_addr) + memcpy(ndev->dev_addr, mac_addr, ETH_ALEN); + + /* Check if the MAC address is valid, if not get a random one */ + if (!is_valid_ether_addr(ndev->dev_addr)) { + eth_hw_addr_random(ndev); + dev_warn(&pdev->dev, "using random MAC address %pM\n", + ndev->dev_addr); + } + + db->regulator = devm_regulator_get(&pdev->dev, "phy"); + if(IS_ERR(db->regulator)) { + if(PTR_ERR(db->regulator) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + dev_info(&pdev->dev, "no regulator found\n"); + } + + db->emacrx_completed_flag = 1; + emac_powerup(ndev); + emac_reset(db); + + ether_setup(ndev); + + ndev->netdev_ops = &emac_netdev_ops; + ndev->watchdog_timeo = msecs_to_jiffies(watchdog); + ndev->ethtool_ops = &emac_ethtool_ops; + +#ifdef CONFIG_NET_POLL_CONTROLLER + ndev->poll_controller = &emac_poll_controller; +#endif + + platform_set_drvdata(pdev, ndev); + + ret = emac_mii_init(db); + if (ret) { + dev_err(&pdev->dev, "MII init failed!\n"); + goto out; + } + + /* Carrier starts down, phylib will bring it up */ + netif_carrier_off(ndev); + + ret = register_netdev(ndev); + if (ret) { + dev_err(&pdev->dev, "Registering netdev failed!\n"); + ret = -ENODEV; + goto out; + } + + dev_info(&pdev->dev, "%s: at %p, IRQ %d MAC: %pM\n", + ndev->name, db->membase, ndev->irq, ndev->dev_addr); + + return 0; + +out: + dev_err(db->dev, "not found (%d).\n", ret); + + free_netdev(ndev); + + return ret; +} + +static int emac_remove(struct platform_device *pdev) +{ + struct net_device *ndev = platform_get_drvdata(pdev); + struct emac_board_info *db = netdev_priv(ndev); + + platform_set_drvdata(pdev, NULL); + + regulator_disable(db->regulator); + + unregister_netdev(ndev); + free_netdev(ndev); + + dev_dbg(&pdev->dev, "released and freed device\n"); + return 0; +} + +static int emac_suspend(struct platform_device *dev, pm_message_t state) +{ + struct net_device *ndev = platform_get_drvdata(dev); + + netif_carrier_off(ndev); + netif_device_detach(ndev); + emac_shutdown(ndev); + + return 0; +} + +static int emac_resume(struct platform_device *dev) +{ + struct net_device *ndev = platform_get_drvdata(dev); + struct emac_board_info *db = netdev_priv(ndev); + + emac_reset(db); + emac_init_emac(ndev); + netif_device_attach(ndev); + + return 0; +} + +static const struct of_device_id emac_of_match[] = { + {.compatible = "allwinner,sun4i-emac",}, + {}, +}; + +MODULE_DEVICE_TABLE(of, emac_of_match); + +static struct platform_driver emac_driver = { + .driver = { + .name = "sun4i-emac", + .of_match_table = emac_of_match, + }, + .probe = emac_probe, + .remove = emac_remove, + .suspend = emac_suspend, + .resume = emac_resume, +}; + +module_platform_driver(emac_driver); + +MODULE_AUTHOR("Stefan Roese <sr@denx.de>"); +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>"); +MODULE_DESCRIPTION("Allwinner A10 emac network driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.h b/drivers/net/ethernet/allwinner/sun4i-emac.h new file mode 100644 index 0000000..f1b262c --- /dev/null +++ b/drivers/net/ethernet/allwinner/sun4i-emac.h @@ -0,0 +1,114 @@ +/* + * Allwinner EMAC Fast Ethernet driver for Linux. + * + * Copyright 2012 Stefan Roese <sr@denx.de> + * Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com> + * + * Based on the Linux driver provided by Allwinner: + * Copyright (C) 1997 Sten Wang + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#ifndef _SUN4I_EMAC_H_ +#define _SUN4I_EMAC_H_ + +#define EMAC_CTL_REG (0x00) +#define EMAC_CTL_RESET (1 << 0) +#define EMAC_CTL_TX_EN (1 << 1) +#define EMAC_CTL_RX_EN (1 << 2) +#define EMAC_TX_MODE_REG (0x04) +#define EMAC_TX_MODE_ABORTED_FRAME_EN (1 << 0) +#define EMAC_TX_MODE_DMA_EN (1 << 1) +#define EMAC_TX_FLOW_REG (0x08) +#define EMAC_TX_CTL0_REG (0x0c) +#define EMAC_TX_CTL1_REG (0x10) +#define EMAC_TX_INS_REG (0x14) +#define EMAC_TX_PL0_REG (0x18) +#define EMAC_TX_PL1_REG (0x1c) +#define EMAC_TX_STA_REG (0x20) +#define EMAC_TX_IO_DATA_REG (0x24) +#define EMAC_TX_IO_DATA1_REG (0x28) +#define EMAC_TX_TSVL0_REG (0x2c) +#define EMAC_TX_TSVH0_REG (0x30) +#define EMAC_TX_TSVL1_REG (0x34) +#define EMAC_TX_TSVH1_REG (0x38) +#define EMAC_RX_CTL_REG (0x3c) +#define EMAC_RX_CTL_AUTO_DRQ_EN (1 << 1) +#define EMAC_RX_CTL_DMA_EN (1 << 2) +#define EMAC_RX_CTL_PASS_ALL_EN (1 << 4) +#define EMAC_RX_CTL_PASS_CTL_EN (1 << 5) +#define EMAC_RX_CTL_PASS_CRC_ERR_EN (1 << 6) +#define EMAC_RX_CTL_PASS_LEN_ERR_EN (1 << 7) +#define EMAC_RX_CTL_PASS_LEN_OOR_EN (1 << 8) +#define EMAC_RX_CTL_ACCEPT_UNICAST_EN (1 << 16) +#define EMAC_RX_CTL_DA_FILTER_EN (1 << 17) +#define EMAC_RX_CTL_ACCEPT_MULTICAST_EN (1 << 20) +#define EMAC_RX_CTL_HASH_FILTER_EN (1 << 21) +#define EMAC_RX_CTL_ACCEPT_BROADCAST_EN (1 << 22) +#define EMAC_RX_CTL_SA_FILTER_EN (1 << 24) +#define EMAC_RX_CTL_SA_FILTER_INVERT_EN (1 << 25) +#define EMAC_RX_HASH0_REG (0x40) +#define EMAC_RX_HASH1_REG (0x44) +#define EMAC_RX_STA_REG (0x48) +#define EMAC_RX_IO_DATA_REG (0x4c) +#define EMAC_RX_IO_DATA_LEN(x) (x & 0xffff) +#define EMAC_RX_IO_DATA_STATUS(x) ((x >> 16) & 0xffff) +#define EMAC_RX_IO_DATA_STATUS_CRC_ERR (1 << 4) +#define EMAC_RX_IO_DATA_STATUS_LEN_ERR (3 << 5) +#define EMAC_RX_IO_DATA_STATUS_OK (1 << 7) +#define EMAC_RX_FBC_REG (0x50) +#define EMAC_INT_CTL_REG (0x54) +#define EMAC_INT_STA_REG (0x58) +#define EMAC_MAC_CTL0_REG (0x5c) +#define EMAC_MAC_CTL0_RX_FLOW_CTL_EN (1 << 2) +#define EMAC_MAC_CTL0_TX_FLOW_CTL_EN (1 << 3) +#define EMAC_MAC_CTL0_SOFT_RESET (1 << 15) +#define EMAC_MAC_CTL1_REG (0x60) +#define EMAC_MAC_CTL1_DUPLEX_EN (1 << 0) +#define EMAC_MAC_CTL1_LEN_CHECK_EN (1 << 1) +#define EMAC_MAC_CTL1_HUGE_FRAME_EN (1 << 2) +#define EMAC_MAC_CTL1_DELAYED_CRC_EN (1 << 3) +#define EMAC_MAC_CTL1_CRC_EN (1 << 4) +#define EMAC_MAC_CTL1_PAD_EN (1 << 5) +#define EMAC_MAC_CTL1_PAD_CRC_EN (1 << 6) +#define EMAC_MAC_CTL1_AD_SHORT_FRAME_EN (1 << 7) +#define EMAC_MAC_CTL1_BACKOFF_DIS (1 << 12) +#define EMAC_MAC_IPGT_REG (0x64) +#define EMAC_MAC_IPGT_HALF_DUPLEX (0x12) +#define EMAC_MAC_IPGT_FULL_DUPLEX (0x15) +#define EMAC_MAC_IPGR_REG (0x68) +#define EMAC_MAC_IPGR_IPG1 (0x0c) +#define EMAC_MAC_IPGR_IPG2 (0x12) +#define EMAC_MAC_CLRT_REG (0x6c) +#define EMAC_MAC_CLRT_COLLISION_WINDOW (0x37) +#define EMAC_MAC_CLRT_RM (0x0f) +#define EMAC_MAC_MAXF_REG (0x70) +#define EMAC_MAC_SUPP_REG (0x74) +#define EMAC_MAC_TEST_REG (0x78) +#define EMAC_MAC_MCFG_REG (0x7c) +#define EMAC_MAC_MCMD_REG (0x80) +#define EMAC_MAC_MADR_REG (0x84) +#define EMAC_MAC_MWTD_REG (0x88) +#define EMAC_MAC_MRDD_REG (0x8c) +#define EMAC_MAC_MIND_REG (0x90) +#define EMAC_MAC_SSRR_REG (0x94) +#define EMAC_MAC_A0_REG (0x98) +#define EMAC_MAC_A1_REG (0x9c) +#define EMAC_MAC_A2_REG (0xa0) +#define EMAC_SAFX_L_REG0 (0xa4) +#define EMAC_SAFX_H_REG0 (0xa8) +#define EMAC_SAFX_L_REG1 (0xac) +#define EMAC_SAFX_H_REG1 (0xb0) +#define EMAC_SAFX_L_REG2 (0xb4) +#define EMAC_SAFX_H_REG2 (0xb8) +#define EMAC_SAFX_L_REG3 (0xbc) +#define EMAC_SAFX_H_REG3 (0xc0) + +#define EMAC_PHY_DUPLEX (1 << 8) + +#define EMAC_EEPROM_MAGIC (0x444d394b) +#define EMAC_UNDOCUMENTED_MAGIC (0x0143414d) +#endif /* _SUN4I_EMAC_H_ */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's 2013-03-23 22:30 ` Maxime Ripard @ 2013-03-24 19:03 ` Florian Fainelli -1 siblings, 0 replies; 18+ messages in thread From: Florian Fainelli @ 2013-03-24 19:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Maxime Ripard, linux-doc, Alejandro Mery, netdev, devicetree-discuss, linux-kernel, Rob Herring, Grant Likely, Rob Landley, sunny, shuge, Stefan Roese, kevin Hello, Your phylib implementation looks good now, just some minor comments below: Le samedi 23 mars 2013 23:30:10, Maxime Ripard a écrit : > From: Stefan Roese <sr@denx.de> > > The Allwinner A10 has an ethernet controller that seem to be developped > internally by them. > > The exact feature set of this controller is unknown, since there is no > public documentation for this IP, and this driver is mostly the one > published by Allwinner that has been heavily cleaned up. > > Signed-off-by: Stefan Roese <sr@denx.de> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > .../bindings/net/allwinner,sun4i-emac.txt | 19 + > drivers/net/ethernet/Kconfig | 1 + > drivers/net/ethernet/Makefile | 1 + > drivers/net/ethernet/allwinner/Kconfig | 36 + > drivers/net/ethernet/allwinner/Makefile | 5 + > drivers/net/ethernet/allwinner/sun4i-emac.c | 1033 > ++++++++++++++++++++ drivers/net/ethernet/allwinner/sun4i-emac.h | > 114 +++ > 7 files changed, 1209 insertions(+) > create mode 100644 > Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt create mode > 100644 drivers/net/ethernet/allwinner/Kconfig > create mode 100644 drivers/net/ethernet/allwinner/Makefile > create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c > create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h > > diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt > b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt new file > mode 100644 > index 0000000..aaf5013 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt > @@ -0,0 +1,19 @@ > +* Allwinner EMAC ethernet controller > + > +Required properties: > +- compatible: should be "allwinner,sun4i-emac". > +- reg: address and length of the register set for the device. > +- interrupts: interrupt for the device > + > +Optional properties: > +- phy-supply: phandle to a regulator if the PHY needs one > +- (local-)mac-address: mac address to be used by this driver > + > +Example: > + > +emac: ethernet@01c0b000 { > + compatible = "allwinner,sun4i-emac"; > + reg = <0x01c0b000 0x1000>; > + phy-supply = <®_emac_3v3>; > + interrupts = <55>; Also include a standard PHY device tree binding and use the device tree helpers to find and connect to your PHY device. [snip] > +if NET_VENDOR_ALLWINNER > + > +config SUN4I_EMAC > + tristate "Allwinner A10 EMAC support" > + depends on ARCH_SUNXI > + depends on OF > + select CRC32 > + select NET_CORE > + select MII You should select PHYLIB now that you implement it. [snip] > +static int emac_mdio_read(struct mii_bus *bus, int mii_id, int regnum) > +{ > + struct emac_board_info *db = bus->priv; > + int value; > + > + /* issue the phy address and reg */ > + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); > + /* pull up the phy io line */ > + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); > + > + /* Wait read complete */ > + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) > + cpu_relax(); This needs proper timeout handling. > + > + /* push down the phy io line */ > + writel(0x0, db->membase + EMAC_MAC_MCMD_REG); > + /* and read data */ > + value = readl(db->membase + EMAC_MAC_MRDD_REG); > + > + return value; > +} > + > +static int emac_mdio_write(struct mii_bus *bus, int mii_id, int regnum, > + u16 value) > +{ > + struct emac_board_info *db = bus->priv; > + > + /* issue the phy address and reg */ > + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); > + /* pull up the phy io line */ > + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); > + > + /* Wait read complete */ > + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) > + cpu_relax(); Same here. [snip] > +static void emac_init_emac(struct net_device *dev); > +static void emac_handle_link_change(struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + struct phy_device *phydev = db->phy_dev; > + unsigned long flags; > + int status_change = 0; > + > + spin_lock_irqsave(&db->lock, flags); a phylib adjust_link callback is already called with a mutex hold, so your spinlock could be moved down to emac_init_emac() where the RMW sequence is performed. > + > + if (phydev->link) { > + if ((db->speed != phydev->speed) || > + (db->duplex != phydev->duplex)) { > + /* Re-init EMAC with new settings */ > + emac_init_emac(dev); emac_init_emac() (the name could be change BTW) is not just changing the duplex setting of the MAC but also touches the transmitter/receiver enable bits, is that what you want as well? [snip] > +static int emac_mii_probe(struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + struct phy_device *phydev; > + int ret; > + > + phydev = phy_find_first(db->mii_bus); > + if (!phydev) { > + netdev_err(dev, "no PHY found\n"); > + return -1; > + } > + > + /* to-do: PHY interrupts are currently not supported */ > + > + /* attach the mac to the phy */ > + ret = phy_connect_direct(dev, phydev, &emac_handle_link_change, > + db->phy_interface); > + if (ret) { > + netdev_err(dev, "Could not attach to PHY\n"); > + return ret; > + } You could use of_phy_connect() here to eliminate some boilerplate code. [snip] > +unsigned int emac_powerup(struct net_device *ndev) > +{ > + struct emac_board_info *db = netdev_priv(ndev); > + unsigned int reg_val; > + > + /* initial EMAC */ > + /* flush RX FIFO */ > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + reg_val |= 0x8; > + writel(reg_val, db->membase + EMAC_RX_CTL_REG); > + udelay(1); > + > + /* initial MAC */ > + /* soft reset MAC */ > + reg_val = readl(db->membase + EMAC_MAC_CTL0_REG); > + reg_val &= ~EMAC_MAC_CTL0_SOFT_RESET; > + writel(reg_val, db->membase + EMAC_MAC_CTL0_REG); > + > + /* set MII clock */ > + reg_val = readl(db->membase + EMAC_MAC_MCFG_REG); > + reg_val &= (~(0xf << 2)); > + reg_val |= (0xD << 2); > + writel(reg_val, db->membase + EMAC_MAC_MCFG_REG); > + > + /* clear RX counter */ > + writel(0x0, db->membase + EMAC_RX_FBC_REG); > + > + /* disable all interrupt and clear interrupt status */ > + writel(0, db->membase + EMAC_INT_CTL_REG); > + reg_val = readl(db->membase + EMAC_INT_STA_REG); > + writel(reg_val, db->membase + EMAC_INT_STA_REG); > + > + udelay(1); > + > + /* set up EMAC */ > + emac_setup(ndev); > + > + /* set mac_address to chip */ > + writel(ndev->dev_addr[0] << 16 | ndev->dev_addr[1] << 8 | ndev-> > + dev_addr[2], db->membase + EMAC_MAC_A1_REG); > + writel(ndev->dev_addr[3] << 16 | ndev->dev_addr[4] << 8 | ndev-> > + dev_addr[5], db->membase + EMAC_MAC_A0_REG); > + > + mdelay(1); > + > + return 1; Either return 0 to be consistent, or do not return anything [snip] > +static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + unsigned long channel; > + unsigned long flags; > + > + channel = db->tx_fifo_stat & 3; > + if (channel == 3) > + return NETDEV_TX_BUSY; NETDEV_TX_BUSY really is a hard condition, your initial submission had something like netif_stop_queue(dev) and return 1 and this was actually better. [snip] > + > +/* Received a packet and pass to upper layer > + */ > +static void emac_rx(struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + struct sk_buff *skb; > + u8 *rdptr; > + bool good_packet; > + static int rxlen_last; > + unsigned int reg_val; > + u32 rxhdr, rxstatus, rxcount, rxlen; > + > + /* Check packet ready or not */ > + while (1) { > + /* race warning: the first packet might arrive with > + * the interrupts disabled, but the second will fix > + * it > + */ > + rxcount = readl(db->membase + EMAC_RX_FBC_REG); > + > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "RXCount: %x\n", rxcount); > + > + if ((db->skb_last != NULL) && (rxlen_last > 0)) { > + dev->stats.rx_bytes += rxlen_last; > + > + /* Pass to upper layer */ > + db->skb_last->protocol = eth_type_trans(db->skb_last, > + dev); > + netif_rx(db->skb_last); > + dev->stats.rx_packets++; > + db->skb_last = NULL; > + rxlen_last = 0; > + > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + reg_val &= ~EMAC_RX_CTL_DMA_EN; > + writel(reg_val, db->membase + EMAC_RX_CTL_REG); > + } > + > + if (!rxcount) { > + db->emacrx_completed_flag = 1; > + reg_val = readl(db->membase + EMAC_INT_CTL_REG); > + reg_val |= (0xf << 0) | (0x01 << 8); > + writel(reg_val, db->membase + EMAC_INT_CTL_REG); > + > + /* had one stuck? */ > + rxcount = readl(db->membase + EMAC_RX_FBC_REG); > + if (!rxcount) > + return; > + } > + > + reg_val = readl(db->membase + EMAC_RX_IO_DATA_REG); > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "receive header: %x\n", reg_val); > + if (reg_val != EMAC_UNDOCUMENTED_MAGIC) { > + /* disable RX */ > + reg_val = readl(db->membase + EMAC_CTL_REG); > + writel(reg_val & ~EMAC_CTL_RX_EN, > + db->membase + EMAC_CTL_REG); > + > + /* Flush RX FIFO */ > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + writel(reg_val | (1 << 3), > + db->membase + EMAC_RX_CTL_REG); > + > + do { > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + } while (reg_val & (1 << 3)); > + > + /* enable RX */ > + reg_val = readl(db->membase + EMAC_CTL_REG); > + writel(reg_val | EMAC_CTL_RX_EN, > + db->membase + EMAC_CTL_REG); > + reg_val = readl(db->membase + EMAC_INT_CTL_REG); > + reg_val |= (0xf << 0) | (0x01 << 8); > + writel(reg_val, db->membase + EMAC_INT_CTL_REG); > + > + db->emacrx_completed_flag = 1; > + > + return; > + } > + > + /* A packet ready now & Get status/length */ > + good_packet = true; > + > + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, > + &rxhdr, sizeof(rxhdr)); > + > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "rxhdr: %x\n", *((int *)(&rxhdr))); > + > + rxlen = EMAC_RX_IO_DATA_LEN(rxhdr); > + rxstatus = EMAC_RX_IO_DATA_STATUS(rxhdr); > + > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "RX: status %02x, length %04x\n", > + rxstatus, rxlen); > + > + /* Packet Status check */ > + if (rxlen < 0x40) { > + good_packet = false; > + if (netif_msg_rx_err(db)) > + dev_dbg(db->dev, "RX: Bad Packet (runt)\n"); > + } > + > + if (unlikely(!(rxstatus & EMAC_RX_IO_DATA_STATUS_OK))) { > + good_packet = false; > + > + if (rxstatus & EMAC_RX_IO_DATA_STATUS_CRC_ERR) { > + if (netif_msg_rx_err(db)) > + dev_dbg(db->dev, "crc error\n"); > + dev->stats.rx_crc_errors++; > + } > + > + if (rxstatus & EMAC_RX_IO_DATA_STATUS_LEN_ERR) { > + if (netif_msg_rx_err(db)) > + dev_dbg(db->dev, "length error\n"); > + dev->stats.rx_length_errors++; > + } > + } > + > + /* Move data from EMAC */ > + skb = dev_alloc_skb(rxlen + 4); > + if (good_packet && skb) { > + skb_reserve(skb, 2); > + rdptr = (u8 *) skb_put(skb, rxlen - 4); > + > + /* Read received packet from RX SRAM */ > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "RxLen %x\n", rxlen); > + > + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, > + rdptr, rxlen); > + dev->stats.rx_bytes += rxlen; > + > + /* Pass to upper layer */ > + skb->protocol = eth_type_trans(skb, dev); > + netif_rx(skb); > + dev->stats.rx_packets++; > + } > + } > +} > + > +static irqreturn_t emac_interrupt(int irq, void *dev_id) > +{ You should implement NAPI, you do not have much to change to actually be able to do it. > + netif_stop_queue(ndev); > + netif_carrier_off(ndev); phy_stop() is missing here. -- Florian ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's @ 2013-03-24 19:03 ` Florian Fainelli 0 siblings, 0 replies; 18+ messages in thread From: Florian Fainelli @ 2013-03-24 19:03 UTC (permalink / raw) To: linux-arm-kernel Hello, Your phylib implementation looks good now, just some minor comments below: Le samedi 23 mars 2013 23:30:10, Maxime Ripard a ?crit : > From: Stefan Roese <sr@denx.de> > > The Allwinner A10 has an ethernet controller that seem to be developped > internally by them. > > The exact feature set of this controller is unknown, since there is no > public documentation for this IP, and this driver is mostly the one > published by Allwinner that has been heavily cleaned up. > > Signed-off-by: Stefan Roese <sr@denx.de> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > .../bindings/net/allwinner,sun4i-emac.txt | 19 + > drivers/net/ethernet/Kconfig | 1 + > drivers/net/ethernet/Makefile | 1 + > drivers/net/ethernet/allwinner/Kconfig | 36 + > drivers/net/ethernet/allwinner/Makefile | 5 + > drivers/net/ethernet/allwinner/sun4i-emac.c | 1033 > ++++++++++++++++++++ drivers/net/ethernet/allwinner/sun4i-emac.h | > 114 +++ > 7 files changed, 1209 insertions(+) > create mode 100644 > Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt create mode > 100644 drivers/net/ethernet/allwinner/Kconfig > create mode 100644 drivers/net/ethernet/allwinner/Makefile > create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c > create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h > > diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt > b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt new file > mode 100644 > index 0000000..aaf5013 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt > @@ -0,0 +1,19 @@ > +* Allwinner EMAC ethernet controller > + > +Required properties: > +- compatible: should be "allwinner,sun4i-emac". > +- reg: address and length of the register set for the device. > +- interrupts: interrupt for the device > + > +Optional properties: > +- phy-supply: phandle to a regulator if the PHY needs one > +- (local-)mac-address: mac address to be used by this driver > + > +Example: > + > +emac: ethernet at 01c0b000 { > + compatible = "allwinner,sun4i-emac"; > + reg = <0x01c0b000 0x1000>; > + phy-supply = <®_emac_3v3>; > + interrupts = <55>; Also include a standard PHY device tree binding and use the device tree helpers to find and connect to your PHY device. [snip] > +if NET_VENDOR_ALLWINNER > + > +config SUN4I_EMAC > + tristate "Allwinner A10 EMAC support" > + depends on ARCH_SUNXI > + depends on OF > + select CRC32 > + select NET_CORE > + select MII You should select PHYLIB now that you implement it. [snip] > +static int emac_mdio_read(struct mii_bus *bus, int mii_id, int regnum) > +{ > + struct emac_board_info *db = bus->priv; > + int value; > + > + /* issue the phy address and reg */ > + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); > + /* pull up the phy io line */ > + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); > + > + /* Wait read complete */ > + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) > + cpu_relax(); This needs proper timeout handling. > + > + /* push down the phy io line */ > + writel(0x0, db->membase + EMAC_MAC_MCMD_REG); > + /* and read data */ > + value = readl(db->membase + EMAC_MAC_MRDD_REG); > + > + return value; > +} > + > +static int emac_mdio_write(struct mii_bus *bus, int mii_id, int regnum, > + u16 value) > +{ > + struct emac_board_info *db = bus->priv; > + > + /* issue the phy address and reg */ > + writel((mii_id << 8) | regnum, db->membase + EMAC_MAC_MADR_REG); > + /* pull up the phy io line */ > + writel(0x1, db->membase + EMAC_MAC_MCMD_REG); > + > + /* Wait read complete */ > + while (readl(db->membase + EMAC_MAC_MIND_REG) & 0x1) > + cpu_relax(); Same here. [snip] > +static void emac_init_emac(struct net_device *dev); > +static void emac_handle_link_change(struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + struct phy_device *phydev = db->phy_dev; > + unsigned long flags; > + int status_change = 0; > + > + spin_lock_irqsave(&db->lock, flags); a phylib adjust_link callback is already called with a mutex hold, so your spinlock could be moved down to emac_init_emac() where the RMW sequence is performed. > + > + if (phydev->link) { > + if ((db->speed != phydev->speed) || > + (db->duplex != phydev->duplex)) { > + /* Re-init EMAC with new settings */ > + emac_init_emac(dev); emac_init_emac() (the name could be change BTW) is not just changing the duplex setting of the MAC but also touches the transmitter/receiver enable bits, is that what you want as well? [snip] > +static int emac_mii_probe(struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + struct phy_device *phydev; > + int ret; > + > + phydev = phy_find_first(db->mii_bus); > + if (!phydev) { > + netdev_err(dev, "no PHY found\n"); > + return -1; > + } > + > + /* to-do: PHY interrupts are currently not supported */ > + > + /* attach the mac to the phy */ > + ret = phy_connect_direct(dev, phydev, &emac_handle_link_change, > + db->phy_interface); > + if (ret) { > + netdev_err(dev, "Could not attach to PHY\n"); > + return ret; > + } You could use of_phy_connect() here to eliminate some boilerplate code. [snip] > +unsigned int emac_powerup(struct net_device *ndev) > +{ > + struct emac_board_info *db = netdev_priv(ndev); > + unsigned int reg_val; > + > + /* initial EMAC */ > + /* flush RX FIFO */ > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + reg_val |= 0x8; > + writel(reg_val, db->membase + EMAC_RX_CTL_REG); > + udelay(1); > + > + /* initial MAC */ > + /* soft reset MAC */ > + reg_val = readl(db->membase + EMAC_MAC_CTL0_REG); > + reg_val &= ~EMAC_MAC_CTL0_SOFT_RESET; > + writel(reg_val, db->membase + EMAC_MAC_CTL0_REG); > + > + /* set MII clock */ > + reg_val = readl(db->membase + EMAC_MAC_MCFG_REG); > + reg_val &= (~(0xf << 2)); > + reg_val |= (0xD << 2); > + writel(reg_val, db->membase + EMAC_MAC_MCFG_REG); > + > + /* clear RX counter */ > + writel(0x0, db->membase + EMAC_RX_FBC_REG); > + > + /* disable all interrupt and clear interrupt status */ > + writel(0, db->membase + EMAC_INT_CTL_REG); > + reg_val = readl(db->membase + EMAC_INT_STA_REG); > + writel(reg_val, db->membase + EMAC_INT_STA_REG); > + > + udelay(1); > + > + /* set up EMAC */ > + emac_setup(ndev); > + > + /* set mac_address to chip */ > + writel(ndev->dev_addr[0] << 16 | ndev->dev_addr[1] << 8 | ndev-> > + dev_addr[2], db->membase + EMAC_MAC_A1_REG); > + writel(ndev->dev_addr[3] << 16 | ndev->dev_addr[4] << 8 | ndev-> > + dev_addr[5], db->membase + EMAC_MAC_A0_REG); > + > + mdelay(1); > + > + return 1; Either return 0 to be consistent, or do not return anything [snip] > +static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + unsigned long channel; > + unsigned long flags; > + > + channel = db->tx_fifo_stat & 3; > + if (channel == 3) > + return NETDEV_TX_BUSY; NETDEV_TX_BUSY really is a hard condition, your initial submission had something like netif_stop_queue(dev) and return 1 and this was actually better. [snip] > + > +/* Received a packet and pass to upper layer > + */ > +static void emac_rx(struct net_device *dev) > +{ > + struct emac_board_info *db = netdev_priv(dev); > + struct sk_buff *skb; > + u8 *rdptr; > + bool good_packet; > + static int rxlen_last; > + unsigned int reg_val; > + u32 rxhdr, rxstatus, rxcount, rxlen; > + > + /* Check packet ready or not */ > + while (1) { > + /* race warning: the first packet might arrive with > + * the interrupts disabled, but the second will fix > + * it > + */ > + rxcount = readl(db->membase + EMAC_RX_FBC_REG); > + > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "RXCount: %x\n", rxcount); > + > + if ((db->skb_last != NULL) && (rxlen_last > 0)) { > + dev->stats.rx_bytes += rxlen_last; > + > + /* Pass to upper layer */ > + db->skb_last->protocol = eth_type_trans(db->skb_last, > + dev); > + netif_rx(db->skb_last); > + dev->stats.rx_packets++; > + db->skb_last = NULL; > + rxlen_last = 0; > + > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + reg_val &= ~EMAC_RX_CTL_DMA_EN; > + writel(reg_val, db->membase + EMAC_RX_CTL_REG); > + } > + > + if (!rxcount) { > + db->emacrx_completed_flag = 1; > + reg_val = readl(db->membase + EMAC_INT_CTL_REG); > + reg_val |= (0xf << 0) | (0x01 << 8); > + writel(reg_val, db->membase + EMAC_INT_CTL_REG); > + > + /* had one stuck? */ > + rxcount = readl(db->membase + EMAC_RX_FBC_REG); > + if (!rxcount) > + return; > + } > + > + reg_val = readl(db->membase + EMAC_RX_IO_DATA_REG); > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "receive header: %x\n", reg_val); > + if (reg_val != EMAC_UNDOCUMENTED_MAGIC) { > + /* disable RX */ > + reg_val = readl(db->membase + EMAC_CTL_REG); > + writel(reg_val & ~EMAC_CTL_RX_EN, > + db->membase + EMAC_CTL_REG); > + > + /* Flush RX FIFO */ > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + writel(reg_val | (1 << 3), > + db->membase + EMAC_RX_CTL_REG); > + > + do { > + reg_val = readl(db->membase + EMAC_RX_CTL_REG); > + } while (reg_val & (1 << 3)); > + > + /* enable RX */ > + reg_val = readl(db->membase + EMAC_CTL_REG); > + writel(reg_val | EMAC_CTL_RX_EN, > + db->membase + EMAC_CTL_REG); > + reg_val = readl(db->membase + EMAC_INT_CTL_REG); > + reg_val |= (0xf << 0) | (0x01 << 8); > + writel(reg_val, db->membase + EMAC_INT_CTL_REG); > + > + db->emacrx_completed_flag = 1; > + > + return; > + } > + > + /* A packet ready now & Get status/length */ > + good_packet = true; > + > + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, > + &rxhdr, sizeof(rxhdr)); > + > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "rxhdr: %x\n", *((int *)(&rxhdr))); > + > + rxlen = EMAC_RX_IO_DATA_LEN(rxhdr); > + rxstatus = EMAC_RX_IO_DATA_STATUS(rxhdr); > + > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "RX: status %02x, length %04x\n", > + rxstatus, rxlen); > + > + /* Packet Status check */ > + if (rxlen < 0x40) { > + good_packet = false; > + if (netif_msg_rx_err(db)) > + dev_dbg(db->dev, "RX: Bad Packet (runt)\n"); > + } > + > + if (unlikely(!(rxstatus & EMAC_RX_IO_DATA_STATUS_OK))) { > + good_packet = false; > + > + if (rxstatus & EMAC_RX_IO_DATA_STATUS_CRC_ERR) { > + if (netif_msg_rx_err(db)) > + dev_dbg(db->dev, "crc error\n"); > + dev->stats.rx_crc_errors++; > + } > + > + if (rxstatus & EMAC_RX_IO_DATA_STATUS_LEN_ERR) { > + if (netif_msg_rx_err(db)) > + dev_dbg(db->dev, "length error\n"); > + dev->stats.rx_length_errors++; > + } > + } > + > + /* Move data from EMAC */ > + skb = dev_alloc_skb(rxlen + 4); > + if (good_packet && skb) { > + skb_reserve(skb, 2); > + rdptr = (u8 *) skb_put(skb, rxlen - 4); > + > + /* Read received packet from RX SRAM */ > + if (netif_msg_rx_status(db)) > + dev_dbg(db->dev, "RxLen %x\n", rxlen); > + > + emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, > + rdptr, rxlen); > + dev->stats.rx_bytes += rxlen; > + > + /* Pass to upper layer */ > + skb->protocol = eth_type_trans(skb, dev); > + netif_rx(skb); > + dev->stats.rx_packets++; > + } > + } > +} > + > +static irqreturn_t emac_interrupt(int irq, void *dev_id) > +{ You should implement NAPI, you do not have much to change to actually be able to do it. > + netif_stop_queue(ndev); > + netif_carrier_off(ndev); phy_stop() is missing here. -- Florian ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's 2013-03-24 19:03 ` Florian Fainelli @ 2013-04-04 15:37 ` Stefan Roese -1 siblings, 0 replies; 18+ messages in thread From: Stefan Roese @ 2013-04-04 15:37 UTC (permalink / raw) To: Florian Fainelli Cc: linux-arm-kernel, Maxime Ripard, linux-doc, Alejandro Mery, netdev, devicetree-discuss, linux-kernel, Rob Herring, Grant Likely, Rob Landley, sunny, shuge, kevin Hi Florian, On 24.03.2013 20:03, Florian Fainelli wrote: > Your phylib implementation looks good now, just some minor comments below: Thanks for the review. I'll try to address your new comments in a few days (currently swamped). Thanks, Stefan ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's @ 2013-04-04 15:37 ` Stefan Roese 0 siblings, 0 replies; 18+ messages in thread From: Stefan Roese @ 2013-04-04 15:37 UTC (permalink / raw) To: linux-arm-kernel Hi Florian, On 24.03.2013 20:03, Florian Fainelli wrote: > Your phylib implementation looks good now, just some minor comments below: Thanks for the review. I'll try to address your new comments in a few days (currently swamped). Thanks, Stefan ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/5] ARM: sunxi: Add EMAC controller node to sun4i DTSI 2013-03-23 22:30 ` Maxime Ripard @ 2013-03-23 22:30 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Cc: kevin, sunny, shuge, netdev, Stefan Roese, Alejandro Mery, Russell King, linux-kernel Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 03d2b53..a6bd36a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -47,5 +47,12 @@ allwinner,pull = <0>; }; }; + + emac: ethernet@01c0b000 { + compatible = "allwinner,sun4i-emac"; + reg = <0x01c0b000 0x1000>; + interrupts = <55>; + status = "disabled"; + }; }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/5] ARM: sunxi: Add EMAC controller node to sun4i DTSI @ 2013-03-23 22:30 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 03d2b53..a6bd36a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -47,5 +47,12 @@ allwinner,pull = <0>; }; }; + + emac: ethernet at 01c0b000 { + compatible = "allwinner,sun4i-emac"; + reg = <0x01c0b000 0x1000>; + interrupts = <55>; + status = "disabled"; + }; }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/5] ARM: sun4i: Add muxing options for the ethernet controller 2013-03-23 22:30 ` Maxime Ripard @ 2013-03-23 22:30 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Cc: kevin, sunny, shuge, netdev, Stefan Roese, Alejandro Mery, Russell King, linux-kernel The EMAC only has one pinset available for muxing, so hopefully, we cover all cases. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index a6bd36a..e5ef5e5 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -46,6 +46,17 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + + emac_pins_a: emac0@0 { + allwinner,pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + allwinner,function = "wemac"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; }; emac: ethernet@01c0b000 { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/5] ARM: sun4i: Add muxing options for the ethernet controller @ 2013-03-23 22:30 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel The EMAC only has one pinset available for muxing, so hopefully, we cover all cases. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index a6bd36a..e5ef5e5 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -46,6 +46,17 @@ allwinner,drive = <0>; allwinner,pull = <0>; }; + + emac_pins_a: emac0 at 0 { + allwinner,pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + allwinner,function = "wemac"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; }; emac: ethernet at 01c0b000 { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/5] ARM: cubieboard: Enable ethernet (WEMAC) support in dts 2013-03-23 22:30 ` Maxime Ripard @ 2013-03-23 22:30 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Cc: kevin, sunny, shuge, netdev, Stefan Roese, Alejandro Mery, Russell King, linux-kernel From: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de> --- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 88e2dc1..9bf4b4f 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -43,6 +43,12 @@ uart1: uart@01c28400 { status = "okay"; }; + + emac: ethernet@01c0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&emac_pins_a>; + status = "okay"; + }; }; leds { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/5] ARM: cubieboard: Enable ethernet (WEMAC) support in dts @ 2013-03-23 22:30 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel From: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de> --- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 88e2dc1..9bf4b4f 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -43,6 +43,12 @@ uart1: uart at 01c28400 { status = "okay"; }; + + emac: ethernet at 01c0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&emac_pins_a>; + status = "okay"; + }; }; leds { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/5] ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree 2013-03-23 22:30 ` Maxime Ripard @ 2013-03-23 22:30 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel Cc: kevin, sunny, shuge, netdev, Stefan Roese, Alejandro Mery, Russell King, linux-kernel The Hackberry has a PHY that needs to be powered up through a GPIO, so we need to use a fixed regulator here. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index f84549a..072d51f 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -23,8 +23,40 @@ }; soc { + pio: pinctrl@01c20800 { + pinctrl-names = "default"; + pinctrl-0 = <&hackberry_hogs>; + + hackberry_hogs: hogs@0 { + allwinner,pins = "PH19"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; + uart0: uart@01c28000 { status = "okay"; }; + + emac: ethernet@01c0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&emac_pins_a>; + phy-supply = <®_emac_3v3>; + status = "okay"; + }; + }; + + regulators { + compatible = "simple-bus"; + + reg_emac_3v3: emac-3v3 { + compatible = "regulator-fixed"; + regulator-name = "emac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 19 0>; + }; }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/5] ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree @ 2013-03-23 22:30 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-23 22:30 UTC (permalink / raw) To: linux-arm-kernel The Hackberry has a PHY that needs to be powered up through a GPIO, so we need to use a fixed regulator here. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index f84549a..072d51f 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -23,8 +23,40 @@ }; soc { + pio: pinctrl at 01c20800 { + pinctrl-names = "default"; + pinctrl-0 = <&hackberry_hogs>; + + hackberry_hogs: hogs at 0 { + allwinner,pins = "PH19"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; + uart0: uart at 01c28000 { status = "okay"; }; + + emac: ethernet at 01c0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&emac_pins_a>; + phy-supply = <®_emac_3v3>; + status = "okay"; + }; + }; + + regulators { + compatible = "simple-bus"; + + reg_emac_3v3: emac-3v3 { + compatible = "regulator-fixed"; + regulator-name = "emac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 19 0>; + }; }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 0/5] ARM: sunxi: Add support for A10 Ethernet controller
@ 2013-03-15 20:49 Maxime Ripard
2013-03-15 20:50 ` Maxime Ripard
0 siblings, 1 reply; 18+ messages in thread
From: Maxime Ripard @ 2013-03-15 20:49 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: kevin, sunny, shuge, netdev
Hi,
The Allwinner A10 SoC has an ethernet that is said to be coming from
Davicom embedded in it. This IP has no public documentation, so exact
details are quite sparse, and this code come from refactored allwinner
code.
Since we don't have any clock support yet for the Allwinner SoCs, we
rely on the bootloader to enable the wemac clock.
Thanks,
Maxime
Maxime Ripard (3):
ARM: sunxi: Add wemac to sun4i dtsi
ARM: sun4i: Add muxing options for the ethernet controller
ARM: hackberry: dt: Add Ethernet controller to the Hackberry device
tree
Stefan Roese (2):
net: Add davicom wemac ethernet driver found on Allwinner A10 SoC's
ARM: cubieboard: Enable ethernet (WEMAC) support in dts
.../devicetree/bindings/net/davicom-wemac.txt | 20 +
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 19 +
arch/arm/boot/dts/sun4i-a10.dtsi | 18 +
drivers/net/ethernet/Makefile | 2 +-
drivers/net/ethernet/davicom/Kconfig | 31 +
drivers/net/ethernet/davicom/Makefile | 1 +
drivers/net/ethernet/davicom/wemac.c | 1033 ++++++++++++++++++++
drivers/net/ethernet/davicom/wemac.h | 130 +++
9 files changed, 1259 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/net/davicom-wemac.txt
create mode 100644 drivers/net/ethernet/davicom/wemac.c
create mode 100644 drivers/net/ethernet/davicom/wemac.h
--
1.7.10.4
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 5/5] ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree 2013-03-15 20:49 [PATCH 0/5] ARM: sunxi: Add support for A10 Ethernet controller Maxime Ripard @ 2013-03-15 20:50 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-15 20:50 UTC (permalink / raw) To: linux-arm-kernel; +Cc: kevin, sunny, shuge, netdev, Russell King, linux-kernel Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index f84549a..3808c1a 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -23,8 +23,27 @@ }; soc { + pio: pinctrl@01c20800 { + pinctrl-names = "default"; + pinctrl-0 = <&hackberry_hogs>; + + hackberry_hogs: hogs@0 { + allwinner,pins = "PH19"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; + uart0: uart@01c28000 { status = "okay"; }; + + wemac: ethernet@01c0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&wemac_pins_a>; + status = "ok"; + allwinner,power-gpios = <&pio 7 19 0>; + }; }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/5] ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree @ 2013-03-15 20:50 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2013-03-15 20:50 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index f84549a..3808c1a 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -23,8 +23,27 @@ }; soc { + pio: pinctrl at 01c20800 { + pinctrl-names = "default"; + pinctrl-0 = <&hackberry_hogs>; + + hackberry_hogs: hogs at 0 { + allwinner,pins = "PH19"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + }; + uart0: uart at 01c28000 { status = "okay"; }; + + wemac: ethernet at 01c0b000 { + pinctrl-names = "default"; + pinctrl-0 = <&wemac_pins_a>; + status = "ok"; + allwinner,power-gpios = <&pio 7 19 0>; + }; }; }; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2013-04-04 15:38 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-03-23 22:30 [PATCHv2 0/5] ARM: sunxi: Add support for A10 Ethernet controller Maxime Ripard 2013-03-23 22:30 ` Maxime Ripard 2013-03-23 22:30 ` [PATCH 1/5] net: Add EMAC ethernet driver found on Allwinner A10 SoC's Maxime Ripard 2013-03-23 22:30 ` Maxime Ripard 2013-03-24 19:03 ` Florian Fainelli 2013-03-24 19:03 ` Florian Fainelli 2013-04-04 15:37 ` Stefan Roese 2013-04-04 15:37 ` Stefan Roese 2013-03-23 22:30 ` [PATCH 2/5] ARM: sunxi: Add EMAC controller node to sun4i DTSI Maxime Ripard 2013-03-23 22:30 ` Maxime Ripard 2013-03-23 22:30 ` [PATCH 3/5] ARM: sun4i: Add muxing options for the ethernet controller Maxime Ripard 2013-03-23 22:30 ` Maxime Ripard 2013-03-23 22:30 ` [PATCH 4/5] ARM: cubieboard: Enable ethernet (WEMAC) support in dts Maxime Ripard 2013-03-23 22:30 ` Maxime Ripard 2013-03-23 22:30 ` [PATCH 5/5] ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree Maxime Ripard 2013-03-23 22:30 ` Maxime Ripard -- strict thread matches above, loose matches on Subject: below -- 2013-03-15 20:49 [PATCH 0/5] ARM: sunxi: Add support for A10 Ethernet controller Maxime Ripard 2013-03-15 20:50 ` [PATCH 5/5] ARM: hackberry: dt: Add Ethernet controller to the Hackberry device tree Maxime Ripard 2013-03-15 20:50 ` Maxime Ripard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.