All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
@ 2016-05-05 19:34 Marek Vasut
  2016-05-08 12:58 ` Daniel Schwierzeck
  2016-05-08 21:25 ` Amit Tomer
  0 siblings, 2 replies; 20+ messages in thread
From: Marek Vasut @ 2016-05-05 19:34 UTC (permalink / raw)
  To: u-boot

Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
The driver could be easily extended to other WiSoCs.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Wills Wang <wills.wang@live.com>
---
 drivers/net/Kconfig  |   9 +
 drivers/net/Makefile |   1 +
 drivers/net/ag7xxx.c | 982 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 992 insertions(+)
 create mode 100644 drivers/net/ag7xxx.c

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 91b7690..00f151f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -46,6 +46,15 @@ menuconfig NETDEVICES
 
 if NETDEVICES
 
+config AG7XXX
+	bool "Atheros AG7xxx Ethernet MAC support"
+	depends on DM_ETH
+	select PHYLIB
+	help
+	  This driver supports the Atheros AG7xxx Ethernet MAC. This MAC is
+	  present in the Atheros AR7xxx, AR9xxx and QCA9xxx MIPS chips.
+
+
 config ALTERA_TSE
 	bool "Altera Triple-Speed Ethernet MAC support"
 	depends on DM_ETH
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fbedd04..55d56a0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -7,6 +7,7 @@
 
 obj-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
 obj-$(CONFIG_ALTERA_TSE) += altera_tse.o
