[PATCH 0/3] Ethernet support for Raspberry Pi 4
This series adds Ethernet support for the Raspberry Pi 4. The SoC includes a "Broadcom Genet v5 MAC" IP, connected as a proper platform device (no USB anymore!). Patch 1 provides a driver for that. There does not seem to be publicly available documentation, so this is based on the Linux driver, but stripped down to just provide what U-Boot needs. Patch 2 fixes up the RPi4 memory map to accommodate the MMIO area the MAC lives in, while patch 3 enables it in the respective defconfigs.
Compared to the RFC post from Friday this is now fully functional, although there are some minor issues left (sometimes unstable initialisation, weird behaviour on repeated tftp gets (though it works), PHY startup not properly timing out, (unjustified?) cache complaints on 32-bit).
Please have a look and test it, I hope this helps to simplify development, as you spare the SD card and its slot from heavy swapping.
This tries to address the review comments on the RFC post (mostly my own ;-), I put a branch on [1] showing what was changed over the original post.
Cheers, Andre.
P.S.: Since Amit will be busy this week, I took the freedom of fixing this up and posting this (with his permission).
[1] https://github.com/apritzel/u-boot/commits/rpi4-eth
Amit Singh Tomar (3): net: Add support for Broadcom GENETv5 Ethernet controller rpi4: Update memory map to accommodate scb devices rpi4: Enable GENET Ethernet controller
arch/arm/mach-bcm283x/init.c | 6 +- configs/rpi_4_32b_defconfig | 2 + configs/rpi_4_defconfig | 2 + configs/rpi_arm64_defconfig | 1 + drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++ 7 files changed, 718 insertions(+), 3 deletions(-) create mode 100644 drivers/net/bcmgenet.c
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com --- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 142a2c6953..999714dd39 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -136,6 +136,13 @@ config BCM6368_ETH help This driver supports the BCM6368 Ethernet MAC.
+config BCMGENET + bool "BCMGENET V5 support" + depends on DM_ETH + select PHYLIB + help + This driver supports the BCMGENET Ethernet MAC. + config DWC_ETH_QOS bool "Synopsys DWC Ethernet QOS device support" depends on DM_ETH diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 30991834ec..6e0a68834d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_AG7XXX) += ag7xxx.o obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o obj-$(CONFIG_BCM6348_ETH) += bcm6348-eth.o obj-$(CONFIG_BCM6368_ETH) += bcm6368-eth.o +obj-$(CONFIG_BCMGENET) += bcmgenet.o obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o obj-$(CONFIG_DRIVER_AX88180) += ax88180.o obj-$(CONFIG_BCM_SF2_ETH) += bcm-sf2-eth.o diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c new file mode 100644 index 0000000000..24b025d804 --- /dev/null +++ b/drivers/net/bcmgenet.c @@ -0,0 +1,702 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Amit Singh Tomar amittomer25@gmail.com + * + * Driver for Broadcom GENETv5 Ethernet controller (as found on the RPi4) + * This driver is based on the Linux driver: + * drivers/net/ethernet/broadcom/genet/bcmgenet.c + * which is: Copyright (c) 2014-2017 Broadcom + * + * The hardware supports multiple queues (16 priority queues and one + * default queue), both for RX and TX. There are 256 DMA descriptors (both + * for TX and RX), and they live in MMIO registers. The hardware allows + * assigning descriptor ranges to queues, but we choose the most simple setup: + * All 256 descriptors are assigned to the default queue (#16). + * Also the Linux driver supports multiple generations of the MAC, whereas + * we only support v5, as used in the Raspberry Pi 4. + */ + +#include <asm/io.h> +#include <clk.h> +#include <cpu_func.h> +#include <dm.h> +#include <fdt_support.h> +#include <linux/err.h> +#include <malloc.h> +#include <miiphy.h> +#include <net.h> +#include <dm/of_access.h> +#include <dm/ofnode.h> +#include <linux/libfdt.h> +#include <linux/iopoll.h> +#include <asm/dma-mapping.h> +#include <wait_bit.h> + +/* Register definitions derived from Linux source */ +#define SYS_REV_CTRL 0x00 + +#define SYS_PORT_CTRL 0x04 +#define PORT_MODE_EXT_GPHY 3 + +#define GENET_SYS_OFF 0x0000 +#define SYS_RBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x08) +#define SYS_TBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x0c) + +#define GENET_EXT_OFF 0x0080 +#define EXT_RGMII_OOB_CTRL (GENET_EXT_OFF + 0x0c) +#define RGMII_LINK BIT(4) +#define OOB_DISABLE BIT(5) +#define RGMII_MODE_EN BIT(6) +#define ID_MODE_DIS BIT(16) + +#define GENET_RBUF_OFF 0x0300 +#define RBUF_TBUF_SIZE_CTRL (GENET_RBUF_OFF + 0xb4) +#define RBUF_CTRL (GENET_RBUF_OFF + 0x00) +#define RBUF_ALIGN_2B BIT(1) + +#define GENET_UMAC_OFF 0x0800 +#define UMAC_MIB_CTRL (GENET_UMAC_OFF + 0x580) +#define UMAC_MAX_FRAME_LEN (GENET_UMAC_OFF + 0x014) +#define UMAC_MAC0 (GENET_UMAC_OFF + 0x00c) +#define UMAC_MAC1 (GENET_UMAC_OFF + 0x010) +#define UMAC_CMD (GENET_UMAC_OFF + 0x008) +#define MDIO_CMD (GENET_UMAC_OFF + 0x614) +#define UMAC_TX_FLUSH (GENET_UMAC_OFF + 0x334) +#define MDIO_START_BUSY BIT(29) +#define MDIO_READ_FAIL BIT(28) +#define MDIO_RD (2 << 26) +#define MDIO_WR BIT(26) +#define MDIO_PMD_SHIFT 21 +#define MDIO_PMD_MASK 0x1f +#define MDIO_REG_SHIFT 16 +#define MDIO_REG_MASK 0x1f + +#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1) +#define UMAC_SPEED_10 0 +#define UMAC_SPEED_100 1 +#define UMAC_SPEED_1000 2 +#define UMAC_SPEED_2500 3 +#define CMD_SPEED_SHIFT 2 +#define CMD_SPEED_MASK 3 +#define CMD_SW_RESET BIT(13) +#define CMD_LCL_LOOP_EN BIT(15) +#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1) + +#define MIB_RESET_RX BIT(0) +#define MIB_RESET_RUNT BIT(1) +#define MIB_RESET_TX BIT(2) + +/* total number of Buffer Descriptors, same for Rx/Tx */ +#define TOTAL_DESCS 256 +#define RX_DESCS TOTAL_DESCS +#define TX_DESCS TOTAL_DESCS + +#define DEFAULT_Q 0x10 + +/* Body(1500) + EH_SIZE(14) + VLANTAG(4) + BRCMTAG(6) + FCS(4) = 1528. + * 1536 is multiple of 256 bytes + */ +#define ENET_BRCM_TAG_LEN 6 +#define ENET_PAD 8 +#define ENET_MAX_MTU_SIZE (ETH_DATA_LEN + ETH_HLEN + \ + VLAN_HLEN + ENET_BRCM_TAG_LEN + \ + ETH_FCS_LEN + ENET_PAD) + +/* Tx/Rx Dma Descriptor common bits */ +#define DMA_EN BIT(0) +#define DMA_RING_BUF_EN_SHIFT 0x01 +#define DMA_RING_BUF_EN_MASK 0xffff +#define DMA_BUFLENGTH_MASK 0x0fff +#define DMA_BUFLENGTH_SHIFT 16 +#define DMA_RING_SIZE_SHIFT 16 +#define DMA_OWN 0x8000 +#define DMA_EOP 0x4000 +#define DMA_SOP 0x2000 +#define DMA_WRAP 0x1000 +#define DMA_MAX_BURST_LENGTH 0x8 +/* Tx specific DMA descriptor bits */ +#define DMA_TX_UNDERRUN 0x0200 +#define DMA_TX_APPEND_CRC 0x0040 +#define DMA_TX_OW_CRC 0x0020 +#define DMA_TX_DO_CSUM 0x0010 +#define DMA_TX_QTAG_SHIFT 7 + +/* DMA rings size */ +#define DMA_RING_SIZE 0x40 +#define DMA_RINGS_SIZE (DMA_RING_SIZE * (DEFAULT_Q + 1)) + +/* DMA descriptor */ +#define DMA_DESC_LENGTH_STATUS 0x00 +#define DMA_DESC_ADDRESS_LO 0x04 +#define DMA_DESC_ADDRESS_HI 0x08 +#define DMA_DESC_SIZE 12 + +#define GENET_RX_OFF 0x2000 +#define GENET_RDMA_REG_OFF \ + (GENET_RX_OFF + TOTAL_DESCS * DMA_DESC_SIZE) +#define GENET_TX_OFF 0x4000 +#define GENET_TDMA_REG_OFF \ + (GENET_TX_OFF + TOTAL_DESCS * DMA_DESC_SIZE) + +#define DMA_FC_THRESH_HI (RX_DESCS >> 4) +#define DMA_FC_THRESH_LO 5 +#define DMA_FC_THRESH_VALUE ((DMA_FC_THRESH_LO << 16) | \ + DMA_FC_THRESH_HI) + +#define DMA_XOFF_THRESHOLD_SHIFT 16 + +#define TDMA_RING_REG_BASE \ + (GENET_TDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE) +#define TDMA_READ_PTR (TDMA_RING_REG_BASE + 0x00) +#define TDMA_CONS_INDEX (TDMA_RING_REG_BASE + 0x08) +#define TDMA_PROD_INDEX (TDMA_RING_REG_BASE + 0x0c) +#define DMA_RING_BUF_SIZE 0x10 +#define DMA_START_ADDR 0x14 +#define DMA_END_ADDR 0x1c +#define DMA_MBUF_DONE_THRESH 0x24 +#define TDMA_FLOW_PERIOD (TDMA_RING_REG_BASE + 0x28) +#define TDMA_WRITE_PTR (TDMA_RING_REG_BASE + 0x2c) + +#define RDMA_RING_REG_BASE \ + (GENET_RDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE) +#define RDMA_WRITE_PTR (RDMA_RING_REG_BASE + 0x00) +#define RDMA_PROD_INDEX (RDMA_RING_REG_BASE + 0x08) +#define RDMA_CONS_INDEX (RDMA_RING_REG_BASE + 0x0c) +#define RDMA_XON_XOFF_THRESH (RDMA_RING_REG_BASE + 0x28) +#define RDMA_READ_PTR (RDMA_RING_REG_BASE + 0x2c) + +#define TDMA_REG_BASE (GENET_TDMA_REG_OFF + DMA_RINGS_SIZE) +#define RDMA_REG_BASE (GENET_RDMA_REG_OFF + DMA_RINGS_SIZE) +#define DMA_RING_CFG 0x00 +#define DMA_CTRL 0x04 +#define DMA_SCB_BURST_SIZE 0x0c + +#define RX_BUF_LENGTH 2048 +#define RX_TOTAL_BUFSIZE (RX_BUF_LENGTH * RX_DESCS) +#define RX_BUF_OFFSET 2 + +DECLARE_GLOBAL_DATA_PTR; + +struct bcmgenet_eth_priv { + void *mac_reg; + char rxbuffer[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN); + void *tx_desc_base; + void *rx_desc_base; + int tx_index; + int rx_index; + int c_index; + int phyaddr; + u32 interface; + u32 speed; + struct phy_device *phydev; + struct mii_dev *bus; +}; + +static void bcmgenet_umac_reset(struct bcmgenet_eth_priv *priv) +{ + u32 reg; + + reg = readl(priv->mac_reg + SYS_RBUF_FLUSH_CTRL); + reg |= BIT(1); + writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL)); + udelay(10); + + reg &= ~BIT(1); + writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL)); + udelay(10); + + writel(0, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL)); + udelay(10); + + writel(0, priv->mac_reg + UMAC_CMD); + + writel(CMD_SW_RESET | CMD_LCL_LOOP_EN, priv->mac_reg + UMAC_CMD); + udelay(2); + writel(0, priv->mac_reg + UMAC_CMD); + + /* clear tx/rx counter */ + writel(MIB_RESET_RX | MIB_RESET_TX | MIB_RESET_RUNT, + priv->mac_reg + UMAC_MIB_CTRL); + writel(0, priv->mac_reg + UMAC_MIB_CTRL); + + writel(ENET_MAX_MTU_SIZE, priv->mac_reg + UMAC_MAX_FRAME_LEN); + + /* init rx registers, enable ip header optimization */ + reg = readl(priv->mac_reg + RBUF_CTRL); + reg |= RBUF_ALIGN_2B; + writel(reg, (priv->mac_reg + RBUF_CTRL)); + + writel(1, (priv->mac_reg + RBUF_TBUF_SIZE_CTRL)); +} + +static int bcmgenet_gmac_write_hwaddr(struct udevice *dev) +{ + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + struct eth_pdata *pdata = dev_get_platdata(dev); + uchar *addr = pdata->enetaddr; + u32 reg; + + reg = addr[0] << 24 | addr[1] << 16 | addr[2] << 8 | addr[3]; + writel_relaxed(reg, priv->mac_reg + UMAC_MAC0); + + reg = addr[4] << 8 | addr[5]; + writel_relaxed(reg, priv->mac_reg + UMAC_MAC1); + + return 0; +} + +static void bcmgenet_disable_dma(struct bcmgenet_eth_priv *priv) +{ + clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL, DMA_EN); + clrbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, DMA_EN); + + writel(1, priv->mac_reg + UMAC_TX_FLUSH); + udelay(10); + writel(0, priv->mac_reg + UMAC_TX_FLUSH); +} + +static void bcmgenet_enable_dma(struct bcmgenet_eth_priv *priv) +{ + u32 dma_ctrl = (1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT)) | DMA_EN; + + writel(dma_ctrl, priv->mac_reg + TDMA_REG_BASE + DMA_CTRL); + + setbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, dma_ctrl); +} + +static int bcmgenet_gmac_eth_send(struct udevice *dev, void *packet, int length) +{ + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + void *desc_base = priv->tx_desc_base + priv->tx_index * DMA_DESC_SIZE; + u32 len_stat = length << DMA_BUFLENGTH_SHIFT; + u32 prod_index, cons; + u32 tries = 100; + + prod_index = readl(priv->mac_reg + TDMA_PROD_INDEX); + + flush_dcache_range((ulong)packet, (ulong)packet + length); + + len_stat |= 0x3F << DMA_TX_QTAG_SHIFT; + len_stat |= DMA_TX_APPEND_CRC | DMA_SOP | DMA_EOP; + + /* Set-up packet for transmission */ + writel(lower_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_LO)); + writel(upper_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_HI)); + writel(len_stat, (desc_base + DMA_DESC_LENGTH_STATUS)); + + /* Increment index and start transmission */ + if (++priv->tx_index >= TX_DESCS) + priv->tx_index = 0; + + prod_index++; + + /* Start Transmisson */ + writel(prod_index, priv->mac_reg + TDMA_PROD_INDEX); + + do { + cons = readl(priv->mac_reg + TDMA_CONS_INDEX); + } while ((cons & 0xffff) < prod_index && --tries); + if (!tries) + return -ETIMEDOUT; + + return 0; +} + +static int bcmgenet_gmac_eth_recv(struct udevice *dev, + int flags, uchar **packetp) +{ + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + void *desc_base = priv->rx_desc_base + priv->rx_index * DMA_DESC_SIZE; + u32 prod_index = readl(priv->mac_reg + RDMA_PROD_INDEX); + u32 length, addr; + + if (prod_index == priv->c_index) + return -EAGAIN; + + length = readl(desc_base + DMA_DESC_LENGTH_STATUS); + length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK; + addr = readl(desc_base + DMA_DESC_ADDRESS_LO); + + invalidate_dcache_range(addr, + addr + roundup(length, ARCH_DMA_MINALIGN)); + + /* To cater for the IP header alignment the hardware does. + * This would actually not be needed if we don't program + * RBUF_ALIGN_2B + */ + *packetp = (uchar *)(ulong)addr + RX_BUF_OFFSET; + + return length - RX_BUF_OFFSET; +} + +static int bcmgenet_gmac_free_pkt(struct udevice *dev, uchar *packet, + int length) +{ + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + + /* Tell the MAC we have consumed that last receive buffer. */ + priv->c_index = (priv->c_index + 1) & 0xFFFF; + writel(priv->c_index, priv->mac_reg + RDMA_CONS_INDEX); + + /* Forward our descriptor pointer, wrapping around if needed. */ + if (++priv->rx_index >= RX_DESCS) + priv->rx_index = 0; + + return 0; +} + +static void rx_descs_init(struct bcmgenet_eth_priv *priv) +{ + char *rxbuffs = &priv->rxbuffer[0]; + u32 len_stat, i; + void *desc_base = priv->rx_desc_base; + + priv->c_index = 0; + + len_stat = (RX_BUF_LENGTH << DMA_BUFLENGTH_SHIFT) | DMA_OWN; + + for (i = 0; i < RX_DESCS; i++) { + writel(lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]), + desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO); + writel(upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]), + desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI); + writel(len_stat, + desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS); + } +} + +static void rx_ring_init(struct bcmgenet_eth_priv *priv) +{ + writel(DMA_MAX_BURST_LENGTH, + priv->mac_reg + RDMA_REG_BASE + DMA_SCB_BURST_SIZE); + + writel(0x0, priv->mac_reg + RDMA_RING_REG_BASE + DMA_START_ADDR); + writel(0x0, priv->mac_reg + RDMA_READ_PTR); + writel(0x0, priv->mac_reg + RDMA_WRITE_PTR); + writel(RX_DESCS * DMA_DESC_SIZE / 4 - 1, + priv->mac_reg + RDMA_RING_REG_BASE + DMA_END_ADDR); + + writel(0x0, priv->mac_reg + RDMA_PROD_INDEX); + writel(0x0, priv->mac_reg + RDMA_CONS_INDEX); + writel((RX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH, + priv->mac_reg + RDMA_RING_REG_BASE + DMA_RING_BUF_SIZE); + writel(DMA_FC_THRESH_VALUE, priv->mac_reg + RDMA_XON_XOFF_THRESH); + writel(1 << DEFAULT_Q, priv->mac_reg + RDMA_REG_BASE + DMA_RING_CFG); +} + +static void tx_ring_init(struct bcmgenet_eth_priv *priv) +{ + writel(DMA_MAX_BURST_LENGTH, + priv->mac_reg + TDMA_REG_BASE + DMA_SCB_BURST_SIZE); + + writel(0x0, priv->mac_reg + TDMA_RING_REG_BASE + DMA_START_ADDR); + writel(0x0, priv->mac_reg + TDMA_READ_PTR); + writel(0x0, priv->mac_reg + TDMA_WRITE_PTR); + writel(TX_DESCS * DMA_DESC_SIZE / 4 - 1, + priv->mac_reg + TDMA_RING_REG_BASE + DMA_END_ADDR); + writel(0x0, priv->mac_reg + TDMA_PROD_INDEX); + writel(0x0, priv->mac_reg + TDMA_CONS_INDEX); + writel(0x1, priv->mac_reg + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH); + writel(0x0, priv->mac_reg + TDMA_FLOW_PERIOD); + writel((TX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH, + priv->mac_reg + TDMA_RING_REG_BASE + DMA_RING_BUF_SIZE); + + writel(1 << DEFAULT_Q, priv->mac_reg + TDMA_REG_BASE + DMA_RING_CFG); +} + +static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv) +{ + struct phy_device *phy_dev = priv->phydev; + u32 speed; + + switch (phy_dev->speed) { + case SPEED_1000: + speed = UMAC_SPEED_1000; + break; + case SPEED_100: + speed = UMAC_SPEED_100; + break; + case SPEED_10: + speed = UMAC_SPEED_10; + break; + default: + printf("bcmgenet: Unsupported PHY speed: %d\n", phy_dev->speed); + return -EINVAL; + } + + clrsetbits_le32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE, + RGMII_LINK | RGMII_MODE_EN | ID_MODE_DIS); + + writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD)); + + return 0; +} + +static int bcmgenet_gmac_eth_start(struct udevice *dev) +{ + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + int ret; + + priv->tx_desc_base = priv->mac_reg + GENET_TX_OFF; + priv->rx_desc_base = priv->mac_reg + GENET_RX_OFF; + priv->tx_index = 0x0; + priv->rx_index = 0x0; + + bcmgenet_umac_reset(priv); + + bcmgenet_gmac_write_hwaddr(dev); + + /* Disable RX/TX DMA and flush TX queues */ + bcmgenet_disable_dma(priv); + + rx_ring_init(priv); + rx_descs_init(priv); + + tx_ring_init(priv); + + /* Enable RX/TX DMA */ + bcmgenet_enable_dma(priv); + + /* read PHY properties over the wire from generic PHY set-up */ + ret = phy_startup(priv->phydev); + if (ret) { + printf("bcmgenet: PHY startup failed: %d\n", ret); + return ret; + } + + /* Update MAC registers based on PHY property */ + ret = bcmgenet_adjust_link(priv); + if (ret) { + printf("bcmgenet: adjust PHY link failed: %d\n", ret); + return ret; + } + + /* Enable Rx/Tx */ + setbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN); + + return 0; +} + +static int bcmgenet_phy_init(struct bcmgenet_eth_priv *priv, void *dev) +{ + struct phy_device *phydev; + int ret; + + phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface); + if (!phydev) + return -ENODEV; + + phydev->supported &= PHY_GBIT_FEATURES; + if (priv->speed) { + ret = phy_set_supported(priv->phydev, priv->speed); + if (ret) + return ret; + } + phydev->advertising = phydev->supported; + + phy_connect_dev(phydev, dev); + + priv->phydev = phydev; + phy_config(priv->phydev); + + return 0; +} + +static void bcmgenet_mdio_start(struct bcmgenet_eth_priv *priv) +{ + setbits_le32(priv->mac_reg + MDIO_CMD, MDIO_START_BUSY); +} + +static int bcmgenet_mdio_write(struct mii_dev *bus, int addr, int devad, + int reg, u16 value) +{ + struct udevice *dev = bus->priv; + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + u32 val; + + /* Prepare the read operation */ + val = MDIO_WR | (addr << MDIO_PMD_SHIFT) | + (reg << MDIO_REG_SHIFT) | (0xffff & value); + writel_relaxed(val, priv->mac_reg + MDIO_CMD); + + /* Start MDIO transaction */ + bcmgenet_mdio_start(priv); + + return wait_for_bit_le32(priv->mac_reg + MDIO_CMD, + MDIO_START_BUSY, false, 20, true); +} + +static int bcmgenet_mdio_read(struct mii_dev *bus, int addr, int devad, int reg) +{ + struct udevice *dev = bus->priv; + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + u32 val; + int ret; + + /* Prepare the read operation */ + val = MDIO_RD | (addr << MDIO_PMD_SHIFT) | (reg << MDIO_REG_SHIFT); + writel_relaxed(val, priv->mac_reg + MDIO_CMD); + + /* Start MDIO transaction */ + bcmgenet_mdio_start(priv); + + ret = wait_for_bit_le32(priv->mac_reg + MDIO_CMD, + MDIO_START_BUSY, false, 20, true); + if (ret) + return ret; + + val = readl_relaxed(priv->mac_reg + MDIO_CMD); + + return val & 0xffff; +} + +static int bcmgenet_mdio_init(const char *name, struct udevice *priv) +{ + struct mii_dev *bus = mdio_alloc(); + + if (!bus) { + debug("Failed to allocate MDIO bus\n"); + return -ENOMEM; + } + + bus->read = bcmgenet_mdio_read; + bus->write = bcmgenet_mdio_write; + snprintf(bus->name, sizeof(bus->name), name); + bus->priv = (void *)priv; + + return mdio_register(bus); +} + +/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{ + phy_interface_t phy_mode = priv->interface; + + switch (phy_mode) { + case PHY_INTERFACE_MODE_RGMII: + writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL); + break; + default: + printf("unknown phy mode: %d\n", priv->interface); + return -EINVAL; + } + + return 0; +} + +static int bcmgenet_eth_probe(struct udevice *dev) +{ + struct eth_pdata *pdata = dev_get_platdata(dev); + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + int offset = dev_of_offset(dev); + const char *name; + u32 reg; + int ret; + u8 major; + + priv->mac_reg = (void *)pdata->iobase; + priv->interface = pdata->phy_interface; + priv->speed = pdata->max_speed; + + /* Read GENET HW version */ + reg = readl_relaxed(priv->mac_reg + SYS_REV_CTRL); + major = (reg >> 24) & 0x0f; + if (major != 6) { + if (major == 5) + major = 4; + else if (major == 0) + major = 1; + + printf("Unsupported GENETv%d.%d\n", major, (reg >> 16) & 0x0f); + return -ENODEV; + } + + ret = bcmgenet_interface_set(priv); + if (ret) + return ret; + + offset = fdt_first_subnode(gd->fdt_blob, offset); + name = fdt_get_name(gd->fdt_blob, offset, NULL); + + ret = bcmgenet_mdio_init(name, dev); + if (ret) + return ret; + + priv->bus = miiphy_get_dev_by_name(name); + + return bcmgenet_phy_init(priv, dev); +} + +static void bcmgenet_gmac_eth_stop(struct udevice *dev) +{ + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + + clrbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN); + clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL, + 1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT) | DMA_EN); +} + +static const struct eth_ops bcmgenet_gmac_eth_ops = { + .start = bcmgenet_gmac_eth_start, + .write_hwaddr = bcmgenet_gmac_write_hwaddr, + .send = bcmgenet_gmac_eth_send, + .recv = bcmgenet_gmac_eth_recv, + .free_pkt = bcmgenet_gmac_free_pkt, + .stop = bcmgenet_gmac_eth_stop, +}; + +static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev) +{ + struct eth_pdata *pdata = dev_get_platdata(dev); + struct bcmgenet_eth_priv *priv = dev_get_priv(dev); + const char *phy_mode; + int node = dev_of_offset(dev); + int offset; + + pdata->iobase = (phys_addr_t)devfdt_get_addr(dev); + + /* Get phy mode from DT */ + pdata->phy_interface = -1; + phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "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; + } + + offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle"); + if (offset > 0) { + priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", 0); + pdata->max_speed = fdtdec_get_int(gd->fdt_blob, offset, + "max-speed", 0); + } + + return 0; +} + +/* The BCM2711 implementation has a limited burst length compared to a generic + * GENETv5 version, but we go with that shorter value (8) in both cases, for + * the sake of simplicity. + */ +static const struct udevice_id bcmgenet_eth_ids[] = { + {.compatible = "brcm,genet-v5"}, + {.compatible = "brcm,bcm2711-genet-v5"}, + {} +}; + +U_BOOT_DRIVER(eth_bcmgenet) = { + .name = "eth_bcmgenet", + .id = UCLASS_ETH, + .of_match = bcmgenet_eth_ids, + .ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata, + .probe = bcmgenet_eth_probe, + .ops = &bcmgenet_gmac_eth_ops, + .priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv), + .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +};
Am 18.12.19 um 12:59 schrieb Andre Przywara:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 142a2c6953..999714dd39 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -136,6 +136,13 @@ config BCM6368_ETH help This driver supports the BCM6368 Ethernet MAC.
+config BCMGENET
- bool "BCMGENET V5 support"
- depends on DM_ETH
- select PHYLIB
- help
This driver supports the BCMGENET Ethernet MAC.config DWC_ETH_QOS bool "Synopsys DWC Ethernet QOS device support" depends on DM_ETH diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 30991834ec..6e0a68834d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_AG7XXX) += ag7xxx.o obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o obj-$(CONFIG_BCM6348_ETH) += bcm6348-eth.o obj-$(CONFIG_BCM6368_ETH) += bcm6368-eth.o +obj-$(CONFIG_BCMGENET) += bcmgenet.o obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o obj-$(CONFIG_DRIVER_AX88180) += ax88180.o obj-$(CONFIG_BCM_SF2_ETH) += bcm-sf2-eth.o diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c new file mode 100644 index 0000000000..24b025d804 --- /dev/null +++ b/drivers/net/bcmgenet.c @@ -0,0 +1,702 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (C) 2019 Amit Singh Tomar amittomer25@gmail.com
- Driver for Broadcom GENETv5 Ethernet controller (as found on the RPi4)
- This driver is based on the Linux driver:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
which is: Copyright (c) 2014-2017 Broadcom
- The hardware supports multiple queues (16 priority queues and one
- default queue), both for RX and TX. There are 256 DMA descriptors (both
- for TX and RX), and they live in MMIO registers. The hardware allows
- assigning descriptor ranges to queues, but we choose the most simple setup:
- All 256 descriptors are assigned to the default queue (#16).
- Also the Linux driver supports multiple generations of the MAC, whereas
- we only support v5, as used in the Raspberry Pi 4.
- */
+#include <asm/io.h> +#include <clk.h> +#include <cpu_func.h> +#include <dm.h> +#include <fdt_support.h> +#include <linux/err.h> +#include <malloc.h> +#include <miiphy.h> +#include <net.h> +#include <dm/of_access.h> +#include <dm/ofnode.h> +#include <linux/libfdt.h> +#include <linux/iopoll.h> +#include <asm/dma-mapping.h> +#include <wait_bit.h>
+/* Register definitions derived from Linux source */ +#define SYS_REV_CTRL 0x00
+#define SYS_PORT_CTRL 0x04 +#define PORT_MODE_EXT_GPHY 3
+#define GENET_SYS_OFF 0x0000 +#define SYS_RBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x08) +#define SYS_TBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x0c)
+#define GENET_EXT_OFF 0x0080 +#define EXT_RGMII_OOB_CTRL (GENET_EXT_OFF + 0x0c) +#define RGMII_LINK BIT(4) +#define OOB_DISABLE BIT(5) +#define RGMII_MODE_EN BIT(6) +#define ID_MODE_DIS BIT(16)
+#define GENET_RBUF_OFF 0x0300 +#define RBUF_TBUF_SIZE_CTRL (GENET_RBUF_OFF + 0xb4) +#define RBUF_CTRL (GENET_RBUF_OFF + 0x00) +#define RBUF_ALIGN_2B BIT(1)
+#define GENET_UMAC_OFF 0x0800 +#define UMAC_MIB_CTRL (GENET_UMAC_OFF + 0x580) +#define UMAC_MAX_FRAME_LEN (GENET_UMAC_OFF + 0x014) +#define UMAC_MAC0 (GENET_UMAC_OFF + 0x00c) +#define UMAC_MAC1 (GENET_UMAC_OFF + 0x010) +#define UMAC_CMD (GENET_UMAC_OFF + 0x008) +#define MDIO_CMD (GENET_UMAC_OFF + 0x614) +#define UMAC_TX_FLUSH (GENET_UMAC_OFF + 0x334) +#define MDIO_START_BUSY BIT(29) +#define MDIO_READ_FAIL BIT(28) +#define MDIO_RD (2 << 26) +#define MDIO_WR BIT(26) +#define MDIO_PMD_SHIFT 21 +#define MDIO_PMD_MASK 0x1f +#define MDIO_REG_SHIFT 16 +#define MDIO_REG_MASK 0x1f
+#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1) +#define UMAC_SPEED_10 0 +#define UMAC_SPEED_100 1 +#define UMAC_SPEED_1000 2 +#define UMAC_SPEED_2500 3 +#define CMD_SPEED_SHIFT 2 +#define CMD_SPEED_MASK 3 +#define CMD_SW_RESET BIT(13) +#define CMD_LCL_LOOP_EN BIT(15) +#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1)
+#define MIB_RESET_RX BIT(0) +#define MIB_RESET_RUNT BIT(1) +#define MIB_RESET_TX BIT(2)
+/* total number of Buffer Descriptors, same for Rx/Tx */ +#define TOTAL_DESCS 256 +#define RX_DESCS TOTAL_DESCS +#define TX_DESCS TOTAL_DESCS
+#define DEFAULT_Q 0x10
+/* Body(1500) + EH_SIZE(14) + VLANTAG(4) + BRCMTAG(6) + FCS(4) = 1528.
- 1536 is multiple of 256 bytes
- */
+#define ENET_BRCM_TAG_LEN 6 +#define ENET_PAD 8 +#define ENET_MAX_MTU_SIZE (ETH_DATA_LEN + ETH_HLEN + \
VLAN_HLEN + ENET_BRCM_TAG_LEN + \ETH_FCS_LEN + ENET_PAD)+/* Tx/Rx Dma Descriptor common bits */ +#define DMA_EN BIT(0) +#define DMA_RING_BUF_EN_SHIFT 0x01 +#define DMA_RING_BUF_EN_MASK 0xffff +#define DMA_BUFLENGTH_MASK 0x0fff +#define DMA_BUFLENGTH_SHIFT 16 +#define DMA_RING_SIZE_SHIFT 16 +#define DMA_OWN 0x8000 +#define DMA_EOP 0x4000 +#define DMA_SOP 0x2000 +#define DMA_WRAP 0x1000 +#define DMA_MAX_BURST_LENGTH 0x8 +/* Tx specific DMA descriptor bits */ +#define DMA_TX_UNDERRUN 0x0200 +#define DMA_TX_APPEND_CRC 0x0040 +#define DMA_TX_OW_CRC 0x0020 +#define DMA_TX_DO_CSUM 0x0010 +#define DMA_TX_QTAG_SHIFT 7
+/* DMA rings size */ +#define DMA_RING_SIZE 0x40 +#define DMA_RINGS_SIZE (DMA_RING_SIZE * (DEFAULT_Q + 1))
+/* DMA descriptor */ +#define DMA_DESC_LENGTH_STATUS 0x00 +#define DMA_DESC_ADDRESS_LO 0x04 +#define DMA_DESC_ADDRESS_HI 0x08 +#define DMA_DESC_SIZE 12
+#define GENET_RX_OFF 0x2000 +#define GENET_RDMA_REG_OFF \
- (GENET_RX_OFF + TOTAL_DESCS * DMA_DESC_SIZE)
+#define GENET_TX_OFF 0x4000 +#define GENET_TDMA_REG_OFF \
- (GENET_TX_OFF + TOTAL_DESCS * DMA_DESC_SIZE)
+#define DMA_FC_THRESH_HI (RX_DESCS >> 4) +#define DMA_FC_THRESH_LO 5 +#define DMA_FC_THRESH_VALUE ((DMA_FC_THRESH_LO << 16) | \
DMA_FC_THRESH_HI)+#define DMA_XOFF_THRESHOLD_SHIFT 16
+#define TDMA_RING_REG_BASE \
- (GENET_TDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE)
+#define TDMA_READ_PTR (TDMA_RING_REG_BASE + 0x00) +#define TDMA_CONS_INDEX (TDMA_RING_REG_BASE + 0x08) +#define TDMA_PROD_INDEX (TDMA_RING_REG_BASE + 0x0c) +#define DMA_RING_BUF_SIZE 0x10 +#define DMA_START_ADDR 0x14 +#define DMA_END_ADDR 0x1c +#define DMA_MBUF_DONE_THRESH 0x24 +#define TDMA_FLOW_PERIOD (TDMA_RING_REG_BASE + 0x28) +#define TDMA_WRITE_PTR (TDMA_RING_REG_BASE + 0x2c)
+#define RDMA_RING_REG_BASE \
- (GENET_RDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE)
+#define RDMA_WRITE_PTR (RDMA_RING_REG_BASE + 0x00) +#define RDMA_PROD_INDEX (RDMA_RING_REG_BASE + 0x08) +#define RDMA_CONS_INDEX (RDMA_RING_REG_BASE + 0x0c) +#define RDMA_XON_XOFF_THRESH (RDMA_RING_REG_BASE + 0x28) +#define RDMA_READ_PTR (RDMA_RING_REG_BASE + 0x2c)
+#define TDMA_REG_BASE (GENET_TDMA_REG_OFF + DMA_RINGS_SIZE) +#define RDMA_REG_BASE (GENET_RDMA_REG_OFF + DMA_RINGS_SIZE) +#define DMA_RING_CFG 0x00 +#define DMA_CTRL 0x04 +#define DMA_SCB_BURST_SIZE 0x0c
+#define RX_BUF_LENGTH 2048 +#define RX_TOTAL_BUFSIZE (RX_BUF_LENGTH * RX_DESCS) +#define RX_BUF_OFFSET 2
+DECLARE_GLOBAL_DATA_PTR;
+struct bcmgenet_eth_priv {
- void *mac_reg;
- char rxbuffer[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
- void *tx_desc_base;
- void *rx_desc_base;
- int tx_index;
- int rx_index;
- int c_index;
- int phyaddr;
- u32 interface;
- u32 speed;
- struct phy_device *phydev;
- struct mii_dev *bus;
+};
+static void bcmgenet_umac_reset(struct bcmgenet_eth_priv *priv) +{
- u32 reg;
- reg = readl(priv->mac_reg + SYS_RBUF_FLUSH_CTRL);
- reg |= BIT(1);
- writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- reg &= ~BIT(1);
- writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- writel(0, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- writel(0, priv->mac_reg + UMAC_CMD);
- writel(CMD_SW_RESET | CMD_LCL_LOOP_EN, priv->mac_reg + UMAC_CMD);
- udelay(2);
- writel(0, priv->mac_reg + UMAC_CMD);
- /* clear tx/rx counter */
- writel(MIB_RESET_RX | MIB_RESET_TX | MIB_RESET_RUNT,
priv->mac_reg + UMAC_MIB_CTRL);- writel(0, priv->mac_reg + UMAC_MIB_CTRL);
- writel(ENET_MAX_MTU_SIZE, priv->mac_reg + UMAC_MAX_FRAME_LEN);
- /* init rx registers, enable ip header optimization */
- reg = readl(priv->mac_reg + RBUF_CTRL);
- reg |= RBUF_ALIGN_2B;
- writel(reg, (priv->mac_reg + RBUF_CTRL));
- writel(1, (priv->mac_reg + RBUF_TBUF_SIZE_CTRL));
+}
+static int bcmgenet_gmac_write_hwaddr(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- struct eth_pdata *pdata = dev_get_platdata(dev);
- uchar *addr = pdata->enetaddr;
- u32 reg;
- reg = addr[0] << 24 | addr[1] << 16 | addr[2] << 8 | addr[3];
- writel_relaxed(reg, priv->mac_reg + UMAC_MAC0);
- reg = addr[4] << 8 | addr[5];
- writel_relaxed(reg, priv->mac_reg + UMAC_MAC1);
- return 0;
+}
+static void bcmgenet_disable_dma(struct bcmgenet_eth_priv *priv) +{
- clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL, DMA_EN);
- clrbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, DMA_EN);
for cross-arch compatibility with MIPS please use the endian-native variants like clrbits_32 or setbits_32 etc.
- writel(1, priv->mac_reg + UMAC_TX_FLUSH);
- udelay(10);
- writel(0, priv->mac_reg + UMAC_TX_FLUSH);
+}
+static void bcmgenet_enable_dma(struct bcmgenet_eth_priv *priv) +{
- u32 dma_ctrl = (1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT)) | DMA_EN;
- writel(dma_ctrl, priv->mac_reg + TDMA_REG_BASE + DMA_CTRL);
- setbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, dma_ctrl);
+}
+static int bcmgenet_gmac_eth_send(struct udevice *dev, void *packet, int length) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- void *desc_base = priv->tx_desc_base + priv->tx_index * DMA_DESC_SIZE;
- u32 len_stat = length << DMA_BUFLENGTH_SHIFT;
- u32 prod_index, cons;
- u32 tries = 100;
- prod_index = readl(priv->mac_reg + TDMA_PROD_INDEX);
- flush_dcache_range((ulong)packet, (ulong)packet + length);
- len_stat |= 0x3F << DMA_TX_QTAG_SHIFT;
- len_stat |= DMA_TX_APPEND_CRC | DMA_SOP | DMA_EOP;
- /* Set-up packet for transmission */
- writel(lower_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_LO));
- writel(upper_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_HI));
- writel(len_stat, (desc_base + DMA_DESC_LENGTH_STATUS));
- /* Increment index and start transmission */
- if (++priv->tx_index >= TX_DESCS)
priv->tx_index = 0;- prod_index++;
- /* Start Transmisson */
- writel(prod_index, priv->mac_reg + TDMA_PROD_INDEX);
- do {
cons = readl(priv->mac_reg + TDMA_CONS_INDEX);- } while ((cons & 0xffff) < prod_index && --tries);
- if (!tries)
return -ETIMEDOUT;- return 0;
+}
+static int bcmgenet_gmac_eth_recv(struct udevice *dev,
int flags, uchar **packetp)+{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- void *desc_base = priv->rx_desc_base + priv->rx_index * DMA_DESC_SIZE;
- u32 prod_index = readl(priv->mac_reg + RDMA_PROD_INDEX);
- u32 length, addr;
- if (prod_index == priv->c_index)
return -EAGAIN;- length = readl(desc_base + DMA_DESC_LENGTH_STATUS);
- length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK;
- addr = readl(desc_base + DMA_DESC_ADDRESS_LO);
- invalidate_dcache_range(addr,
addr + roundup(length, ARCH_DMA_MINALIGN));- /* To cater for the IP header alignment the hardware does.
* This would actually not be needed if we don't program* RBUF_ALIGN_2B*/- *packetp = (uchar *)(ulong)addr + RX_BUF_OFFSET;
- return length - RX_BUF_OFFSET;
+}
+static int bcmgenet_gmac_free_pkt(struct udevice *dev, uchar *packet,
int length)+{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- /* Tell the MAC we have consumed that last receive buffer. */
- priv->c_index = (priv->c_index + 1) & 0xFFFF;
- writel(priv->c_index, priv->mac_reg + RDMA_CONS_INDEX);
- /* Forward our descriptor pointer, wrapping around if needed. */
- if (++priv->rx_index >= RX_DESCS)
priv->rx_index = 0;- return 0;
+}
+static void rx_descs_init(struct bcmgenet_eth_priv *priv) +{
- char *rxbuffs = &priv->rxbuffer[0];
- u32 len_stat, i;
- void *desc_base = priv->rx_desc_base;
- priv->c_index = 0;
- len_stat = (RX_BUF_LENGTH << DMA_BUFLENGTH_SHIFT) | DMA_OWN;
- for (i = 0; i < RX_DESCS; i++) {
writel(lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]),desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO);writel(upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]),desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI);writel(len_stat,desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS);- }
+}
+static void rx_ring_init(struct bcmgenet_eth_priv *priv) +{
- writel(DMA_MAX_BURST_LENGTH,
priv->mac_reg + RDMA_REG_BASE + DMA_SCB_BURST_SIZE);- writel(0x0, priv->mac_reg + RDMA_RING_REG_BASE + DMA_START_ADDR);
- writel(0x0, priv->mac_reg + RDMA_READ_PTR);
- writel(0x0, priv->mac_reg + RDMA_WRITE_PTR);
- writel(RX_DESCS * DMA_DESC_SIZE / 4 - 1,
priv->mac_reg + RDMA_RING_REG_BASE + DMA_END_ADDR);- writel(0x0, priv->mac_reg + RDMA_PROD_INDEX);
- writel(0x0, priv->mac_reg + RDMA_CONS_INDEX);
- writel((RX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH,
priv->mac_reg + RDMA_RING_REG_BASE + DMA_RING_BUF_SIZE);- writel(DMA_FC_THRESH_VALUE, priv->mac_reg + RDMA_XON_XOFF_THRESH);
- writel(1 << DEFAULT_Q, priv->mac_reg + RDMA_REG_BASE + DMA_RING_CFG);
+}
+static void tx_ring_init(struct bcmgenet_eth_priv *priv) +{
- writel(DMA_MAX_BURST_LENGTH,
priv->mac_reg + TDMA_REG_BASE + DMA_SCB_BURST_SIZE);- writel(0x0, priv->mac_reg + TDMA_RING_REG_BASE + DMA_START_ADDR);
- writel(0x0, priv->mac_reg + TDMA_READ_PTR);
- writel(0x0, priv->mac_reg + TDMA_WRITE_PTR);
- writel(TX_DESCS * DMA_DESC_SIZE / 4 - 1,
priv->mac_reg + TDMA_RING_REG_BASE + DMA_END_ADDR);- writel(0x0, priv->mac_reg + TDMA_PROD_INDEX);
- writel(0x0, priv->mac_reg + TDMA_CONS_INDEX);
- writel(0x1, priv->mac_reg + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH);
- writel(0x0, priv->mac_reg + TDMA_FLOW_PERIOD);
- writel((TX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH,
priv->mac_reg + TDMA_RING_REG_BASE + DMA_RING_BUF_SIZE);- writel(1 << DEFAULT_Q, priv->mac_reg + TDMA_REG_BASE + DMA_RING_CFG);
+}
+static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv) +{
- struct phy_device *phy_dev = priv->phydev;
- u32 speed;
- switch (phy_dev->speed) {
- case SPEED_1000:
speed = UMAC_SPEED_1000;break;- case SPEED_100:
speed = UMAC_SPEED_100;break;- case SPEED_10:
speed = UMAC_SPEED_10;break;- default:
printf("bcmgenet: Unsupported PHY speed: %d\n", phy_dev->speed);return -EINVAL;- }
- clrsetbits_le32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE,
RGMII_LINK | RGMII_MODE_EN | ID_MODE_DIS);- writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD));
- return 0;
+}
+static int bcmgenet_gmac_eth_start(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- int ret;
- priv->tx_desc_base = priv->mac_reg + GENET_TX_OFF;
- priv->rx_desc_base = priv->mac_reg + GENET_RX_OFF;
- priv->tx_index = 0x0;
- priv->rx_index = 0x0;
- bcmgenet_umac_reset(priv);
- bcmgenet_gmac_write_hwaddr(dev);
- /* Disable RX/TX DMA and flush TX queues */
- bcmgenet_disable_dma(priv);
- rx_ring_init(priv);
- rx_descs_init(priv);
- tx_ring_init(priv);
- /* Enable RX/TX DMA */
- bcmgenet_enable_dma(priv);
- /* read PHY properties over the wire from generic PHY set-up */
- ret = phy_startup(priv->phydev);
- if (ret) {
printf("bcmgenet: PHY startup failed: %d\n", ret);return ret;- }
- /* Update MAC registers based on PHY property */
- ret = bcmgenet_adjust_link(priv);
- if (ret) {
printf("bcmgenet: adjust PHY link failed: %d\n", ret);return ret;- }
- /* Enable Rx/Tx */
- setbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN);
- return 0;
+}
+static int bcmgenet_phy_init(struct bcmgenet_eth_priv *priv, void *dev) +{
- struct phy_device *phydev;
- int ret;
- phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface);
- if (!phydev)
return -ENODEV;- phydev->supported &= PHY_GBIT_FEATURES;
- if (priv->speed) {
ret = phy_set_supported(priv->phydev, priv->speed);if (ret)return ret;- }
- phydev->advertising = phydev->supported;
- phy_connect_dev(phydev, dev);
- priv->phydev = phydev;
- phy_config(priv->phydev);
- return 0;
+}
+static void bcmgenet_mdio_start(struct bcmgenet_eth_priv *priv) +{
- setbits_le32(priv->mac_reg + MDIO_CMD, MDIO_START_BUSY);
+}
+static int bcmgenet_mdio_write(struct mii_dev *bus, int addr, int devad,
int reg, u16 value)+{
- struct udevice *dev = bus->priv;
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- u32 val;
- /* Prepare the read operation */
- val = MDIO_WR | (addr << MDIO_PMD_SHIFT) |
(reg << MDIO_REG_SHIFT) | (0xffff & value);- writel_relaxed(val, priv->mac_reg + MDIO_CMD);
- /* Start MDIO transaction */
- bcmgenet_mdio_start(priv);
- return wait_for_bit_le32(priv->mac_reg + MDIO_CMD,
MDIO_START_BUSY, false, 20, true);+}
+static int bcmgenet_mdio_read(struct mii_dev *bus, int addr, int devad, int reg) +{
- struct udevice *dev = bus->priv;
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- u32 val;
- int ret;
- /* Prepare the read operation */
- val = MDIO_RD | (addr << MDIO_PMD_SHIFT) | (reg << MDIO_REG_SHIFT);
- writel_relaxed(val, priv->mac_reg + MDIO_CMD);
- /* Start MDIO transaction */
- bcmgenet_mdio_start(priv);
- ret = wait_for_bit_le32(priv->mac_reg + MDIO_CMD,
MDIO_START_BUSY, false, 20, true);- if (ret)
return ret;- val = readl_relaxed(priv->mac_reg + MDIO_CMD);
- return val & 0xffff;
+}
+static int bcmgenet_mdio_init(const char *name, struct udevice *priv) +{
- struct mii_dev *bus = mdio_alloc();
- if (!bus) {
debug("Failed to allocate MDIO bus\n");return -ENOMEM;- }
- bus->read = bcmgenet_mdio_read;
- bus->write = bcmgenet_mdio_write;
- snprintf(bus->name, sizeof(bus->name), name);
- bus->priv = (void *)priv;
- return mdio_register(bus);
+}
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;- default:
printf("unknown phy mode: %d\n", priv->interface);return -EINVAL;- }
- return 0;
+}
+static int bcmgenet_eth_probe(struct udevice *dev) +{
- struct eth_pdata *pdata = dev_get_platdata(dev);
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- int offset = dev_of_offset(dev);
- const char *name;
- u32 reg;
- int ret;
- u8 major;
- priv->mac_reg = (void *)pdata->iobase;
- priv->interface = pdata->phy_interface;
- priv->speed = pdata->max_speed;
- /* Read GENET HW version */
- reg = readl_relaxed(priv->mac_reg + SYS_REV_CTRL);
- major = (reg >> 24) & 0x0f;
- if (major != 6) {
if (major == 5)major = 4;else if (major == 0)major = 1;printf("Unsupported GENETv%d.%d\n", major, (reg >> 16) & 0x0f);return -ENODEV;- }
- ret = bcmgenet_interface_set(priv);
- if (ret)
return ret;- offset = fdt_first_subnode(gd->fdt_blob, offset);
- name = fdt_get_name(gd->fdt_blob, offset, NULL);
- ret = bcmgenet_mdio_init(name, dev);
- if (ret)
return ret;- priv->bus = miiphy_get_dev_by_name(name);
- return bcmgenet_phy_init(priv, dev);
+}
+static void bcmgenet_gmac_eth_stop(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- clrbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN);
- clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL,
1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT) | DMA_EN);+}
+static const struct eth_ops bcmgenet_gmac_eth_ops = {
- .start = bcmgenet_gmac_eth_start,
- .write_hwaddr = bcmgenet_gmac_write_hwaddr,
- .send = bcmgenet_gmac_eth_send,
- .recv = bcmgenet_gmac_eth_recv,
- .free_pkt = bcmgenet_gmac_free_pkt,
- .stop = bcmgenet_gmac_eth_stop,
+};
+static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev) +{
- struct eth_pdata *pdata = dev_get_platdata(dev);
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- const char *phy_mode;
- int node = dev_of_offset(dev);
- int offset;
- pdata->iobase = (phys_addr_t)devfdt_get_addr(dev);
for compatibility with MIPS please remap all physical addresses from DT to virtual addresses. You can use the existing wrappers like dev_remap_addr(), dev_remap_addr_index() or dev_remap_addr_name() for that.
- /* Get phy mode from DT */
- pdata->phy_interface = -1;
- phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
NULL);
generally you should use the newer DM API for that (see include/dm/read.h) to get rid of the gd pointer and to be able to use the live-tree feature. In this case dev_read_string().
- 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;- }
- offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle");
dev_read_phandle_with_args()
- if (offset > 0) {
priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", 0);pdata->max_speed = fdtdec_get_int(gd->fdt_blob, offset,"max-speed", 0);
dev_read_s32() or dev_read_u32()
- }
- return 0;
+}
+/* The BCM2711 implementation has a limited burst length compared to a generic
- GENETv5 version, but we go with that shorter value (8) in both cases, for
- the sake of simplicity.
- */
+static const struct udevice_id bcmgenet_eth_ids[] = {
- {.compatible = "brcm,genet-v5"},
- {.compatible = "brcm,bcm2711-genet-v5"},
- {}
+};
+U_BOOT_DRIVER(eth_bcmgenet) = {
- .name = "eth_bcmgenet",
- .id = UCLASS_ETH,
- .of_match = bcmgenet_eth_ids,
- .ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata,
- .probe = bcmgenet_eth_probe,
- .ops = &bcmgenet_gmac_eth_ops,
- .priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
- .flags = DM_FLAG_ALLOC_PRIV_DMA,
+};
On Thu, 19 Dec 2019 12:32:06 +0100 Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
Hi Daniel,
many thanks for your valuable comments! Do you have access to a MIPS board using a GENETv5 MAC? I would be very curious to see if the driver works there, and am happy to make adjustments. Does your board use a PHY connected via RGMII? Because this is something we are relying on at the moment. But without any ways of testing this I'd rather not support other transports at this time.
I think your points below are all valid, so thanks for bringing this up. Will test this later on and post a v2 in due time then.
Cheers, Andre.
Am 18.12.19 um 12:59 schrieb Andre Przywara:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 142a2c6953..999714dd39 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -136,6 +136,13 @@ config BCM6368_ETH help This driver supports the BCM6368 Ethernet MAC.
+config BCMGENET
- bool "BCMGENET V5 support"
- depends on DM_ETH
- select PHYLIB
- help
This driver supports the BCMGENET Ethernet MAC.config DWC_ETH_QOS bool "Synopsys DWC Ethernet QOS device support" depends on DM_ETH diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 30991834ec..6e0a68834d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_AG7XXX) += ag7xxx.o obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o obj-$(CONFIG_BCM6348_ETH) += bcm6348-eth.o obj-$(CONFIG_BCM6368_ETH) += bcm6368-eth.o +obj-$(CONFIG_BCMGENET) += bcmgenet.o obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o obj-$(CONFIG_DRIVER_AX88180) += ax88180.o obj-$(CONFIG_BCM_SF2_ETH) += bcm-sf2-eth.o diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c new file mode 100644 index 0000000000..24b025d804 --- /dev/null +++ b/drivers/net/bcmgenet.c @@ -0,0 +1,702 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (C) 2019 Amit Singh Tomar amittomer25@gmail.com
- Driver for Broadcom GENETv5 Ethernet controller (as found on the RPi4)
- This driver is based on the Linux driver:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
which is: Copyright (c) 2014-2017 Broadcom
- The hardware supports multiple queues (16 priority queues and one
- default queue), both for RX and TX. There are 256 DMA descriptors (both
- for TX and RX), and they live in MMIO registers. The hardware allows
- assigning descriptor ranges to queues, but we choose the most simple setup:
- All 256 descriptors are assigned to the default queue (#16).
- Also the Linux driver supports multiple generations of the MAC, whereas
- we only support v5, as used in the Raspberry Pi 4.
- */
+#include <asm/io.h> +#include <clk.h> +#include <cpu_func.h> +#include <dm.h> +#include <fdt_support.h> +#include <linux/err.h> +#include <malloc.h> +#include <miiphy.h> +#include <net.h> +#include <dm/of_access.h> +#include <dm/ofnode.h> +#include <linux/libfdt.h> +#include <linux/iopoll.h> +#include <asm/dma-mapping.h> +#include <wait_bit.h>
+/* Register definitions derived from Linux source */ +#define SYS_REV_CTRL 0x00
+#define SYS_PORT_CTRL 0x04 +#define PORT_MODE_EXT_GPHY 3
+#define GENET_SYS_OFF 0x0000 +#define SYS_RBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x08) +#define SYS_TBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x0c)
+#define GENET_EXT_OFF 0x0080 +#define EXT_RGMII_OOB_CTRL (GENET_EXT_OFF + 0x0c) +#define RGMII_LINK BIT(4) +#define OOB_DISABLE BIT(5) +#define RGMII_MODE_EN BIT(6) +#define ID_MODE_DIS BIT(16)
+#define GENET_RBUF_OFF 0x0300 +#define RBUF_TBUF_SIZE_CTRL (GENET_RBUF_OFF + 0xb4) +#define RBUF_CTRL (GENET_RBUF_OFF + 0x00) +#define RBUF_ALIGN_2B BIT(1)
+#define GENET_UMAC_OFF 0x0800 +#define UMAC_MIB_CTRL (GENET_UMAC_OFF + 0x580) +#define UMAC_MAX_FRAME_LEN (GENET_UMAC_OFF + 0x014) +#define UMAC_MAC0 (GENET_UMAC_OFF + 0x00c) +#define UMAC_MAC1 (GENET_UMAC_OFF + 0x010) +#define UMAC_CMD (GENET_UMAC_OFF + 0x008) +#define MDIO_CMD (GENET_UMAC_OFF + 0x614) +#define UMAC_TX_FLUSH (GENET_UMAC_OFF + 0x334) +#define MDIO_START_BUSY BIT(29) +#define MDIO_READ_FAIL BIT(28) +#define MDIO_RD (2 << 26) +#define MDIO_WR BIT(26) +#define MDIO_PMD_SHIFT 21 +#define MDIO_PMD_MASK 0x1f +#define MDIO_REG_SHIFT 16 +#define MDIO_REG_MASK 0x1f
+#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1) +#define UMAC_SPEED_10 0 +#define UMAC_SPEED_100 1 +#define UMAC_SPEED_1000 2 +#define UMAC_SPEED_2500 3 +#define CMD_SPEED_SHIFT 2 +#define CMD_SPEED_MASK 3 +#define CMD_SW_RESET BIT(13) +#define CMD_LCL_LOOP_EN BIT(15) +#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1)
+#define MIB_RESET_RX BIT(0) +#define MIB_RESET_RUNT BIT(1) +#define MIB_RESET_TX BIT(2)
+/* total number of Buffer Descriptors, same for Rx/Tx */ +#define TOTAL_DESCS 256 +#define RX_DESCS TOTAL_DESCS +#define TX_DESCS TOTAL_DESCS
+#define DEFAULT_Q 0x10
+/* Body(1500) + EH_SIZE(14) + VLANTAG(4) + BRCMTAG(6) + FCS(4) = 1528.
- 1536 is multiple of 256 bytes
- */
+#define ENET_BRCM_TAG_LEN 6 +#define ENET_PAD 8 +#define ENET_MAX_MTU_SIZE (ETH_DATA_LEN + ETH_HLEN + \
VLAN_HLEN + ENET_BRCM_TAG_LEN + \ETH_FCS_LEN + ENET_PAD)+/* Tx/Rx Dma Descriptor common bits */ +#define DMA_EN BIT(0) +#define DMA_RING_BUF_EN_SHIFT 0x01 +#define DMA_RING_BUF_EN_MASK 0xffff +#define DMA_BUFLENGTH_MASK 0x0fff +#define DMA_BUFLENGTH_SHIFT 16 +#define DMA_RING_SIZE_SHIFT 16 +#define DMA_OWN 0x8000 +#define DMA_EOP 0x4000 +#define DMA_SOP 0x2000 +#define DMA_WRAP 0x1000 +#define DMA_MAX_BURST_LENGTH 0x8 +/* Tx specific DMA descriptor bits */ +#define DMA_TX_UNDERRUN 0x0200 +#define DMA_TX_APPEND_CRC 0x0040 +#define DMA_TX_OW_CRC 0x0020 +#define DMA_TX_DO_CSUM 0x0010 +#define DMA_TX_QTAG_SHIFT 7
+/* DMA rings size */ +#define DMA_RING_SIZE 0x40 +#define DMA_RINGS_SIZE (DMA_RING_SIZE * (DEFAULT_Q + 1))
+/* DMA descriptor */ +#define DMA_DESC_LENGTH_STATUS 0x00 +#define DMA_DESC_ADDRESS_LO 0x04 +#define DMA_DESC_ADDRESS_HI 0x08 +#define DMA_DESC_SIZE 12
+#define GENET_RX_OFF 0x2000 +#define GENET_RDMA_REG_OFF \
- (GENET_RX_OFF + TOTAL_DESCS * DMA_DESC_SIZE)
+#define GENET_TX_OFF 0x4000 +#define GENET_TDMA_REG_OFF \
- (GENET_TX_OFF + TOTAL_DESCS * DMA_DESC_SIZE)
+#define DMA_FC_THRESH_HI (RX_DESCS >> 4) +#define DMA_FC_THRESH_LO 5 +#define DMA_FC_THRESH_VALUE ((DMA_FC_THRESH_LO << 16) | \
DMA_FC_THRESH_HI)+#define DMA_XOFF_THRESHOLD_SHIFT 16
+#define TDMA_RING_REG_BASE \
- (GENET_TDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE)
+#define TDMA_READ_PTR (TDMA_RING_REG_BASE + 0x00) +#define TDMA_CONS_INDEX (TDMA_RING_REG_BASE + 0x08) +#define TDMA_PROD_INDEX (TDMA_RING_REG_BASE + 0x0c) +#define DMA_RING_BUF_SIZE 0x10 +#define DMA_START_ADDR 0x14 +#define DMA_END_ADDR 0x1c +#define DMA_MBUF_DONE_THRESH 0x24 +#define TDMA_FLOW_PERIOD (TDMA_RING_REG_BASE + 0x28) +#define TDMA_WRITE_PTR (TDMA_RING_REG_BASE + 0x2c)
+#define RDMA_RING_REG_BASE \
- (GENET_RDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE)
+#define RDMA_WRITE_PTR (RDMA_RING_REG_BASE + 0x00) +#define RDMA_PROD_INDEX (RDMA_RING_REG_BASE + 0x08) +#define RDMA_CONS_INDEX (RDMA_RING_REG_BASE + 0x0c) +#define RDMA_XON_XOFF_THRESH (RDMA_RING_REG_BASE + 0x28) +#define RDMA_READ_PTR (RDMA_RING_REG_BASE + 0x2c)
+#define TDMA_REG_BASE (GENET_TDMA_REG_OFF + DMA_RINGS_SIZE) +#define RDMA_REG_BASE (GENET_RDMA_REG_OFF + DMA_RINGS_SIZE) +#define DMA_RING_CFG 0x00 +#define DMA_CTRL 0x04 +#define DMA_SCB_BURST_SIZE 0x0c
+#define RX_BUF_LENGTH 2048 +#define RX_TOTAL_BUFSIZE (RX_BUF_LENGTH * RX_DESCS) +#define RX_BUF_OFFSET 2
+DECLARE_GLOBAL_DATA_PTR;
+struct bcmgenet_eth_priv {
- void *mac_reg;
- char rxbuffer[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
- void *tx_desc_base;
- void *rx_desc_base;
- int tx_index;
- int rx_index;
- int c_index;
- int phyaddr;
- u32 interface;
- u32 speed;
- struct phy_device *phydev;
- struct mii_dev *bus;
+};
+static void bcmgenet_umac_reset(struct bcmgenet_eth_priv *priv) +{
- u32 reg;
- reg = readl(priv->mac_reg + SYS_RBUF_FLUSH_CTRL);
- reg |= BIT(1);
- writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- reg &= ~BIT(1);
- writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- writel(0, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- writel(0, priv->mac_reg + UMAC_CMD);
- writel(CMD_SW_RESET | CMD_LCL_LOOP_EN, priv->mac_reg + UMAC_CMD);
- udelay(2);
- writel(0, priv->mac_reg + UMAC_CMD);
- /* clear tx/rx counter */
- writel(MIB_RESET_RX | MIB_RESET_TX | MIB_RESET_RUNT,
priv->mac_reg + UMAC_MIB_CTRL);- writel(0, priv->mac_reg + UMAC_MIB_CTRL);
- writel(ENET_MAX_MTU_SIZE, priv->mac_reg + UMAC_MAX_FRAME_LEN);
- /* init rx registers, enable ip header optimization */
- reg = readl(priv->mac_reg + RBUF_CTRL);
- reg |= RBUF_ALIGN_2B;
- writel(reg, (priv->mac_reg + RBUF_CTRL));
- writel(1, (priv->mac_reg + RBUF_TBUF_SIZE_CTRL));
+}
+static int bcmgenet_gmac_write_hwaddr(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- struct eth_pdata *pdata = dev_get_platdata(dev);
- uchar *addr = pdata->enetaddr;
- u32 reg;
- reg = addr[0] << 24 | addr[1] << 16 | addr[2] << 8 | addr[3];
- writel_relaxed(reg, priv->mac_reg + UMAC_MAC0);
- reg = addr[4] << 8 | addr[5];
- writel_relaxed(reg, priv->mac_reg + UMAC_MAC1);
- return 0;
+}
+static void bcmgenet_disable_dma(struct bcmgenet_eth_priv *priv) +{
- clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL, DMA_EN);
- clrbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, DMA_EN);
for cross-arch compatibility with MIPS please use the endian-native variants like clrbits_32 or setbits_32 etc.
- writel(1, priv->mac_reg + UMAC_TX_FLUSH);
- udelay(10);
- writel(0, priv->mac_reg + UMAC_TX_FLUSH);
+}
+static void bcmgenet_enable_dma(struct bcmgenet_eth_priv *priv) +{
- u32 dma_ctrl = (1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT)) | DMA_EN;
- writel(dma_ctrl, priv->mac_reg + TDMA_REG_BASE + DMA_CTRL);
- setbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, dma_ctrl);
+}
+static int bcmgenet_gmac_eth_send(struct udevice *dev, void *packet, int length) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- void *desc_base = priv->tx_desc_base + priv->tx_index * DMA_DESC_SIZE;
- u32 len_stat = length << DMA_BUFLENGTH_SHIFT;
- u32 prod_index, cons;
- u32 tries = 100;
- prod_index = readl(priv->mac_reg + TDMA_PROD_INDEX);
- flush_dcache_range((ulong)packet, (ulong)packet + length);
- len_stat |= 0x3F << DMA_TX_QTAG_SHIFT;
- len_stat |= DMA_TX_APPEND_CRC | DMA_SOP | DMA_EOP;
- /* Set-up packet for transmission */
- writel(lower_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_LO));
- writel(upper_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_HI));
- writel(len_stat, (desc_base + DMA_DESC_LENGTH_STATUS));
- /* Increment index and start transmission */
- if (++priv->tx_index >= TX_DESCS)
priv->tx_index = 0;- prod_index++;
- /* Start Transmisson */
- writel(prod_index, priv->mac_reg + TDMA_PROD_INDEX);
- do {
cons = readl(priv->mac_reg + TDMA_CONS_INDEX);- } while ((cons & 0xffff) < prod_index && --tries);
- if (!tries)
return -ETIMEDOUT;- return 0;
+}
+static int bcmgenet_gmac_eth_recv(struct udevice *dev,
int flags, uchar **packetp)+{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- void *desc_base = priv->rx_desc_base + priv->rx_index * DMA_DESC_SIZE;
- u32 prod_index = readl(priv->mac_reg + RDMA_PROD_INDEX);
- u32 length, addr;
- if (prod_index == priv->c_index)
return -EAGAIN;- length = readl(desc_base + DMA_DESC_LENGTH_STATUS);
- length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK;
- addr = readl(desc_base + DMA_DESC_ADDRESS_LO);
- invalidate_dcache_range(addr,
addr + roundup(length, ARCH_DMA_MINALIGN));- /* To cater for the IP header alignment the hardware does.
* This would actually not be needed if we don't program* RBUF_ALIGN_2B*/- *packetp = (uchar *)(ulong)addr + RX_BUF_OFFSET;
- return length - RX_BUF_OFFSET;
+}
+static int bcmgenet_gmac_free_pkt(struct udevice *dev, uchar *packet,
int length)+{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- /* Tell the MAC we have consumed that last receive buffer. */
- priv->c_index = (priv->c_index + 1) & 0xFFFF;
- writel(priv->c_index, priv->mac_reg + RDMA_CONS_INDEX);
- /* Forward our descriptor pointer, wrapping around if needed. */
- if (++priv->rx_index >= RX_DESCS)
priv->rx_index = 0;- return 0;
+}
+static void rx_descs_init(struct bcmgenet_eth_priv *priv) +{
- char *rxbuffs = &priv->rxbuffer[0];
- u32 len_stat, i;
- void *desc_base = priv->rx_desc_base;
- priv->c_index = 0;
- len_stat = (RX_BUF_LENGTH << DMA_BUFLENGTH_SHIFT) | DMA_OWN;
- for (i = 0; i < RX_DESCS; i++) {
writel(lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]),desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO);writel(upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]),desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI);writel(len_stat,desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS);- }
+}
+static void rx_ring_init(struct bcmgenet_eth_priv *priv) +{
- writel(DMA_MAX_BURST_LENGTH,
priv->mac_reg + RDMA_REG_BASE + DMA_SCB_BURST_SIZE);- writel(0x0, priv->mac_reg + RDMA_RING_REG_BASE + DMA_START_ADDR);
- writel(0x0, priv->mac_reg + RDMA_READ_PTR);
- writel(0x0, priv->mac_reg + RDMA_WRITE_PTR);
- writel(RX_DESCS * DMA_DESC_SIZE / 4 - 1,
priv->mac_reg + RDMA_RING_REG_BASE + DMA_END_ADDR);- writel(0x0, priv->mac_reg + RDMA_PROD_INDEX);
- writel(0x0, priv->mac_reg + RDMA_CONS_INDEX);
- writel((RX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH,
priv->mac_reg + RDMA_RING_REG_BASE + DMA_RING_BUF_SIZE);- writel(DMA_FC_THRESH_VALUE, priv->mac_reg + RDMA_XON_XOFF_THRESH);
- writel(1 << DEFAULT_Q, priv->mac_reg + RDMA_REG_BASE + DMA_RING_CFG);
+}
+static void tx_ring_init(struct bcmgenet_eth_priv *priv) +{
- writel(DMA_MAX_BURST_LENGTH,
priv->mac_reg + TDMA_REG_BASE + DMA_SCB_BURST_SIZE);- writel(0x0, priv->mac_reg + TDMA_RING_REG_BASE + DMA_START_ADDR);
- writel(0x0, priv->mac_reg + TDMA_READ_PTR);
- writel(0x0, priv->mac_reg + TDMA_WRITE_PTR);
- writel(TX_DESCS * DMA_DESC_SIZE / 4 - 1,
priv->mac_reg + TDMA_RING_REG_BASE + DMA_END_ADDR);- writel(0x0, priv->mac_reg + TDMA_PROD_INDEX);
- writel(0x0, priv->mac_reg + TDMA_CONS_INDEX);
- writel(0x1, priv->mac_reg + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH);
- writel(0x0, priv->mac_reg + TDMA_FLOW_PERIOD);
- writel((TX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH,
priv->mac_reg + TDMA_RING_REG_BASE + DMA_RING_BUF_SIZE);- writel(1 << DEFAULT_Q, priv->mac_reg + TDMA_REG_BASE + DMA_RING_CFG);
+}
+static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv) +{
- struct phy_device *phy_dev = priv->phydev;
- u32 speed;
- switch (phy_dev->speed) {
- case SPEED_1000:
speed = UMAC_SPEED_1000;break;- case SPEED_100:
speed = UMAC_SPEED_100;break;- case SPEED_10:
speed = UMAC_SPEED_10;break;- default:
printf("bcmgenet: Unsupported PHY speed: %d\n", phy_dev->speed);return -EINVAL;- }
- clrsetbits_le32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE,
RGMII_LINK | RGMII_MODE_EN | ID_MODE_DIS);- writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD));
- return 0;
+}
+static int bcmgenet_gmac_eth_start(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- int ret;
- priv->tx_desc_base = priv->mac_reg + GENET_TX_OFF;
- priv->rx_desc_base = priv->mac_reg + GENET_RX_OFF;
- priv->tx_index = 0x0;
- priv->rx_index = 0x0;
- bcmgenet_umac_reset(priv);
- bcmgenet_gmac_write_hwaddr(dev);
- /* Disable RX/TX DMA and flush TX queues */
- bcmgenet_disable_dma(priv);
- rx_ring_init(priv);
- rx_descs_init(priv);
- tx_ring_init(priv);
- /* Enable RX/TX DMA */
- bcmgenet_enable_dma(priv);
- /* read PHY properties over the wire from generic PHY set-up */
- ret = phy_startup(priv->phydev);
- if (ret) {
printf("bcmgenet: PHY startup failed: %d\n", ret);return ret;- }
- /* Update MAC registers based on PHY property */
- ret = bcmgenet_adjust_link(priv);
- if (ret) {
printf("bcmgenet: adjust PHY link failed: %d\n", ret);return ret;- }
- /* Enable Rx/Tx */
- setbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN);
- return 0;
+}
+static int bcmgenet_phy_init(struct bcmgenet_eth_priv *priv, void *dev) +{
- struct phy_device *phydev;
- int ret;
- phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface);
- if (!phydev)
return -ENODEV;- phydev->supported &= PHY_GBIT_FEATURES;
- if (priv->speed) {
ret = phy_set_supported(priv->phydev, priv->speed);if (ret)return ret;- }
- phydev->advertising = phydev->supported;
- phy_connect_dev(phydev, dev);
- priv->phydev = phydev;
- phy_config(priv->phydev);
- return 0;
+}
+static void bcmgenet_mdio_start(struct bcmgenet_eth_priv *priv) +{
- setbits_le32(priv->mac_reg + MDIO_CMD, MDIO_START_BUSY);
+}
+static int bcmgenet_mdio_write(struct mii_dev *bus, int addr, int devad,
int reg, u16 value)+{
- struct udevice *dev = bus->priv;
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- u32 val;
- /* Prepare the read operation */
- val = MDIO_WR | (addr << MDIO_PMD_SHIFT) |
(reg << MDIO_REG_SHIFT) | (0xffff & value);- writel_relaxed(val, priv->mac_reg + MDIO_CMD);
- /* Start MDIO transaction */
- bcmgenet_mdio_start(priv);
- return wait_for_bit_le32(priv->mac_reg + MDIO_CMD,
MDIO_START_BUSY, false, 20, true);+}
+static int bcmgenet_mdio_read(struct mii_dev *bus, int addr, int devad, int reg) +{
- struct udevice *dev = bus->priv;
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- u32 val;
- int ret;
- /* Prepare the read operation */
- val = MDIO_RD | (addr << MDIO_PMD_SHIFT) | (reg << MDIO_REG_SHIFT);
- writel_relaxed(val, priv->mac_reg + MDIO_CMD);
- /* Start MDIO transaction */
- bcmgenet_mdio_start(priv);
- ret = wait_for_bit_le32(priv->mac_reg + MDIO_CMD,
MDIO_START_BUSY, false, 20, true);- if (ret)
return ret;- val = readl_relaxed(priv->mac_reg + MDIO_CMD);
- return val & 0xffff;
+}
+static int bcmgenet_mdio_init(const char *name, struct udevice *priv) +{
- struct mii_dev *bus = mdio_alloc();
- if (!bus) {
debug("Failed to allocate MDIO bus\n");return -ENOMEM;- }
- bus->read = bcmgenet_mdio_read;
- bus->write = bcmgenet_mdio_write;
- snprintf(bus->name, sizeof(bus->name), name);
- bus->priv = (void *)priv;
- return mdio_register(bus);
+}
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;- default:
printf("unknown phy mode: %d\n", priv->interface);return -EINVAL;- }
- return 0;
+}
+static int bcmgenet_eth_probe(struct udevice *dev) +{
- struct eth_pdata *pdata = dev_get_platdata(dev);
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- int offset = dev_of_offset(dev);
- const char *name;
- u32 reg;
- int ret;
- u8 major;
- priv->mac_reg = (void *)pdata->iobase;
- priv->interface = pdata->phy_interface;
- priv->speed = pdata->max_speed;
- /* Read GENET HW version */
- reg = readl_relaxed(priv->mac_reg + SYS_REV_CTRL);
- major = (reg >> 24) & 0x0f;
- if (major != 6) {
if (major == 5)major = 4;else if (major == 0)major = 1;printf("Unsupported GENETv%d.%d\n", major, (reg >> 16) & 0x0f);return -ENODEV;- }
- ret = bcmgenet_interface_set(priv);
- if (ret)
return ret;- offset = fdt_first_subnode(gd->fdt_blob, offset);
- name = fdt_get_name(gd->fdt_blob, offset, NULL);
- ret = bcmgenet_mdio_init(name, dev);
- if (ret)
return ret;- priv->bus = miiphy_get_dev_by_name(name);
- return bcmgenet_phy_init(priv, dev);
+}
+static void bcmgenet_gmac_eth_stop(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- clrbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN);
- clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL,
1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT) | DMA_EN);+}
+static const struct eth_ops bcmgenet_gmac_eth_ops = {
- .start = bcmgenet_gmac_eth_start,
- .write_hwaddr = bcmgenet_gmac_write_hwaddr,
- .send = bcmgenet_gmac_eth_send,
- .recv = bcmgenet_gmac_eth_recv,
- .free_pkt = bcmgenet_gmac_free_pkt,
- .stop = bcmgenet_gmac_eth_stop,
+};
+static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev) +{
- struct eth_pdata *pdata = dev_get_platdata(dev);
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- const char *phy_mode;
- int node = dev_of_offset(dev);
- int offset;
- pdata->iobase = (phys_addr_t)devfdt_get_addr(dev);
for compatibility with MIPS please remap all physical addresses from DT to virtual addresses. You can use the existing wrappers like dev_remap_addr(), dev_remap_addr_index() or dev_remap_addr_name() for that.
- /* Get phy mode from DT */
- pdata->phy_interface = -1;
- phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
NULL);generally you should use the newer DM API for that (see include/dm/read.h) to get rid of the gd pointer and to be able to use the live-tree feature. In this case dev_read_string().
- 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;- }
- offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle");
dev_read_phandle_with_args()
- if (offset > 0) {
priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", 0);pdata->max_speed = fdtdec_get_int(gd->fdt_blob, offset,"max-speed", 0);dev_read_s32() or dev_read_u32()
- }
- return 0;
+}
+/* The BCM2711 implementation has a limited burst length compared to a generic
- GENETv5 version, but we go with that shorter value (8) in both cases, for
- the sake of simplicity.
- */
+static const struct udevice_id bcmgenet_eth_ids[] = {
- {.compatible = "brcm,genet-v5"},
- {.compatible = "brcm,bcm2711-genet-v5"},
- {}
+};
+U_BOOT_DRIVER(eth_bcmgenet) = {
- .name = "eth_bcmgenet",
- .id = UCLASS_ETH,
- .of_match = bcmgenet_eth_ids,
- .ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata,
- .probe = bcmgenet_eth_probe,
- .ops = &bcmgenet_gmac_eth_ops,
- .priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
- .flags = DM_FLAG_ALLOC_PRIV_DMA,
+};
Hi Andre,
Am 19.12.19 um 12:42 schrieb Andre Przywara:
On Thu, 19 Dec 2019 12:32:06 +0100 Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
Hi Daniel,
many thanks for your valuable comments! Do you have access to a MIPS board using a GENETv5 MAC? I would be very curious to see if the driver works there, and am happy to make adjustments.
No, I have not. I was only triggered by your commit message that this MAC is also used on some MIPS based Broadcom SoC's ;)
Does your board use a PHY connected via RGMII? Because this is something we are relying on at the moment. But without any ways of testing this I'd rather not support other transports at this time.
I think your points below are all valid, so thanks for bringing this up. Will test this later on and post a v2 in due time then.
We had a similar scenario a few months ago, where a newly supported ARM based Broadcom SoC could simply reuse various drivers initially added for MIPS based Broadcom SoC's. So if someone wants to use your driver with a MIPS based Broadcom SoC in the future, likely some tweaking of the driver is required. But at least the basic cross-arch compatibility should be given.
On Thu, 19 Dec 2019 13:58:24 +0100 Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
Hi Daniel,
Am 19.12.19 um 12:42 schrieb Andre Przywara:
On Thu, 19 Dec 2019 12:32:06 +0100 Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
Hi Daniel,
many thanks for your valuable comments! Do you have access to a MIPS board using a GENETv5 MAC? I would be very curious to see if the driver works there, and am happy to make adjustments.
No, I have not. I was only triggered by your commit message that this MAC is also used on some MIPS based Broadcom SoC's ;)
Well, actually I am not sure about it, I just saw *previous* generations (up to v3) used in MIPS .dts files in the kernel. Might as well be that v5 was never used with a MIPS core.
Does your board use a PHY connected via RGMII? Because this is something we are relying on at the moment. But without any ways of testing this I'd rather not support other transports at this time.
I think your points below are all valid, so thanks for bringing this up. Will test this later on and post a v2 in due time then.
We had a similar scenario a few months ago, where a newly supported ARM based Broadcom SoC could simply reuse various drivers initially added for MIPS based Broadcom SoC's. So if someone wants to use your driver with a MIPS based Broadcom SoC in the future, likely some tweaking of the driver is required. But at least the basic cross-arch compatibility should be given.
Yeah, and especially the fdt vs. ofnode comments were very justified.
One thing I was wondering about: on ARM the bus is always little-endian, regardless of the current CPU state. That's why we routinely use _le32 function for hardware accesses. A comment in the Linux driver[1] suggests that this is not the case for MIPS, do you know anything about it? I used the native endian version as you suggested, as I am not aware that anyone is running U-Boot in BE on ARM.
So I addressed your comments already, you can have a look here [2] (top three commits). I will try if I can fix some of the known shortcomings (PHY timeout etc) before posting a v2.
Cheers, Andre.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/driv... [2] https://github.com/apritzel/u-boot/commits/rpi4-eth
On 12/19/2019 4:58 AM, Daniel Schwierzeck wrote:
Hi Andre,
Am 19.12.19 um 12:42 schrieb Andre Przywara:
On Thu, 19 Dec 2019 12:32:06 +0100 Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
Hi Daniel,
many thanks for your valuable comments! Do you have access to a MIPS board using a GENETv5 MAC? I would be very curious to see if the driver works there, and am happy to make adjustments.
No, I have not. I was only triggered by your commit message that this MAC is also used on some MIPS based Broadcom SoC's ;)
GENET v1, v2 and v3 are used exclusively used on MIPS-based Broadcom STB chips. GENET v4 is used exclusively used on ARM (32-bit) Broadcom STB chips and finally GENET v5 is used exclusively used on ARM 64-bit based chips, including 2711. Unlike other peripherals (SPI, NAND, I2C, Ethernet switches and PHYs) this Ethernet MAC is only used on STB chips and no other business unit within Broadcom has used it AFAICT so the chances of finding GENET in a non STB chips are close to zero at this point.
The GENET data path goes through a proprietary bus called SCB which for MIPS and ARM 32-bit was configurable to be little, big or automatically follow the CPU's endian which is the default. With the latest 64-bit ARM chips it was decided to drop the endian configuration and hard code the bus to be little endian. The register interface goes through a proprietary bus called GISB which always follows the CPU's endian and is not configurable AFAICT (there are other properties, like no re-ordering, no posting, which is why "raw" accessors are correct, too). Therefore using native endian accessors is the right thing to do here to guarantee maximum portability between all SoCs where this controller can be used.
Only MIPS-based STB chips support a boot strap to select the CPU's endian and when that happens the SCB and GISB buses remain native endian as indicated earlier. We did some work to ensure that an ARM BE kernel would work:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
but that was just for making sure there were no obvious problem and is not a configuration we support or want to support and only the kernel and userland were made BE for testing, it was booted from the LE boot loader.
Does your board use a PHY connected via RGMII? Because this is something we are relying on at the moment. But without any ways of testing this I'd rather not support other transports at this time.
I think your points below are all valid, so thanks for bringing this up. Will test this later on and post a v2 in due time then.
We had a similar scenario a few months ago, where a newly supported ARM based Broadcom SoC could simply reuse various drivers initially added for MIPS based Broadcom SoC's. So if someone wants to use your driver with a MIPS based Broadcom SoC in the future, likely some tweaking of the driver is required. But at least the basic cross-arch compatibility should be given.
Agreed. I am not sure if such a situation will ever arise in the future because those MIPS-based chips are reasonably old now, and few if any people have shown interest in using something different than CFE (Broadcom's own boot loader) or their own third stage, but hey, someone might see the light at some point :).
On 18/12/2019 12:59, Andre Przywara wrote:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
Tested-by: Matthias Brugger mbrugger@suse.com
Thanks a lot.
Joe I suppose that this patch goes through your tree, please keep me in the loop, I'll take patch 2 and 3 through my tree then.
Regards, Matthias
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 142a2c6953..999714dd39 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -136,6 +136,13 @@ config BCM6368_ETH help This driver supports the BCM6368 Ethernet MAC.
+config BCMGENET
- bool "BCMGENET V5 support"
- depends on DM_ETH
- select PHYLIB
- help
This driver supports the BCMGENET Ethernet MAC.config DWC_ETH_QOS bool "Synopsys DWC Ethernet QOS device support" depends on DM_ETH diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 30991834ec..6e0a68834d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_AG7XXX) += ag7xxx.o obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o obj-$(CONFIG_BCM6348_ETH) += bcm6348-eth.o obj-$(CONFIG_BCM6368_ETH) += bcm6368-eth.o +obj-$(CONFIG_BCMGENET) += bcmgenet.o obj-$(CONFIG_DRIVER_AT91EMAC) += at91_emac.o obj-$(CONFIG_DRIVER_AX88180) += ax88180.o obj-$(CONFIG_BCM_SF2_ETH) += bcm-sf2-eth.o diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c new file mode 100644 index 0000000000..24b025d804 --- /dev/null +++ b/drivers/net/bcmgenet.c @@ -0,0 +1,702 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (C) 2019 Amit Singh Tomar amittomer25@gmail.com
- Driver for Broadcom GENETv5 Ethernet controller (as found on the RPi4)
- This driver is based on the Linux driver:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
which is: Copyright (c) 2014-2017 Broadcom
- The hardware supports multiple queues (16 priority queues and one
- default queue), both for RX and TX. There are 256 DMA descriptors (both
- for TX and RX), and they live in MMIO registers. The hardware allows
- assigning descriptor ranges to queues, but we choose the most simple setup:
- All 256 descriptors are assigned to the default queue (#16).
- Also the Linux driver supports multiple generations of the MAC, whereas
- we only support v5, as used in the Raspberry Pi 4.
- */
+#include <asm/io.h> +#include <clk.h> +#include <cpu_func.h> +#include <dm.h> +#include <fdt_support.h> +#include <linux/err.h> +#include <malloc.h> +#include <miiphy.h> +#include <net.h> +#include <dm/of_access.h> +#include <dm/ofnode.h> +#include <linux/libfdt.h> +#include <linux/iopoll.h> +#include <asm/dma-mapping.h> +#include <wait_bit.h>
+/* Register definitions derived from Linux source */ +#define SYS_REV_CTRL 0x00
+#define SYS_PORT_CTRL 0x04 +#define PORT_MODE_EXT_GPHY 3
+#define GENET_SYS_OFF 0x0000 +#define SYS_RBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x08) +#define SYS_TBUF_FLUSH_CTRL (GENET_SYS_OFF + 0x0c)
+#define GENET_EXT_OFF 0x0080 +#define EXT_RGMII_OOB_CTRL (GENET_EXT_OFF + 0x0c) +#define RGMII_LINK BIT(4) +#define OOB_DISABLE BIT(5) +#define RGMII_MODE_EN BIT(6) +#define ID_MODE_DIS BIT(16)
+#define GENET_RBUF_OFF 0x0300 +#define RBUF_TBUF_SIZE_CTRL (GENET_RBUF_OFF + 0xb4) +#define RBUF_CTRL (GENET_RBUF_OFF + 0x00) +#define RBUF_ALIGN_2B BIT(1)
+#define GENET_UMAC_OFF 0x0800 +#define UMAC_MIB_CTRL (GENET_UMAC_OFF + 0x580) +#define UMAC_MAX_FRAME_LEN (GENET_UMAC_OFF + 0x014) +#define UMAC_MAC0 (GENET_UMAC_OFF + 0x00c) +#define UMAC_MAC1 (GENET_UMAC_OFF + 0x010) +#define UMAC_CMD (GENET_UMAC_OFF + 0x008) +#define MDIO_CMD (GENET_UMAC_OFF + 0x614) +#define UMAC_TX_FLUSH (GENET_UMAC_OFF + 0x334) +#define MDIO_START_BUSY BIT(29) +#define MDIO_READ_FAIL BIT(28) +#define MDIO_RD (2 << 26) +#define MDIO_WR BIT(26) +#define MDIO_PMD_SHIFT 21 +#define MDIO_PMD_MASK 0x1f +#define MDIO_REG_SHIFT 16 +#define MDIO_REG_MASK 0x1f
+#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1) +#define UMAC_SPEED_10 0 +#define UMAC_SPEED_100 1 +#define UMAC_SPEED_1000 2 +#define UMAC_SPEED_2500 3 +#define CMD_SPEED_SHIFT 2 +#define CMD_SPEED_MASK 3 +#define CMD_SW_RESET BIT(13) +#define CMD_LCL_LOOP_EN BIT(15) +#define CMD_TX_EN BIT(0) +#define CMD_RX_EN BIT(1)
+#define MIB_RESET_RX BIT(0) +#define MIB_RESET_RUNT BIT(1) +#define MIB_RESET_TX BIT(2)
+/* total number of Buffer Descriptors, same for Rx/Tx */ +#define TOTAL_DESCS 256 +#define RX_DESCS TOTAL_DESCS +#define TX_DESCS TOTAL_DESCS
+#define DEFAULT_Q 0x10
+/* Body(1500) + EH_SIZE(14) + VLANTAG(4) + BRCMTAG(6) + FCS(4) = 1528.
- 1536 is multiple of 256 bytes
- */
+#define ENET_BRCM_TAG_LEN 6 +#define ENET_PAD 8 +#define ENET_MAX_MTU_SIZE (ETH_DATA_LEN + ETH_HLEN + \
VLAN_HLEN + ENET_BRCM_TAG_LEN + \ETH_FCS_LEN + ENET_PAD)+/* Tx/Rx Dma Descriptor common bits */ +#define DMA_EN BIT(0) +#define DMA_RING_BUF_EN_SHIFT 0x01 +#define DMA_RING_BUF_EN_MASK 0xffff +#define DMA_BUFLENGTH_MASK 0x0fff +#define DMA_BUFLENGTH_SHIFT 16 +#define DMA_RING_SIZE_SHIFT 16 +#define DMA_OWN 0x8000 +#define DMA_EOP 0x4000 +#define DMA_SOP 0x2000 +#define DMA_WRAP 0x1000 +#define DMA_MAX_BURST_LENGTH 0x8 +/* Tx specific DMA descriptor bits */ +#define DMA_TX_UNDERRUN 0x0200 +#define DMA_TX_APPEND_CRC 0x0040 +#define DMA_TX_OW_CRC 0x0020 +#define DMA_TX_DO_CSUM 0x0010 +#define DMA_TX_QTAG_SHIFT 7
+/* DMA rings size */ +#define DMA_RING_SIZE 0x40 +#define DMA_RINGS_SIZE (DMA_RING_SIZE * (DEFAULT_Q + 1))
+/* DMA descriptor */ +#define DMA_DESC_LENGTH_STATUS 0x00 +#define DMA_DESC_ADDRESS_LO 0x04 +#define DMA_DESC_ADDRESS_HI 0x08 +#define DMA_DESC_SIZE 12
+#define GENET_RX_OFF 0x2000 +#define GENET_RDMA_REG_OFF \
- (GENET_RX_OFF + TOTAL_DESCS * DMA_DESC_SIZE)
+#define GENET_TX_OFF 0x4000 +#define GENET_TDMA_REG_OFF \
- (GENET_TX_OFF + TOTAL_DESCS * DMA_DESC_SIZE)
+#define DMA_FC_THRESH_HI (RX_DESCS >> 4) +#define DMA_FC_THRESH_LO 5 +#define DMA_FC_THRESH_VALUE ((DMA_FC_THRESH_LO << 16) | \
DMA_FC_THRESH_HI)+#define DMA_XOFF_THRESHOLD_SHIFT 16
+#define TDMA_RING_REG_BASE \
- (GENET_TDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE)
+#define TDMA_READ_PTR (TDMA_RING_REG_BASE + 0x00) +#define TDMA_CONS_INDEX (TDMA_RING_REG_BASE + 0x08) +#define TDMA_PROD_INDEX (TDMA_RING_REG_BASE + 0x0c) +#define DMA_RING_BUF_SIZE 0x10 +#define DMA_START_ADDR 0x14 +#define DMA_END_ADDR 0x1c +#define DMA_MBUF_DONE_THRESH 0x24 +#define TDMA_FLOW_PERIOD (TDMA_RING_REG_BASE + 0x28) +#define TDMA_WRITE_PTR (TDMA_RING_REG_BASE + 0x2c)
+#define RDMA_RING_REG_BASE \
- (GENET_RDMA_REG_OFF + DEFAULT_Q * DMA_RING_SIZE)
+#define RDMA_WRITE_PTR (RDMA_RING_REG_BASE + 0x00) +#define RDMA_PROD_INDEX (RDMA_RING_REG_BASE + 0x08) +#define RDMA_CONS_INDEX (RDMA_RING_REG_BASE + 0x0c) +#define RDMA_XON_XOFF_THRESH (RDMA_RING_REG_BASE + 0x28) +#define RDMA_READ_PTR (RDMA_RING_REG_BASE + 0x2c)
+#define TDMA_REG_BASE (GENET_TDMA_REG_OFF + DMA_RINGS_SIZE) +#define RDMA_REG_BASE (GENET_RDMA_REG_OFF + DMA_RINGS_SIZE) +#define DMA_RING_CFG 0x00 +#define DMA_CTRL 0x04 +#define DMA_SCB_BURST_SIZE 0x0c
+#define RX_BUF_LENGTH 2048 +#define RX_TOTAL_BUFSIZE (RX_BUF_LENGTH * RX_DESCS) +#define RX_BUF_OFFSET 2
+DECLARE_GLOBAL_DATA_PTR;
+struct bcmgenet_eth_priv {
- void *mac_reg;
- char rxbuffer[RX_TOTAL_BUFSIZE] __aligned(ARCH_DMA_MINALIGN);
- void *tx_desc_base;
- void *rx_desc_base;
- int tx_index;
- int rx_index;
- int c_index;
- int phyaddr;
- u32 interface;
- u32 speed;
- struct phy_device *phydev;
- struct mii_dev *bus;
+};
+static void bcmgenet_umac_reset(struct bcmgenet_eth_priv *priv) +{
- u32 reg;
- reg = readl(priv->mac_reg + SYS_RBUF_FLUSH_CTRL);
- reg |= BIT(1);
- writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- reg &= ~BIT(1);
- writel(reg, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- writel(0, (priv->mac_reg + SYS_RBUF_FLUSH_CTRL));
- udelay(10);
- writel(0, priv->mac_reg + UMAC_CMD);
- writel(CMD_SW_RESET | CMD_LCL_LOOP_EN, priv->mac_reg + UMAC_CMD);
- udelay(2);
- writel(0, priv->mac_reg + UMAC_CMD);
- /* clear tx/rx counter */
- writel(MIB_RESET_RX | MIB_RESET_TX | MIB_RESET_RUNT,
priv->mac_reg + UMAC_MIB_CTRL);- writel(0, priv->mac_reg + UMAC_MIB_CTRL);
- writel(ENET_MAX_MTU_SIZE, priv->mac_reg + UMAC_MAX_FRAME_LEN);
- /* init rx registers, enable ip header optimization */
- reg = readl(priv->mac_reg + RBUF_CTRL);
- reg |= RBUF_ALIGN_2B;
- writel(reg, (priv->mac_reg + RBUF_CTRL));
- writel(1, (priv->mac_reg + RBUF_TBUF_SIZE_CTRL));
+}
+static int bcmgenet_gmac_write_hwaddr(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- struct eth_pdata *pdata = dev_get_platdata(dev);
- uchar *addr = pdata->enetaddr;
- u32 reg;
- reg = addr[0] << 24 | addr[1] << 16 | addr[2] << 8 | addr[3];
- writel_relaxed(reg, priv->mac_reg + UMAC_MAC0);
- reg = addr[4] << 8 | addr[5];
- writel_relaxed(reg, priv->mac_reg + UMAC_MAC1);
- return 0;
+}
+static void bcmgenet_disable_dma(struct bcmgenet_eth_priv *priv) +{
- clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL, DMA_EN);
- clrbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, DMA_EN);
- writel(1, priv->mac_reg + UMAC_TX_FLUSH);
- udelay(10);
- writel(0, priv->mac_reg + UMAC_TX_FLUSH);
+}
+static void bcmgenet_enable_dma(struct bcmgenet_eth_priv *priv) +{
- u32 dma_ctrl = (1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT)) | DMA_EN;
- writel(dma_ctrl, priv->mac_reg + TDMA_REG_BASE + DMA_CTRL);
- setbits_le32(priv->mac_reg + RDMA_REG_BASE + DMA_CTRL, dma_ctrl);
+}
+static int bcmgenet_gmac_eth_send(struct udevice *dev, void *packet, int length) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- void *desc_base = priv->tx_desc_base + priv->tx_index * DMA_DESC_SIZE;
- u32 len_stat = length << DMA_BUFLENGTH_SHIFT;
- u32 prod_index, cons;
- u32 tries = 100;
- prod_index = readl(priv->mac_reg + TDMA_PROD_INDEX);
- flush_dcache_range((ulong)packet, (ulong)packet + length);
- len_stat |= 0x3F << DMA_TX_QTAG_SHIFT;
- len_stat |= DMA_TX_APPEND_CRC | DMA_SOP | DMA_EOP;
- /* Set-up packet for transmission */
- writel(lower_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_LO));
- writel(upper_32_bits((ulong)packet), (desc_base + DMA_DESC_ADDRESS_HI));
- writel(len_stat, (desc_base + DMA_DESC_LENGTH_STATUS));
- /* Increment index and start transmission */
- if (++priv->tx_index >= TX_DESCS)
priv->tx_index = 0;- prod_index++;
- /* Start Transmisson */
- writel(prod_index, priv->mac_reg + TDMA_PROD_INDEX);
- do {
cons = readl(priv->mac_reg + TDMA_CONS_INDEX);- } while ((cons & 0xffff) < prod_index && --tries);
- if (!tries)
return -ETIMEDOUT;- return 0;
+}
+static int bcmgenet_gmac_eth_recv(struct udevice *dev,
int flags, uchar **packetp)+{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- void *desc_base = priv->rx_desc_base + priv->rx_index * DMA_DESC_SIZE;
- u32 prod_index = readl(priv->mac_reg + RDMA_PROD_INDEX);
- u32 length, addr;
- if (prod_index == priv->c_index)
return -EAGAIN;- length = readl(desc_base + DMA_DESC_LENGTH_STATUS);
- length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK;
- addr = readl(desc_base + DMA_DESC_ADDRESS_LO);
- invalidate_dcache_range(addr,
addr + roundup(length, ARCH_DMA_MINALIGN));- /* To cater for the IP header alignment the hardware does.
* This would actually not be needed if we don't program* RBUF_ALIGN_2B*/- *packetp = (uchar *)(ulong)addr + RX_BUF_OFFSET;
- return length - RX_BUF_OFFSET;
+}
+static int bcmgenet_gmac_free_pkt(struct udevice *dev, uchar *packet,
int length)+{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- /* Tell the MAC we have consumed that last receive buffer. */
- priv->c_index = (priv->c_index + 1) & 0xFFFF;
- writel(priv->c_index, priv->mac_reg + RDMA_CONS_INDEX);
- /* Forward our descriptor pointer, wrapping around if needed. */
- if (++priv->rx_index >= RX_DESCS)
priv->rx_index = 0;- return 0;
+}
+static void rx_descs_init(struct bcmgenet_eth_priv *priv) +{
- char *rxbuffs = &priv->rxbuffer[0];
- u32 len_stat, i;
- void *desc_base = priv->rx_desc_base;
- priv->c_index = 0;
- len_stat = (RX_BUF_LENGTH << DMA_BUFLENGTH_SHIFT) | DMA_OWN;
- for (i = 0; i < RX_DESCS; i++) {
writel(lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]),desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO);writel(upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]),desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI);writel(len_stat,desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS);- }
+}
+static void rx_ring_init(struct bcmgenet_eth_priv *priv) +{
- writel(DMA_MAX_BURST_LENGTH,
priv->mac_reg + RDMA_REG_BASE + DMA_SCB_BURST_SIZE);- writel(0x0, priv->mac_reg + RDMA_RING_REG_BASE + DMA_START_ADDR);
- writel(0x0, priv->mac_reg + RDMA_READ_PTR);
- writel(0x0, priv->mac_reg + RDMA_WRITE_PTR);
- writel(RX_DESCS * DMA_DESC_SIZE / 4 - 1,
priv->mac_reg + RDMA_RING_REG_BASE + DMA_END_ADDR);- writel(0x0, priv->mac_reg + RDMA_PROD_INDEX);
- writel(0x0, priv->mac_reg + RDMA_CONS_INDEX);
- writel((RX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH,
priv->mac_reg + RDMA_RING_REG_BASE + DMA_RING_BUF_SIZE);- writel(DMA_FC_THRESH_VALUE, priv->mac_reg + RDMA_XON_XOFF_THRESH);
- writel(1 << DEFAULT_Q, priv->mac_reg + RDMA_REG_BASE + DMA_RING_CFG);
+}
+static void tx_ring_init(struct bcmgenet_eth_priv *priv) +{
- writel(DMA_MAX_BURST_LENGTH,
priv->mac_reg + TDMA_REG_BASE + DMA_SCB_BURST_SIZE);- writel(0x0, priv->mac_reg + TDMA_RING_REG_BASE + DMA_START_ADDR);
- writel(0x0, priv->mac_reg + TDMA_READ_PTR);
- writel(0x0, priv->mac_reg + TDMA_WRITE_PTR);
- writel(TX_DESCS * DMA_DESC_SIZE / 4 - 1,
priv->mac_reg + TDMA_RING_REG_BASE + DMA_END_ADDR);- writel(0x0, priv->mac_reg + TDMA_PROD_INDEX);
- writel(0x0, priv->mac_reg + TDMA_CONS_INDEX);
- writel(0x1, priv->mac_reg + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH);
- writel(0x0, priv->mac_reg + TDMA_FLOW_PERIOD);
- writel((TX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH,
priv->mac_reg + TDMA_RING_REG_BASE + DMA_RING_BUF_SIZE);- writel(1 << DEFAULT_Q, priv->mac_reg + TDMA_REG_BASE + DMA_RING_CFG);
+}
+static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv) +{
- struct phy_device *phy_dev = priv->phydev;
- u32 speed;
- switch (phy_dev->speed) {
- case SPEED_1000:
speed = UMAC_SPEED_1000;break;- case SPEED_100:
speed = UMAC_SPEED_100;break;- case SPEED_10:
speed = UMAC_SPEED_10;break;- default:
printf("bcmgenet: Unsupported PHY speed: %d\n", phy_dev->speed);return -EINVAL;- }
- clrsetbits_le32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE,
RGMII_LINK | RGMII_MODE_EN | ID_MODE_DIS);- writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD));
- return 0;
+}
+static int bcmgenet_gmac_eth_start(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- int ret;
- priv->tx_desc_base = priv->mac_reg + GENET_TX_OFF;
- priv->rx_desc_base = priv->mac_reg + GENET_RX_OFF;
- priv->tx_index = 0x0;
- priv->rx_index = 0x0;
- bcmgenet_umac_reset(priv);
- bcmgenet_gmac_write_hwaddr(dev);
- /* Disable RX/TX DMA and flush TX queues */
- bcmgenet_disable_dma(priv);
- rx_ring_init(priv);
- rx_descs_init(priv);
- tx_ring_init(priv);
- /* Enable RX/TX DMA */
- bcmgenet_enable_dma(priv);
- /* read PHY properties over the wire from generic PHY set-up */
- ret = phy_startup(priv->phydev);
- if (ret) {
printf("bcmgenet: PHY startup failed: %d\n", ret);return ret;- }
- /* Update MAC registers based on PHY property */
- ret = bcmgenet_adjust_link(priv);
- if (ret) {
printf("bcmgenet: adjust PHY link failed: %d\n", ret);return ret;- }
- /* Enable Rx/Tx */
- setbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN);
- return 0;
+}
+static int bcmgenet_phy_init(struct bcmgenet_eth_priv *priv, void *dev) +{
- struct phy_device *phydev;
- int ret;
- phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface);
- if (!phydev)
return -ENODEV;- phydev->supported &= PHY_GBIT_FEATURES;
- if (priv->speed) {
ret = phy_set_supported(priv->phydev, priv->speed);if (ret)return ret;- }
- phydev->advertising = phydev->supported;
- phy_connect_dev(phydev, dev);
- priv->phydev = phydev;
- phy_config(priv->phydev);
- return 0;
+}
+static void bcmgenet_mdio_start(struct bcmgenet_eth_priv *priv) +{
- setbits_le32(priv->mac_reg + MDIO_CMD, MDIO_START_BUSY);
+}
+static int bcmgenet_mdio_write(struct mii_dev *bus, int addr, int devad,
int reg, u16 value)+{
- struct udevice *dev = bus->priv;
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- u32 val;
- /* Prepare the read operation */
- val = MDIO_WR | (addr << MDIO_PMD_SHIFT) |
(reg << MDIO_REG_SHIFT) | (0xffff & value);- writel_relaxed(val, priv->mac_reg + MDIO_CMD);
- /* Start MDIO transaction */
- bcmgenet_mdio_start(priv);
- return wait_for_bit_le32(priv->mac_reg + MDIO_CMD,
MDIO_START_BUSY, false, 20, true);+}
+static int bcmgenet_mdio_read(struct mii_dev *bus, int addr, int devad, int reg) +{
- struct udevice *dev = bus->priv;
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- u32 val;
- int ret;
- /* Prepare the read operation */
- val = MDIO_RD | (addr << MDIO_PMD_SHIFT) | (reg << MDIO_REG_SHIFT);
- writel_relaxed(val, priv->mac_reg + MDIO_CMD);
- /* Start MDIO transaction */
- bcmgenet_mdio_start(priv);
- ret = wait_for_bit_le32(priv->mac_reg + MDIO_CMD,
MDIO_START_BUSY, false, 20, true);- if (ret)
return ret;- val = readl_relaxed(priv->mac_reg + MDIO_CMD);
- return val & 0xffff;
+}
+static int bcmgenet_mdio_init(const char *name, struct udevice *priv) +{
- struct mii_dev *bus = mdio_alloc();
- if (!bus) {
debug("Failed to allocate MDIO bus\n");return -ENOMEM;- }
- bus->read = bcmgenet_mdio_read;
- bus->write = bcmgenet_mdio_write;
- snprintf(bus->name, sizeof(bus->name), name);
- bus->priv = (void *)priv;
- return mdio_register(bus);
+}
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;- default:
printf("unknown phy mode: %d\n", priv->interface);return -EINVAL;- }
- return 0;
+}
+static int bcmgenet_eth_probe(struct udevice *dev) +{
- struct eth_pdata *pdata = dev_get_platdata(dev);
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- int offset = dev_of_offset(dev);
- const char *name;
- u32 reg;
- int ret;
- u8 major;
- priv->mac_reg = (void *)pdata->iobase;
- priv->interface = pdata->phy_interface;
- priv->speed = pdata->max_speed;
- /* Read GENET HW version */
- reg = readl_relaxed(priv->mac_reg + SYS_REV_CTRL);
- major = (reg >> 24) & 0x0f;
- if (major != 6) {
if (major == 5)major = 4;else if (major == 0)major = 1;printf("Unsupported GENETv%d.%d\n", major, (reg >> 16) & 0x0f);return -ENODEV;- }
- ret = bcmgenet_interface_set(priv);
- if (ret)
return ret;- offset = fdt_first_subnode(gd->fdt_blob, offset);
- name = fdt_get_name(gd->fdt_blob, offset, NULL);
- ret = bcmgenet_mdio_init(name, dev);
- if (ret)
return ret;- priv->bus = miiphy_get_dev_by_name(name);
- return bcmgenet_phy_init(priv, dev);
+}
+static void bcmgenet_gmac_eth_stop(struct udevice *dev) +{
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- clrbits_le32(priv->mac_reg + UMAC_CMD, CMD_TX_EN | CMD_RX_EN);
- clrbits_le32(priv->mac_reg + TDMA_REG_BASE + DMA_CTRL,
1 << (DEFAULT_Q + DMA_RING_BUF_EN_SHIFT) | DMA_EN);+}
+static const struct eth_ops bcmgenet_gmac_eth_ops = {
- .start = bcmgenet_gmac_eth_start,
- .write_hwaddr = bcmgenet_gmac_write_hwaddr,
- .send = bcmgenet_gmac_eth_send,
- .recv = bcmgenet_gmac_eth_recv,
- .free_pkt = bcmgenet_gmac_free_pkt,
- .stop = bcmgenet_gmac_eth_stop,
+};
+static int bcmgenet_eth_ofdata_to_platdata(struct udevice *dev) +{
- struct eth_pdata *pdata = dev_get_platdata(dev);
- struct bcmgenet_eth_priv *priv = dev_get_priv(dev);
- const char *phy_mode;
- int node = dev_of_offset(dev);
- int offset;
- pdata->iobase = (phys_addr_t)devfdt_get_addr(dev);
- /* Get phy mode from DT */
- pdata->phy_interface = -1;
- phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "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;- }
- offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "phy-handle");
- if (offset > 0) {
priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", 0);pdata->max_speed = fdtdec_get_int(gd->fdt_blob, offset,"max-speed", 0);- }
- return 0;
+}
+/* The BCM2711 implementation has a limited burst length compared to a generic
- GENETv5 version, but we go with that shorter value (8) in both cases, for
- the sake of simplicity.
- */
+static const struct udevice_id bcmgenet_eth_ids[] = {
- {.compatible = "brcm,genet-v5"},
- {.compatible = "brcm,bcm2711-genet-v5"},
- {}
+};
+U_BOOT_DRIVER(eth_bcmgenet) = {
- .name = "eth_bcmgenet",
- .id = UCLASS_ETH,
- .of_match = bcmgenet_eth_ids,
- .ofdata_to_platdata = bcmgenet_eth_ofdata_to_platdata,
- .probe = bcmgenet_eth_probe,
- .ops = &bcmgenet_gmac_eth_ops,
- .priv_auto_alloc_size = sizeof(struct bcmgenet_eth_priv),
- .platdata_auto_alloc_size = sizeof(struct eth_pdata),
- .flags = DM_FLAG_ALLOC_PRIV_DMA,
+};
Hi Andre,
Am 18.12.19 um 12:59 schrieb Andre Przywara:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
...
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;
This doesn't match the current Linux upstream kernel / DTS. We consider the PHY mode in the downstream DTS as wrong. It should be PHY_INTERFACE_MODE_RGMII_RXID. So please add this to keep compatibility to the upstream devicetree.
Please following this series [1] for more information.
Thank you a lot for this work
Stefan
[1] - https://marc.info/?l=linux-netdev&m=157350191805462&w=2
- default:
printf("unknown phy mode: %d\n", priv->interface);return -EINVAL;- }
- return 0;
+}
Am 20.12.19 um 20:29 schrieb Stefan Wahren:
Hi Andre,
Am 18.12.19 um 12:59 schrieb Andre Przywara:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
...
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;This doesn't match the current Linux upstream kernel / DTS. We consider the PHY mode in the downstream DTS as wrong. It should be PHY_INTERFACE_MODE_RGMII_RXID. So please add this to keep compatibility to the upstream devicetree.
Please following this series [1] for more information.
Thank you a lot for this work
Stefan
[1] - https://marc.info/?l=linux-netdev&m=157350191805462&w=2
Except of this, i noticed another issue with current u-boot. It complains about misaligned access:
U-Boot 2020.01-rc5-00007-g5111518-dirty (Dec 23 2019 - 19:25:49 +0100) DRAM: 948 MiB RPI 4 Model B (0xc03112) MMC: sdhci@7e300000: 0, emmc2@7e340000: 1 Loading Environment from FAT... Card did not respond to voltage select! In: serial Out: serial Err: serial Net: eth0: ethernet@7d580000 Hit any key to stop autoboot: 0 Card did not respond to voltage select! switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot.scr 213 bytes read in 73 ms (2 KiB/s) ## Executing script at 02400000 Card did not respond to voltage select! Wrong Image Format for bootm command ERROR: can't get kernel image! SCRIPT FAILED: continuing... 30395 bytes read in 53 ms (559.6 KiB/s) ethernet@7d580000 Waiting for PHY auto negotiation to complete.. done BOOTP broadcast 1 CACHE: Misaligned operation at range [3b3ed1c0, 3b3ed316] CACHE: Misaligned operation at range [3b3ed1c0, 3b3ed316] DHCP client bound to address 192.168.1.171 (15 ms) *** Warning: no boot file name; using 'C0A801AB.img' Using ethernet@7d580000 device TFTP from server 192.168.1.1; our IP address is 192.168.1.171 Filename 'C0A801AB.img'. Load address: 0x200000 Loading: CACHE: Misaligned operation at range [3b3ec640, 3b3ec66a]
On 23/12/2019 18:42, Stefan Wahren wrote:
Hi Stefan,
Am 20.12.19 um 20:29 schrieb Stefan Wahren:
Hi Andre,
Am 18.12.19 um 12:59 schrieb Andre Przywara:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
...
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;This doesn't match the current Linux upstream kernel / DTS. We consider the PHY mode in the downstream DTS as wrong. It should be PHY_INTERFACE_MODE_RGMII_RXID. So please add this to keep compatibility to the upstream devicetree.
Please following this series [1] for more information.
Thank you a lot for this work
Stefan
[1] - https://marc.info/?l=linux-netdev&m=157350191805462&w=2
Except of this, i noticed another issue with current u-boot. It complains about misaligned access:
Thanks for the report, and yeah: this is one of the things I wanted to fix still. But that only happens with the 32-bit build, right? The issue goes a bit deeper than it seems at the first glance. Can you please try this patch? https://lists.denx.de/pipermail/u-boot/2019-December/394174.html
And feel free to join the discussion there ;-)
Cheers, Andre
U-Boot 2020.01-rc5-00007-g5111518-dirty (Dec 23 2019 - 19:25:49 +0100) DRAM: 948 MiB RPI 4 Model B (0xc03112) MMC: sdhci@7e300000: 0, emmc2@7e340000: 1 Loading Environment from FAT... Card did not respond to voltage select! In: serial Out: serial Err: serial Net: eth0: ethernet@7d580000 Hit any key to stop autoboot: 0 Card did not respond to voltage select! switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot.scr 213 bytes read in 73 ms (2 KiB/s) ## Executing script at 02400000 Card did not respond to voltage select! Wrong Image Format for bootm command ERROR: can't get kernel image! SCRIPT FAILED: continuing... 30395 bytes read in 53 ms (559.6 KiB/s) ethernet@7d580000 Waiting for PHY auto negotiation to complete.. done BOOTP broadcast 1 CACHE: Misaligned operation at range [3b3ed1c0, 3b3ed316] CACHE: Misaligned operation at range [3b3ed1c0, 3b3ed316] DHCP client bound to address 192.168.1.171 (15 ms) *** Warning: no boot file name; using 'C0A801AB.img' Using ethernet@7d580000 device TFTP from server 192.168.1.1; our IP address is 192.168.1.171 Filename 'C0A801AB.img'. Load address: 0x200000 Loading: CACHE: Misaligned operation at range [3b3ec640, 3b3ec66a]
thank you :-)
@Andre: you said it before.
Are any other cases i could test ? don't worry, one of three boards i could damage ! (but it's better if not ... ;-))
Happy days, people - for all of you :-)
and thank you again
Am Mo., 23. Dez. 2019 um 23:24 Uhr schrieb André Przywara andre.przywara@arm.com:
On 23/12/2019 18:42, Stefan Wahren wrote:
Hi Stefan,
Am 20.12.19 um 20:29 schrieb Stefan Wahren:
Hi Andre,
Am 18.12.19 um 12:59 schrieb Andre Przywara:
From: Amit Singh Tomar amittomer25@gmail.com
The Broadcom GENET Ethernet MACs are used in several MIPS based SoCs and in the Broadcom 2711/2838 SoC used on the Raspberry Pi 4. There is no publicly available documentation, so this driver is based on the Linux driver. Compared to that the queue management is drastically simplified, also we only support version 5 of the IP and RGMII connections between MAC and PHY, as used on the RPi4.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com [Andre: heavy cleanup and a few fixes] Signed-off-by: Andre Przywara andre.przywara@arm.com
drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 710 insertions(+) create mode 100644 drivers/net/bcmgenet.c
...
+/* We only support RGMII (as used on the RPi4). */ +static int bcmgenet_interface_set(struct bcmgenet_eth_priv *priv) +{
- phy_interface_t phy_mode = priv->interface;
- switch (phy_mode) {
- case PHY_INTERFACE_MODE_RGMII:
writel(PORT_MODE_EXT_GPHY, priv->mac_reg + SYS_PORT_CTRL);break;This doesn't match the current Linux upstream kernel / DTS. We consider the PHY mode in the downstream DTS as wrong. It should be PHY_INTERFACE_MODE_RGMII_RXID. So please add this to keep compatibility to the upstream devicetree.
Please following this series [1] for more information.
Thank you a lot for this work
Stefan
[1] - https://marc.info/?l=linux-netdev&m=157350191805462&w=2
Except of this, i noticed another issue with current u-boot. It complains about misaligned access:
Thanks for the report, and yeah: this is one of the things I wanted to fix still. But that only happens with the 32-bit build, right? The issue goes a bit deeper than it seems at the first glance. Can you please try this patch? https://lists.denx.de/pipermail/u-boot/2019-December/394174.html
And feel free to join the discussion there ;-)
Cheers, Andre
U-Boot 2020.01-rc5-00007-g5111518-dirty (Dec 23 2019 - 19:25:49 +0100)
DRAM: 948 MiB RPI 4 Model B (0xc03112) MMC: sdhci@7e300000: 0, emmc2@7e340000: 1 Loading Environment from FAT... Card did not respond to voltage select! In: serial Out: serial Err: serial Net: eth0: ethernet@7d580000 Hit any key to stop autoboot: 0 Card did not respond to voltage select! switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot.scr 213 bytes read in 73 ms (2 KiB/s) ## Executing script at 02400000 Card did not respond to voltage select! Wrong Image Format for bootm command ERROR: can't get kernel image! SCRIPT FAILED: continuing... 30395 bytes read in 53 ms (559.6 KiB/s) ethernet@7d580000 Waiting for PHY auto negotiation to complete.. done BOOTP broadcast 1 CACHE: Misaligned operation at range [3b3ed1c0, 3b3ed316] CACHE: Misaligned operation at range [3b3ed1c0, 3b3ed316] DHCP client bound to address 192.168.1.171 (15 ms) *** Warning: no boot file name; using 'C0A801AB.img' Using ethernet@7d580000 device TFTP from server 192.168.1.1; our IP address is 192.168.1.171 Filename 'C0A801AB.img'. Load address: 0x200000 Loading: CACHE: Misaligned operation at range [3b3ec640, 3b3ec66a]
Hi Sascha,
Are any other cases i could test ? don't worry, one of three boards i could damage ! (but it's better if not ... ;-))
Just curious to know what data transfer rate, you see while tftp?
Thanks -Amit
From: Amit Singh Tomar amittomer25@gmail.com
Some of the devices(for instance, pcie and gnet controller) sitting on SCB bus falls behind/below the memory range that we currenty have.
This patch updates the memory range to map those devices correctly.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com Reviewed-by: Andre Przywara andre.przywara@arm.com Signed-off-by: Andre Przywara andre.przywara@arm.com --- arch/arm/mach-bcm283x/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 3b5f45b431..9966d6c833 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -42,9 +42,9 @@ static struct mm_region bcm2711_mem_map[] = { .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE }, { - .virt = 0xfe000000UL, - .phys = 0xfe000000UL, - .size = 0x01800000UL, + .virt = 0xfc000000UL, + .phys = 0xfc000000UL, + .size = 0x03800000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN
From: Amit Singh Tomar amittomer25@gmail.com
The Raspberry Pi 4 SoC features an integrated Gigabit Ethernet controller, connected as a platform device.
Enable the new driver in the three applicable defconfigs, to allow TFTP booting on the board.
Signed-off-by: Amit Singh Tomar amittomer25@gmail.com [Andre: Add joined and 32-bit configs] Signed-off-by: Andre Przywara andre.przywara@arm.com --- configs/rpi_4_32b_defconfig | 2 ++ configs/rpi_4_defconfig | 2 ++ configs/rpi_arm64_defconfig | 1 + 3 files changed, 5 insertions(+)
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 00f80f71ad..e7ea88bd4b 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -24,6 +24,8 @@ CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y +CONFIG_DM_ETH=y +CONFIG_BCMGENET=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 8cf1bb81ff..b0f9cf1c0e 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -24,6 +24,8 @@ CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y +CONFIG_DM_ETH=y +CONFIG_BCMGENET=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig index 10fbe0db92..00b3096481 100644 --- a/configs/rpi_arm64_defconfig +++ b/configs/rpi_arm64_defconfig @@ -36,6 +36,7 @@ CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_LAN78XX=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_BCMGENET=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_BPP32=y CONFIG_SYS_WHITE_ON_BLACK=y
Thank you :-)
I will test it these days.
Am Mi., 18. Dez. 2019 um 12:59 Uhr schrieb Andre Przywara andre.przywara@arm.com:
This series adds Ethernet support for the Raspberry Pi 4. The SoC includes a "Broadcom Genet v5 MAC" IP, connected as a proper platform device (no USB anymore!). Patch 1 provides a driver for that. There does not seem to be publicly available documentation, so this is based on the Linux driver, but stripped down to just provide what U-Boot needs. Patch 2 fixes up the RPi4 memory map to accommodate the MMIO area the MAC lives in, while patch 3 enables it in the respective defconfigs.
Compared to the RFC post from Friday this is now fully functional, although there are some minor issues left (sometimes unstable initialisation, weird behaviour on repeated tftp gets (though it works), PHY startup not properly timing out, (unjustified?) cache complaints on 32-bit).
Please have a look and test it, I hope this helps to simplify development, as you spare the SD card and its slot from heavy swapping.
This tries to address the review comments on the RFC post (mostly my own ;-), I put a branch on [1] showing what was changed over the original post.
Cheers, Andre.
P.S.: Since Amit will be busy this week, I took the freedom of fixing this up and posting this (with his permission).
[1] https://github.com/apritzel/u-boot/commits/rpi4-eth
Amit Singh Tomar (3): net: Add support for Broadcom GENETv5 Ethernet controller rpi4: Update memory map to accommodate scb devices rpi4: Enable GENET Ethernet controller
arch/arm/mach-bcm283x/init.c | 6 +- configs/rpi_4_32b_defconfig | 2 + configs/rpi_4_defconfig | 2 + configs/rpi_arm64_defconfig | 1 + drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 702 +++++++++++++++++++++++++++++++++++ 7 files changed, 718 insertions(+), 3 deletions(-) create mode 100644 drivers/net/bcmgenet.c
-- 2.17.1
participants (8)
-
Amit Tomer -
Andre Przywara -
André Przywara
-
Daniel Schwierzeck -
Florian Fainelli -
Matthias Brugger -
Sascha Dewald -
Stefan Wahren