+obj-$(CONFIG_AG7XXX) += ag7xxx.o
 obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o
 obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o
 obj-$(CONFIG_DRIVER_AX88180) += ax88180.o
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
new file mode 100644
index 0000000..51bf7a4
--- /dev/null
+++ b/drivers/net/ag7xxx.c
@@ -0,0 +1,982 @@
+/*
+ * Atheros AR71xx / AR9xxx GMAC driver
+ *
+ * Copyright (C) 2016 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <miiphy.h>
+#include <malloc.h>
+#include <linux/compiler.h>
+#include <linux/err.h>
+#include <linux/mii.h>
+#include <wait_bit.h>
+#include <asm/io.h>
+
+#include <mach/ath79.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+enum ag7xxx_model {
+	AG7XXX_MODEL_AG933X,
+	AG7XXX_MODEL_AG934X,
+};
+
+#define AG7XXX_ETH_CFG1				0x00
+#define AG7XXX_ETH_CFG1_SOFT_RST		BIT(31)
+#define AG7XXX_ETH_CFG1_RX_RST			BIT(19)
+#define AG7XXX_ETH_CFG1_TX_RST			BIT(18)
+#define AG7XXX_ETH_CFG1_LOOPBACK		BIT(8)
+#define AG7XXX_ETH_CFG1_RX_EN			BIT(2)
+#define AG7XXX_ETH_CFG1_TX_EN			BIT(0)
+
+#define AG7XXX_ETH_CFG2				0x04
+#define AG7XXX_ETH_CFG2_IF_1000			BIT(9)
+#define AG7XXX_ETH_CFG2_IF_10_100		BIT(8)
+#define AG7XXX_ETH_CFG2_IF_SPEED_MASK		(3 << 8)
+#define AG7XXX_ETH_CFG2_HUGE_FRAME_EN		BIT(5)
+#define AG7XXX_ETH_CFG2_LEN_CHECK		BIT(4)
+#define AG7XXX_ETH_CFG2_PAD_CRC_EN		BIT(2)
+#define AG7XXX_ETH_CFG2_FDX			BIT(0)
+
+#define AG7XXX_ETH_MII_MGMT_CFG			0x20
+#define AG7XXX_ETH_MII_MGMT_CFG_RESET		BIT(31)
+
+#define AG7XXX_ETH_MII_MGMT_CMD			0x24
+#define AG7XXX_ETH_MII_MGMT_CMD_READ		0x1
+
+#define AG7XXX_ETH_MII_MGMT_ADDRESS		0x28
+#define AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT	8
+
+#define AG7XXX_ETH_MII_MGMT_CTRL		0x2c
+
+#define AG7XXX_ETH_MII_MGMT_STATUS		0x30
+
+#define AG7XXX_ETH_MII_MGMT_IND			0x34
+#define AG7XXX_ETH_MII_MGMT_IND_INVALID		BIT(2)
+#define AG7XXX_ETH_MII_MGMT_IND_BUSY		BIT(0)
+
+#define AG7XXX_ETH_ADDR1			0x40
+#define AG7XXX_ETH_ADDR2			0x44
+
+#define AG7XXX_ETH_FIFO_CFG_0			0x48
+#define AG7XXX_ETH_FIFO_CFG_1			0x4c
+#define AG7XXX_ETH_FIFO_CFG_2			0x50
+#define AG7XXX_ETH_FIFO_CFG_3			0x54
+#define AG7XXX_ETH_FIFO_CFG_4			0x58
+#define AG7XXX_ETH_FIFO_CFG_5			0x5c
+
+#define AG7XXX_ETH_DMA_TX_CTRL			0x180
+#define AG7XXX_ETH_DMA_TX_CTRL_TXE		BIT(0)
+
+#define AG7XXX_ETH_DMA_TX_DESC			0x184
+
+#define AG7XXX_ETH_DMA_TX_STATUS		0x188
+
+#define AG7XXX_ETH_DMA_RX_CTRL			0x18c
+#define AG7XXX_ETH_DMA_RX_CTRL_RXE		BIT(0)
+
+#define AG7XXX_ETH_DMA_RX_DESC			0x190
+
+#define AG7XXX_ETH_DMA_RX_STATUS		0x194
+
+/* Custom register@0x18070000 */
+#define AG7XXX_GMAC_ETH_CFG			0x00
+#define AG7XXX_ETH_CFG_SW_PHY_ADDR_SWAP		BIT(8)
+#define AG7XXX_ETH_CFG_SW_PHY_SWAP		BIT(7)
+#define AG7XXX_ETH_CFG_SW_ONLY_MODE		BIT(6)
+#define AG7XXX_ETH_CFG_GE0_ERR_EN		BIT(5)
+#define AG7XXX_ETH_CFG_MII_GE0_SLAVE		BIT(4)
+#define AG7XXX_ETH_CFG_MII_GE0_MASTER		BIT(3)
+#define AG7XXX_ETH_CFG_GMII_GE0			BIT(2)
+#define AG7XXX_ETH_CFG_MII_GE0			BIT(1)
+#define AG7XXX_ETH_CFG_RGMII_GE0		BIT(0)
+
+#define CONFIG_TX_DESCR_NUM	8
+#define CONFIG_RX_DESCR_NUM	8
+#define CONFIG_ETH_BUFSIZE	2048
+#define TX_TOTAL_BUFSIZE	(CONFIG_ETH_BUFSIZE * CONFIG_TX_DESCR_NUM)
+#define RX_TOTAL_BUFSIZE	(CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM)
+
+/* DMA descriptor. */
+struct ag7xxx_dma_desc {
+	u32	data_addr;
+#define AG7XXX_DMADESC_IS_EMPTY			BIT(31)
+#define AG7XXX_DMADESC_FTPP_OVERRIDE_OFFSET	16
+#define AG7XXX_DMADESC_PKT_SIZE_OFFSET		0
+#define AG7XXX_DMADESC_PKT_SIZE_MASK		0xfff
+	u32	config;
+	u32	next_desc;
+	u32	_pad[5];
+};
+
+struct ar7xxx_eth_priv {
+	struct ag7xxx_dma_desc	tx_mac_descrtable[CONFIG_TX_DESCR_NUM];
+	struct ag7xxx_dma_desc	rx_mac_descrtable[CONFIG_RX_DESCR_NUM];
+	char		txbuffs[TX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
+	char		rxbuffs[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
+
+	void __iomem		*regs;
+	void __iomem		*phyregs;
+
+	struct eth_device	*dev;
+	struct phy_device	*phydev;
+	struct mii_dev		*bus;
+
+	u32			interface;
+	u32			tx_currdescnum;
+	u32			rx_currdescnum;
+	enum ag7xxx_model	model;
+};
+
+/*
+ * Switch and MDIO access
+ */
+static int ag7xxx_switch_read(struct mii_dev *bus, int addr, int reg, u16 *val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	void __iomem *regs = priv->phyregs;
+	int ret;
+
+	writel(0x0, regs + AG7XXX_ETH_MII_MGMT_CMD);
+	writel((addr << AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT) | reg,
+	       regs + AG7XXX_ETH_MII_MGMT_ADDRESS);
+	writel(AG7XXX_ETH_MII_MGMT_CMD_READ,
+	       regs + AG7XXX_ETH_MII_MGMT_CMD);
+
+	ret = wait_for_bit("ag7xxx", regs + AG7XXX_ETH_MII_MGMT_IND,
+			   AG7XXX_ETH_MII_MGMT_IND_BUSY, 0, 1000, 0);
+	if (ret)
+		return ret;
+
+	*val = readl(regs + AG7XXX_ETH_MII_MGMT_STATUS) & 0xffff;
+	writel(0x0, regs + AG7XXX_ETH_MII_MGMT_CMD);
+
+	return 0;
+}
+
+static int ag7xxx_switch_write(struct mii_dev *bus, int addr, int reg, u16 val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	void __iomem *regs = priv->phyregs;
+	int ret;
+
+	writel((addr << AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT) | reg,
+	       regs + AG7XXX_ETH_MII_MGMT_ADDRESS);
+	writel(val, regs + AG7XXX_ETH_MII_MGMT_CTRL);
+
+	ret = wait_for_bit("ag7xxx", regs + AG7XXX_ETH_MII_MGMT_IND,
+			   AG7XXX_ETH_MII_MGMT_IND_BUSY, 0, 1000, 0);
+
+	return ret;
+}
+
+static int ag7xxx_switch_reg_read(struct mii_dev *bus, int reg, u32 *val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	u32 phy_addr;
+	u32 reg_addr;
+	u32 phy_temp;
+	u32 reg_temp;
+	u16 rv = 0;
+	int ret;
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		phy_addr = 0x1f;
+		reg_addr = 0x10;
+	} else if (priv->model == AG7XXX_MODEL_AG934X) {
+		phy_addr = 0x18;
+		reg_addr = 0x00;
+	} else
+		return -EINVAL;
+
+	ret = ag7xxx_switch_write(bus, phy_addr, reg_addr, reg >> 9);
+	if (ret)
+		return ret;
+
+	phy_temp = ((reg >> 6) & 0x7) | 0x10;
+	reg_temp = (reg >> 1) & 0x1e;
+	*val = 0;
+
+	ret = ag7xxx_switch_read(bus, phy_temp, reg_temp | 0, &rv);
+	if (ret < 0)
+		return ret;
+	*val |= rv;
+
+	ret = ag7xxx_switch_read(bus, phy_temp, reg_temp | 1, &rv);
+	if (ret < 0)
+		return ret;
+	*val |= (rv << 16);
+
+	return 0;
+}
+
+static int ag7xxx_switch_reg_write(struct mii_dev *bus, int reg, u32 val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	u32 phy_addr;
+	u32 reg_addr;
+	u32 phy_temp;
+	u32 reg_temp;
+	int ret;
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		phy_addr = 0x1f;
+		reg_addr = 0x10;
+	} else if (priv->model == AG7XXX_MODEL_AG934X) {
+		phy_addr = 0x18;
+		reg_addr = 0x00;
+	} else
+		return -EINVAL;
+
+	ret = ag7xxx_switch_write(bus, phy_addr, reg_addr, reg >> 9);
+	if (ret)
+		return ret;
+
+	phy_temp = ((reg >> 6) & 0x7) | 0x10;
+	reg_temp = (reg >> 1) & 0x1e;
+
+	/*
+	 * The switch on AR933x has some special register behavior, which
+	 * expects particular write order of their nibbles:
+	 *   0x40 ..... MSB first, LSB second
+	 *   0x50 ..... MSB first, LSB second
+	 *   0x98 ..... LSB first, MSB second
+	 *   others ... don't care
+	 */
+	if ((priv->model == AG7XXX_MODEL_AG933X) && (reg == 0x98)) {
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 0, val & 0xffff);
+		if (ret < 0)
+			return ret;
+
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 1, val >> 16);
+		if (ret < 0)
+			return ret;
+	} else {
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 1, val >> 16);
+		if (ret < 0)
+			return ret;
+
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 0, val & 0xffff);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static u16 ag7xxx_mdio_rw(struct mii_dev *bus, int addr, int reg, u32 val)
+{
+	u32 data;
+
+	/* Dummy read followed by PHY read/write command. */
+	ag7xxx_switch_reg_read(bus, 0x98, &data);
+	data = val | (reg << 16) | (addr << 21) | BIT(30) | BIT(31);
+	ag7xxx_switch_reg_write(bus, 0x98, data);
+
+	/* Wait for operation to finish */
+	do {
+		ag7xxx_switch_reg_read(bus, 0x98, &data);
+	} while (data & BIT(31));
+
+	return data & 0xffff;
+}
+
+static int ag7xxx_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
+{
+	return ag7xxx_mdio_rw(bus, addr, reg, BIT(27));
+}
+
+static int ag7xxx_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
+			     u16 val)
+{
+	ag7xxx_mdio_rw(bus, addr, reg, val);
+	return 0;
+}
+
+/*
+ * DMA ring handlers
+ */
+static void ag7xxx_dma_clean_tx(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr, *next;
+	u32 start, end;
+	int i;
+
+	for (i = 0; i < CONFIG_TX_DESCR_NUM; i++) {
+		curr = &priv->tx_mac_descrtable[i];
+		next = &priv->tx_mac_descrtable[(i + 1) % CONFIG_TX_DESCR_NUM];
+
+		curr->data_addr = virt_to_phys(&priv->txbuffs[i * CONFIG_ETH_BUFSIZE]);
+		curr->config = AG7XXX_DMADESC_IS_EMPTY;
+		curr->next_desc = virt_to_phys(next);
+	}
+
+	priv->tx_currdescnum = 0;
+
+	/* Cache: Flush descriptors, don't care about buffers. */
+	start = (u32)(&priv->tx_mac_descrtable[0]);
+	end = start + sizeof(priv->tx_mac_descrtable);
+	flush_dcache_range(start, end);
+}
+
+static void ag7xxx_dma_clean_rx(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr, *next;
+	u32 start, end;
+	int i;
+
+	for (i = 0; i < CONFIG_RX_DESCR_NUM; i++) {
+		curr = &priv->rx_mac_descrtable[i];
+		next = &priv->rx_mac_descrtable[(i + 1) % CONFIG_RX_DESCR_NUM];
+
+		curr->data_addr = virt_to_phys(&priv->rxbuffs[i * CONFIG_ETH_BUFSIZE]);
+		curr->config = AG7XXX_DMADESC_IS_EMPTY;
+		curr->next_desc = virt_to_phys(next);
+	}
+
+	priv->rx_currdescnum = 0;
+
+	/* Cache: Flush+Invalidate descriptors, Invalidate buffers. */
+	start = (u32)(&priv->rx_mac_descrtable[0]);
+	end = start + sizeof(priv->rx_mac_descrtable);
+	flush_dcache_range(start, end);
+	invalidate_dcache_range(start, end);
+
+	start = (u32)&priv->rxbuffs;
+	end = start + sizeof(priv->rxbuffs);
+	invalidate_dcache_range(start, end);
+}
+
+/*
+ * Ethernet I/O
+ */
+static int ag7xxx_eth_send(struct udevice *dev, void *packet, int length)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr;
+	u32 start, end;
+
+	curr = &priv->tx_mac_descrtable[priv->tx_currdescnum];
+
+	/* Cache: Invalidate descriptor. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	invalidate_dcache_range(start, end);
+
+	if (!(curr->config & AG7XXX_DMADESC_IS_EMPTY)) {
+		printf("ag7xxx: Out of TX DMA descriptors!\n");
+		return -EPERM;
+	}
+
+	/* Copy the packet into the data buffer. */
+	memcpy(phys_to_virt(curr->data_addr), packet, length);
+	curr->config = length & AG7XXX_DMADESC_PKT_SIZE_MASK;
+
+	/* Cache: Flush descriptor, Flush buffer. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	flush_dcache_range(start, end);
+	start = (u32)phys_to_virt(curr->data_addr);
+	end = start + length;
+	flush_dcache_range(start, end);
+
+	/* Load the DMA descriptor and start TX DMA. */
+	writel(AG7XXX_ETH_DMA_TX_CTRL_TXE,
+	       priv->regs + AG7XXX_ETH_DMA_TX_CTRL);
+
+	/* Switch to next TX descriptor. */
+	priv->tx_currdescnum = (priv->tx_currdescnum + 1) % CONFIG_TX_DESCR_NUM;
+
+	return 0;
+}
+
+static int ag7xxx_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr;
+	u32 start, end, length;
+
+	curr = &priv->rx_mac_descrtable[priv->rx_currdescnum];
+
+	/* Cache: Invalidate descriptor. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	invalidate_dcache_range(start, end);
+
+	/* No packets received. */
+	if (curr->config & AG7XXX_DMADESC_IS_EMPTY)
+		return -EAGAIN;
+
+	length = curr->config & AG7XXX_DMADESC_PKT_SIZE_MASK;
+
+	/* Cache: Invalidate buffer. */
+	start = (u32)phys_to_virt(curr->data_addr);
+	end = start + length;
+	invalidate_dcache_range(start, end);
+
+	/* Receive one packet and return length. */
+	*packetp = phys_to_virt(curr->data_addr);
+	return length;
+}
+
+static int ag7xxx_eth_free_pkt(struct udevice *dev, uchar *packet,
+				   int length)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr;
+	u32 start, end;
+
+	curr = &priv->rx_mac_descrtable[priv->rx_currdescnum];
+
+	curr->config = AG7XXX_DMADESC_IS_EMPTY;
+
+	/* Cache: Flush descriptor. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	flush_dcache_range(start, end);
+
+	/* Switch to next RX descriptor. */
+	priv->rx_currdescnum = (priv->rx_currdescnum + 1) % CONFIG_RX_DESCR_NUM;
+
+	return 0;
+}
+
+static int ag7xxx_eth_start(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	/* FIXME: Check if link up */
+
+	/* Clear the DMA rings. */
+	ag7xxx_dma_clean_tx(dev);
+	ag7xxx_dma_clean_rx(dev);
+
+	/* Load DMA descriptors and start the RX DMA. */
+	writel(virt_to_phys(&priv->tx_mac_descrtable[priv->tx_currdescnum]),
+	       priv->regs + AG7XXX_ETH_DMA_TX_DESC);
+	writel(virt_to_phys(&priv->rx_mac_descrtable[priv->rx_currdescnum]),
+	       priv->regs + AG7XXX_ETH_DMA_RX_DESC);
+	writel(AG7XXX_ETH_DMA_RX_CTRL_RXE,
+	       priv->regs + AG7XXX_ETH_DMA_RX_CTRL);
+
+	return 0;
+}
+
+static void ag7xxx_eth_stop(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	/* Stop the TX DMA. */
+	writel(0, priv->regs + AG7XXX_ETH_DMA_TX_CTRL);
+	wait_for_bit("ag7xxx", priv->regs + AG7XXX_ETH_DMA_TX_CTRL, ~0, 0,
+		     1000, 0);
+
+	/* Stop the RX DMA. */
+	writel(0, priv->regs + AG7XXX_ETH_DMA_RX_CTRL);
+	wait_for_bit("ag7xxx", priv->regs + AG7XXX_ETH_DMA_RX_CTRL, ~0, 0,
+		     1000, 0);
+}
+
+/*
+ * Hardware setup
+ */
+static int ag7xxx_eth_write_hwaddr(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	unsigned char *mac = pdata->enetaddr;
+	u32 macid_lo, macid_hi;
+
+	macid_hi = mac[3] | (mac[2] << 8) | (mac[1] << 16) | (mac[0] << 24);
+	macid_lo = (mac[5] << 16) | (mac[4] << 24);
+
+	writel(macid_lo, priv->regs + AG7XXX_ETH_ADDR1);
+	writel(macid_hi, priv->regs + AG7XXX_ETH_ADDR2);
+
+	return 0;
+}
+
+static void ag7xxx_hw_setup(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	u32 speed;
+
+	setbits_be32(priv->regs + AG7XXX_ETH_CFG1,
+		     AG7XXX_ETH_CFG1_RX_RST | AG7XXX_ETH_CFG1_TX_RST |
+		     AG7XXX_ETH_CFG1_SOFT_RST);
+
+	mdelay(10);
+
+	writel(AG7XXX_ETH_CFG1_RX_EN | AG7XXX_ETH_CFG1_TX_EN,
+	       priv->regs + AG7XXX_ETH_CFG1);
+
+	if (priv->interface == PHY_INTERFACE_MODE_RMII)
+		speed = AG7XXX_ETH_CFG2_IF_10_100;
+	else
+		speed = AG7XXX_ETH_CFG2_IF_1000;
+
+	clrsetbits_be32(priv->regs + AG7XXX_ETH_CFG2,
+			AG7XXX_ETH_CFG2_IF_SPEED_MASK,
+			speed | AG7XXX_ETH_CFG2_PAD_CRC_EN |
+			AG7XXX_ETH_CFG2_LEN_CHECK);
+
+	writel(0xfff0000, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
+	writel(0x1fff, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
+
+	writel(0x1f00, priv->regs + AG7XXX_ETH_FIFO_CFG_0);
+	setbits_be32(priv->regs + AG7XXX_ETH_FIFO_CFG_4, 0x3ffff);
+	writel(0x10ffff, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
+	writel(0xaaa0555, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
+	writel(0x7eccf, priv->regs + AG7XXX_ETH_FIFO_CFG_5);
+	writel(0x1f00140, priv->regs + AG7XXX_ETH_FIFO_CFG_3);
+}
+
+static int ag7xxx_mii_get_div(void)
+{
+	ulong freq = get_bus_freq(0);
+
+	switch (freq / 1000000) {
+	case 150:	return 0x7;
+	case 175:	return 0x5;
+	case 200:	return 0x4;
+	case 210:	return 0x9;
+	case 220:	return 0x9;
+	default:	return 0x7;
+	}
+}
+
+static int ag7xxx_mii_setup(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret, div = ag7xxx_mii_get_div();
+	u32 reg;
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		/* Unit 0 is PHY-less on AR9331, see datasheet Figure 2-3 */
+		if (priv->interface == PHY_INTERFACE_MODE_RMII)
+			return 0;
+	}
+
+	if (priv->model == AG7XXX_MODEL_AG934X) {
+		writel(AG7XXX_ETH_MII_MGMT_CFG_RESET | 0x4,
+		       priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+		writel(0x4, priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+		return 0;
+	}
+
+	for (i = 0; i < 10; i++) {
+		writel(AG7XXX_ETH_MII_MGMT_CFG_RESET | div,
+		       priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+		writel(div, priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+
+		/* Check the switch */
+		ret = ag7xxx_switch_reg_read(priv->bus, 0x10c, &reg);
+		if (ret)
+			continue;
+
+		if (reg != 0x18007fff)
+			continue;
+
+		return 0;
+	}
+
+	return -EINVAL;
+}
+
+static int ag933x_phy_setup_wan(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	/* Configure switch port 4 (GMAC0) */
+	return ag7xxx_mdio_write(priv->bus, 4, 0, MII_BMCR, 0x9000);
+}
+
+static int ag933x_phy_setup_lan(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret;
+	u32 reg;
+
+	/* Reset the switch */
+	ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
+	if (ret)
+		return ret;
+	reg |= BIT(31);
+	ret = ag7xxx_switch_reg_write(priv->bus, 0, reg);
+	if (ret)
+		return ret;
+
+	do {
+		ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
+		if (ret)
+			return ret;
+	} while (reg & BIT(31));
+
+	/* Configure switch ports 0...3 (GMAC1) */
+	for (i = 0; i < 4; i++) {
+		ret = ag7xxx_mdio_write(priv->bus, 0x4, 0, MII_BMCR, 0x9000);
+		if (ret)
+			return ret;
+	}
+
+	/* Enable CPU port */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x78, BIT(8));
+	if (ret)
+		return ret;
+
+	for (i = 0; i < 4; i++) {
+		ret = ag7xxx_switch_reg_write(priv->bus, i * 0x100, BIT(9));
+		if (ret)
+			return ret;
+	}
+
+	/* QM Control */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x38, 0xc000050e);
+	if (ret)
+		return ret;
+
+	/* Disable Atheros header */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x104, 0x4004);
+	if (ret)
+		return ret;
+
+	/* Tag priority mapping */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x70, 0xfa50);
+	if (ret)
+		return ret;
+
+	/* Enable ARP packets to the CPU */
+	ret = ag7xxx_switch_reg_read(priv->bus, 0x5c, &reg);
+	if (ret)
+		return ret;
+	reg |= 0x100000;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x5c, reg);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int ag933x_phy_setup_reset_set(struct udevice *dev, int port)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	ret = ag7xxx_mdio_write(priv->bus, port, 0, MII_ADVERTISE,
+				ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
+				ADVERTISE_PAUSE_ASYM);
+	if (ret)
+		return ret;
+
+	if (priv->model == AG7XXX_MODEL_AG934X) {
+		ret = ag7xxx_mdio_write(priv->bus, port, 0, MII_CTRL1000,
+					ADVERTISE_1000FULL);
+		if (ret)
+			return ret;
+	}
+
+	return ag7xxx_mdio_write(priv->bus, port, 0, MII_BMCR,
+				 BMCR_ANENABLE | BMCR_RESET);
+}
+
+static int ag933x_phy_setup_reset_fin(struct udevice *dev, int port)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	do {
+		ret = ag7xxx_mdio_read(priv->bus, port, 0, MII_BMCR);
+		if (ret < 0)
+			return ret;
+		mdelay(10);
+	} while (ret & BMCR_RESET);
+
+	return 0;
+}
+
+static int ag933x_phy_setup_common(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret, phymax;
+
+	if (priv->model == AG7XXX_MODEL_AG933X)
+		phymax = 4;
+	else if (priv->model == AG7XXX_MODEL_AG934X)
+		phymax = 5;
+	else
+		return -EINVAL;
+
+	if (priv->interface == PHY_INTERFACE_MODE_RMII) {
+		ret = ag933x_phy_setup_reset_set(dev, phymax);
+		if (ret)
+			return ret;
+
+		ret = ag933x_phy_setup_reset_fin(dev, phymax);
+		if (ret)
+			return ret;
+
+		/* Read out link status */
+		ret = ag7xxx_mdio_read(priv->bus, phymax, 0, 0x11);
+		if (ret < 0)
+			return ret;
+
+		return 0;
+	}
+
+	/* Switch ports */
+	for (i = 0; i < phymax; i++) {
+		ret = ag933x_phy_setup_reset_set(dev, i);
+		if (ret)
+			return ret;
+	}
+
+	for (i = 0; i < phymax; i++) {
+		ret = ag933x_phy_setup_reset_fin(dev, i);
+		if (ret)
+			return ret;
+	}
+
+	for (i = 0; i < phymax; i++) {
+		/* Read out link status */
+		ret = ag7xxx_mdio_read(priv->bus, i, 0, 0x11);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int ag934x_phy_setup(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret;
+	u32 reg;
+
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x624, 0x7f7f7f7f);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x10, 0x40000000);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x4, 0x07600000);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0xc, 0x01000000);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x7c, 0x0000007e);
+	if (ret)
+		return ret;
+
+	/* AR8327/AR8328 v1.0 fixup */
+	ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
+	if (ret)
+		return ret;
+	if ((reg & 0xffff) == 0x1201) {
+		for (i = 0; i < 5; i++) {
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1d, 0x0);
+			if (ret)
+				return ret;
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1e, 0x02ea);
+			if (ret)
+				return ret;
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1d, 0x3d);
+			if (ret)
+				return ret;
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1e, 0x68a0);
+			if (ret)
+				return ret;
+		}
+	}
+
+	ret = ag7xxx_switch_reg_read(priv->bus, 0x66c, &reg);
+	if (ret)
+		return ret;
+	reg &= ~0x70000;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x66c, reg);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int ag7xxx_mac_probe(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	ag7xxx_hw_setup(dev);
+	ret = ag7xxx_mii_setup(dev);
+	if (ret)
+		return ret;
+
+	ag7xxx_eth_write_hwaddr(dev);
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		if (priv->interface == PHY_INTERFACE_MODE_RMII)
+			ret = ag933x_phy_setup_wan(dev);
+		else
+			ret = ag933x_phy_setup_lan(dev);
+	} else if (priv->model == AG7XXX_MODEL_AG934X) {
+		ret = ag934x_phy_setup(dev);
+	} else {
+		return -EINVAL;
+	}
+
+	if (ret)
+		return ret;
+
+	return ag933x_phy_setup_common(dev);
+}
+
+static int ag7xxx_mdio_probe(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct mii_dev *bus = mdio_alloc();
+
+	if (!bus) {
+		printf("Failed to allocate MDIO bus\n");
+		return -ENOMEM;
+	}
+
+	bus->read = ag7xxx_mdio_read;
+	bus->write = ag7xxx_mdio_write;
+	snprintf(bus->name, sizeof(bus->name), dev->name);
+
+	bus->priv = (void *)priv;
+
+	return mdio_register(bus);
+}
+
+static int ag7xxx_get_phy_iface_offset(struct udevice *dev)
+{
+	int offset;
+
+	offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, "phy");
+	if (offset <= 0) {
+		debug("%s: PHY OF node not found (ret=%i)\n", __func__, offset);
+		return -EINVAL;
+	}
+
+	offset = fdt_parent_offset(gd->fdt_blob, offset);
+	if (offset <= 0) {
+		debug("%s: PHY OF node parent MDIO bus not found (ret=%i)\n",
+		      __func__, offset);
+		return -EINVAL;
+	}
+
+	offset = fdt_parent_offset(gd->fdt_blob, offset);
+	if (offset <= 0) {
+		debug("%s: PHY MDIO OF node parent MAC not found (ret=%i)\n",
+		      __func__, offset);
+		return -EINVAL;
+	}
+
+	return offset;
+}
+
+static int ag7xxx_eth_probe(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	void __iomem *iobase, *phyiobase;
+	int ret, phyreg;
+
+	/* Decoding of convoluted PHY wiring on Atheros MIPS. */
+	ret = ag7xxx_get_phy_iface_offset(dev);
+	if (ret <= 0)
+		return ret;
+	phyreg = fdtdec_get_int(gd->fdt_blob, ret, "reg", -1);
+
+	iobase = map_physmem(pdata->iobase, 0x200, MAP_NOCACHE);
+	phyiobase = map_physmem(phyreg, 0x200, MAP_NOCACHE);
+
+	debug("%s, iobase=%p, phyiobase=%p, priv=%p\n",
+	      __func__, iobase, phyiobase, priv);
+	priv->regs = iobase;
+	priv->phyregs = phyiobase;
+	priv->interface = pdata->phy_interface;
+	priv->model = dev_get_driver_data(dev);
+
+	ret = ag7xxx_mdio_probe(dev);
+	if (ret)
+		return ret;
+
+	priv->bus = miiphy_get_dev_by_name(dev->name);
+
+	ret = ag7xxx_mac_probe(dev);
+	debug("%s, ret=%d\n", __func__, ret);
+
+	return ret;
+}
+
+static int ag7xxx_eth_remove(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	free(priv->phydev);
+	mdio_unregister(priv->bus);
+	mdio_free(priv->bus);
+
+	return 0;
+}
+
+static const struct eth_ops ag7xxx_eth_ops = {
+	.start			= ag7xxx_eth_start,
+	.send			= ag7xxx_eth_send,
+	.recv			= ag7xxx_eth_recv,
+	.free_pkt		= ag7xxx_eth_free_pkt,
+	.stop			= ag7xxx_eth_stop,
+	.write_hwaddr		= ag7xxx_eth_write_hwaddr,
+};
+
+static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	const char *phy_mode;
+	int ret;
+
+	pdata->iobase = dev_get_addr(dev);
+	pdata->phy_interface = -1;
+
+	/* Decoding of convoluted PHY wiring on Atheros MIPS. */
+	ret = ag7xxx_get_phy_iface_offset(dev);
+	if (ret <= 0)
+		return ret;
+
+	phy_mode = fdt_getprop(gd->fdt_blob, ret, "phy-mode", NULL);
+	if (phy_mode)
+		pdata->phy_interface = phy_get_interface_by_name(phy_mode);
+	if (pdata->phy_interface == -1) {
+		debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static const struct udevice_id ag7xxx_eth_ids[] = {
+	{ .compatible = "qca,ag933x-mac", .data = AG7XXX_MODEL_AG933X },
+	{ .compatible = "qca,ag934x-mac", .data = AG7XXX_MODEL_AG934X },
+	{ }
+};
+
+U_BOOT_DRIVER(eth_ag7xxx) = {
+	.name		= "eth_ag7xxx",
+	.id		= UCLASS_ETH,
+	.of_match	= ag7xxx_eth_ids,
+	.ofdata_to_platdata = ag7xxx_eth_ofdata_to_platdata,
+	.probe		= ag7xxx_eth_probe,
+	.remove		= ag7xxx_eth_remove,
+	.ops		= &ag7xxx_eth_ops,
+	.priv_auto_alloc_size = sizeof(struct ar7xxx_eth_priv),
+	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
+};
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-05 19:34 [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS Marek Vasut
@ 2016-05-08 12:58 ` Daniel Schwierzeck
  2016-05-08 15:22   ` Marek Vasut
  2016-05-08 21:25 ` Amit Tomer
  1 sibling, 1 reply; 20+ messages in thread
From: Daniel Schwierzeck @ 2016-05-08 12:58 UTC (permalink / raw)
  To: u-boot



Am 05.05.2016 um 21:34 schrieb Marek Vasut:
> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
> The driver could be easily extended to other WiSoCs.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Wills Wang <wills.wang@live.com>
> ---
>  drivers/net/Kconfig  |   9 +
>  drivers/net/Makefile |   1 +
>  drivers/net/ag7xxx.c | 982 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 992 insertions(+)
>  create mode 100644 drivers/net/ag7xxx.c

Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>

nits below

> 
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 91b7690..00f151f 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -46,6 +46,15 @@ menuconfig NETDEVICES
>  
>  if NETDEVICES
>  
> +config AG7XXX
> +	bool "Atheros AG7xxx Ethernet MAC support"
> +	depends on DM_ETH

this should be limited to the ath79 platform:

depends on DM_ETH && ARCH_ATH79

> +	select PHYLIB
> +	help
> +	  This driver supports the Atheros AG7xxx Ethernet MAC. This MAC is
> +	  present in the Atheros AR7xxx, AR9xxx and QCA9xxx MIPS chips.
> +
> +
>  config ALTERA_TSE
>  	bool "Altera Triple-Speed Ethernet MAC support"
>  	depends on DM_ETH
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index fbedd04..55d56a0 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -7,6 +7,7 @@
>  
>  obj-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
>  obj-$(CONFIG_ALTERA_TSE) += altera_tse.o
> +obj-$(CONFIG_AG7XXX) += ag7xxx.o
>  obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o
>  obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o
>  obj-$(CONFIG_DRIVER_AX88180) += ax88180.o
> diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
> new file mode 100644
> index 0000000..51bf7a4
> --- /dev/null
> +++ b/drivers/net/ag7xxx.c
> @@ -0,0 +1,982 @@
> +/*
> + * Atheros AR71xx / AR9xxx GMAC driver
> + *
> + * Copyright (C) 2016 Marek Vasut <marex@denx.de>
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <dm.h>
> +#include <errno.h>
> +#include <miiphy.h>
> +#include <malloc.h>
> +#include <linux/compiler.h>
> +#include <linux/err.h>
> +#include <linux/mii.h>
> +#include <wait_bit.h>
> +#include <asm/io.h>
> +
> +#include <mach/ath79.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +enum ag7xxx_model {
> +	AG7XXX_MODEL_AG933X,
> +	AG7XXX_MODEL_AG934X,
> +};
> +
> +#define AG7XXX_ETH_CFG1				0x00
> +#define AG7XXX_ETH_CFG1_SOFT_RST		BIT(31)
> +#define AG7XXX_ETH_CFG1_RX_RST			BIT(19)
> +#define AG7XXX_ETH_CFG1_TX_RST			BIT(18)
> +#define AG7XXX_ETH_CFG1_LOOPBACK		BIT(8)
> +#define AG7XXX_ETH_CFG1_RX_EN			BIT(2)
> +#define AG7XXX_ETH_CFG1_TX_EN			BIT(0)
> +
> +#define AG7XXX_ETH_CFG2				0x04
> +#define AG7XXX_ETH_CFG2_IF_1000			BIT(9)
> +#define AG7XXX_ETH_CFG2_IF_10_100		BIT(8)
> +#define AG7XXX_ETH_CFG2_IF_SPEED_MASK		(3 << 8)
> +#define AG7XXX_ETH_CFG2_HUGE_FRAME_EN		BIT(5)
> +#define AG7XXX_ETH_CFG2_LEN_CHECK		BIT(4)
> +#define AG7XXX_ETH_CFG2_PAD_CRC_EN		BIT(2)
> +#define AG7XXX_ETH_CFG2_FDX			BIT(0)
> +
> +#define AG7XXX_ETH_MII_MGMT_CFG			0x20
> +#define AG7XXX_ETH_MII_MGMT_CFG_RESET		BIT(31)
> +
> +#define AG7XXX_ETH_MII_MGMT_CMD			0x24
> +#define AG7XXX_ETH_MII_MGMT_CMD_READ		0x1
> +
> +#define AG7XXX_ETH_MII_MGMT_ADDRESS		0x28
> +#define AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT	8
> +
> +#define AG7XXX_ETH_MII_MGMT_CTRL		0x2c
> +
> +#define AG7XXX_ETH_MII_MGMT_STATUS		0x30
> +
> +#define AG7XXX_ETH_MII_MGMT_IND			0x34
> +#define AG7XXX_ETH_MII_MGMT_IND_INVALID		BIT(2)
> +#define AG7XXX_ETH_MII_MGMT_IND_BUSY		BIT(0)
> +
> +#define AG7XXX_ETH_ADDR1			0x40
> +#define AG7XXX_ETH_ADDR2			0x44
> +
> +#define AG7XXX_ETH_FIFO_CFG_0			0x48
> +#define AG7XXX_ETH_FIFO_CFG_1			0x4c
> +#define AG7XXX_ETH_FIFO_CFG_2			0x50
> +#define AG7XXX_ETH_FIFO_CFG_3			0x54
> +#define AG7XXX_ETH_FIFO_CFG_4			0x58
> +#define AG7XXX_ETH_FIFO_CFG_5			0x5c
> +
> +#define AG7XXX_ETH_DMA_TX_CTRL			0x180
> +#define AG7XXX_ETH_DMA_TX_CTRL_TXE		BIT(0)
> +
> +#define AG7XXX_ETH_DMA_TX_DESC			0x184
> +
> +#define AG7XXX_ETH_DMA_TX_STATUS		0x188
> +
> +#define AG7XXX_ETH_DMA_RX_CTRL			0x18c
> +#define AG7XXX_ETH_DMA_RX_CTRL_RXE		BIT(0)
> +
> +#define AG7XXX_ETH_DMA_RX_DESC			0x190
> +
> +#define AG7XXX_ETH_DMA_RX_STATUS		0x194
> +
> +/* Custom register at 0x18070000 */
> +#define AG7XXX_GMAC_ETH_CFG			0x00
> +#define AG7XXX_ETH_CFG_SW_PHY_ADDR_SWAP		BIT(8)
> +#define AG7XXX_ETH_CFG_SW_PHY_SWAP		BIT(7)
> +#define AG7XXX_ETH_CFG_SW_ONLY_MODE		BIT(6)
> +#define AG7XXX_ETH_CFG_GE0_ERR_EN		BIT(5)
> +#define AG7XXX_ETH_CFG_MII_GE0_SLAVE		BIT(4)
> +#define AG7XXX_ETH_CFG_MII_GE0_MASTER		BIT(3)
> +#define AG7XXX_ETH_CFG_GMII_GE0			BIT(2)
> +#define AG7XXX_ETH_CFG_MII_GE0			BIT(1)
> +#define AG7XXX_ETH_CFG_RGMII_GE0		BIT(0)
> +
> +#define CONFIG_TX_DESCR_NUM	8
> +#define CONFIG_RX_DESCR_NUM	8
> +#define CONFIG_ETH_BUFSIZE	2048
> +#define TX_TOTAL_BUFSIZE	(CONFIG_ETH_BUFSIZE * CONFIG_TX_DESCR_NUM)
> +#define RX_TOTAL_BUFSIZE	(CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM)
> +
> +/* DMA descriptor. */
> +struct ag7xxx_dma_desc {
> +	u32	data_addr;
> +#define AG7XXX_DMADESC_IS_EMPTY			BIT(31)
> +#define AG7XXX_DMADESC_FTPP_OVERRIDE_OFFSET	16
> +#define AG7XXX_DMADESC_PKT_SIZE_OFFSET		0
> +#define AG7XXX_DMADESC_PKT_SIZE_MASK		0xfff
> +	u32	config;
> +	u32	next_desc;
> +	u32	_pad[5];
> +};
> +
> +struct ar7xxx_eth_priv {
> +	struct ag7xxx_dma_desc	tx_mac_descrtable[CONFIG_TX_DESCR_NUM];
> +	struct ag7xxx_dma_desc	rx_mac_descrtable[CONFIG_RX_DESCR_NUM];
> +	char		txbuffs[TX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
> +	char		rxbuffs[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
> +
> +	void __iomem		*regs;
> +	void __iomem		*phyregs;
> +
> +	struct eth_device	*dev;
> +	struct phy_device	*phydev;
> +	struct mii_dev		*bus;
> +
> +	u32			interface;
> +	u32			tx_currdescnum;
> +	u32			rx_currdescnum;
> +	enum ag7xxx_model	model;
> +};
> +
> +/*
> + * Switch and MDIO access
> + */
> +static int ag7xxx_switch_read(struct mii_dev *bus, int addr, int reg, u16 *val)
> +{
> +	struct ar7xxx_eth_priv *priv = bus->priv;
> +	void __iomem *regs = priv->phyregs;
> +	int ret;
> +
> +	writel(0x0, regs + AG7XXX_ETH_MII_MGMT_CMD);
> +	writel((addr << AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT) | reg,
> +	       regs + AG7XXX_ETH_MII_MGMT_ADDRESS);
> +	writel(AG7XXX_ETH_MII_MGMT_CMD_READ,
> +	       regs + AG7XXX_ETH_MII_MGMT_CMD);
> +
> +	ret = wait_for_bit("ag7xxx", regs + AG7XXX_ETH_MII_MGMT_IND,
> +			   AG7XXX_ETH_MII_MGMT_IND_BUSY, 0, 1000, 0);
> +	if (ret)
> +		return ret;
> +
> +	*val = readl(regs + AG7XXX_ETH_MII_MGMT_STATUS) & 0xffff;
> +	writel(0x0, regs + AG7XXX_ETH_MII_MGMT_CMD);
> +
> +	return 0;
> +}
> +
> +static int ag7xxx_switch_write(struct mii_dev *bus, int addr, int reg, u16 val)
> +{
> +	struct ar7xxx_eth_priv *priv = bus->priv;
> +	void __iomem *regs = priv->phyregs;
> +	int ret;
> +
> +	writel((addr << AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT) | reg,
> +	       regs + AG7XXX_ETH_MII_MGMT_ADDRESS);
> +	writel(val, regs + AG7XXX_ETH_MII_MGMT_CTRL);
> +
> +	ret = wait_for_bit("ag7xxx", regs + AG7XXX_ETH_MII_MGMT_IND,
> +			   AG7XXX_ETH_MII_MGMT_IND_BUSY, 0, 1000, 0);
> +
> +	return ret;
> +}
> +
> +static int ag7xxx_switch_reg_read(struct mii_dev *bus, int reg, u32 *val)
> +{
> +	struct ar7xxx_eth_priv *priv = bus->priv;
> +	u32 phy_addr;
> +	u32 reg_addr;
> +	u32 phy_temp;
> +	u32 reg_temp;
> +	u16 rv = 0;
> +	int ret;
> +
> +	if (priv->model == AG7XXX_MODEL_AG933X) {
> +		phy_addr = 0x1f;
> +		reg_addr = 0x10;
> +	} else if (priv->model == AG7XXX_MODEL_AG934X) {
> +		phy_addr = 0x18;
> +		reg_addr = 0x00;
> +	} else
> +		return -EINVAL;
> +
> +	ret = ag7xxx_switch_write(bus, phy_addr, reg_addr, reg >> 9);
> +	if (ret)
> +		return ret;
> +
> +	phy_temp = ((reg >> 6) & 0x7) | 0x10;
> +	reg_temp = (reg >> 1) & 0x1e;
> +	*val = 0;
> +
> +	ret = ag7xxx_switch_read(bus, phy_temp, reg_temp | 0, &rv);
> +	if (ret < 0)
> +		return ret;
> +	*val |= rv;
> +
> +	ret = ag7xxx_switch_read(bus, phy_temp, reg_temp | 1, &rv);
> +	if (ret < 0)
> +		return ret;
> +	*val |= (rv << 16);
> +
> +	return 0;
> +}
> +
> +static int ag7xxx_switch_reg_write(struct mii_dev *bus, int reg, u32 val)
> +{
> +	struct ar7xxx_eth_priv *priv = bus->priv;
> +	u32 phy_addr;
> +	u32 reg_addr;
> +	u32 phy_temp;
> +	u32 reg_temp;
> +	int ret;
> +
> +	if (priv->model == AG7XXX_MODEL_AG933X) {
> +		phy_addr = 0x1f;
> +		reg_addr = 0x10;
> +	} else if (priv->model == AG7XXX_MODEL_AG934X) {
> +		phy_addr = 0x18;
> +		reg_addr = 0x00;
> +	} else
> +		return -EINVAL;
> +
> +	ret = ag7xxx_switch_write(bus, phy_addr, reg_addr, reg >> 9);
> +	if (ret)
> +		return ret;
> +
> +	phy_temp = ((reg >> 6) & 0x7) | 0x10;
> +	reg_temp = (reg >> 1) & 0x1e;
> +
> +	/*
> +	 * The switch on AR933x has some special register behavior, which
> +	 * expects particular write order of their nibbles:
> +	 *   0x40 ..... MSB first, LSB second
> +	 *   0x50 ..... MSB first, LSB second
> +	 *   0x98 ..... LSB first, MSB second
> +	 *   others ... don't care
> +	 */
> +	if ((priv->model == AG7XXX_MODEL_AG933X) && (reg == 0x98)) {
> +		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 0, val & 0xffff);
> +		if (ret < 0)
> +			return ret;
> +
> +		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 1, val >> 16);
> +		if (ret < 0)
> +			return ret;
> +	} else {
> +		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 1, val >> 16);
> +		if (ret < 0)
> +			return ret;
> +
> +		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 0, val & 0xffff);
> +		if (ret < 0)
> +			return ret;
> +	}
> +
> +	return 0;
> +}
> +
> +static u16 ag7xxx_mdio_rw(struct mii_dev *bus, int addr, int reg, u32 val)
> +{
> +	u32 data;
> +
> +	/* Dummy read followed by PHY read/write command. */
> +	ag7xxx_switch_reg_read(bus, 0x98, &data);
> +	data = val | (reg << 16) | (addr << 21) | BIT(30) | BIT(31);
> +	ag7xxx_switch_reg_write(bus, 0x98, data);
> +
> +	/* Wait for operation to finish */
> +	do {
> +		ag7xxx_switch_reg_read(bus, 0x98, &data);
> +	} while (data & BIT(31));
> +
> +	return data & 0xffff;
> +}
> +
> +static int ag7xxx_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
> +{
> +	return ag7xxx_mdio_rw(bus, addr, reg, BIT(27));
> +}
> +
> +static int ag7xxx_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
> +			     u16 val)
> +{
> +	ag7xxx_mdio_rw(bus, addr, reg, val);
> +	return 0;
> +}
> +
> +/*
> + * DMA ring handlers
> + */
> +static void ag7xxx_dma_clean_tx(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	struct ag7xxx_dma_desc *curr, *next;
> +	u32 start, end;
> +	int i;
> +
> +	for (i = 0; i < CONFIG_TX_DESCR_NUM; i++) {
> +		curr = &priv->tx_mac_descrtable[i];
> +		next = &priv->tx_mac_descrtable[(i + 1) % CONFIG_TX_DESCR_NUM];
> +
> +		curr->data_addr = virt_to_phys(&priv->txbuffs[i * CONFIG_ETH_BUFSIZE]);
> +		curr->config = AG7XXX_DMADESC_IS_EMPTY;
> +		curr->next_desc = virt_to_phys(next);
> +	}
> +
> +	priv->tx_currdescnum = 0;
> +
> +	/* Cache: Flush descriptors, don't care about buffers. */
> +	start = (u32)(&priv->tx_mac_descrtable[0]);
> +	end = start + sizeof(priv->tx_mac_descrtable);
> +	flush_dcache_range(start, end);
> +}
> +
> +static void ag7xxx_dma_clean_rx(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	struct ag7xxx_dma_desc *curr, *next;
> +	u32 start, end;
> +	int i;
> +
> +	for (i = 0; i < CONFIG_RX_DESCR_NUM; i++) {
> +		curr = &priv->rx_mac_descrtable[i];
> +		next = &priv->rx_mac_descrtable[(i + 1) % CONFIG_RX_DESCR_NUM];
> +
> +		curr->data_addr = virt_to_phys(&priv->rxbuffs[i * CONFIG_ETH_BUFSIZE]);
> +		curr->config = AG7XXX_DMADESC_IS_EMPTY;
> +		curr->next_desc = virt_to_phys(next);
> +	}
> +
> +	priv->rx_currdescnum = 0;
> +
> +	/* Cache: Flush+Invalidate descriptors, Invalidate buffers. */
> +	start = (u32)(&priv->rx_mac_descrtable[0]);
> +	end = start + sizeof(priv->rx_mac_descrtable);
> +	flush_dcache_range(start, end);
> +	invalidate_dcache_range(start, end);
> +
> +	start = (u32)&priv->rxbuffs;
> +	end = start + sizeof(priv->rxbuffs);
> +	invalidate_dcache_range(start, end);
> +}
> +
> +/*
> + * Ethernet I/O
> + */
> +static int ag7xxx_eth_send(struct udevice *dev, void *packet, int length)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	struct ag7xxx_dma_desc *curr;
> +	u32 start, end;
> +
> +	curr = &priv->tx_mac_descrtable[priv->tx_currdescnum];
> +
> +	/* Cache: Invalidate descriptor. */
> +	start = (u32)curr;
> +	end = start + sizeof(*curr);
> +	invalidate_dcache_range(start, end);
> +
> +	if (!(curr->config & AG7XXX_DMADESC_IS_EMPTY)) {
> +		printf("ag7xxx: Out of TX DMA descriptors!\n");
> +		return -EPERM;
> +	}
> +
> +	/* Copy the packet into the data buffer. */
> +	memcpy(phys_to_virt(curr->data_addr), packet, length);
> +	curr->config = length & AG7XXX_DMADESC_PKT_SIZE_MASK;
> +
> +	/* Cache: Flush descriptor, Flush buffer. */
> +	start = (u32)curr;
> +	end = start + sizeof(*curr);
> +	flush_dcache_range(start, end);
> +	start = (u32)phys_to_virt(curr->data_addr);
> +	end = start + length;
> +	flush_dcache_range(start, end);
> +
> +	/* Load the DMA descriptor and start TX DMA. */
> +	writel(AG7XXX_ETH_DMA_TX_CTRL_TXE,
> +	       priv->regs + AG7XXX_ETH_DMA_TX_CTRL);
> +
> +	/* Switch to next TX descriptor. */
> +	priv->tx_currdescnum = (priv->tx_currdescnum + 1) % CONFIG_TX_DESCR_NUM;
> +
> +	return 0;
> +}
> +
> +static int ag7xxx_eth_recv(struct udevice *dev, int flags, uchar **packetp)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	struct ag7xxx_dma_desc *curr;
> +	u32 start, end, length;
> +
> +	curr = &priv->rx_mac_descrtable[priv->rx_currdescnum];
> +
> +	/* Cache: Invalidate descriptor. */
> +	start = (u32)curr;
> +	end = start + sizeof(*curr);
> +	invalidate_dcache_range(start, end);
> +
> +	/* No packets received. */
> +	if (curr->config & AG7XXX_DMADESC_IS_EMPTY)
> +		return -EAGAIN;
> +
> +	length = curr->config & AG7XXX_DMADESC_PKT_SIZE_MASK;
> +
> +	/* Cache: Invalidate buffer. */
> +	start = (u32)phys_to_virt(curr->data_addr);
> +	end = start + length;
> +	invalidate_dcache_range(start, end);
> +
> +	/* Receive one packet and return length. */
> +	*packetp = phys_to_virt(curr->data_addr);
> +	return length;
> +}
> +
> +static int ag7xxx_eth_free_pkt(struct udevice *dev, uchar *packet,
> +				   int length)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	struct ag7xxx_dma_desc *curr;
> +	u32 start, end;
> +
> +	curr = &priv->rx_mac_descrtable[priv->rx_currdescnum];
> +
> +	curr->config = AG7XXX_DMADESC_IS_EMPTY;
> +
> +	/* Cache: Flush descriptor. */
> +	start = (u32)curr;
> +	end = start + sizeof(*curr);
> +	flush_dcache_range(start, end);
> +
> +	/* Switch to next RX descriptor. */
> +	priv->rx_currdescnum = (priv->rx_currdescnum + 1) % CONFIG_RX_DESCR_NUM;
> +
> +	return 0;
> +}
> +
> +static int ag7xxx_eth_start(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +
> +	/* FIXME: Check if link up */
> +
> +	/* Clear the DMA rings. */
> +	ag7xxx_dma_clean_tx(dev);
> +	ag7xxx_dma_clean_rx(dev);
> +
> +	/* Load DMA descriptors and start the RX DMA. */
> +	writel(virt_to_phys(&priv->tx_mac_descrtable[priv->tx_currdescnum]),
> +	       priv->regs + AG7XXX_ETH_DMA_TX_DESC);
> +	writel(virt_to_phys(&priv->rx_mac_descrtable[priv->rx_currdescnum]),
> +	       priv->regs + AG7XXX_ETH_DMA_RX_DESC);
> +	writel(AG7XXX_ETH_DMA_RX_CTRL_RXE,
> +	       priv->regs + AG7XXX_ETH_DMA_RX_CTRL);
> +
> +	return 0;
> +}
> +
> +static void ag7xxx_eth_stop(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +
> +	/* Stop the TX DMA. */
> +	writel(0, priv->regs + AG7XXX_ETH_DMA_TX_CTRL);
> +	wait_for_bit("ag7xxx", priv->regs + AG7XXX_ETH_DMA_TX_CTRL, ~0, 0,
> +		     1000, 0);
> +
> +	/* Stop the RX DMA. */
> +	writel(0, priv->regs + AG7XXX_ETH_DMA_RX_CTRL);
> +	wait_for_bit("ag7xxx", priv->regs + AG7XXX_ETH_DMA_RX_CTRL, ~0, 0,
> +		     1000, 0);
> +}
> +
> +/*
> + * Hardware setup
> + */
> +static int ag7xxx_eth_write_hwaddr(struct udevice *dev)
> +{
> +	struct eth_pdata *pdata = dev_get_platdata(dev);
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	unsigned char *mac = pdata->enetaddr;
> +	u32 macid_lo, macid_hi;
> +
> +	macid_hi = mac[3] | (mac[2] << 8) | (mac[1] << 16) | (mac[0] << 24);
> +	macid_lo = (mac[5] << 16) | (mac[4] << 24);
> +
> +	writel(macid_lo, priv->regs + AG7XXX_ETH_ADDR1);
> +	writel(macid_hi, priv->regs + AG7XXX_ETH_ADDR2);
> +
> +	return 0;
> +}
> +
> +static void ag7xxx_hw_setup(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	u32 speed;
> +
> +	setbits_be32(priv->regs + AG7XXX_ETH_CFG1,
> +		     AG7XXX_ETH_CFG1_RX_RST | AG7XXX_ETH_CFG1_TX_RST |
> +		     AG7XXX_ETH_CFG1_SOFT_RST);

explicitely using the BE variant is inconsistent because everywhere else
your are using writel/readl. You can also use setbits_32() etc. to avoid
forcing the endianess. Though it doesn't matter for the generated code
unless you enable CONFIG_SWAP_IO_SPACE.

> +
> +	mdelay(10);
> +
> +	writel(AG7XXX_ETH_CFG1_RX_EN | AG7XXX_ETH_CFG1_TX_EN,
> +	       priv->regs + AG7XXX_ETH_CFG1);
> +
> +	if (priv->interface == PHY_INTERFACE_MODE_RMII)
> +		speed = AG7XXX_ETH_CFG2_IF_10_100;
> +	else
> +		speed = AG7XXX_ETH_CFG2_IF_1000;
> +
> +	clrsetbits_be32(priv->regs + AG7XXX_ETH_CFG2,
> +			AG7XXX_ETH_CFG2_IF_SPEED_MASK,
> +			speed | AG7XXX_ETH_CFG2_PAD_CRC_EN |
> +			AG7XXX_ETH_CFG2_LEN_CHECK);
> +
> +	writel(0xfff0000, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
> +	writel(0x1fff, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
> +
> +	writel(0x1f00, priv->regs + AG7XXX_ETH_FIFO_CFG_0);
> +	setbits_be32(priv->regs + AG7XXX_ETH_FIFO_CFG_4, 0x3ffff);
> +	writel(0x10ffff, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
> +	writel(0xaaa0555, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
> +	writel(0x7eccf, priv->regs + AG7XXX_ETH_FIFO_CFG_5);
> +	writel(0x1f00140, priv->regs + AG7XXX_ETH_FIFO_CFG_3);
> +}
> +
> +static int ag7xxx_mii_get_div(void)
> +{
> +	ulong freq = get_bus_freq(0);
> +
> +	switch (freq / 1000000) {
> +	case 150:	return 0x7;
> +	case 175:	return 0x5;
> +	case 200:	return 0x4;
> +	case 210:	return 0x9;
> +	case 220:	return 0x9;
> +	default:	return 0x7;
> +	}
> +}
> +
> +static int ag7xxx_mii_setup(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int i, ret, div = ag7xxx_mii_get_div();
> +	u32 reg;
> +
> +	if (priv->model == AG7XXX_MODEL_AG933X) {
> +		/* Unit 0 is PHY-less on AR9331, see datasheet Figure 2-3 */
> +		if (priv->interface == PHY_INTERFACE_MODE_RMII)
> +			return 0;
> +	}
> +
> +	if (priv->model == AG7XXX_MODEL_AG934X) {
> +		writel(AG7XXX_ETH_MII_MGMT_CFG_RESET | 0x4,
> +		       priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
> +		writel(0x4, priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
> +		return 0;
> +	}
> +
> +	for (i = 0; i < 10; i++) {
> +		writel(AG7XXX_ETH_MII_MGMT_CFG_RESET | div,
> +		       priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
> +		writel(div, priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
> +
> +		/* Check the switch */
> +		ret = ag7xxx_switch_reg_read(priv->bus, 0x10c, &reg);
> +		if (ret)
> +			continue;
> +
> +		if (reg != 0x18007fff)
> +			continue;
> +
> +		return 0;
> +	}
> +
> +	return -EINVAL;
> +}
> +
> +static int ag933x_phy_setup_wan(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +
> +	/* Configure switch port 4 (GMAC0) */
> +	return ag7xxx_mdio_write(priv->bus, 4, 0, MII_BMCR, 0x9000);
> +}
> +
> +static int ag933x_phy_setup_lan(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int i, ret;
> +	u32 reg;
> +
> +	/* Reset the switch */
> +	ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
> +	if (ret)
> +		return ret;
> +	reg |= BIT(31);
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0, reg);
> +	if (ret)
> +		return ret;
> +
> +	do {
> +		ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
> +		if (ret)
> +			return ret;
> +	} while (reg & BIT(31));
> +
> +	/* Configure switch ports 0...3 (GMAC1) */
> +	for (i = 0; i < 4; i++) {
> +		ret = ag7xxx_mdio_write(priv->bus, 0x4, 0, MII_BMCR, 0x9000);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	/* Enable CPU port */
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x78, BIT(8));
> +	if (ret)
> +		return ret;
> +
> +	for (i = 0; i < 4; i++) {
> +		ret = ag7xxx_switch_reg_write(priv->bus, i * 0x100, BIT(9));
> +		if (ret)
> +			return ret;
> +	}
> +
> +	/* QM Control */
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x38, 0xc000050e);
> +	if (ret)
> +		return ret;
> +
> +	/* Disable Atheros header */
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x104, 0x4004);
> +	if (ret)
> +		return ret;
> +
> +	/* Tag priority mapping */
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x70, 0xfa50);
> +	if (ret)
> +		return ret;
> +
> +	/* Enable ARP packets to the CPU */
> +	ret = ag7xxx_switch_reg_read(priv->bus, 0x5c, &reg);
> +	if (ret)
> +		return ret;
> +	reg |= 0x100000;
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x5c, reg);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +
> +static int ag933x_phy_setup_reset_set(struct udevice *dev, int port)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int ret;
> +
> +	ret = ag7xxx_mdio_write(priv->bus, port, 0, MII_ADVERTISE,
> +				ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
> +				ADVERTISE_PAUSE_ASYM);
> +	if (ret)
> +		return ret;
> +
> +	if (priv->model == AG7XXX_MODEL_AG934X) {
> +		ret = ag7xxx_mdio_write(priv->bus, port, 0, MII_CTRL1000,
> +					ADVERTISE_1000FULL);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	return ag7xxx_mdio_write(priv->bus, port, 0, MII_BMCR,
> +				 BMCR_ANENABLE | BMCR_RESET);
> +}
> +
> +static int ag933x_phy_setup_reset_fin(struct udevice *dev, int port)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int ret;
> +
> +	do {
> +		ret = ag7xxx_mdio_read(priv->bus, port, 0, MII_BMCR);
> +		if (ret < 0)
> +			return ret;
> +		mdelay(10);
> +	} while (ret & BMCR_RESET);
> +
> +	return 0;
> +}
> +
> +static int ag933x_phy_setup_common(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int i, ret, phymax;
> +
> +	if (priv->model == AG7XXX_MODEL_AG933X)
> +		phymax = 4;
> +	else if (priv->model == AG7XXX_MODEL_AG934X)
> +		phymax = 5;
> +	else
> +		return -EINVAL;
> +
> +	if (priv->interface == PHY_INTERFACE_MODE_RMII) {
> +		ret = ag933x_phy_setup_reset_set(dev, phymax);
> +		if (ret)
> +			return ret;
> +
> +		ret = ag933x_phy_setup_reset_fin(dev, phymax);
> +		if (ret)
> +			return ret;
> +
> +		/* Read out link status */
> +		ret = ag7xxx_mdio_read(priv->bus, phymax, 0, 0x11);
> +		if (ret < 0)
> +			return ret;
> +
> +		return 0;
> +	}
> +
> +	/* Switch ports */
> +	for (i = 0; i < phymax; i++) {
> +		ret = ag933x_phy_setup_reset_set(dev, i);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	for (i = 0; i < phymax; i++) {
> +		ret = ag933x_phy_setup_reset_fin(dev, i);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	for (i = 0; i < phymax; i++) {
> +		/* Read out link status */
> +		ret = ag7xxx_mdio_read(priv->bus, i, 0, 0x11);
> +		if (ret < 0)
> +			return ret;
> +	}
> +
> +	return 0;
> +}
> +
> +static int ag934x_phy_setup(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int i, ret;
> +	u32 reg;
> +
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x624, 0x7f7f7f7f);
> +	if (ret)
> +		return ret;
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x10, 0x40000000);
> +	if (ret)
> +		return ret;
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x4, 0x07600000);
> +	if (ret)
> +		return ret;
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0xc, 0x01000000);
> +	if (ret)
> +		return ret;
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x7c, 0x0000007e);
> +	if (ret)
> +		return ret;
> +
> +	/* AR8327/AR8328 v1.0 fixup */
> +	ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
> +	if (ret)
> +		return ret;
> +	if ((reg & 0xffff) == 0x1201) {
> +		for (i = 0; i < 5; i++) {
> +			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1d, 0x0);
> +			if (ret)
> +				return ret;
> +			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1e, 0x02ea);
> +			if (ret)
> +				return ret;
> +			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1d, 0x3d);
> +			if (ret)
> +				return ret;
> +			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1e, 0x68a0);
> +			if (ret)
> +				return ret;
> +		}
> +	}
> +
> +	ret = ag7xxx_switch_reg_read(priv->bus, 0x66c, &reg);
> +	if (ret)
> +		return ret;
> +	reg &= ~0x70000;
> +	ret = ag7xxx_switch_reg_write(priv->bus, 0x66c, reg);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +
> +static int ag7xxx_mac_probe(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	int ret;
> +
> +	ag7xxx_hw_setup(dev);
> +	ret = ag7xxx_mii_setup(dev);
> +	if (ret)
> +		return ret;
> +
> +	ag7xxx_eth_write_hwaddr(dev);
> +
> +	if (priv->model == AG7XXX_MODEL_AG933X) {
> +		if (priv->interface == PHY_INTERFACE_MODE_RMII)
> +			ret = ag933x_phy_setup_wan(dev);
> +		else
> +			ret = ag933x_phy_setup_lan(dev);
> +	} else if (priv->model == AG7XXX_MODEL_AG934X) {
> +		ret = ag934x_phy_setup(dev);
> +	} else {
> +		return -EINVAL;
> +	}
> +
> +	if (ret)
> +		return ret;
> +
> +	return ag933x_phy_setup_common(dev);
> +}
> +
> +static int ag7xxx_mdio_probe(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	struct mii_dev *bus = mdio_alloc();
> +
> +	if (!bus) {
> +		printf("Failed to allocate MDIO bus\n");

isn't debug() better?

> +		return -ENOMEM;
> +	}
> +
> +	bus->read = ag7xxx_mdio_read;
> +	bus->write = ag7xxx_mdio_write;
> +	snprintf(bus->name, sizeof(bus->name), dev->name);
> +
> +	bus->priv = (void *)priv;
> +
> +	return mdio_register(bus);
> +}
> +
> +static int ag7xxx_get_phy_iface_offset(struct udevice *dev)
> +{
> +	int offset;
> +
> +	offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, "phy");
> +	if (offset <= 0) {
> +		debug("%s: PHY OF node not found (ret=%i)\n", __func__, offset);
> +		return -EINVAL;
> +	}
> +
> +	offset = fdt_parent_offset(gd->fdt_blob, offset);
> +	if (offset <= 0) {
> +		debug("%s: PHY OF node parent MDIO bus not found (ret=%i)\n",
> +		      __func__, offset);
> +		return -EINVAL;
> +	}
> +
> +	offset = fdt_parent_offset(gd->fdt_blob, offset);
> +	if (offset <= 0) {
> +		debug("%s: PHY MDIO OF node parent MAC not found (ret=%i)\n",
> +		      __func__, offset);
> +		return -EINVAL;
> +	}
> +
> +	return offset;
> +}
> +
> +static int ag7xxx_eth_probe(struct udevice *dev)
> +{
> +	struct eth_pdata *pdata = dev_get_platdata(dev);
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +	void __iomem *iobase, *phyiobase;
> +	int ret, phyreg;
> +
> +	/* Decoding of convoluted PHY wiring on Atheros MIPS. */
> +	ret = ag7xxx_get_phy_iface_offset(dev);
> +	if (ret <= 0)
> +		return ret;
> +	phyreg = fdtdec_get_int(gd->fdt_blob, ret, "reg", -1);
> +
> +	iobase = map_physmem(pdata->iobase, 0x200, MAP_NOCACHE);
> +	phyiobase = map_physmem(phyreg, 0x200, MAP_NOCACHE);
> +
> +	debug("%s, iobase=%p, phyiobase=%p, priv=%p\n",
> +	      __func__, iobase, phyiobase, priv);
> +	priv->regs = iobase;
> +	priv->phyregs = phyiobase;
> +	priv->interface = pdata->phy_interface;
> +	priv->model = dev_get_driver_data(dev);
> +
> +	ret = ag7xxx_mdio_probe(dev);
> +	if (ret)
> +		return ret;
> +
> +	priv->bus = miiphy_get_dev_by_name(dev->name);
> +
> +	ret = ag7xxx_mac_probe(dev);
> +	debug("%s, ret=%d\n", __func__, ret);
> +
> +	return ret;
> +}
> +
> +static int ag7xxx_eth_remove(struct udevice *dev)
> +{
> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +
> +	free(priv->phydev);
> +	mdio_unregister(priv->bus);
> +	mdio_free(priv->bus);
> +
> +	return 0;
> +}
> +
> +static const struct eth_ops ag7xxx_eth_ops = {
> +	.start			= ag7xxx_eth_start,
> +	.send			= ag7xxx_eth_send,
> +	.recv			= ag7xxx_eth_recv,
> +	.free_pkt		= ag7xxx_eth_free_pkt,
> +	.stop			= ag7xxx_eth_stop,
> +	.write_hwaddr		= ag7xxx_eth_write_hwaddr,
> +};
> +
> +static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev)
> +{
> +	struct eth_pdata *pdata = dev_get_platdata(dev);
> +	const char *phy_mode;
> +	int ret;
> +
> +	pdata->iobase = dev_get_addr(dev);
> +	pdata->phy_interface = -1;
> +
> +	/* Decoding of convoluted PHY wiring on Atheros MIPS. */
> +	ret = ag7xxx_get_phy_iface_offset(dev);
> +	if (ret <= 0)
> +		return ret;
> +
> +	phy_mode = fdt_getprop(gd->fdt_blob, ret, "phy-mode", NULL);
> +	if (phy_mode)
> +		pdata->phy_interface = phy_get_interface_by_name(phy_mode);
> +	if (pdata->phy_interface == -1) {
> +		debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static const struct udevice_id ag7xxx_eth_ids[] = {
> +	{ .compatible = "qca,ag933x-mac", .data = AG7XXX_MODEL_AG933X },
> +	{ .compatible = "qca,ag934x-mac", .data = AG7XXX_MODEL_AG934X },
> +	{ }
> +};
> +
> +U_BOOT_DRIVER(eth_ag7xxx) = {
> +	.name		= "eth_ag7xxx",
> +	.id		= UCLASS_ETH,
> +	.of_match	= ag7xxx_eth_ids,
> +	.ofdata_to_platdata = ag7xxx_eth_ofdata_to_platdata,
> +	.probe		= ag7xxx_eth_probe,
> +	.remove		= ag7xxx_eth_remove,
> +	.ops		= &ag7xxx_eth_ops,
> +	.priv_auto_alloc_size = sizeof(struct ar7xxx_eth_priv),
> +	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
> +	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
> +};
> 

-- 
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160508/8f378097/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-08 12:58 ` Daniel Schwierzeck
@ 2016-05-08 15:22   ` Marek Vasut
  2016-05-20  4:18     ` Wills Wang
  0 siblings, 1 reply; 20+ messages in thread
From: Marek Vasut @ 2016-05-08 15:22 UTC (permalink / raw)
  To: u-boot

On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:

Hi!

> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>> The driver could be easily extended to other WiSoCs.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>> Cc: Joe Hershberger <joe.hershberger@ni.com>
>> Cc: Wills Wang <wills.wang@live.com>
>> ---
>>  drivers/net/Kconfig  |   9 +
>>  drivers/net/Makefile |   1 +
>>  drivers/net/ag7xxx.c | 982 +++++++++++++++++++++++++++++++++++++++++++++++++++
>>  3 files changed, 992 insertions(+)
>>  create mode 100644 drivers/net/ag7xxx.c
> 
> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> 
> nits below

[...]

>> +static void ag7xxx_hw_setup(struct udevice *dev)
>> +{
>> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
>> +	u32 speed;
>> +
>> +	setbits_be32(priv->regs + AG7XXX_ETH_CFG1,
>> +		     AG7XXX_ETH_CFG1_RX_RST | AG7XXX_ETH_CFG1_TX_RST |
>> +		     AG7XXX_ETH_CFG1_SOFT_RST);
> 
> explicitely using the BE variant is inconsistent because everywhere else
> your are using writel/readl.

This is a BE platform, so I have to use setbits_be*() . I was under the
impression that writel()/readl() are endianness agnostic now, so it's OK
to use those, no ?

> You can also use setbits_32() etc. to avoid
> forcing the endianess. Though it doesn't matter for the generated code
> unless you enable CONFIG_SWAP_IO_SPACE.

Ha, I didn't know we now have endianness-agnostic setbits_*(), nice.

>> +
>> +	mdelay(10);
>> +
>> +	writel(AG7XXX_ETH_CFG1_RX_EN | AG7XXX_ETH_CFG1_TX_EN,
>> +	       priv->regs + AG7XXX_ETH_CFG1);
>> +
>> +	if (priv->interface == PHY_INTERFACE_MODE_RMII)
>> +		speed = AG7XXX_ETH_CFG2_IF_10_100;
>> +	else
>> +		speed = AG7XXX_ETH_CFG2_IF_1000;
>> +
>> +	clrsetbits_be32(priv->regs + AG7XXX_ETH_CFG2,
>> +			AG7XXX_ETH_CFG2_IF_SPEED_MASK,
>> +			speed | AG7XXX_ETH_CFG2_PAD_CRC_EN |
>> +			AG7XXX_ETH_CFG2_LEN_CHECK);
>> +
>> +	writel(0xfff0000, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
>> +	writel(0x1fff, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
>> +
>> +	writel(0x1f00, priv->regs + AG7XXX_ETH_FIFO_CFG_0);
>> +	setbits_be32(priv->regs + AG7XXX_ETH_FIFO_CFG_4, 0x3ffff);
>> +	writel(0x10ffff, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
>> +	writel(0xaaa0555, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
>> +	writel(0x7eccf, priv->regs + AG7XXX_ETH_FIFO_CFG_5);
>> +	writel(0x1f00140, priv->regs + AG7XXX_ETH_FIFO_CFG_3);
>> +}

[...]

>> +static int ag7xxx_mdio_probe(struct udevice *dev)
>> +{
>> +	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
>> +	struct mii_dev *bus = mdio_alloc();
>> +
>> +	if (!bus) {
>> +		printf("Failed to allocate MDIO bus\n");
> 
> isn't debug() better?

I think I will remove the printf() altogether, we ran out of memory, so
we're doomed anyway.

>> +		return -ENOMEM;
>> +	}
>> +
>> +	bus->read = ag7xxx_mdio_read;
>> +	bus->write = ag7xxx_mdio_write;
>> +	snprintf(bus->name, sizeof(bus->name), dev->name);
>> +
>> +	bus->priv = (void *)priv;
>> +
>> +	return mdio_register(bus);
>> +}

[...]

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-05 19:34 [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS Marek Vasut
  2016-05-08 12:58 ` Daniel Schwierzeck
@ 2016-05-08 21:25 ` Amit Tomer
  2016-05-08 22:09   ` Marek Vasut
  1 sibling, 1 reply; 20+ messages in thread
From: Amit Tomer @ 2016-05-08 21:25 UTC (permalink / raw)
  To: u-boot

Hello!

> +
> +#define CONFIG_TX_DESCR_NUM    8
> +#define CONFIG_RX_DESCR_NUM    8
> +#define CONFIG_ETH_BUFSIZE     2048

 Isn't it too BIG size for normal ethernet frame, unless we need Jumbo Frame ?

Thanks,
Amit.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-08 21:25 ` Amit Tomer
@ 2016-05-08 22:09   ` Marek Vasut
  0 siblings, 0 replies; 20+ messages in thread
From: Marek Vasut @ 2016-05-08 22:09 UTC (permalink / raw)
  To: u-boot

On 05/08/2016 11:25 PM, Amit Tomer wrote:
> Hello!

Hi!

>> +
>> +#define CONFIG_TX_DESCR_NUM    8
>> +#define CONFIG_RX_DESCR_NUM    8
>> +#define CONFIG_ETH_BUFSIZE     2048
> 
>  Isn't it too BIG size for normal ethernet frame, unless we need Jumbo Frame ?

It is the next larger power of two from the 1536B ethernet frame, which
has the benefit:
 - The buffers are aligned to half the page size (on this machine)
 - There is enough space of oversized packets (due to tags etc)
Jumbo frames are 9k, they are not supported by u-boot and won't fit anyway.

Given the size of DRAM on MIPS machines with this SoC, microoptimizing
here seems pointless to me.

> Thanks,
> Amit.
> 


-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-08 15:22   ` Marek Vasut
@ 2016-05-20  4:18     ` Wills Wang
  2016-05-20 11:59       ` Marek Vasut
  0 siblings, 1 reply; 20+ messages in thread
From: Wills Wang @ 2016-05-20  4:18 UTC (permalink / raw)
  To: u-boot



On 05/08/2016 11:22 PM, Marek Vasut wrote:
> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>
> Hi!
>
>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>>> The driver could be easily extended to other WiSoCs.
How to make this patch work on ar933x board?
I apply this patch on the top of mips/next branch and enable this option 
in menuconfig,
but i can't see any boot information for Ethernet.

By the way, the DT node "compatible" in driver is different from 
arch/mips/dts/ar933x.dtsi, and
the following compiling error occur because of commit 
4feefdcfe916113ac6e1837ea22857f25fe1771c:

drivers/usb/host/built-in.o: In function `ehci_usb_probe':
drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x40): undefined 
reference to `clk_get_by_index'
drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x4c): undefined 
reference to `clk_get_by_index'
drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x60): undefined 
reference to `clk_enable'
drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x68): undefined 
reference to `clk_enable'

-- 
Best Regards
Wills

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-20  4:18     ` Wills Wang
@ 2016-05-20 11:59       ` Marek Vasut
  2016-05-20 16:43         ` Wills Wang
  0 siblings, 1 reply; 20+ messages in thread
From: Marek Vasut @ 2016-05-20 11:59 UTC (permalink / raw)
  To: u-boot

On 05/20/2016 06:18 AM, Wills Wang wrote:
> 
> 
> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>
>> Hi!
>>
>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>>>> The driver could be easily extended to other WiSoCs.
> How to make this patch work on ar933x board?
> I apply this patch on the top of mips/next branch and enable this option
> in menuconfig,
> but i can't see any boot information for Ethernet.

The Kconfig conversion is not complete. See the tplink_wdr4300_defconfig
for the necessary options, it should be at least these:

CONFIG_CMD_NET=y
CONFIG_CMD_NFS=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM_ETH=y
CONFIG_AG7XXX=y

> By the way, the DT node "compatible" in driver is different from
> arch/mips/dts/ar933x.dtsi

OK, tweak that one to "qca,ag933x-mac" in the DTS.

, and
> the following compiling error occur because of commit
> 4feefdcfe916113ac6e1837ea22857f25fe1771c:

Enable CONFIG_CLK=y in your defconfig .

> drivers/usb/host/built-in.o: In function `ehci_usb_probe':
> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x40): undefined
> reference to `clk_get_by_index'
> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x4c): undefined
> reference to `clk_get_by_index'
> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x60): undefined
> reference to `clk_enable'
> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x68): undefined
> reference to `clk_enable'
> 


-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-20 11:59       ` Marek Vasut
@ 2016-05-20 16:43         ` Wills Wang
  2016-05-20 17:08           ` Marek Vasut
  0 siblings, 1 reply; 20+ messages in thread
From: Wills Wang @ 2016-05-20 16:43 UTC (permalink / raw)
  To: u-boot



On 05/20/2016 07:59 PM, Marek Vasut wrote:
> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>
>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>
>>> Hi!
>>>
>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>>>>> The driver could be easily extended to other WiSoCs.
>> How to make this patch work on ar933x board?
>> I apply this patch on the top of mips/next branch and enable this option
>> in menuconfig,
>> but i can't see any boot information for Ethernet.
> The Kconfig conversion is not complete. See the tplink_wdr4300_defconfig
> for the necessary options, it should be at least these:
>
> CONFIG_CMD_NET=y
> CONFIG_CMD_NFS=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_PING=y
> CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_DM_ETH=y
> CONFIG_AG7XXX=y
>
I add these options and boot up as the following, but my ar933x board 
don't work,
the link indicator led on router is off when plug in the cable and 
execute "dhcp" command.

U-Boot 2016.05-gfe4be7c-dirty (May 21 2016 - 00:10:47 +0800)

Atheros AR9330 rev 1
Model: AP121 Reference Board
DRAM:  64 MiB
SF: Detected W25Q64CV with page size 256 Bytes, erase size 4 KiB, total 
8 MiB, mapped at 9f000000
*** Warning - bad CRC, using default environment

In:    uart at 18020000
Out:   uart at 18020000
Err:   uart at 18020000
Net:
Warning: eth at 0x19000000 (eth0) using random MAC address - 6a:62:33:b1:0d:2e
eth0: eth at 0x19000000
Hit any key to stop autoboot:  0
ap121 # dhcp
BOOTP broadcast 1
BOOTP broadcast 2
BOOTP broadcast 3
BOOTP broadcast 4
BOOTP broadcast 5
BOOTP broadcast 6
BOOTP broadcast 7
BOOTP broadcast 8
BOOTP broadcast 9
BOOTP broadcast 10
BOOTP broadcast 11
BOOTP broadcast 12
BOOTP broadcast 13
BOOTP broadcast 14
ag7xxx: Out of TX DMA descriptors!
BOOTP broadcast 15
ag7xxx: Out of TX DMA descriptors!
BOOTP broadcast 16
ag7xxx: Out of TX DMA descriptors!
BOOTP broadcast 17
ag7xxx: Out of TX DMA descriptors!

Retry time exceeded; starting again
ap121 #

>> By the way, the DT node "compatible" in driver is different from
>> arch/mips/dts/ar933x.dtsi
> OK, tweak that one to "qca,ag933x-mac" in the DTS.
>
> , and
>> the following compiling error occur because of commit
>> 4feefdcfe916113ac6e1837ea22857f25fe1771c:
> Enable CONFIG_CLK=y in your defconfig .
>
>> drivers/usb/host/built-in.o: In function `ehci_usb_probe':
>> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x40): undefined
>> reference to `clk_get_by_index'
>> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x4c): undefined
>> reference to `clk_get_by_index'
>> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x60): undefined
>> reference to `clk_enable'
>> drivers/usb/host/ehci-generic.c:(.text.ehci_usb_probe+0x68): undefined
>> reference to `clk_enable'
>>
>

-- 
Best Regards
Wills

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-20 16:43         ` Wills Wang
@ 2016-05-20 17:08           ` Marek Vasut
  2016-05-21  3:25             ` Wills Wang
  2016-05-21 11:03             ` Wills Wang
  0 siblings, 2 replies; 20+ messages in thread
From: Marek Vasut @ 2016-05-20 17:08 UTC (permalink / raw)
  To: u-boot

On 05/20/2016 06:43 PM, Wills Wang wrote:
> 
> 
> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>
>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>
>>>> Hi!
>>>>
>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>>>>>> The driver could be easily extended to other WiSoCs.
>>> How to make this patch work on ar933x board?
>>> I apply this patch on the top of mips/next branch and enable this option
>>> in menuconfig,
>>> but i can't see any boot information for Ethernet.
>> The Kconfig conversion is not complete. See the tplink_wdr4300_defconfig
>> for the necessary options, it should be at least these:
>>
>> CONFIG_CMD_NET=y
>> CONFIG_CMD_NFS=y
>> CONFIG_CMD_DHCP=y
>> CONFIG_CMD_PING=y
>> CONFIG_NET_RANDOM_ETHADDR=y
>> CONFIG_DM_ETH=y
>> CONFIG_AG7XXX=y
>>
> I add these options and boot up as the following, but my ar933x board
> don't work,
> the link indicator led on router is off when plug in the cable and
> execute "dhcp" command.
> 

Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
I have. The ar933x is such a junk chip that I kinda gave up on it. I
also tested this on ar934x (my primary test platform) and it works.

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-20 17:08           ` Marek Vasut
@ 2016-05-21  3:25             ` Wills Wang
  2016-05-21  9:29               ` Marek Vasut
  2016-05-21 11:03             ` Wills Wang
  1 sibling, 1 reply; 20+ messages in thread
From: Wills Wang @ 2016-05-21  3:25 UTC (permalink / raw)
  To: u-boot



On 05/21/2016 01:08 AM, Marek Vasut wrote:
> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>
>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>
>>>>> Hi!
>>>>>
>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>>>>>>> The driver could be easily extended to other WiSoCs.
>>>> How to make this patch work on ar933x board?
>>>> I apply this patch on the top of mips/next branch and enable this option
>>>> in menuconfig,
>>>> but i can't see any boot information for Ethernet.
>>> The Kconfig conversion is not complete. See the tplink_wdr4300_defconfig
>>> for the necessary options, it should be at least these:
>>>
>>> CONFIG_CMD_NET=y
>>> CONFIG_CMD_NFS=y
>>> CONFIG_CMD_DHCP=y
>>> CONFIG_CMD_PING=y
>>> CONFIG_NET_RANDOM_ETHADDR=y
>>> CONFIG_DM_ETH=y
>>> CONFIG_AG7XXX=y
>>>
>> I add these options and boot up as the following, but my ar933x board
>> don't work,
>> the link indicator led on router is off when plug in the cable and
>> execute "dhcp" command.
>>
> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
> I have. The ar933x is such a junk chip that I kinda gave up on it. I
> also tested this on ar934x (my primary test platform) and it works.
>
I boot openwrt from u-boot on my ar933x board, and the ethernet driver
can't find chip build-in PHY, but it work well if boot from original 
manufacturer's
u-boot 1.14.

[    1.854519] libphy: ag71xx_mdio: probed
[    2.646539] ag71xx-mdio.1: unknown phy id 'ffff:ffff'
[    3.235778] ag71xx ag71xx.0: no PHY found with phy_mask=00000010

Do you test this situation on your ar934x platform?

-- 
Best Regards
Wills

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-21  3:25             ` Wills Wang
@ 2016-05-21  9:29               ` Marek Vasut
  2016-05-24 15:15                 ` Joe Hershberger
  0 siblings, 1 reply; 20+ messages in thread
From: Marek Vasut @ 2016-05-21  9:29 UTC (permalink / raw)
  To: u-boot

On 05/21/2016 05:25 AM, Wills Wang wrote:
> 
> 
> On 05/21/2016 01:08 AM, Marek Vasut wrote:
>> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>>
>>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>>
>>>>>> Hi!
>>>>>>
>>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS
>>>>>>>> machines.
>>>>>>>> The driver could be easily extended to other WiSoCs.
>>>>> How to make this patch work on ar933x board?
>>>>> I apply this patch on the top of mips/next branch and enable this
>>>>> option
>>>>> in menuconfig,
>>>>> but i can't see any boot information for Ethernet.
>>>> The Kconfig conversion is not complete. See the
>>>> tplink_wdr4300_defconfig
>>>> for the necessary options, it should be at least these:
>>>>
>>>> CONFIG_CMD_NET=y
>>>> CONFIG_CMD_NFS=y
>>>> CONFIG_CMD_DHCP=y
>>>> CONFIG_CMD_PING=y
>>>> CONFIG_NET_RANDOM_ETHADDR=y
>>>> CONFIG_DM_ETH=y
>>>> CONFIG_AG7XXX=y
>>>>
>>> I add these options and boot up as the following, but my ar933x board
>>> don't work,
>>> the link indicator led on router is off when plug in the cable and
>>> execute "dhcp" command.
>>>
>> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
>> I have. The ar933x is such a junk chip that I kinda gave up on it. I
>> also tested this on ar934x (my primary test platform) and it works.
>>
> I boot openwrt from u-boot on my ar933x board, and the ethernet driver
> can't find chip build-in PHY, but it work well if boot from original
> manufacturer's
> u-boot 1.14.
> 
> [    1.854519] libphy: ag71xx_mdio: probed
> [    2.646539] ag71xx-mdio.1: unknown phy id 'ffff:ffff'
> [    3.235778] ag71xx ag71xx.0: no PHY found with phy_mask=00000010
> 
> Do you test this situation on your ar934x platform?
> 
Yeah, I can boot Linux 4.4.x just fine and ethernet does work, but keep
in mind that ethernet does work for me in U-Boot as well.

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-20 17:08           ` Marek Vasut
  2016-05-21  3:25             ` Wills Wang
@ 2016-05-21 11:03             ` Wills Wang
  2016-05-21 11:37               ` Marek Vasut
  1 sibling, 1 reply; 20+ messages in thread
From: Wills Wang @ 2016-05-21 11:03 UTC (permalink / raw)
  To: u-boot



On 05/21/2016 01:08 AM, Marek Vasut wrote:
> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>
>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>
>>>>> Hi!
>>>>>
>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>>>>>>> The driver could be easily extended to other WiSoCs.
>>>> How to make this patch work on ar933x board?
>>>> I apply this patch on the top of mips/next branch and enable this option
>>>> in menuconfig,
>>>> but i can't see any boot information for Ethernet.
>>> The Kconfig conversion is not complete. See the tplink_wdr4300_defconfig
>>> for the necessary options, it should be at least these:
>>>
>>> CONFIG_CMD_NET=y
>>> CONFIG_CMD_NFS=y
>>> CONFIG_CMD_DHCP=y
>>> CONFIG_CMD_PING=y
>>> CONFIG_NET_RANDOM_ETHADDR=y
>>> CONFIG_DM_ETH=y
>>> CONFIG_AG7XXX=y
>>>
>> I add these options and boot up as the following, but my ar933x board
>> don't work,
>> the link indicator led on router is off when plug in the cable and
>> execute "dhcp" command.
>>
> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
> I have. The ar933x is such a junk chip that I kinda gave up on it. I
> also tested this on ar934x (my primary test platform) and it works.
>
I have fixed this issue, a patch will be sent later on.

u-boot:
ap121 # dhcp
BOOTP broadcast 1
DHCP client bound to address 192.168.42.172 (3 ms)
*** Warning: no boot file name; using 'AC2AA8C0.img'
Using eth at 0x19000000 device
TFTP from server 192.168.42.250; our IP address is 192.168.42.172
Filename 'AC2AA8C0.img'.
Load address: 0x81000000

openwrt:
[    0.861533] libphy: ag71xx_mdio: probed
[    1.445996] ag71xx-mdio.1: Found an AR7240/AR9330 built-in switch
[    1.478056] eth0: Atheros AG71xx at 0xba000000, irq 5, mode:GMII
[    2.066210] ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.1:04 
[uid=004dd041, driver=Generic PHY]
[    2.074979] eth1: Atheros AG71xx at 0xb9000000, irq 4, mode:MII

-- 
Best Regards
Wills

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-21 11:03             ` Wills Wang
@ 2016-05-21 11:37               ` Marek Vasut
  0 siblings, 0 replies; 20+ messages in thread
From: Marek Vasut @ 2016-05-21 11:37 UTC (permalink / raw)
  To: u-boot

On 05/21/2016 01:03 PM, Wills Wang wrote:
> 
> 
> On 05/21/2016 01:08 AM, Marek Vasut wrote:
>> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>>
>>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>>
>>>>>> Hi!
>>>>>>
>>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS
>>>>>>>> machines.
>>>>>>>> The driver could be easily extended to other WiSoCs.
>>>>> How to make this patch work on ar933x board?
>>>>> I apply this patch on the top of mips/next branch and enable this
>>>>> option
>>>>> in menuconfig,
>>>>> but i can't see any boot information for Ethernet.
>>>> The Kconfig conversion is not complete. See the
>>>> tplink_wdr4300_defconfig
>>>> for the necessary options, it should be at least these:
>>>>
>>>> CONFIG_CMD_NET=y
>>>> CONFIG_CMD_NFS=y
>>>> CONFIG_CMD_DHCP=y
>>>> CONFIG_CMD_PING=y
>>>> CONFIG_NET_RANDOM_ETHADDR=y
>>>> CONFIG_DM_ETH=y
>>>> CONFIG_AG7XXX=y
>>>>
>>> I add these options and boot up as the following, but my ar933x board
>>> don't work,
>>> the link indicator led on router is off when plug in the cable and
>>> execute "dhcp" command.
>>>
>> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
>> I have. The ar933x is such a junk chip that I kinda gave up on it. I
>> also tested this on ar934x (my primary test platform) and it works.
>>
> I have fixed this issue, a patch will be sent later on.

Cool, thanks!

> u-boot:
> ap121 # dhcp
> BOOTP broadcast 1
> DHCP client bound to address 192.168.42.172 (3 ms)
> *** Warning: no boot file name; using 'AC2AA8C0.img'
> Using eth at 0x19000000 device
> TFTP from server 192.168.42.250; our IP address is 192.168.42.172
> Filename 'AC2AA8C0.img'.
> Load address: 0x81000000
> 
> openwrt:

btw. it's Linux here, not openwrt.

> [    0.861533] libphy: ag71xx_mdio: probed
> [    1.445996] ag71xx-mdio.1: Found an AR7240/AR9330 built-in switch
> [    1.478056] eth0: Atheros AG71xx at 0xba000000, irq 5, mode:GMII
> [    2.066210] ag71xx ag71xx.0: connected to PHY at ag71xx-mdio.1:04
> [uid=004dd041, driver=Generic PHY]
> [    2.074979] eth1: Atheros AG71xx at 0xb9000000, irq 4, mode:MII
> 


-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-21  9:29               ` Marek Vasut
@ 2016-05-24 15:15                 ` Joe Hershberger
  2016-05-24 15:17                   ` Marek Vasut
  0 siblings, 1 reply; 20+ messages in thread
From: Joe Hershberger @ 2016-05-24 15:15 UTC (permalink / raw)
  To: u-boot

Hi Marek,

On Sat, May 21, 2016 at 4:29 AM, Marek Vasut <marex@denx.de> wrote:
> On 05/21/2016 05:25 AM, Wills Wang wrote:
>>
>>
>> On 05/21/2016 01:08 AM, Marek Vasut wrote:
>>> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>>>
>>>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>>>
>>>>>>> Hi!
>>>>>>>
>>>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS
>>>>>>>>> machines.
>>>>>>>>> The driver could be easily extended to other WiSoCs.
>>>>>> How to make this patch work on ar933x board?
>>>>>> I apply this patch on the top of mips/next branch and enable this
>>>>>> option
>>>>>> in menuconfig,
>>>>>> but i can't see any boot information for Ethernet.
>>>>> The Kconfig conversion is not complete. See the
>>>>> tplink_wdr4300_defconfig
>>>>> for the necessary options, it should be at least these:
>>>>>
>>>>> CONFIG_CMD_NET=y
>>>>> CONFIG_CMD_NFS=y
>>>>> CONFIG_CMD_DHCP=y
>>>>> CONFIG_CMD_PING=y
>>>>> CONFIG_NET_RANDOM_ETHADDR=y
>>>>> CONFIG_DM_ETH=y
>>>>> CONFIG_AG7XXX=y
>>>>>
>>>> I add these options and boot up as the following, but my ar933x board
>>>> don't work,
>>>> the link indicator led on router is off when plug in the cable and
>>>> execute "dhcp" command.
>>>>
>>> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
>>> I have. The ar933x is such a junk chip that I kinda gave up on it. I
>>> also tested this on ar934x (my primary test platform) and it works.
>>>
>> I boot openwrt from u-boot on my ar933x board, and the ethernet driver
>> can't find chip build-in PHY, but it work well if boot from original
>> manufacturer's
>> u-boot 1.14.
>>
>> [    1.854519] libphy: ag71xx_mdio: probed
>> [    2.646539] ag71xx-mdio.1: unknown phy id 'ffff:ffff'
>> [    3.235778] ag71xx ag71xx.0: no PHY found with phy_mask=00000010
>>
>> Do you test this situation on your ar934x platform?
>>
> Yeah, I can boot Linux 4.4.x just fine and ethernet does work, but keep
> in mind that ethernet does work for me in U-Boot as well.

Are you planning to send a v2?

Thanks,
-Joe

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-24 15:15                 ` Joe Hershberger
@ 2016-05-24 15:17                   ` Marek Vasut
  2016-05-24 15:22                     ` Marek Vasut
  0 siblings, 1 reply; 20+ messages in thread
From: Marek Vasut @ 2016-05-24 15:17 UTC (permalink / raw)
  To: u-boot

On 05/24/2016 05:15 PM, Joe Hershberger wrote:
> Hi Marek,
> 
> On Sat, May 21, 2016 at 4:29 AM, Marek Vasut <marex@denx.de> wrote:
>> On 05/21/2016 05:25 AM, Wills Wang wrote:
>>>
>>>
>>> On 05/21/2016 01:08 AM, Marek Vasut wrote:
>>>> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>>>>
>>>>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>>>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>>>>
>>>>>>>> Hi!
>>>>>>>>
>>>>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS
>>>>>>>>>> machines.
>>>>>>>>>> The driver could be easily extended to other WiSoCs.
>>>>>>> How to make this patch work on ar933x board?
>>>>>>> I apply this patch on the top of mips/next branch and enable this
>>>>>>> option
>>>>>>> in menuconfig,
>>>>>>> but i can't see any boot information for Ethernet.
>>>>>> The Kconfig conversion is not complete. See the
>>>>>> tplink_wdr4300_defconfig
>>>>>> for the necessary options, it should be at least these:
>>>>>>
>>>>>> CONFIG_CMD_NET=y
>>>>>> CONFIG_CMD_NFS=y
>>>>>> CONFIG_CMD_DHCP=y
>>>>>> CONFIG_CMD_PING=y
>>>>>> CONFIG_NET_RANDOM_ETHADDR=y
>>>>>> CONFIG_DM_ETH=y
>>>>>> CONFIG_AG7XXX=y
>>>>>>
>>>>> I add these options and boot up as the following, but my ar933x board
>>>>> don't work,
>>>>> the link indicator led on router is off when plug in the cable and
>>>>> execute "dhcp" command.
>>>>>
>>>> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
>>>> I have. The ar933x is such a junk chip that I kinda gave up on it. I
>>>> also tested this on ar934x (my primary test platform) and it works.
>>>>
>>> I boot openwrt from u-boot on my ar933x board, and the ethernet driver
>>> can't find chip build-in PHY, but it work well if boot from original
>>> manufacturer's
>>> u-boot 1.14.
>>>
>>> [    1.854519] libphy: ag71xx_mdio: probed
>>> [    2.646539] ag71xx-mdio.1: unknown phy id 'ffff:ffff'
>>> [    3.235778] ag71xx ag71xx.0: no PHY found with phy_mask=00000010
>>>
>>> Do you test this situation on your ar934x platform?
>>>
>> Yeah, I can boot Linux 4.4.x just fine and ethernet does work, but keep
>> in mind that ethernet does work for me in U-Boot as well.
> 
> Are you planning to send a v2?

I think Wills sent a subsequent patch which fixes DT for him, so feel
free to pick this one and his fixes.

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-24 15:17                   ` Marek Vasut
@ 2016-05-24 15:22                     ` Marek Vasut
  0 siblings, 0 replies; 20+ messages in thread
From: Marek Vasut @ 2016-05-24 15:22 UTC (permalink / raw)
  To: u-boot

On 05/24/2016 05:17 PM, Marek Vasut wrote:
> On 05/24/2016 05:15 PM, Joe Hershberger wrote:
>> Hi Marek,
>>
>> On Sat, May 21, 2016 at 4:29 AM, Marek Vasut <marex@denx.de> wrote:
>>> On 05/21/2016 05:25 AM, Wills Wang wrote:
>>>>
>>>>
>>>> On 05/21/2016 01:08 AM, Marek Vasut wrote:
>>>>> On 05/20/2016 06:43 PM, Wills Wang wrote:
>>>>>>
>>>>>> On 05/20/2016 07:59 PM, Marek Vasut wrote:
>>>>>>> On 05/20/2016 06:18 AM, Wills Wang wrote:
>>>>>>>> On 05/08/2016 11:22 PM, Marek Vasut wrote:
>>>>>>>>> On 05/08/2016 02:58 PM, Daniel Schwierzeck wrote:
>>>>>>>>>
>>>>>>>>> Hi!
>>>>>>>>>
>>>>>>>>>> Am 05.05.2016 um 21:34 schrieb Marek Vasut:
>>>>>>>>>>> Add ethernet driver for the AR933x and AR934x Atheros MIPS
>>>>>>>>>>> machines.
>>>>>>>>>>> The driver could be easily extended to other WiSoCs.
>>>>>>>> How to make this patch work on ar933x board?
>>>>>>>> I apply this patch on the top of mips/next branch and enable this
>>>>>>>> option
>>>>>>>> in menuconfig,
>>>>>>>> but i can't see any boot information for Ethernet.
>>>>>>> The Kconfig conversion is not complete. See the
>>>>>>> tplink_wdr4300_defconfig
>>>>>>> for the necessary options, it should be at least these:
>>>>>>>
>>>>>>> CONFIG_CMD_NET=y
>>>>>>> CONFIG_CMD_NFS=y
>>>>>>> CONFIG_CMD_DHCP=y
>>>>>>> CONFIG_CMD_PING=y
>>>>>>> CONFIG_NET_RANDOM_ETHADDR=y
>>>>>>> CONFIG_DM_ETH=y
>>>>>>> CONFIG_AG7XXX=y
>>>>>>>
>>>>>> I add these options and boot up as the following, but my ar933x board
>>>>>> don't work,
>>>>>> the link indicator led on router is off when plug in the cable and
>>>>>> execute "dhcp" command.
>>>>>>
>>>>> Hrm, I have no idea, sorry, you'd have to dive in. It works on the board
>>>>> I have. The ar933x is such a junk chip that I kinda gave up on it. I
>>>>> also tested this on ar934x (my primary test platform) and it works.
>>>>>
>>>> I boot openwrt from u-boot on my ar933x board, and the ethernet driver
>>>> can't find chip build-in PHY, but it work well if boot from original
>>>> manufacturer's
>>>> u-boot 1.14.
>>>>
>>>> [    1.854519] libphy: ag71xx_mdio: probed
>>>> [    2.646539] ag71xx-mdio.1: unknown phy id 'ffff:ffff'
>>>> [    3.235778] ag71xx ag71xx.0: no PHY found with phy_mask=00000010
>>>>
>>>> Do you test this situation on your ar934x platform?
>>>>
>>> Yeah, I can boot Linux 4.4.x just fine and ethernet does work, but keep
>>> in mind that ethernet does work for me in U-Boot as well.
>>
>> Are you planning to send a v2?
> 
> I think Wills sent a subsequent patch which fixes DT for him, so feel
> free to pick this one and his fixes.
> 
Oh oops, I have a V2 lined up, so I will send that now. Sorry.

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2017-06-08 15:04 ` Joe Hershberger
@ 2017-06-09  9:02   ` Marek Vasut
  0 siblings, 0 replies; 20+ messages in thread
From: Marek Vasut @ 2017-06-09  9:02 UTC (permalink / raw)
  To: u-boot

On 06/08/2017 05:04 PM, Joe Hershberger wrote:
> Hi Marek,

Hi!

> I was looking at something else and noticed what looks like an issue
> with this code you submitted.
> 
> On Tue, May 24, 2016 at 4:29 PM, Marek Vasut <marex@denx.de> wrote:
>> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
>> The driver could be easily extended to other WiSoCs.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>> Cc: Joe Hershberger <joe.hershberger@ni.com>
>> Cc: Wills Wang <wills.wang@live.com>
>> ---
>> V2: - Drop the printf() in case malloc fails, it's pointless to try
>>       and print something if we cannot allocate memory, since printf
>>       also allocates memory.
>> V3: - Replace magic 0x11 with MII_MIPSCR register
>> ---
> 
> [...] SNIP
> 
>> +static u16 ag7xxx_mdio_rw(struct mii_dev *bus, int addr, int reg, u32 val)
> 
> Returns a u16
> 
>> +{
>> +       u32 data;
>> +
>> +       /* Dummy read followed by PHY read/write command. */
>> +       ag7xxx_switch_reg_read(bus, 0x98, &data);
>> +       data = val | (reg << 16) | (addr << 21) | BIT(30) | BIT(31);
>> +       ag7xxx_switch_reg_write(bus, 0x98, data);
>> +
>> +       /* Wait for operation to finish */
>> +       do {
>> +               ag7xxx_switch_reg_read(bus, 0x98, &data);
>> +       } while (data & BIT(31));
>> +
>> +       return data & 0xffff;
>> +}
>> +
>> +static int ag7xxx_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
>> +{
>> +       return ag7xxx_mdio_rw(bus, addr, reg, BIT(27));
> 
> Directly returns said u16 as an int.
> 
>> +}
>> +
>> +static int ag7xxx_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
>> +                            u16 val)
>> +{
>> +       ag7xxx_mdio_rw(bus, addr, reg, val);
>> +       return 0;
>> +}
> 
> [...] SNIP
> 
>> +static int ag933x_phy_setup_common(struct udevice *dev)
>> +{
>> +       struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
>> +       int i, ret, phymax;
>> +
>> +       if (priv->model == AG7XXX_MODEL_AG933X)
>> +               phymax = 4;
>> +       else if (priv->model == AG7XXX_MODEL_AG934X)
>> +               phymax = 5;
>> +       else
>> +               return -EINVAL;
>> +
>> +       if (priv->interface == PHY_INTERFACE_MODE_RMII) {
>> +               ret = ag933x_phy_setup_reset_set(dev, phymax);
>> +               if (ret)
>> +                       return ret;
>> +
>> +               ret = ag933x_phy_setup_reset_fin(dev, phymax);
>> +               if (ret)
>> +                       return ret;
>> +
>> +               /* Read out link status */
>> +               ret = ag7xxx_mdio_read(priv->bus, phymax, 0, MII_MIPSCR);
> 
> Read the link status, which can never be negative.

Can you send a patch for this ?

> Another issue: Is MII_MIPSCR really the register name? It's not better
> than "17" - constants should mean something, just just be a random
> name with the right value.

Can you check the AR9331 or AR9344 datasheet ? It should be there,
although they tend to be cryptic.

>> +               if (ret < 0)
>> +                       return ret;
>> +
>> +               return 0;
> 
> Return 0 unconditionally. Presumably you want to actually check the
> link status to be something specific if you bother to read it out.

Actually, I think this is only for the switch ports, so we don't care
about the link status.

>> +       }
>> +
>> +       /* Switch ports */
>> +       for (i = 0; i < phymax; i++) {
>> +               ret = ag933x_phy_setup_reset_set(dev, i);
>> +               if (ret)
>> +                       return ret;
>> +       }
>> +
>> +       for (i = 0; i < phymax; i++) {
>> +               ret = ag933x_phy_setup_reset_fin(dev, i);
>> +               if (ret)
>> +                       return ret;
>> +       }
>> +
>> +       for (i = 0; i < phymax; i++) {
>> +               /* Read out link status */
>> +               ret = ag7xxx_mdio_read(priv->bus, i, 0, MII_MIPSCR);
> 
> Same thing here.
> 
>> +               if (ret < 0)
>> +                       return ret;
>> +       }
>> +
>> +       return 0;
>> +}


-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-24 21:29 Marek Vasut
  2016-05-30 10:05 ` Daniel Schwierzeck
@ 2017-06-08 15:04 ` Joe Hershberger
  2017-06-09  9:02   ` Marek Vasut
  1 sibling, 1 reply; 20+ messages in thread
From: Joe Hershberger @ 2017-06-08 15:04 UTC (permalink / raw)
  To: u-boot

Hi Marek,

I was looking at something else and noticed what looks like an issue
with this code you submitted.

On Tue, May 24, 2016 at 4:29 PM, Marek Vasut <marex@denx.de> wrote:
> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
> The driver could be easily extended to other WiSoCs.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Wills Wang <wills.wang@live.com>
> ---
> V2: - Drop the printf() in case malloc fails, it's pointless to try
>       and print something if we cannot allocate memory, since printf
>       also allocates memory.
> V3: - Replace magic 0x11 with MII_MIPSCR register
> ---

[...] SNIP

> +static u16 ag7xxx_mdio_rw(struct mii_dev *bus, int addr, int reg, u32 val)

Returns a u16

> +{
> +       u32 data;
> +
> +       /* Dummy read followed by PHY read/write command. */
> +       ag7xxx_switch_reg_read(bus, 0x98, &data);
> +       data = val | (reg << 16) | (addr << 21) | BIT(30) | BIT(31);
> +       ag7xxx_switch_reg_write(bus, 0x98, data);
> +
> +       /* Wait for operation to finish */
> +       do {
> +               ag7xxx_switch_reg_read(bus, 0x98, &data);
> +       } while (data & BIT(31));
> +
> +       return data & 0xffff;
> +}
> +
> +static int ag7xxx_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
> +{
> +       return ag7xxx_mdio_rw(bus, addr, reg, BIT(27));

Directly returns said u16 as an int.

> +}
> +
> +static int ag7xxx_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
> +                            u16 val)
> +{
> +       ag7xxx_mdio_rw(bus, addr, reg, val);
> +       return 0;
> +}

[...] SNIP

> +static int ag933x_phy_setup_common(struct udevice *dev)
> +{
> +       struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
> +       int i, ret, phymax;
> +
> +       if (priv->model == AG7XXX_MODEL_AG933X)
> +               phymax = 4;
> +       else if (priv->model == AG7XXX_MODEL_AG934X)
> +               phymax = 5;
> +       else
> +               return -EINVAL;
> +
> +       if (priv->interface == PHY_INTERFACE_MODE_RMII) {
> +               ret = ag933x_phy_setup_reset_set(dev, phymax);
> +               if (ret)
> +                       return ret;
> +
> +               ret = ag933x_phy_setup_reset_fin(dev, phymax);
> +               if (ret)
> +                       return ret;
> +
> +               /* Read out link status */
> +               ret = ag7xxx_mdio_read(priv->bus, phymax, 0, MII_MIPSCR);

Read the link status, which can never be negative.

Another issue: Is MII_MIPSCR really the register name? It's not better
than "17" - constants should mean something, just just be a random
name with the right value.

> +               if (ret < 0)
> +                       return ret;
> +
> +               return 0;

Return 0 unconditionally. Presumably you want to actually check the
link status to be something specific if you bother to read it out.

> +       }
> +
> +       /* Switch ports */
> +       for (i = 0; i < phymax; i++) {
> +               ret = ag933x_phy_setup_reset_set(dev, i);
> +               if (ret)
> +                       return ret;
> +       }
> +
> +       for (i = 0; i < phymax; i++) {
> +               ret = ag933x_phy_setup_reset_fin(dev, i);
> +               if (ret)
> +                       return ret;
> +       }
> +
> +       for (i = 0; i < phymax; i++) {
> +               /* Read out link status */
> +               ret = ag7xxx_mdio_read(priv->bus, i, 0, MII_MIPSCR);

Same thing here.

> +               if (ret < 0)
> +                       return ret;
> +       }
> +
> +       return 0;
> +}

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
  2016-05-24 21:29 Marek Vasut
@ 2016-05-30 10:05 ` Daniel Schwierzeck
  2017-06-08 15:04 ` Joe Hershberger
  1 sibling, 0 replies; 20+ messages in thread
From: Daniel Schwierzeck @ 2016-05-30 10:05 UTC (permalink / raw)
  To: u-boot



Am 24.05.2016 um 23:29 schrieb Marek Vasut:
> Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
> The driver could be easily extended to other WiSoCs.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Wills Wang <wills.wang@live.com>
> ---
> V2: - Drop the printf() in case malloc fails, it's pointless to try
>       and print something if we cannot allocate memory, since printf
>       also allocates memory.
> V3: - Replace magic 0x11 with MII_MIPSCR register
> ---
>  drivers/net/Kconfig  |   9 +
>  drivers/net/Makefile |   1 +
>  drivers/net/ag7xxx.c | 980 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 990 insertions(+)
>  create mode 100644 drivers/net/ag7xxx.c
> 

applied to u-boot-mips, thanks.

-- 
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/97cad8f4/attachment.sig>

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS
@ 2016-05-24 21:29 Marek Vasut
  2016-05-30 10:05 ` Daniel Schwierzeck
  2017-06-08 15:04 ` Joe Hershberger
  0 siblings, 2 replies; 20+ messages in thread
From: Marek Vasut @ 2016-05-24 21:29 UTC (permalink / raw)
  To: u-boot

Add ethernet driver for the AR933x and AR934x Atheros MIPS machines.
The driver could be easily extended to other WiSoCs.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Wills Wang <wills.wang@live.com>
---
V2: - Drop the printf() in case malloc fails, it's pointless to try
      and print something if we cannot allocate memory, since printf
      also allocates memory.
V3: - Replace magic 0x11 with MII_MIPSCR register
---
 drivers/net/Kconfig  |   9 +
 drivers/net/Makefile |   1 +
 drivers/net/ag7xxx.c | 980 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 990 insertions(+)
 create mode 100644 drivers/net/ag7xxx.c

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 91b7690..00f151f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -46,6 +46,15 @@ menuconfig NETDEVICES
 
 if NETDEVICES
 
+config AG7XXX
+	bool "Atheros AG7xxx Ethernet MAC support"
+	depends on DM_ETH
+	select PHYLIB
+	help
+	  This driver supports the Atheros AG7xxx Ethernet MAC. This MAC is
+	  present in the Atheros AR7xxx, AR9xxx and QCA9xxx MIPS chips.
+
+
 config ALTERA_TSE
 	bool "Altera Triple-Speed Ethernet MAC support"
 	depends on DM_ETH
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fbedd04..55d56a0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -7,6 +7,7 @@
 
 obj-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
 obj-$(CONFIG_ALTERA_TSE) += altera_tse.o
+obj-$(CONFIG_AG7XXX) += ag7xxx.o
 obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o
 obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o
 obj-$(CONFIG_DRIVER_AX88180) += ax88180.o
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
new file mode 100644
index 0000000..346f138
--- /dev/null
+++ b/drivers/net/ag7xxx.c
@@ -0,0 +1,980 @@
+/*
+ * Atheros AR71xx / AR9xxx GMAC driver
+ *
+ * Copyright (C) 2016 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <miiphy.h>
+#include <malloc.h>
+#include <linux/compiler.h>
+#include <linux/err.h>
+#include <linux/mii.h>
+#include <wait_bit.h>
+#include <asm/io.h>
+
+#include <mach/ath79.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+enum ag7xxx_model {
+	AG7XXX_MODEL_AG933X,
+	AG7XXX_MODEL_AG934X,
+};
+
+#define AG7XXX_ETH_CFG1				0x00
+#define AG7XXX_ETH_CFG1_SOFT_RST		BIT(31)
+#define AG7XXX_ETH_CFG1_RX_RST			BIT(19)
+#define AG7XXX_ETH_CFG1_TX_RST			BIT(18)
+#define AG7XXX_ETH_CFG1_LOOPBACK		BIT(8)
+#define AG7XXX_ETH_CFG1_RX_EN			BIT(2)
+#define AG7XXX_ETH_CFG1_TX_EN			BIT(0)
+
+#define AG7XXX_ETH_CFG2				0x04
+#define AG7XXX_ETH_CFG2_IF_1000			BIT(9)
+#define AG7XXX_ETH_CFG2_IF_10_100		BIT(8)
+#define AG7XXX_ETH_CFG2_IF_SPEED_MASK		(3 << 8)
+#define AG7XXX_ETH_CFG2_HUGE_FRAME_EN		BIT(5)
+#define AG7XXX_ETH_CFG2_LEN_CHECK		BIT(4)
+#define AG7XXX_ETH_CFG2_PAD_CRC_EN		BIT(2)
+#define AG7XXX_ETH_CFG2_FDX			BIT(0)
+
+#define AG7XXX_ETH_MII_MGMT_CFG			0x20
+#define AG7XXX_ETH_MII_MGMT_CFG_RESET		BIT(31)
+
+#define AG7XXX_ETH_MII_MGMT_CMD			0x24
+#define AG7XXX_ETH_MII_MGMT_CMD_READ		0x1
+
+#define AG7XXX_ETH_MII_MGMT_ADDRESS		0x28
+#define AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT	8
+
+#define AG7XXX_ETH_MII_MGMT_CTRL		0x2c
+
+#define AG7XXX_ETH_MII_MGMT_STATUS		0x30
+
+#define AG7XXX_ETH_MII_MGMT_IND			0x34
+#define AG7XXX_ETH_MII_MGMT_IND_INVALID		BIT(2)
+#define AG7XXX_ETH_MII_MGMT_IND_BUSY		BIT(0)
+
+#define AG7XXX_ETH_ADDR1			0x40
+#define AG7XXX_ETH_ADDR2			0x44
+
+#define AG7XXX_ETH_FIFO_CFG_0			0x48
+#define AG7XXX_ETH_FIFO_CFG_1			0x4c
+#define AG7XXX_ETH_FIFO_CFG_2			0x50
+#define AG7XXX_ETH_FIFO_CFG_3			0x54
+#define AG7XXX_ETH_FIFO_CFG_4			0x58
+#define AG7XXX_ETH_FIFO_CFG_5			0x5c
+
+#define AG7XXX_ETH_DMA_TX_CTRL			0x180
+#define AG7XXX_ETH_DMA_TX_CTRL_TXE		BIT(0)
+
+#define AG7XXX_ETH_DMA_TX_DESC			0x184
+
+#define AG7XXX_ETH_DMA_TX_STATUS		0x188
+
+#define AG7XXX_ETH_DMA_RX_CTRL			0x18c
+#define AG7XXX_ETH_DMA_RX_CTRL_RXE		BIT(0)
+
+#define AG7XXX_ETH_DMA_RX_DESC			0x190
+
+#define AG7XXX_ETH_DMA_RX_STATUS		0x194
+
+/* Custom register@0x18070000 */
+#define AG7XXX_GMAC_ETH_CFG			0x00
+#define AG7XXX_ETH_CFG_SW_PHY_ADDR_SWAP		BIT(8)
+#define AG7XXX_ETH_CFG_SW_PHY_SWAP		BIT(7)
+#define AG7XXX_ETH_CFG_SW_ONLY_MODE		BIT(6)
+#define AG7XXX_ETH_CFG_GE0_ERR_EN		BIT(5)
+#define AG7XXX_ETH_CFG_MII_GE0_SLAVE		BIT(4)
+#define AG7XXX_ETH_CFG_MII_GE0_MASTER		BIT(3)
+#define AG7XXX_ETH_CFG_GMII_GE0			BIT(2)
+#define AG7XXX_ETH_CFG_MII_GE0			BIT(1)
+#define AG7XXX_ETH_CFG_RGMII_GE0		BIT(0)
+
+#define CONFIG_TX_DESCR_NUM	8
+#define CONFIG_RX_DESCR_NUM	8
+#define CONFIG_ETH_BUFSIZE	2048
+#define TX_TOTAL_BUFSIZE	(CONFIG_ETH_BUFSIZE * CONFIG_TX_DESCR_NUM)
+#define RX_TOTAL_BUFSIZE	(CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM)
+
+/* DMA descriptor. */
+struct ag7xxx_dma_desc {
+	u32	data_addr;
+#define AG7XXX_DMADESC_IS_EMPTY			BIT(31)
+#define AG7XXX_DMADESC_FTPP_OVERRIDE_OFFSET	16
+#define AG7XXX_DMADESC_PKT_SIZE_OFFSET		0
+#define AG7XXX_DMADESC_PKT_SIZE_MASK		0xfff
+	u32	config;
+	u32	next_desc;
+	u32	_pad[5];
+};
+
+struct ar7xxx_eth_priv {
+	struct ag7xxx_dma_desc	tx_mac_descrtable[CONFIG_TX_DESCR_NUM];
+	struct ag7xxx_dma_desc	rx_mac_descrtable[CONFIG_RX_DESCR_NUM];
+	char		txbuffs[TX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
+	char		rxbuffs[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
+
+	void __iomem		*regs;
+	void __iomem		*phyregs;
+
+	struct eth_device	*dev;
+	struct phy_device	*phydev;
+	struct mii_dev		*bus;
+
+	u32			interface;
+	u32			tx_currdescnum;
+	u32			rx_currdescnum;
+	enum ag7xxx_model	model;
+};
+
+/*
+ * Switch and MDIO access
+ */
+static int ag7xxx_switch_read(struct mii_dev *bus, int addr, int reg, u16 *val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	void __iomem *regs = priv->phyregs;
+	int ret;
+
+	writel(0x0, regs + AG7XXX_ETH_MII_MGMT_CMD);
+	writel((addr << AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT) | reg,
+	       regs + AG7XXX_ETH_MII_MGMT_ADDRESS);
+	writel(AG7XXX_ETH_MII_MGMT_CMD_READ,
+	       regs + AG7XXX_ETH_MII_MGMT_CMD);
+
+	ret = wait_for_bit("ag7xxx", regs + AG7XXX_ETH_MII_MGMT_IND,
+			   AG7XXX_ETH_MII_MGMT_IND_BUSY, 0, 1000, 0);
+	if (ret)
+		return ret;
+
+	*val = readl(regs + AG7XXX_ETH_MII_MGMT_STATUS) & 0xffff;
+	writel(0x0, regs + AG7XXX_ETH_MII_MGMT_CMD);
+
+	return 0;
+}
+
+static int ag7xxx_switch_write(struct mii_dev *bus, int addr, int reg, u16 val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	void __iomem *regs = priv->phyregs;
+	int ret;
+
+	writel((addr << AG7XXX_ETH_MII_MGMT_ADDRESS_SHIFT) | reg,
+	       regs + AG7XXX_ETH_MII_MGMT_ADDRESS);
+	writel(val, regs + AG7XXX_ETH_MII_MGMT_CTRL);
+
+	ret = wait_for_bit("ag7xxx", regs + AG7XXX_ETH_MII_MGMT_IND,
+			   AG7XXX_ETH_MII_MGMT_IND_BUSY, 0, 1000, 0);
+
+	return ret;
+}
+
+static int ag7xxx_switch_reg_read(struct mii_dev *bus, int reg, u32 *val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	u32 phy_addr;
+	u32 reg_addr;
+	u32 phy_temp;
+	u32 reg_temp;
+	u16 rv = 0;
+	int ret;
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		phy_addr = 0x1f;
+		reg_addr = 0x10;
+	} else if (priv->model == AG7XXX_MODEL_AG934X) {
+		phy_addr = 0x18;
+		reg_addr = 0x00;
+	} else
+		return -EINVAL;
+
+	ret = ag7xxx_switch_write(bus, phy_addr, reg_addr, reg >> 9);
+	if (ret)
+		return ret;
+
+	phy_temp = ((reg >> 6) & 0x7) | 0x10;
+	reg_temp = (reg >> 1) & 0x1e;
+	*val = 0;
+
+	ret = ag7xxx_switch_read(bus, phy_temp, reg_temp | 0, &rv);
+	if (ret < 0)
+		return ret;
+	*val |= rv;
+
+	ret = ag7xxx_switch_read(bus, phy_temp, reg_temp | 1, &rv);
+	if (ret < 0)
+		return ret;
+	*val |= (rv << 16);
+
+	return 0;
+}
+
+static int ag7xxx_switch_reg_write(struct mii_dev *bus, int reg, u32 val)
+{
+	struct ar7xxx_eth_priv *priv = bus->priv;
+	u32 phy_addr;
+	u32 reg_addr;
+	u32 phy_temp;
+	u32 reg_temp;
+	int ret;
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		phy_addr = 0x1f;
+		reg_addr = 0x10;
+	} else if (priv->model == AG7XXX_MODEL_AG934X) {
+		phy_addr = 0x18;
+		reg_addr = 0x00;
+	} else
+		return -EINVAL;
+
+	ret = ag7xxx_switch_write(bus, phy_addr, reg_addr, reg >> 9);
+	if (ret)
+		return ret;
+
+	phy_temp = ((reg >> 6) & 0x7) | 0x10;
+	reg_temp = (reg >> 1) & 0x1e;
+
+	/*
+	 * The switch on AR933x has some special register behavior, which
+	 * expects particular write order of their nibbles:
+	 *   0x40 ..... MSB first, LSB second
+	 *   0x50 ..... MSB first, LSB second
+	 *   0x98 ..... LSB first, MSB second
+	 *   others ... don't care
+	 */
+	if ((priv->model == AG7XXX_MODEL_AG933X) && (reg == 0x98)) {
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 0, val & 0xffff);
+		if (ret < 0)
+			return ret;
+
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 1, val >> 16);
+		if (ret < 0)
+			return ret;
+	} else {
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 1, val >> 16);
+		if (ret < 0)
+			return ret;
+
+		ret = ag7xxx_switch_write(bus, phy_temp, reg_temp | 0, val & 0xffff);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static u16 ag7xxx_mdio_rw(struct mii_dev *bus, int addr, int reg, u32 val)
+{
+	u32 data;
+
+	/* Dummy read followed by PHY read/write command. */
+	ag7xxx_switch_reg_read(bus, 0x98, &data);
+	data = val | (reg << 16) | (addr << 21) | BIT(30) | BIT(31);
+	ag7xxx_switch_reg_write(bus, 0x98, data);
+
+	/* Wait for operation to finish */
+	do {
+		ag7xxx_switch_reg_read(bus, 0x98, &data);
+	} while (data & BIT(31));
+
+	return data & 0xffff;
+}
+
+static int ag7xxx_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
+{
+	return ag7xxx_mdio_rw(bus, addr, reg, BIT(27));
+}
+
+static int ag7xxx_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
+			     u16 val)
+{
+	ag7xxx_mdio_rw(bus, addr, reg, val);
+	return 0;
+}
+
+/*
+ * DMA ring handlers
+ */
+static void ag7xxx_dma_clean_tx(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr, *next;
+	u32 start, end;
+	int i;
+
+	for (i = 0; i < CONFIG_TX_DESCR_NUM; i++) {
+		curr = &priv->tx_mac_descrtable[i];
+		next = &priv->tx_mac_descrtable[(i + 1) % CONFIG_TX_DESCR_NUM];
+
+		curr->data_addr = virt_to_phys(&priv->txbuffs[i * CONFIG_ETH_BUFSIZE]);
+		curr->config = AG7XXX_DMADESC_IS_EMPTY;
+		curr->next_desc = virt_to_phys(next);
+	}
+
+	priv->tx_currdescnum = 0;
+
+	/* Cache: Flush descriptors, don't care about buffers. */
+	start = (u32)(&priv->tx_mac_descrtable[0]);
+	end = start + sizeof(priv->tx_mac_descrtable);
+	flush_dcache_range(start, end);
+}
+
+static void ag7xxx_dma_clean_rx(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr, *next;
+	u32 start, end;
+	int i;
+
+	for (i = 0; i < CONFIG_RX_DESCR_NUM; i++) {
+		curr = &priv->rx_mac_descrtable[i];
+		next = &priv->rx_mac_descrtable[(i + 1) % CONFIG_RX_DESCR_NUM];
+
+		curr->data_addr = virt_to_phys(&priv->rxbuffs[i * CONFIG_ETH_BUFSIZE]);
+		curr->config = AG7XXX_DMADESC_IS_EMPTY;
+		curr->next_desc = virt_to_phys(next);
+	}
+
+	priv->rx_currdescnum = 0;
+
+	/* Cache: Flush+Invalidate descriptors, Invalidate buffers. */
+	start = (u32)(&priv->rx_mac_descrtable[0]);
+	end = start + sizeof(priv->rx_mac_descrtable);
+	flush_dcache_range(start, end);
+	invalidate_dcache_range(start, end);
+
+	start = (u32)&priv->rxbuffs;
+	end = start + sizeof(priv->rxbuffs);
+	invalidate_dcache_range(start, end);
+}
+
+/*
+ * Ethernet I/O
+ */
+static int ag7xxx_eth_send(struct udevice *dev, void *packet, int length)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr;
+	u32 start, end;
+
+	curr = &priv->tx_mac_descrtable[priv->tx_currdescnum];
+
+	/* Cache: Invalidate descriptor. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	invalidate_dcache_range(start, end);
+
+	if (!(curr->config & AG7XXX_DMADESC_IS_EMPTY)) {
+		printf("ag7xxx: Out of TX DMA descriptors!\n");
+		return -EPERM;
+	}
+
+	/* Copy the packet into the data buffer. */
+	memcpy(phys_to_virt(curr->data_addr), packet, length);
+	curr->config = length & AG7XXX_DMADESC_PKT_SIZE_MASK;
+
+	/* Cache: Flush descriptor, Flush buffer. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	flush_dcache_range(start, end);
+	start = (u32)phys_to_virt(curr->data_addr);
+	end = start + length;
+	flush_dcache_range(start, end);
+
+	/* Load the DMA descriptor and start TX DMA. */
+	writel(AG7XXX_ETH_DMA_TX_CTRL_TXE,
+	       priv->regs + AG7XXX_ETH_DMA_TX_CTRL);
+
+	/* Switch to next TX descriptor. */
+	priv->tx_currdescnum = (priv->tx_currdescnum + 1) % CONFIG_TX_DESCR_NUM;
+
+	return 0;
+}
+
+static int ag7xxx_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr;
+	u32 start, end, length;
+
+	curr = &priv->rx_mac_descrtable[priv->rx_currdescnum];
+
+	/* Cache: Invalidate descriptor. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	invalidate_dcache_range(start, end);
+
+	/* No packets received. */
+	if (curr->config & AG7XXX_DMADESC_IS_EMPTY)
+		return -EAGAIN;
+
+	length = curr->config & AG7XXX_DMADESC_PKT_SIZE_MASK;
+
+	/* Cache: Invalidate buffer. */
+	start = (u32)phys_to_virt(curr->data_addr);
+	end = start + length;
+	invalidate_dcache_range(start, end);
+
+	/* Receive one packet and return length. */
+	*packetp = phys_to_virt(curr->data_addr);
+	return length;
+}
+
+static int ag7xxx_eth_free_pkt(struct udevice *dev, uchar *packet,
+				   int length)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct ag7xxx_dma_desc *curr;
+	u32 start, end;
+
+	curr = &priv->rx_mac_descrtable[priv->rx_currdescnum];
+
+	curr->config = AG7XXX_DMADESC_IS_EMPTY;
+
+	/* Cache: Flush descriptor. */
+	start = (u32)curr;
+	end = start + sizeof(*curr);
+	flush_dcache_range(start, end);
+
+	/* Switch to next RX descriptor. */
+	priv->rx_currdescnum = (priv->rx_currdescnum + 1) % CONFIG_RX_DESCR_NUM;
+
+	return 0;
+}
+
+static int ag7xxx_eth_start(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	/* FIXME: Check if link up */
+
+	/* Clear the DMA rings. */
+	ag7xxx_dma_clean_tx(dev);
+	ag7xxx_dma_clean_rx(dev);
+
+	/* Load DMA descriptors and start the RX DMA. */
+	writel(virt_to_phys(&priv->tx_mac_descrtable[priv->tx_currdescnum]),
+	       priv->regs + AG7XXX_ETH_DMA_TX_DESC);
+	writel(virt_to_phys(&priv->rx_mac_descrtable[priv->rx_currdescnum]),
+	       priv->regs + AG7XXX_ETH_DMA_RX_DESC);
+	writel(AG7XXX_ETH_DMA_RX_CTRL_RXE,
+	       priv->regs + AG7XXX_ETH_DMA_RX_CTRL);
+
+	return 0;
+}
+
+static void ag7xxx_eth_stop(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	/* Stop the TX DMA. */
+	writel(0, priv->regs + AG7XXX_ETH_DMA_TX_CTRL);
+	wait_for_bit("ag7xxx", priv->regs + AG7XXX_ETH_DMA_TX_CTRL, ~0, 0,
+		     1000, 0);
+
+	/* Stop the RX DMA. */
+	writel(0, priv->regs + AG7XXX_ETH_DMA_RX_CTRL);
+	wait_for_bit("ag7xxx", priv->regs + AG7XXX_ETH_DMA_RX_CTRL, ~0, 0,
+		     1000, 0);
+}
+
+/*
+ * Hardware setup
+ */
+static int ag7xxx_eth_write_hwaddr(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	unsigned char *mac = pdata->enetaddr;
+	u32 macid_lo, macid_hi;
+
+	macid_hi = mac[3] | (mac[2] << 8) | (mac[1] << 16) | (mac[0] << 24);
+	macid_lo = (mac[5] << 16) | (mac[4] << 24);
+
+	writel(macid_lo, priv->regs + AG7XXX_ETH_ADDR1);
+	writel(macid_hi, priv->regs + AG7XXX_ETH_ADDR2);
+
+	return 0;
+}
+
+static void ag7xxx_hw_setup(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	u32 speed;
+
+	setbits_be32(priv->regs + AG7XXX_ETH_CFG1,
+		     AG7XXX_ETH_CFG1_RX_RST | AG7XXX_ETH_CFG1_TX_RST |
+		     AG7XXX_ETH_CFG1_SOFT_RST);
+
+	mdelay(10);
+
+	writel(AG7XXX_ETH_CFG1_RX_EN | AG7XXX_ETH_CFG1_TX_EN,
+	       priv->regs + AG7XXX_ETH_CFG1);
+
+	if (priv->interface == PHY_INTERFACE_MODE_RMII)
+		speed = AG7XXX_ETH_CFG2_IF_10_100;
+	else
+		speed = AG7XXX_ETH_CFG2_IF_1000;
+
+	clrsetbits_be32(priv->regs + AG7XXX_ETH_CFG2,
+			AG7XXX_ETH_CFG2_IF_SPEED_MASK,
+			speed | AG7XXX_ETH_CFG2_PAD_CRC_EN |
+			AG7XXX_ETH_CFG2_LEN_CHECK);
+
+	writel(0xfff0000, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
+	writel(0x1fff, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
+
+	writel(0x1f00, priv->regs + AG7XXX_ETH_FIFO_CFG_0);
+	setbits_be32(priv->regs + AG7XXX_ETH_FIFO_CFG_4, 0x3ffff);
+	writel(0x10ffff, priv->regs + AG7XXX_ETH_FIFO_CFG_1);
+	writel(0xaaa0555, priv->regs + AG7XXX_ETH_FIFO_CFG_2);
+	writel(0x7eccf, priv->regs + AG7XXX_ETH_FIFO_CFG_5);
+	writel(0x1f00140, priv->regs + AG7XXX_ETH_FIFO_CFG_3);
+}
+
+static int ag7xxx_mii_get_div(void)
+{
+	ulong freq = get_bus_freq(0);
+
+	switch (freq / 1000000) {
+	case 150:	return 0x7;
+	case 175:	return 0x5;
+	case 200:	return 0x4;
+	case 210:	return 0x9;
+	case 220:	return 0x9;
+	default:	return 0x7;
+	}
+}
+
+static int ag7xxx_mii_setup(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret, div = ag7xxx_mii_get_div();
+	u32 reg;
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		/* Unit 0 is PHY-less on AR9331, see datasheet Figure 2-3 */
+		if (priv->interface == PHY_INTERFACE_MODE_RMII)
+			return 0;
+	}
+
+	if (priv->model == AG7XXX_MODEL_AG934X) {
+		writel(AG7XXX_ETH_MII_MGMT_CFG_RESET | 0x4,
+		       priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+		writel(0x4, priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+		return 0;
+	}
+
+	for (i = 0; i < 10; i++) {
+		writel(AG7XXX_ETH_MII_MGMT_CFG_RESET | div,
+		       priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+		writel(div, priv->regs + AG7XXX_ETH_MII_MGMT_CFG);
+
+		/* Check the switch */
+		ret = ag7xxx_switch_reg_read(priv->bus, 0x10c, &reg);
+		if (ret)
+			continue;
+
+		if (reg != 0x18007fff)
+			continue;
+
+		return 0;
+	}
+
+	return -EINVAL;
+}
+
+static int ag933x_phy_setup_wan(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	/* Configure switch port 4 (GMAC0) */
+	return ag7xxx_mdio_write(priv->bus, 4, 0, MII_BMCR, 0x9000);
+}
+
+static int ag933x_phy_setup_lan(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret;
+	u32 reg;
+
+	/* Reset the switch */
+	ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
+	if (ret)
+		return ret;
+	reg |= BIT(31);
+	ret = ag7xxx_switch_reg_write(priv->bus, 0, reg);
+	if (ret)
+		return ret;
+
+	do {
+		ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
+		if (ret)
+			return ret;
+	} while (reg & BIT(31));
+
+	/* Configure switch ports 0...3 (GMAC1) */
+	for (i = 0; i < 4; i++) {
+		ret = ag7xxx_mdio_write(priv->bus, 0x4, 0, MII_BMCR, 0x9000);
+		if (ret)
+			return ret;
+	}
+
+	/* Enable CPU port */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x78, BIT(8));
+	if (ret)
+		return ret;
+
+	for (i = 0; i < 4; i++) {
+		ret = ag7xxx_switch_reg_write(priv->bus, i * 0x100, BIT(9));
+		if (ret)
+			return ret;
+	}
+
+	/* QM Control */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x38, 0xc000050e);
+	if (ret)
+		return ret;
+
+	/* Disable Atheros header */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x104, 0x4004);
+	if (ret)
+		return ret;
+
+	/* Tag priority mapping */
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x70, 0xfa50);
+	if (ret)
+		return ret;
+
+	/* Enable ARP packets to the CPU */
+	ret = ag7xxx_switch_reg_read(priv->bus, 0x5c, &reg);
+	if (ret)
+		return ret;
+	reg |= 0x100000;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x5c, reg);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int ag933x_phy_setup_reset_set(struct udevice *dev, int port)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	ret = ag7xxx_mdio_write(priv->bus, port, 0, MII_ADVERTISE,
+				ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
+				ADVERTISE_PAUSE_ASYM);
+	if (ret)
+		return ret;
+
+	if (priv->model == AG7XXX_MODEL_AG934X) {
+		ret = ag7xxx_mdio_write(priv->bus, port, 0, MII_CTRL1000,
+					ADVERTISE_1000FULL);
+		if (ret)
+			return ret;
+	}
+
+	return ag7xxx_mdio_write(priv->bus, port, 0, MII_BMCR,
+				 BMCR_ANENABLE | BMCR_RESET);
+}
+
+static int ag933x_phy_setup_reset_fin(struct udevice *dev, int port)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	do {
+		ret = ag7xxx_mdio_read(priv->bus, port, 0, MII_BMCR);
+		if (ret < 0)
+			return ret;
+		mdelay(10);
+	} while (ret & BMCR_RESET);
+
+	return 0;
+}
+
+static int ag933x_phy_setup_common(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret, phymax;
+
+	if (priv->model == AG7XXX_MODEL_AG933X)
+		phymax = 4;
+	else if (priv->model == AG7XXX_MODEL_AG934X)
+		phymax = 5;
+	else
+		return -EINVAL;
+
+	if (priv->interface == PHY_INTERFACE_MODE_RMII) {
+		ret = ag933x_phy_setup_reset_set(dev, phymax);
+		if (ret)
+			return ret;
+
+		ret = ag933x_phy_setup_reset_fin(dev, phymax);
+		if (ret)
+			return ret;
+
+		/* Read out link status */
+		ret = ag7xxx_mdio_read(priv->bus, phymax, 0, MII_MIPSCR);
+		if (ret < 0)
+			return ret;
+
+		return 0;
+	}
+
+	/* Switch ports */
+	for (i = 0; i < phymax; i++) {
+		ret = ag933x_phy_setup_reset_set(dev, i);
+		if (ret)
+			return ret;
+	}
+
+	for (i = 0; i < phymax; i++) {
+		ret = ag933x_phy_setup_reset_fin(dev, i);
+		if (ret)
+			return ret;
+	}
+
+	for (i = 0; i < phymax; i++) {
+		/* Read out link status */
+		ret = ag7xxx_mdio_read(priv->bus, i, 0, MII_MIPSCR);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int ag934x_phy_setup(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int i, ret;
+	u32 reg;
+
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x624, 0x7f7f7f7f);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x10, 0x40000000);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x4, 0x07600000);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0xc, 0x01000000);
+	if (ret)
+		return ret;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x7c, 0x0000007e);
+	if (ret)
+		return ret;
+
+	/* AR8327/AR8328 v1.0 fixup */
+	ret = ag7xxx_switch_reg_read(priv->bus, 0, &reg);
+	if (ret)
+		return ret;
+	if ((reg & 0xffff) == 0x1201) {
+		for (i = 0; i < 5; i++) {
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1d, 0x0);
+			if (ret)
+				return ret;
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1e, 0x02ea);
+			if (ret)
+				return ret;
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1d, 0x3d);
+			if (ret)
+				return ret;
+			ret = ag7xxx_mdio_write(priv->bus, i, 0, 0x1e, 0x68a0);
+			if (ret)
+				return ret;
+		}
+	}
+
+	ret = ag7xxx_switch_reg_read(priv->bus, 0x66c, &reg);
+	if (ret)
+		return ret;
+	reg &= ~0x70000;
+	ret = ag7xxx_switch_reg_write(priv->bus, 0x66c, reg);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static int ag7xxx_mac_probe(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	int ret;
+
+	ag7xxx_hw_setup(dev);
+	ret = ag7xxx_mii_setup(dev);
+	if (ret)
+		return ret;
+
+	ag7xxx_eth_write_hwaddr(dev);
+
+	if (priv->model == AG7XXX_MODEL_AG933X) {
+		if (priv->interface == PHY_INTERFACE_MODE_RMII)
+			ret = ag933x_phy_setup_wan(dev);
+		else
+			ret = ag933x_phy_setup_lan(dev);
+	} else if (priv->model == AG7XXX_MODEL_AG934X) {
+		ret = ag934x_phy_setup(dev);
+	} else {
+		return -EINVAL;
+	}
+
+	if (ret)
+		return ret;
+
+	return ag933x_phy_setup_common(dev);
+}
+
+static int ag7xxx_mdio_probe(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	struct mii_dev *bus = mdio_alloc();
+
+	if (!bus)
+		return -ENOMEM;
+
+	bus->read = ag7xxx_mdio_read;
+	bus->write = ag7xxx_mdio_write;
+	snprintf(bus->name, sizeof(bus->name), dev->name);
+
+	bus->priv = (void *)priv;
+
+	return mdio_register(bus);
+}
+
+static int ag7xxx_get_phy_iface_offset(struct udevice *dev)
+{
+	int offset;
+
+	offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, "phy");
+	if (offset <= 0) {
+		debug("%s: PHY OF node not found (ret=%i)\n", __func__, offset);
+		return -EINVAL;
+	}
+
+	offset = fdt_parent_offset(gd->fdt_blob, offset);
+	if (offset <= 0) {
+		debug("%s: PHY OF node parent MDIO bus not found (ret=%i)\n",
+		      __func__, offset);
+		return -EINVAL;
+	}
+
+	offset = fdt_parent_offset(gd->fdt_blob, offset);
+	if (offset <= 0) {
+		debug("%s: PHY MDIO OF node parent MAC not found (ret=%i)\n",
+		      __func__, offset);
+		return -EINVAL;
+	}
+
+	return offset;
+}
+
+static int ag7xxx_eth_probe(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+	void __iomem *iobase, *phyiobase;
+	int ret, phyreg;
+
+	/* Decoding of convoluted PHY wiring on Atheros MIPS. */
+	ret = ag7xxx_get_phy_iface_offset(dev);
+	if (ret <= 0)
+		return ret;
+	phyreg = fdtdec_get_int(gd->fdt_blob, ret, "reg", -1);
+
+	iobase = map_physmem(pdata->iobase, 0x200, MAP_NOCACHE);
+	phyiobase = map_physmem(phyreg, 0x200, MAP_NOCACHE);
+
+	debug("%s, iobase=%p, phyiobase=%p, priv=%p\n",
+	      __func__, iobase, phyiobase, priv);
+	priv->regs = iobase;
+	priv->phyregs = phyiobase;
+	priv->interface = pdata->phy_interface;
+	priv->model = dev_get_driver_data(dev);
+
+	ret = ag7xxx_mdio_probe(dev);
+	if (ret)
+		return ret;
+
+	priv->bus = miiphy_get_dev_by_name(dev->name);
+
+	ret = ag7xxx_mac_probe(dev);
+	debug("%s, ret=%d\n", __func__, ret);
+
+	return ret;
+}
+
+static int ag7xxx_eth_remove(struct udevice *dev)
+{
+	struct ar7xxx_eth_priv *priv = dev_get_priv(dev);
+
+	free(priv->phydev);
+	mdio_unregister(priv->bus);
+	mdio_free(priv->bus);
+
+	return 0;
+}
+
+static const struct eth_ops ag7xxx_eth_ops = {
+	.start			= ag7xxx_eth_start,
+	.send			= ag7xxx_eth_send,
+	.recv			= ag7xxx_eth_recv,
+	.free_pkt		= ag7xxx_eth_free_pkt,
+	.stop			= ag7xxx_eth_stop,
+	.write_hwaddr		= ag7xxx_eth_write_hwaddr,
+};
+
+static int ag7xxx_eth_ofdata_to_platdata(struct udevice *dev)
+{
+	struct eth_pdata *pdata = dev_get_platdata(dev);
+	const char *phy_mode;
+	int ret;
+
+	pdata->iobase = dev_get_addr(dev);
+	pdata->phy_interface = -1;
+
+	/* Decoding of convoluted PHY wiring on Atheros MIPS. */
+	ret = ag7xxx_get_phy_iface_offset(dev);
+	if (ret <= 0)
+		return ret;
+
+	phy_mode = fdt_getprop(gd->fdt_blob, ret, "phy-mode", NULL);
+	if (phy_mode)
+		pdata->phy_interface = phy_get_interface_by_name(phy_mode);
+	if (pdata->phy_interface == -1) {
+		debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static const struct udevice_id ag7xxx_eth_ids[] = {
+	{ .compatible = "qca,ag933x-mac", .data = AG7XXX_MODEL_AG933X },
+	{ .compatible = "qca,ag934x-mac", .data = AG7XXX_MODEL_AG934X },
+	{ }
+};
+
+U_BOOT_DRIVER(eth_ag7xxx) = {
+	.name		= "eth_ag7xxx",
+	.id		= UCLASS_ETH,
+	.of_match	= ag7xxx_eth_ids,
+	.ofdata_to_platdata = ag7xxx_eth_ofdata_to_platdata,
+	.probe		= ag7xxx_eth_probe,
+	.remove		= ag7xxx_eth_remove,
+	.ops		= &ag7xxx_eth_ops,
+	.priv_auto_alloc_size = sizeof(struct ar7xxx_eth_priv),
+	.platdata_auto_alloc_size = sizeof(struct eth_pdata),
+	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
+};
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2017-06-09  9:02 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-05 19:34 [U-Boot] [PATCH] net: Add ag7xxx driver for Atheros MIPS Marek Vasut
2016-05-08 12:58 ` Daniel Schwierzeck
2016-05-08 15:22   ` Marek Vasut
2016-05-20  4:18     ` Wills Wang
2016-05-20 11:59       ` Marek Vasut
2016-05-20 16:43         ` Wills Wang
2016-05-20 17:08           ` Marek Vasut
2016-05-21  3:25             ` Wills Wang
2016-05-21  9:29               ` Marek Vasut
2016-05-24 15:15                 ` Joe Hershberger
2016-05-24 15:17                   ` Marek Vasut
2016-05-24 15:22                     ` Marek Vasut
2016-05-21 11:03             ` Wills Wang
2016-05-21 11:37               ` Marek Vasut
2016-05-08 21:25 ` Amit Tomer
2016-05-08 22:09   ` Marek Vasut
2016-05-24 21:29 Marek Vasut
2016-05-30 10:05 ` Daniel Schwierzeck
2017-06-08 15:04 ` Joe Hershberger
2017-06-09  9:02   ` Marek Vasut

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.