+/*
+ * Gemini GMAC specific defines
+ *
-+ * Copyright (C) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
++ * Copyright (C) 2008, Paulius Zaleckas <paulius.zaleckas@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
-+#ifndef __MACH_GMAC_H__
-+#define __MACH_GMAC_H__
++#ifndef __NET_GEMINI_PLATFORM_H__
++#define __NET_GEMINI_PLATFORM_H__
+
+#include <linux/phy.h>
+
+ phy_interface_t interface[2];
+};
+
-+#endif /* __MACH_GMAC_H__ */
---- /dev/null
-+++ b/drivers/net/gemini_negmac/gm_gmac.c
-@@ -0,0 +1,1359 @@
-+/*
-+ * Ethernet device driver for Gemini SoC.
++#endif /* __NET_GEMINI_PLATFORM_H__ */
+--- a/arch/arm/mach-gemini/common.h 2011-04-19 03:05:29.446367900 +0200
++++ b/arch/arm/mach-gemini/common.h 2011-04-19 03:07:02.191154293 +0200
+@@ -13,6 +13,7 @@
+ #define __GEMINI_COMMON_H__
+
+ struct mtd_partition;
++struct gemini_gmac_platform_data;
+
+ extern void gemini_map_io(void);
+ extern void gemini_init_irq(void);
+@@ -28,5 +28,6 @@
+ extern int platform_register_pwc(void);
+ extern int platform_register_pata(unsigned int i);
+ extern int platform_register_watchdog(void);
++extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata);
+
+ #endif /* __GEMINI_COMMON_H__ */
+--- a/arch/arm/mach-gemini/devices.c 2011-04-21 13:01:53.578121892 +0200
++++ b/arch/arm/mach-gemini/devices.c 2011-04-21 13:14:27.643158445 +0200
+@@ -17,6 +17,7 @@
+ #include <mach/irqs.h>
+ #include <mach/hardware.h>
+ #include <mach/global_reg.h>
++#include <mach/gmac.h>
+ #include "common.h"
+
+ static struct plat_serial8250_port serial_platform_data[] = {
+@@ -134,3 +134,56 @@
+ {
+ return platform_device_register(&wdt_device);
+ }
++
++static struct resource gmac_resources[] = {
++ {
++ .start = GEMINI_TOE_BASE,
++ .end = GEMINI_TOE_BASE + 0xffff,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = IRQ_GMAC0,
++ .end = IRQ_GMAC0,
++ .flags = IORESOURCE_IRQ,
++ },
++ {
++ .start = IRQ_GMAC1,
++ .end = IRQ_GMAC1,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static u64 gmac_dmamask = 0xffffffffUL;
++
++static struct platform_device ethernet_device = {
++ .name = "gmac-gemini",
++ .id = 0,
++ .dev = {
++ .dma_mask = &gmac_dmamask,
++ .coherent_dma_mask = 0xffffffff,
++ },
++ .num_resources = ARRAY_SIZE(gmac_resources),
++ .resource = gmac_resources,
++};
++
++int platform_register_ethernet(struct gemini_gmac_platform_data *pdata)
++{
++ unsigned int reg;
++
++ reg = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) +
++ GLOBAL_MISC_CTRL));
++
++ reg &= ~(GMAC_GMII | GMAC_1_ENABLE);
++
++ if (pdata->bus_id[1])
++ reg |= GMAC_1_ENABLE;
++ else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII)
++ reg |= GMAC_GMII;
++
++ writel(reg, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) +
++ GLOBAL_MISC_CTRL));
++
++ ethernet_device.dev.platform_data = pdata;
++
++ return platform_device_register(ðernet_device);
++}
+
+--- a/drivers/net/ethernet/Kconfig 2012-01-25 22:19:43.633736456 +0100
++++ b/drivers/net/ethernet/Kconfig 2012-01-25 22:20:28.582730742 +0100
+@@ -52,6 +52,7 @@
+ source "drivers/net/ethernet/faraday/Kconfig"
+ source "drivers/net/ethernet/freescale/Kconfig"
+ source "drivers/net/ethernet/fujitsu/Kconfig"
++source "drivers/net/ethernet/gemini/Kconfig"
+ source "drivers/net/ethernet/hp/Kconfig"
+ source "drivers/net/ethernet/ibm/Kconfig"
+ source "drivers/net/ethernet/intel/Kconfig"
+--- a/drivers/net/ethernet/Makefile 2012-01-27 01:37:10.839114389 +0100
++++ b/drivers/net/ethernet/Makefile 2012-01-27 01:39:06.102105027 +0100
+@@ -27,6 +27,7 @@
+ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
+ obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
+ obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/
++obj-$(CONFIG_NET_VENDOR_GEMINI) += gemini/
+ obj-$(CONFIG_NET_VENDOR_HP) += hp/
+ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
+ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+--- /dev/null 2012-01-23 21:36:48.249769447 +0100
++++ b/drivers/net/ethernet/gemini/Kconfig 2012-01-25 22:16:44.285740226 +0100
+@@ -0,0 +1,31 @@
++#
++# Gemini device configuration
++#
++
++config NET_VENDOR_GEMINI
++ bool "Cortina Gemini devices"
++ default y
++ depends on ARCH_GEMINI
++ ---help---
++ If you have a network (Ethernet) card belonging to this class, say Y
++ and read the Ethernet-HOWTO, available from
++ <http://www.tldp.org/docs.html#howto>.
++
++ Note that the answer to this question doesn't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about D-Link devices. If you say Y, you will be asked for
++ your specific card in the following questions.
++
++if NET_VENDOR_GEMINI
++
++config GEMINI_SL351X
++ tristate "StorLink SL351x Gigabit Ethernet support"
++ depends on ARCH_GEMINI
++ select PHYLIB
++ select MDIO_BITBANG
++ select MDIO_GPIO
++ select CRC32
++ ---help---
++ This driver supports StorLink SL351x (Gemini) dual Gigabit Ethernet.
++
++endif # NET_VENDOR_GEMINI
+--- /dev/null 2012-01-23 21:36:48.249769447 +0100
++++ b/drivers/net/ethernet/gemini/Makefile 2012-01-25 22:17:29.698741496 +0100
+@@ -0,0 +1,5 @@
++#
++# Makefile for the Cortina Gemini network device drivers.
++#
++
++obj-$(CONFIG_GEMINI_SL351X) += sl351x.o
+--- /dev/null 2012-01-23 21:36:48.249769447 +0100
++++ b/drivers/net/ethernet/gemini/sl351x.c 2012-01-27 17:09:51.000000000 +0100
+@@ -0,0 +1,2340 @@
++/*
++ * Ethernet device driver for Gemini SoC (SL351x GMAC).
+ *
-+ * Copyright (C) 2006, Storlink, Corp.
-+ * Copyright (C) 2008-2009, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
++ * Copyright (C) 2011, Tobias Waldvogel <tobias.waldvogel@gmail.com>
++ *
++ * Based on work by Michał Mirosław <mirq-linux@rere.qmqm.pl> and
++ * Paulius Zaleckas <paulius.zaleckas@gmail.com> and
++ * Giuseppe De Robertis <Giuseppe.DeRobertis@ba.infn.it> and
++ * GPLd spaghetti code from Raidsonic and other Gemini-based NAS vendors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
++
+#include <linux/module.h>
+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
++#include <linux/init.h>
++
++#include <linux/spinlock.h>
+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/compiler.h>
+#include <linux/dma-mapping.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/delay.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/phy.h>
-+#include <linux/irq.h>
++#include <linux/cache.h>
+#include <linux/interrupt.h>
-+#include <linux/completion.h>
-+#include <linux/kthread.h>
-+#include <linux/io.h>
-+#include <mach/hardware.h>
-+#include <linux/semaphore.h>
-+#include <mach/irqs.h>
++
++#include <linux/platform_device.h>
++#include <linux/etherdevice.h>
++#include <linux/if_vlan.h>
+#include <linux/skbuff.h>
++#include <linux/phy.h>
++#include <linux/crc32.h>
++#include <linux/ethtool.h>
++#include <linux/tcp.h>
++#include <linux/u64_stats_sync.h>
++
+#include <linux/in.h>
+#include <linux/ip.h>
-+#include <linux/tcp.h>
-+#include <linux/udp.h>
++#include <linux/ipv6.h>
++
++#include <mach/hardware.h>
++#include <mach/global_reg.h>
++
+#include <mach/gmac.h>
++#include "sl351x_hw.h"
++
++#define DRV_NAME "gmac-gemini"
++#define DRV_VERSION "1.0"
++
++#define HSIZE_8 0b00
++#define HSIZE_16 0b01
++#define HSIZE_32 0b10
++
++#define HBURST_SINGLE 0b00
++#define HBURST_INCR 0b01
++#define HBURST_INCR4 0b10
++#define HBURST_INCR8 0b11
++
++#define HPROT_DATA_CACHE BIT(0)
++#define HPROT_PRIVILIGED BIT(1)
++#define HPROT_BUFFERABLE BIT(2)
++#define HPROT_CACHABLE BIT(3)
++
++#define DEFAULT_RX_COALESCE_NSECS 0
++#define DEFAULT_GMAC_RXQ_ORDER 9
++#define DEFAULT_GMAC_TXQ_ORDER 8
++#define DEFAULT_RX_BUF_ORDER 11
++#define DEFAULT_NAPI_WEIGHT 64
++#define TX_MAX_FRAGS 16
++#define TX_QUEUE_NUM 1 /* max: 6 */
++#define RX_MAX_ALLOC_ORDER 2
++
++#define GMAC0_IRQ0_2 (GMAC0_TXDERR_INT_BIT|GMAC0_TXPERR_INT_BIT| \
++ GMAC0_RXDERR_INT_BIT|GMAC0_RXPERR_INT_BIT)
++#define GMAC0_IRQ0_TXQ0_INTS (GMAC0_SWTQ00_EOF_INT_BIT| \
++ GMAC0_SWTQ00_FIN_INT_BIT)
++#define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT|GMAC0_RX_OVERRUN_INT_BIT)
++
++#define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \
++ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \
++ NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
++
++MODULE_AUTHOR("Tobias Waldvogel");
++MODULE_DESCRIPTION("StorLink SL351x (Gemini) ethernet driver");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:" DRV_NAME);
+
-+#include "gm_gmac.h"
++struct toe_private {
++ void __iomem *iomem;
++ spinlock_t irq_lock;
+
-+/* #define GMAX_TX_INTR_DISABLED */
-+/* #define DO_HW_CHKSUM */
-+/* #define ENABLE_TSO */
-+#define GMAC_USE_TXQ0
-+/* #define GMAC_LEN_1_2_ISSUE */
++ struct net_device *netdev[2];
++ __le32 mac_addr[2][3];
+
-+#define DEFAULT_RXQ_MAX_CNT 256
++ struct device *dev;
++ int irq;
+
-+/* define chip information */
-+#define DRV_VERSION "0.2"
-+#define SL351x_DRIVER_NAME "Gemini Ethernet driver " DRV_VERSION
++ unsigned int freeq_order;
++ unsigned int freeq_frag_order;
++ GMAC_RXDESC_T *freeq_ring;
++ dma_addr_t freeq_dma_base;
++ struct page **freeq_page_tab;
++ spinlock_t freeq_lock;
++};
+
-+#ifdef GMAC_LEN_1_2_ISSUE
-+ #define _DEBUG_PREFETCH_NUM 256
-+static int _debug_prefetch_cnt;
-+static char _debug_prefetch_buf[_DEBUG_PREFETCH_NUM][4] __attribute__((aligned(4)));
-+#endif
++struct gmac_txq {
++ GMAC_TXDESC_T *ring;
++ struct sk_buff **skb;
++ unsigned int cptr;
++ unsigned int noirq_packets;
++};
++
++struct gmac_private {
++ unsigned int num;
++ struct toe_private *toe;
++ void __iomem *ctl_iomem;
++ void __iomem *dma_iomem;
++
++ void __iomem *rxq_rwptr;
++ GMAC_RXDESC_T *rxq_ring;
++ unsigned int rxq_order;
++
++ struct napi_struct napi;
++ struct hrtimer rx_coalesce_timer;
++ unsigned int rx_coalesce_nsecs;
++ unsigned int freeq_refill;
++ struct gmac_txq txq[TX_QUEUE_NUM];
++ unsigned int txq_order;
++ unsigned int irq_every_tx_packets;
++
++ dma_addr_t rxq_dma_base;
++ dma_addr_t txq_dma_base;
++
++ unsigned int msg_enable;
++ spinlock_t config_lock;
++
++ struct u64_stats_sync tx_stats_syncp;
++ struct u64_stats_sync rx_stats_syncp;
++ struct u64_stats_sync ir_stats_syncp;
++
++ struct rtnl_link_stats64 stats;
++ u64 hw_stats[RX_STATS_NUM];
++ u64 rx_stats[RX_STATUS_NUM];
++ u64 rx_csum_stats[RX_CHKSUM_NUM];
++ u64 rx_napi_exits;
++ u64 tx_frag_stats[TX_MAX_FRAGS];
++ u64 tx_frags_linearized;
++ u64 tx_hw_csummed;
++};
++
++#define GMAC_STATS_NUM ( \
++ RX_STATS_NUM + RX_STATUS_NUM + RX_CHKSUM_NUM + 1 + \
++ TX_MAX_FRAGS + 2)
++
++static const char gmac_stats_strings[GMAC_STATS_NUM][ETH_GSTRING_LEN] = {
++ "GMAC_IN_DISCARDS",
++ "GMAC_IN_ERRORS",
++ "GMAC_IN_MCAST",
++ "GMAC_IN_BCAST",
++ "GMAC_IN_MAC1",
++ "GMAC_IN_MAC2",
++ "RX_STATUS_GOOD_FRAME",
++ "RX_STATUS_TOO_LONG_GOOD_CRC",
++ "RX_STATUS_RUNT_FRAME",
++ "RX_STATUS_SFD_NOT_FOUND",
++ "RX_STATUS_CRC_ERROR",
++ "RX_STATUS_TOO_LONG_BAD_CRC",
++ "RX_STATUS_ALIGNMENT_ERROR",
++ "RX_STATUS_TOO_LONG_BAD_ALIGN",
++ "RX_STATUS_RX_ERR",
++ "RX_STATUS_DA_FILTERED",
++ "RX_STATUS_BUFFER_FULL",
++ "RX_STATUS_11",
++ "RX_STATUS_12",
++ "RX_STATUS_13",
++ "RX_STATUS_14",
++ "RX_STATUS_15",
++ "RX_CHKSUM_IP_UDP_TCP_OK",
++ "RX_CHKSUM_IP_OK_ONLY",
++ "RX_CHKSUM_NONE",
++ "RX_CHKSUM_3",
++ "RX_CHKSUM_IP_ERR_UNKNOWN",
++ "RX_CHKSUM_IP_ERR",
++ "RX_CHKSUM_TCP_UDP_ERR",
++ "RX_CHKSUM_7",
++ "RX_NAPI_EXITS",
++ "TX_FRAGS[1]",
++ "TX_FRAGS[2]",
++ "TX_FRAGS[3]",
++ "TX_FRAGS[4]",
++ "TX_FRAGS[5]",
++ "TX_FRAGS[6]",
++ "TX_FRAGS[7]",
++ "TX_FRAGS[8]",
++ "TX_FRAGS[9]",
++ "TX_FRAGS[10]",
++ "TX_FRAGS[11]",
++ "TX_FRAGS[12]",
++ "TX_FRAGS[13]",
++ "TX_FRAGS[14]",
++ "TX_FRAGS[15]",
++ "TX_FRAGS[16+]",
++ "TX_FRAGS_LINEARIZED",
++ "TX_HW_CSUMMED",
++};
++
++static void gmac_dump_dma_state(struct net_device *dev);
++
++static void gmac_update_config0_reg(struct net_device *dev, u32 val, u32 vmask)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ unsigned long flags;
++ u32 reg;
++
++ spin_lock_irqsave(&gmac->config_lock, flags);
++
++ reg = readl(gmac->ctl_iomem + GMAC_CONFIG0);
++ reg = (reg & ~vmask) | val;
++ writel(reg, gmac->ctl_iomem + GMAC_CONFIG0);
++
++ spin_unlock_irqrestore(&gmac->config_lock, flags);
++}
++
++static void gmac_enable_tx_rx(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ void __iomem *config0 = gmac->ctl_iomem + GMAC_CONFIG0;
++ unsigned long flags;
++ u32 reg;
++
++ spin_lock_irqsave(&gmac->config_lock, flags);
++
++ reg = readl(config0);
++ reg &= ~CONFIG0_TX_RX_DISABLE;
++ writel(reg, config0);
++
++ spin_unlock_irqrestore(&gmac->config_lock, flags);
++}
++
++static void gmac_disable_tx_rx(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ void __iomem *config0 = gmac->ctl_iomem + GMAC_CONFIG0;
++ unsigned long flags;
++ u32 reg;
++
++ spin_lock_irqsave(&gmac->config_lock, flags);
++
++ reg = readl(config0);
++ reg |= CONFIG0_TX_RX_DISABLE;
++ writel(reg, config0);
++
++ spin_unlock_irqrestore(&gmac->config_lock, flags);
++
++ mdelay(10); /* let GMAC consume packet */
++}
++
++static void gmac_set_flow_control(struct net_device *dev, bool tx, bool rx)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ void __iomem *config0 = gmac->ctl_iomem + GMAC_CONFIG0;
++ unsigned long flags;
++ u32 reg;
++
++ spin_lock_irqsave(&gmac->config_lock, flags);
++
++ reg = readl(config0);
++ reg &= ~CONFIG0_FLOW_CTL;
++ if (tx)
++ reg |= CONFIG0_FLOW_TX;
++ if (rx)
++ reg |= CONFIG0_FLOW_RX;
++ writel(reg, config0);
++
++ spin_unlock_irqrestore(&gmac->config_lock, flags);
++}
++
++static void gmac_update_link_state(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ void __iomem *status_reg = gmac->ctl_iomem + GMAC_STATUS;
++ struct phy_device *phydev = dev->phydev;
++ GMAC_STATUS_T status, old_status;
++ int pause_tx=0, pause_rx=0;
++
++ old_status.bits32 = status.bits32 = readl(status_reg);
++
++ status.bits.link = phydev->link;
++ status.bits.duplex = phydev->duplex;
++
++ switch (phydev->speed) {
++ case 1000:
++ status.bits.speed = GMAC_SPEED_1000;
++ if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
++ status.bits.mii_rmii = GMAC_PHY_RGMII_1000;
++ break;
++ case 100:
++ status.bits.speed = GMAC_SPEED_100;
++ if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
++ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
++ break;
++ case 10:
++ status.bits.speed = GMAC_SPEED_10;
++ if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
++ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
++ break;
++ default:
++ netdev_warn(dev, "Not supported PHY speed (%d)\n",
++ phydev->speed);
++ }
++
++ if (phydev->duplex == DUPLEX_FULL) {
++ u16 lcladv = phy_read(phydev, MII_ADVERTISE);
++ u16 rmtadv = phy_read(phydev, MII_LPA);
++ u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
++
++ if (cap & FLOW_CTRL_RX)
++ pause_rx=1;
++ if (cap & FLOW_CTRL_TX)
++ pause_tx=1;
++ }
++
++ gmac_set_flow_control(dev, pause_tx, pause_rx);
+
-+static inline void gmac_write_reg(void __iomem *base, unsigned int offset,
-+ unsigned int data, unsigned int bit_mask)
-+{
-+ unsigned int reg_val;
-+
-+ reg_val = (__raw_readl(base + offset) & (~bit_mask)) | (data & bit_mask);
-+ __raw_writel(reg_val, base + offset);
-+}
-+
-+/*----------------------------------------------------------------------
-+* toe_init_free_queue
-+* (1) Initialize the Free Queue Descriptor Base Address & size
-+* Register: TOE_GLOBAL_BASE + 0x0004
-+* (2) Initialize DMA Read/Write pointer for
-+* SW Free Queue and HW Free Queue
-+* (3) Initialize DMA Descriptors for
-+* SW Free Queue and HW Free Queue,
-+*----------------------------------------------------------------------*/
-+static void toe_init_free_queue(struct toe_private *toe)
-+{
-+ int i;
-+ DMA_RWPTR_T rwptr_reg;
-+ void *desc_buf;
-+ GMAC_RXDESC_T *sw_desc_ptr;
-+ struct sk_buff *skb;
-+
-+ desc_buf = dma_alloc_coherent(toe->dev, TOE_SW_FREEQ_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+ &toe->sw_freeq_desc_base_dma, GFP_KERNEL);
-+ sw_desc_ptr = (GMAC_RXDESC_T *)desc_buf;
-+ if (!desc_buf) {
-+ dev_err(toe->dev, "%s::DMA ALLOC fail\n", __func__);
++ if (old_status.bits32 == status.bits32)
+ return;
++
++ if (netif_msg_link(gmac)) {
++ phy_print_status(phydev);
++ netdev_info(dev, "link flow control: %s\n",
++ phydev->pause
++ ? (phydev->asym_pause ? "tx" : "both")
++ : (phydev->asym_pause ? "rx" : "none")
++ );
+ }
-+ memset(desc_buf, 0, TOE_SW_FREEQ_DESC_NUM * sizeof(GMAC_RXDESC_T));
-+
-+ /* DMA Queue Base & Size */
-+ __raw_writel((toe->sw_freeq_desc_base_dma & DMA_Q_BASE_MASK) | TOE_SW_FREEQ_DESC_POWER,
-+ toe->global_base + GLOBAL_SW_FREEQ_BASE_SIZE_REG);
-+
-+ /* init descriptor base */
-+ toe->swfq_desc_base = (unsigned int)desc_buf;
-+
-+ /* SW Free Queue Descriptors */
-+ for (i = 0; i < TOE_SW_FREEQ_DESC_NUM; i++) {
-+ sw_desc_ptr->word0.bits.buffer_size = SW_RX_BUF_SIZE;
-+ skb = dev_alloc_skb(SW_RX_BUF_SIZE); /* allocate socket buffer */
-+ if (!skb) {
-+ dev_err(toe->dev, "%s::skb buffer allocation fail\n", __func__);
-+ return;
-+ }
-+ REG32(skb->data) = (unsigned int)skb;
-+ skb_reserve(skb, SKB_RESERVE_BYTES);
-+ sw_desc_ptr->word2.buf_adr = dma_map_single(toe->dev, skb->data,
-+ SW_RX_BUF_SIZE - SKB_RESERVE_BYTES,
-+ DMA_FROM_DEVICE);
-+ sw_desc_ptr++;
++
++ gmac_disable_tx_rx(dev);
++ writel(status.bits32, status_reg);
++ gmac_enable_tx_rx(dev);
++}
++
++static int gmac_setup_phy(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ struct gemini_gmac_platform_data *pdata = toe->dev->platform_data;
++ GMAC_STATUS_T status = { .bits32 = 0 };
++ int num = dev->dev_id;
++
++ dev->phydev = phy_connect(dev, pdata->bus_id[num],
++ &gmac_update_link_state, pdata->interface[num]);
++
++ if (IS_ERR(dev->phydev)) {
++ int err = PTR_ERR(dev->phydev);
++ dev->phydev = NULL;
++ return err;
+ }
+
-+ dma_sync_single_for_device(toe->dev, toe->sw_freeq_desc_base_dma,
-+ TOE_SW_FREEQ_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+ DMA_TO_DEVICE);
-+
-+ /* SW Free Queue Read/Write Pointer */
-+ rwptr_reg.bits.wptr = TOE_SW_FREEQ_DESC_NUM - 1;
-+ rwptr_reg.bits.rptr = 0;
-+ __raw_writel(rwptr_reg.bits32, toe->global_base + GLOBAL_SWFQ_RWPTR_REG);
-+
-+ /* DMA Queue Base & Size */
-+ __raw_writel(TOE_HW_FREEQ_DESC_POWER,
-+ toe->global_base + GLOBAL_HW_FREEQ_BASE_SIZE_REG);
-+ rwptr_reg.bits.wptr = TOE_HW_FREEQ_DESC_NUM - 1;
-+ rwptr_reg.bits.rptr = 0;
-+ __raw_writel(rwptr_reg.bits32, toe->global_base + GLOBAL_HWFQ_RWPTR_REG);
-+}
-+
-+/*----------------------------------------------------------------------
-+* toe_init_swtx_queue
-+* (2) Initialize the GMAC 0/1 SW TXQ Queue Descriptor Base Address & sizeup
-+* GMAC_SW_TX_QUEUE_BASE_REG(0x0050)
-+* (2) Initialize DMA Read/Write pointer for
-+* GMAC 0/1 SW TX Q0-5
-+*----------------------------------------------------------------------*/
-+static void toe_init_swtx_queue(struct net_device *dev)
-+{
-+ int i;
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ DMA_RWPTR_T rwptr_reg;
-+ void __iomem *rwptr_addr;
-+ void *desc_buf;
-+ unsigned int offset;
-+
-+ desc_buf = dma_alloc_coherent(toe->dev, TOE_GMAC_SWTXQ_DESC_NUM * TOE_SW_TXQ_NUM * sizeof(GMAC_TXDESC_T),
-+ &gmac->swtxq_desc_base_dma, GFP_KERNEL);
-+ gmac->swtxq_desc_base = (unsigned int)desc_buf;
-+ if (!desc_buf) {
-+ dev_err(toe->dev, "%s::DMA ALLOC fail\n", __func__);
-+ return;
++ dev->phydev->supported &= PHY_GBIT_FEATURES;
++ dev->phydev->supported |= SUPPORTED_Asym_Pause | SUPPORTED_Pause;
++ dev->phydev->advertising = dev->phydev->supported;
++
++ /* set PHY interface type */
++ switch (dev->phydev->interface) {
++ case PHY_INTERFACE_MODE_MII:
++ status.bits.mii_rmii = GMAC_PHY_MII;
++ break;
++ case PHY_INTERFACE_MODE_GMII:
++ status.bits.mii_rmii = GMAC_PHY_GMII;
++ break;
++ case PHY_INTERFACE_MODE_RGMII:
++ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
++ break;
++ default:
++ netdev_err(dev, "Unsupported MII interface\n");
++ phy_disconnect(dev->phydev);
++ dev->phydev = NULL;
++ return -EINVAL;
+ }
-+ memset(desc_buf, 0, TOE_GMAC_SWTXQ_DESC_NUM * TOE_SW_TXQ_NUM * sizeof(GMAC_TXDESC_T));
-+ dma_sync_single_for_device(toe->dev, gmac->swtxq_desc_base_dma,
-+ TOE_GMAC_SWTXQ_DESC_NUM * TOE_SW_TXQ_NUM * sizeof(GMAC_TXDESC_T),
-+ DMA_TO_DEVICE);
-+ __raw_writel((gmac->swtxq_desc_base_dma & DMA_Q_BASE_MASK) | TOE_GMAC_SWTXQ_DESC_POWER,
-+ gmac->dma_base_addr + GMAC_SW_TX_QUEUE_BASE_REG);
-+
-+ /* GMAC0 SW TX Q0-Q5 */
-+ offset = 0;
-+ rwptr_reg.bits.wptr = 0;
-+ rwptr_reg.bits.rptr = 0;
-+ rwptr_addr = gmac->dma_base_addr + GMAC_SW_TX_QUEUE0_PTR_REG;
-+ for (i = 0; i < TOE_SW_TXQ_NUM; i++) {
-+ gmac->swtxq[i].rwptr_reg = rwptr_addr;
-+ gmac->swtxq[i].desc_base_dma = (unsigned int)gmac->swtxq_desc_base_dma + offset;
-+ gmac->swtxq[i].desc_base = (unsigned int)desc_buf + offset;
-+ offset += TOE_GMAC_SWTXQ_DESC_NUM * sizeof(GMAC_TXDESC_T);
-+ __raw_writel(rwptr_reg.bits32, rwptr_addr);
-+ rwptr_addr += 4;
++ writel(status.bits32, gmac->ctl_iomem + GMAC_STATUS);
++
++ return 0;
++}
++
++static int gmac_pick_rx_max_len(int max_l3_len)
++{
++ /* index = CONFIG_MAXLEN_XXX values */
++ static const int max_len[8] = {
++ 1536, 1518, 1522, 1542,
++ 9212, 10236, 1518, 1518
++ };
++ int i, n = 5;
++
++ max_l3_len += ETH_HLEN + VLAN_HLEN;
++
++ if (max_l3_len > max_len[n])
++ return -1;
++
++ for (i = 0; i < 5; ++i) {
++ if (max_len[i] >= max_l3_len && max_len[i] < max_len[n])
++ n = i;
+ }
++
++ return n;
+}
+
-+/*----------------------------------------------------------------------
-+* toe_init_default_queue
-+* (1) Initialize the default 0/1 Queue Header
-+* Register: TOE_DEFAULT_Q0_HDR_BASE (0x60002000)
-+* TOE_DEFAULT_Q1_HDR_BASE (0x60002008)
-+* (2) Initialize Descriptors of Default Queue 0/1
-+*----------------------------------------------------------------------*/
-+static void toe_init_default_queue(struct net_device *dev)
-+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ volatile NONTOE_QHDR_T *qhdr;
-+ GMAC_RXDESC_T *desc_ptr;
-+
-+ desc_ptr = dma_alloc_coherent(toe->dev, TOE_DEFAULT_Q_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+ &gmac->default_desc_base_dma, GFP_KERNEL);
-+ if (!desc_ptr) {
-+ dev_err(toe->dev, "%s::DMA ALLOC fail\n", __func__);
++static int gmac_init(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ u32 val;
++
++ GMAC_CONFIG0_T config0 = { .bits = {
++ .dis_tx = 1,
++ .dis_rx = 1,
++ .ipv4_rx_chksum = 1,
++ .ipv6_rx_chksum = 1,
++ .rx_err_detect = 1,
++ .rgmm_edge = 1,
++ .port0_chk_hwq = 1,
++ .port1_chk_hwq = 1,
++ .port0_chk_toeq = 1,
++ .port1_chk_toeq = 1,
++ .port0_chk_classq = 1,
++ .port1_chk_classq = 1,
++ } };
++ GMAC_AHB_WEIGHT_T ahb_weight = { .bits = {
++ .rx_weight = 1,
++ .tx_weight = 1,
++ .hash_weight = 1,
++ .pre_req = 0x1f,
++ .tqDV_threshold = 0,
++ } };
++ GMAC_TX_WCR0_T hw_weigh = { .bits = {
++ .hw_tq3 = 1,
++ .hw_tq2 = 1,
++ .hw_tq1 = 1,
++ .hw_tq0 = 1,
++ } };
++ GMAC_TX_WCR1_T sw_weigh = { .bits = {
++ .sw_tq5 = 1,
++ .sw_tq4 = 1,
++ .sw_tq3 = 1,
++ .sw_tq2 = 1,
++ .sw_tq1 = 1,
++ .sw_tq0 = 1,
++ } };
++ GMAC_CONFIG1_T config1 = { .bits = {
++ .set_threshold = 16,
++ .rel_threshold = 24,
++ } };
++ GMAC_CONFIG2_T config2 = { .bits = {
++ .set_threshold = 16,
++ .rel_threshold = 32,
++ } };
++ GMAC_CONFIG3_T config3 = { .bits = {
++ .set_threshold = 0,
++ .rel_threshold = 0,
++ } };
++
++ config0.bits.max_len = gmac_pick_rx_max_len(dev->mtu);
++
++ val = readl(gmac->ctl_iomem + GMAC_CONFIG0);
++ config0.bits.reserved = ((GMAC_CONFIG0_T)val).bits.reserved;
++ writel(config0.bits32, gmac->ctl_iomem + GMAC_CONFIG0);
++ writel(config1.bits32, gmac->ctl_iomem + GMAC_CONFIG1);
++ writel(config2.bits32, gmac->ctl_iomem + GMAC_CONFIG2);
++ writel(config3.bits32, gmac->ctl_iomem + GMAC_CONFIG3);
++
++ val = readl(gmac->dma_iomem + GMAC_AHB_WEIGHT_REG);
++ writel(ahb_weight.bits32, gmac->dma_iomem + GMAC_AHB_WEIGHT_REG);
++
++ writel(hw_weigh.bits32,
++ gmac->dma_iomem + GMAC_TX_WEIGHTING_CTRL_0_REG);
++ writel(sw_weigh.bits32,
++ gmac->dma_iomem + GMAC_TX_WEIGHTING_CTRL_1_REG);
++
++ gmac->rxq_order = DEFAULT_GMAC_RXQ_ORDER;
++ gmac->txq_order = DEFAULT_GMAC_TXQ_ORDER;
++ gmac->rx_coalesce_nsecs = DEFAULT_RX_COALESCE_NSECS;
++
++ /* Mark every quarter of the queue a packet for interrupt
++ in order to be able to wake up the queue if it was stopped */
++ gmac->irq_every_tx_packets = 1 << (gmac->txq_order - 2);
++
++ return 0;
++}
++
++static void gmac_uninit(struct net_device *dev)
++{
++ if (dev->phydev)
++ phy_disconnect(dev->phydev);
++}
++
++static int gmac_setup_txqs(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ void __iomem *rwptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE0_PTR_REG;
++ void __iomem *base_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE_BASE_REG;
++
++ unsigned int n_txq = dev->num_tx_queues;
++ size_t entries = 1 <<gmac->txq_order;
++ size_t len = n_txq * entries;
++ struct gmac_txq *txq = gmac->txq;
++ GMAC_TXDESC_T *desc_ring;
++ struct sk_buff **skb_tab;
++ unsigned int r;
++ int i;
++
++ skb_tab = kzalloc(len * sizeof(*skb_tab), GFP_KERNEL);
++ if (!skb_tab)
++ return -ENOMEM;
++
++ desc_ring = dma_alloc_coherent(toe->dev, len * sizeof(*desc_ring),
++ &gmac->txq_dma_base, GFP_KERNEL);
++
++ if (!desc_ring) {
++ kfree(skb_tab);
++ return -ENOMEM;
++ }
++
++ BUG_ON(gmac->txq_dma_base & ~DMA_Q_BASE_MASK);
++
++ writel(gmac->txq_dma_base | gmac->txq_order, base_reg);
++
++ for (i = 0; i < n_txq; i++) {
++ txq->ring = desc_ring;
++ txq->skb = skb_tab;
++ txq->noirq_packets = 0;
++
++ r = readw(rwptr_reg);
++ rwptr_reg += 2;
++ writew(r, rwptr_reg);
++ rwptr_reg +=2;
++ txq->cptr = r;
++
++ txq++;
++ desc_ring += entries;
++ skb_tab += entries;
++ }
++
++ return 0;
++}
++
++static void gmac_clean_txq(struct net_device *dev, struct gmac_txq *txq,
++ unsigned int r)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned int errs = 0;
++ unsigned int pkts = 0;
++ unsigned int hwchksum = 0;
++ unsigned long bytes = 0;
++ unsigned int m = (1 << gmac->txq_order) - 1;
++ unsigned int c = txq->cptr;
++ GMAC_TXDESC_0_T word0;
++ GMAC_TXDESC_1_T word1;
++ unsigned int word3;
++ dma_addr_t mapping;
++ GMAC_TXDESC_T *txd;
++ unsigned short nfrags;
++
++ if (unlikely(c == r))
+ return;
++
++ rmb();
++ while (c != r) {
++ txd = txq->ring + c;
++ word0 = txd->word0;
++ word1 = txd->word1;
++ mapping = txd->word2.buf_adr;
++ word3 = txd->word3.bits32;
++
++ dma_unmap_single(toe->dev, mapping, word0.bits.buffer_size, DMA_TO_DEVICE);
++
++ if (word3 & EOF_BIT)
++ dev_kfree_skb(txq->skb[c]);
++
++ c++;
++ c &= m;
++
++ if (!(word3 & SOF_BIT))
++ continue;
++
++ if (!word0.bits.status_tx_ok) {
++ errs++;
++ continue;
++ }
++
++ pkts++;
++ bytes += txd->word1.bits.byte_count;
++
++ if (word1.bits32 & TSS_CHECKUM_ENABLE)
++ hwchksum++;
++
++ nfrags = word0.bits.desc_count - 1;
++ if (nfrags) {
++ if (nfrags >= TX_MAX_FRAGS)
++ nfrags = TX_MAX_FRAGS - 1;
++
++ u64_stats_update_begin(&gmac->tx_stats_syncp);
++ gmac->tx_frag_stats[nfrags]++;
++ u64_stats_update_end(&gmac->ir_stats_syncp);
++ }
+ }
-+ memset(desc_ptr, 0, TOE_DEFAULT_Q_DESC_NUM * sizeof(GMAC_RXDESC_T));
-+ dma_sync_single_for_device(toe->dev, gmac->default_desc_base_dma,
-+ TOE_DEFAULT_Q_DESC_NUM * sizeof(GMAC_RXDESC_T),
-+ DMA_TO_DEVICE);
-+ gmac->default_desc_base = (unsigned int)desc_ptr;
-+ qhdr = (volatile NONTOE_QHDR_T *)(toe->global_base + TOE_DEFAULT_Q_HDR_BASE(gmac->port_id));
-+ qhdr->word0.base_size = ((unsigned int)gmac->default_desc_base_dma & NONTOE_QHDR0_BASE_MASK) | TOE_DEFAULT_Q_DESC_POWER;
-+ qhdr->word1.bits32 = 0;
-+ gmac->default_qhdr = (NONTOE_QHDR_T *)qhdr;
-+}
-+
-+/*----------------------------------------------------------------------
-+* toe_init_interrupt_config
-+* Interrupt Select Registers are used to map interrupt to int0 or int1
-+* Int0 and int1 are wired to CPU 0/1 GMAC 0/1
-+* Interrupt Device Inteface data are used to pass device info to
-+* upper device driver or store status/statistics
-+* ISR handler
-+* (1) If status bit ON but masked, the prinf error message (bug issue)
-+* (2) If select bits are for me, handle it, else skip to let
-+* the other ISR handles it.
-+* Notes:
-+* GMACx init routine (for eCOS) or open routine (for Linux)
-+* enable the interrupt bits only which are selected for it.
-+*
-+* Default Setting:
-+* GMAC0 intr bits ------> int0 ----> eth0
-+* GMAC1 intr bits ------> int1 ----> eth1
-+* TOE intr -------------> int0 ----> eth0
-+* Classification Intr --> int0 ----> eth0
-+* Default Q0 -----------> int0 ----> eth0
-+* Default Q1 -----------> int1 ----> eth1
-+*----------------------------------------------------------------------*/
-+static void toe_init_interrupt_config(struct toe_private *toe)
-+{
-+ /* clear all status bits */
-+ __raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_0_REG);
-+ __raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_1_REG);
-+ __raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_2_REG);
-+ __raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_3_REG);
-+ __raw_writel(0xffffffff, toe->global_base + GLOBAL_INTERRUPT_STATUS_4_REG);
-+
-+ /* Init select registers */
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG);
-+
-+ /* disable all interrupt */
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_0_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_1_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_2_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_3_REG);
-+ __raw_writel(0, toe->global_base + GLOBAL_INTERRUPT_ENABLE_4_REG);
-+}
-+
-+static void toe_gmac_hw_start(struct gmac_private *gmac)
++
++ u64_stats_update_begin(&gmac->ir_stats_syncp);
++ gmac->stats.tx_errors += errs;
++ gmac->stats.tx_packets += pkts;
++ gmac->stats.tx_bytes += bytes;
++ gmac->tx_hw_csummed += hwchksum;
++ u64_stats_update_end(&gmac->ir_stats_syncp);
++
++ txq->cptr = c;
++}
++
++static void gmac_cleanup_txqs(struct net_device *dev)
+{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ void __iomem *rwptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE0_PTR_REG;
++ void __iomem *base_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE_BASE_REG;
++
++ unsigned n_txq = dev->num_tx_queues;
++ unsigned int r, i;
++
++ for (i = 0; i < n_txq; i++) {
++ r = readw(rwptr_reg);
++ rwptr_reg += 2;
++ writew(r, rwptr_reg);
++ rwptr_reg += 2;
++
++ gmac_clean_txq(dev, gmac->txq + i, r);
++ }
++ writel(0, base_reg);
++
++ kfree(gmac->txq->skb);
++ dma_free_coherent(toe->dev,
++ n_txq * sizeof(*gmac->txq->ring) << gmac->txq_order,
++ gmac->txq->ring, gmac->txq_dma_base);
++}
++
++static int gmac_setup_rxq(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ NONTOE_QHDR_T __iomem *qhdr = toe->iomem + TOE_DEFAULT_Q_HDR_BASE(dev->dev_id);
++
++ gmac->rxq_rwptr = &qhdr->word1;
++ gmac->rxq_ring = dma_alloc_coherent(toe->dev,
++ sizeof(*gmac->rxq_ring) << gmac->rxq_order,
++ &gmac->rxq_dma_base, GFP_KERNEL);
++ if (!gmac->rxq_ring)
++ return -ENOMEM;
++
++ BUG_ON(gmac->rxq_dma_base & ~NONTOE_QHDR0_BASE_MASK);
++
++ writel(gmac->rxq_dma_base | gmac->rxq_order, &qhdr->word0);
++ writel(0, gmac->rxq_rwptr);
++ return 0;
++}
++
++static void gmac_cleanup_rxq(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++
++ NONTOE_QHDR_T __iomem *qhdr = toe->iomem + TOE_DEFAULT_Q_HDR_BASE(dev->dev_id);
++ void __iomem *dma_reg = &qhdr->word0;
++ void __iomem *ptr_reg = &qhdr->word1;
++ GMAC_RXDESC_T *rxd = gmac->rxq_ring;
++ DMA_RWPTR_T rw;
++ unsigned int r, w;
++ unsigned int m = (1 <<gmac->rxq_order) - 1;
++ struct page *page;
++ dma_addr_t mapping;
++
++ rw.bits32 = readl(ptr_reg);
++ r = rw.bits.rptr;
++ w = rw.bits.wptr;
++ writew(r, ptr_reg + 2);
++
++ writel(0, dma_reg);
++
++ rmb();
++ while (r != w) {
++ mapping = rxd[r].word2.buf_adr;
++ r++;
++ r &= m;
++
++ if (!mapping)
++ continue;
++
++ page = pfn_to_page(dma_to_pfn(toe->dev, mapping));
++ put_page(page);
++ }
++
++ dma_free_coherent(toe->dev, sizeof(*gmac->rxq_ring) << gmac->rxq_order,
++ gmac->rxq_ring, gmac->rxq_dma_base);
++}
++
++static struct page *toe_freeq_alloc_map_page(struct toe_private *toe, int pn)
++{
++ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order;
++ unsigned int frag_len = 1 << toe->freeq_frag_order;
++ GMAC_RXDESC_T *freeq_entry;
++ dma_addr_t mapping;
++ struct page *page;
++ int i;
++
++ page = alloc_page(__GFP_COLD | GFP_ATOMIC);
++ if (!page)
++ return NULL;
++
++ mapping = dma_map_single(toe->dev, page_address(page),
++ PAGE_SIZE, DMA_FROM_DEVICE);
++
++ if (unlikely(dma_mapping_error(toe->dev, mapping) || !mapping)) {
++ put_page(page);
++ return NULL;
++ }
++
++ freeq_entry = toe->freeq_ring + (pn << fpp_order);
++ for (i = 1 << fpp_order; i > 0; --i) {
++ freeq_entry->word2.buf_adr = mapping;
++ freeq_entry++;
++ mapping += frag_len;
++ }
++
++ if (toe->freeq_page_tab[pn]) {
++ mapping = toe->freeq_ring[pn << fpp_order].word2.buf_adr;
++ dma_unmap_single(toe->dev, mapping, frag_len, DMA_FROM_DEVICE);
++ put_page(toe->freeq_page_tab[pn]);
++ }
++
++ toe->freeq_page_tab[pn] = page;
++ return page;
++}
++
++static unsigned int toe_fill_freeq(struct toe_private *toe, int reset)
++{
++ void __iomem *rwptr_reg = toe->iomem + GLOBAL_SWFQ_RWPTR_REG;
++
++ DMA_RWPTR_T rw;
++ unsigned int pn, epn;
++ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order;
++ unsigned int m_pn = (1 << (toe->freeq_order - fpp_order)) - 1;
++ struct page *page;
++ unsigned int count = 0;
++ unsigned long flags;
++
++ spin_lock_irqsave(&toe->freeq_lock, flags);
++
++ rw.bits32 = readl(rwptr_reg);
++ pn = (reset ? rw.bits.rptr : rw.bits.wptr) >> fpp_order;
++ epn = (rw.bits.rptr >> fpp_order) - 1;
++ epn &= m_pn;
++
++ while (pn != epn) {
++ page = toe->freeq_page_tab[pn];
++
++ if (atomic_read(&page->_count) > 1) {
++ unsigned int fl = (pn -epn) & m_pn;
++
++ if (fl > 64 >> fpp_order)
++ break;
++
++ page = toe_freeq_alloc_map_page(toe, pn);
++ if (!page)
++ break;
++ }
++
++ atomic_add(1 << fpp_order, &page->_count);
++ count += 1 << fpp_order;
++ pn++;
++ pn &= m_pn;
++ }
++
++ wmb();
++ writew(pn << fpp_order, rwptr_reg+2);
++
++ spin_unlock_irqrestore(&toe->freeq_lock, flags);
++ return count;
++}
++
++static int toe_setup_freeq(struct toe_private *toe)
++{
++ void __iomem *dma_reg = toe->iomem + GLOBAL_SW_FREEQ_BASE_SIZE_REG;
++ QUEUE_THRESHOLD_T qt;
++ DMA_SKB_SIZE_T skbsz;
++ unsigned int filled;
++ unsigned int frag_len = 1 << toe->freeq_frag_order;
++ unsigned int len = 1 << toe->freeq_order;
++ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order;
++ unsigned int pages = len >> fpp_order;
++ dma_addr_t mapping;
++ unsigned int pn;
++
++ toe->freeq_ring = dma_alloc_coherent(toe->dev,
++ sizeof(*toe->freeq_ring) << toe->freeq_order,
++ &toe->freeq_dma_base, GFP_KERNEL);
++ if (!toe->freeq_ring)
++ return -ENOMEM;
++
++ BUG_ON(toe->freeq_dma_base & ~DMA_Q_BASE_MASK);
++
++ toe->freeq_page_tab = kzalloc(pages * sizeof(*toe->freeq_page_tab),
++ GFP_KERNEL);
++ if (!toe->freeq_page_tab)
++ goto err_freeq;
++
++ for (pn = 0; pn < pages; pn++)
++ if (!toe_freeq_alloc_map_page(toe, pn))
++ goto err_freeq_alloc;
++
++ filled = toe_fill_freeq(toe, 1);
++ if (!filled)
++ goto err_freeq_alloc;
++
++ qt.bits32 = readl(toe->iomem + GLOBAL_QUEUE_THRESHOLD_REG);
++ qt.bits.swfq_empty = 32;
++ writel(qt.bits32, toe->iomem + GLOBAL_QUEUE_THRESHOLD_REG);
++
++ skbsz.bits.sw_skb_size = 1 << toe->freeq_frag_order;
++ writel(skbsz.bits32, toe->iomem + GLOBAL_DMA_SKB_SIZE_REG);
++ writel(toe->freeq_dma_base | toe->freeq_order, dma_reg);
++
++ return 0;
++
++err_freeq_alloc:
++ while (pn > 0) {
++ --pn;
++ mapping = toe->freeq_ring[pn << fpp_order].word2.buf_adr;
++ dma_unmap_single(toe->dev, mapping, frag_len, DMA_FROM_DEVICE);
++ put_page(toe->freeq_page_tab[pn]);
++ }
++
++err_freeq:
++ dma_free_coherent(toe->dev,
++ sizeof(*toe->freeq_ring) << toe->freeq_order,
++ toe->freeq_ring, toe->freeq_dma_base);
++ toe->freeq_ring = NULL;
++ return -ENOMEM;
++}
++
++static void toe_cleanup_freeq(struct toe_private *toe)
++{
++ void __iomem *dma_reg = toe->iomem + GLOBAL_SW_FREEQ_BASE_SIZE_REG;
++ void __iomem *ptr_reg = toe->iomem + GLOBAL_SWFQ_RWPTR_REG;
++
++ unsigned int frag_len = 1 << toe->freeq_frag_order;
++ unsigned int len = 1 << toe->freeq_order;
++ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order;
++ unsigned int pages = len >> fpp_order;
++ struct page *page;
++ dma_addr_t mapping;
++ unsigned int pn;
++
++ writew(readw(ptr_reg), ptr_reg + 2);
++ writel(0, dma_reg);
++
++ for (pn = 0; pn < pages; pn++) {
++ mapping = toe->freeq_ring[pn << fpp_order].word2.buf_adr;
++ dma_unmap_single(toe->dev, mapping, frag_len, DMA_FROM_DEVICE);
++
++ page = toe->freeq_page_tab[pn];
++ while (atomic_read(&page->_count) > 0)
++ put_page(page);
++ }
++
++ kfree(toe->freeq_page_tab);
++
++ dma_free_coherent(toe->dev,
++ sizeof(*toe->freeq_ring) << toe->freeq_order,
++ toe->freeq_ring, toe->freeq_dma_base);
++}
++
++static int toe_resize_freeq(struct toe_private *toe, int changing_dev_id)
++{
++ void __iomem *irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG;
++ struct gmac_private *gmac;
++ struct net_device *other = toe->netdev[1 - changing_dev_id];
++ unsigned new_size = 0;
++ unsigned new_order;
++ int err;
++ unsigned long flags;
++ unsigned en;
++
++ if (other && netif_running(other))
++ return -EBUSY;
++
++ if (toe->netdev[0]) {
++ gmac = netdev_priv(toe->netdev[0]);
++ new_size = 1 << (gmac->rxq_order + 1);
++ }
++
++ if (toe->netdev[1]) {
++ gmac = netdev_priv(toe->netdev[1]);
++ new_size += 1 << (gmac->rxq_order + 1);
++ }
++
++ new_order = min(15, ilog2(new_size - 1) + 1);
++ if (toe->freeq_order == new_order)
++ return 0;
++
++ spin_lock_irqsave(&toe->irq_lock, flags);
++ en = readl(irqen_reg);
++ en &= ~SWFQ_EMPTY_INT_BIT;
++ writel(en, irqen_reg);
++
++ if (toe->freeq_ring)
++ toe_cleanup_freeq(toe);
++
++ toe->freeq_order = new_order;
++ err = toe_setup_freeq(toe);
++
++ en |= SWFQ_EMPTY_INT_BIT;
++ writel(en, irqen_reg);
++ spin_unlock_irqrestore(&toe->irq_lock, flags);
++
++ return err;
++}
++
++static void gmac_tx_irq_enable(struct net_device *dev, unsigned txq, int en)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned val, mask;
++
++ mask = GMAC0_IRQ0_TXQ0_INTS << (6 * dev->dev_id + txq);
++
++ if (en)
++ writel(mask, toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG);
++
++ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG);
++ val = en ? val | mask : val & ~mask;
++ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG);
++}
++
++
++static void gmac_tx_irq(struct net_device *dev, unsigned txq_num)
++{
++ struct netdev_queue *ntxq = netdev_get_tx_queue(dev, txq_num);
++
++ gmac_tx_irq_enable(dev, txq_num, 0);
++ netif_tx_wake_queue(ntxq);
++}
++
++static int gmac_map_tx_bufs(struct net_device *dev, struct sk_buff *skb,
++ struct gmac_txq *txq, unsigned short *desc)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ struct skb_shared_info *skb_si = skb_shinfo(skb);
++ skb_frag_t *skb_frag;
++ short frag, last_frag = skb_si->nr_frags - 1;
++ unsigned short m = (1 << gmac->txq_order) -1;
++ unsigned short w = *desc;
++ unsigned word1, word3, buflen;
++ dma_addr_t mapping;
++ void *buffer;
++ unsigned short mtu;
++ GMAC_TXDESC_T *txd;
++
++ mtu = ETH_HLEN;
++ mtu += dev->mtu;
++ if (skb->protocol == htons(ETH_P_8021Q))
++ mtu += VLAN_HLEN;
++
++ word1 = skb->len;
++ word3 = SOF_BIT;
++
++ if (word1 > mtu) {
++ word1 |= TSS_MTU_ENABLE_BIT;
++ word3 += mtu;
++ }
++
++ if (skb->ip_summed != CHECKSUM_NONE) {
++ int tcp = 0;
++ if (skb->protocol == htons(ETH_P_IP)) {
++ word1 |= TSS_IP_CHKSUM_BIT;
++ tcp = ip_hdr(skb)->protocol == IPPROTO_TCP;
++ } else { /* IPv6 */
++ word1 |= TSS_IPV6_ENABLE_BIT;
++ tcp = ipv6_hdr(skb)->nexthdr == IPPROTO_TCP;
++ }
++
++ word1 |= tcp ? TSS_TCP_CHKSUM_BIT : TSS_UDP_CHKSUM_BIT;
++ }
++
++ frag = -1;
++ while (frag <= last_frag) {
++ if (frag == -1) {
++ buffer = skb->data;
++ buflen = skb_headlen(skb);
++ } else {
++ skb_frag = skb_si->frags + frag;
++ buffer = page_address(skb_frag_page(skb_frag)) +
++ skb_frag->page_offset;
++ buflen = skb_frag->size;
++ }
++
++ if (frag == last_frag) {
++ word3 |= EOF_BIT;
++ txq->skb[w] = skb;
++ }
++
++ mapping = dma_map_single(toe->dev, buffer, buflen,
++ DMA_TO_DEVICE);
++ if (dma_mapping_error(toe->dev, mapping) ||
++ !(mapping & PAGE_MASK))
++ goto map_error;
++
++ txd = txq->ring + w;
++ txd->word0.bits32 = buflen;
++ txd->word1.bits32 = word1;
++ txd->word2.buf_adr = mapping;
++ txd->word3.bits32 = word3;
++
++ word3 &= MTU_SIZE_BIT_MASK;
++ w++;
++ w &= m;
++ frag++;
++ }
++
++ *desc = w;
++ return 0;
++
++map_error:
++ while (w != *desc) {
++ w--;
++ w &= m;
++
++ dma_unmap_page(toe->dev, txq->ring[w].word2.buf_adr,
++ txq->ring[w].word0.bits.buffer_size, DMA_TO_DEVICE);
++ }
++ return ENOMEM;
++}
++
++static int gmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++
++ void __iomem *ptr_reg;
++ struct gmac_txq *txq;
++ struct netdev_queue *ntxq;
++ int txq_num, nfrags;
++ DMA_RWPTR_T rw;
++ unsigned short r, w, d;
++ unsigned short m = (1 << gmac->txq_order) - 1;
++
++ SKB_FRAG_ASSERT(skb);
++
++ if (unlikely(skb->len >= 0x10000))
++ goto out_drop_free;
++
++ txq_num = skb_get_queue_mapping(skb);
++ ptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE_PTR_REG(txq_num);
++ txq = &gmac->txq[txq_num];
++ ntxq = netdev_get_tx_queue(dev, txq_num);
++ nfrags = skb_shinfo(skb)->nr_frags;
++
++ rw.bits32 = readl(ptr_reg);
++ r = rw.bits.rptr;
++ w = rw.bits.wptr;
++
++ d = txq->cptr - w - 1;
++ d &= m;
++
++ if (unlikely(d < nfrags+2))
++ {
++ gmac_clean_txq(dev, txq, r);
++ d = txq->cptr - w - 1;
++ d &= m;
++
++ if (unlikely(d < nfrags+2)) {
++ netif_tx_stop_queue(ntxq);
++
++ d = txq->cptr + nfrags + 16;
++ d &= m;
++ txq->ring[d].word3.bits.eofie = 1;
++ gmac_tx_irq_enable(dev, txq_num, 1);
++
++ u64_stats_update_begin(&gmac->tx_stats_syncp);
++ dev->stats.tx_fifo_errors++;
++ u64_stats_update_end(&gmac->tx_stats_syncp);
++ return NETDEV_TX_BUSY;
++ }
++ }
++
++ if (unlikely(gmac_map_tx_bufs(dev, skb, txq, &w))) {
++ if (skb_linearize(skb))
++ goto out_drop;
++
++ if (unlikely(gmac_map_tx_bufs(dev, skb, txq, &w)))
++ goto out_drop_free;
++
++ u64_stats_update_begin(&gmac->tx_stats_syncp);
++ gmac->tx_frags_linearized++;
++ u64_stats_update_end(&gmac->tx_stats_syncp);
++ }
++
++ writew(w, ptr_reg+2);
++
++ gmac_clean_txq(dev, txq, r);
++ return NETDEV_TX_OK;
++
++out_drop_free:
++ dev_kfree_skb(skb);
++out_drop:
++ u64_stats_update_begin(&gmac->tx_stats_syncp);
++ gmac->stats.tx_dropped++;
++ u64_stats_update_end(&gmac->tx_stats_syncp);
++ return NETDEV_TX_OK;
++}
++
++static void gmac_tx_timeout(struct net_device *dev)
++{
++ netdev_err(dev, "Tx timeout\n");
++ gmac_dump_dma_state(dev);
++}
++
++static void gmac_enable_irq(struct net_device *dev, int enable)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned long flags;
++ unsigned val, mask;
++
++ spin_lock_irqsave(&toe->irq_lock, flags);
++
++ mask = GMAC0_IRQ0_2 << (dev->dev_id * 2);
++ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG);
++ val = enable ? (val | mask) : (val & ~mask);
++ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG);
++
++ mask = DEFAULT_Q0_INT_BIT << dev->dev_id;
++ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG);
++ val = enable ? (val | mask) : (val & ~mask);
++ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG);
++
++ mask = GMAC0_IRQ4_8 << (dev->dev_id * 8);
++ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG);
++ val = enable ? (val | mask) : (val & ~mask);
++ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG);
++
++ spin_unlock_irqrestore(&toe->irq_lock, flags);
++}
++
++static void gmac_enable_rx_irq(struct net_device *dev, int enable)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned long flags;
++ unsigned val, mask;
++
++ spin_lock_irqsave(&toe->irq_lock, flags);
++ mask = DEFAULT_Q0_INT_BIT << dev->dev_id;
++
++ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG);
++ val = enable ? (val | mask) : (val & ~mask);
++ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG);
++
++ spin_unlock_irqrestore(&toe->irq_lock, flags);
++}
++
++static struct sk_buff *gmac_skb_if_good_frame(struct gmac_private *gmac,
++ GMAC_RXDESC_0_T word0, unsigned frame_len)
++{
++ struct sk_buff *skb = NULL;
++ unsigned rx_status = word0.bits.status;
++ unsigned rx_csum = word0.bits.chksum_status;
++
++ gmac->rx_stats[rx_status]++;
++ gmac->rx_csum_stats[rx_csum]++;
++
++ if (word0.bits.derr || word0.bits.perr ||
++ rx_status || frame_len < ETH_ZLEN ||
++ rx_csum >= RX_CHKSUM_IP_ERR_UNKNOWN) {
++ gmac->stats.rx_errors++;
++
++ if (frame_len < ETH_ZLEN || RX_ERROR_LENGTH(rx_status))
++ gmac->stats.rx_length_errors++;
++ if (RX_ERROR_OVER(rx_status))
++ gmac->stats.rx_over_errors++;
++ if (RX_ERROR_CRC(rx_status))
++ gmac->stats.rx_crc_errors++;
++ if (RX_ERROR_FRAME(rx_status))
++ gmac->stats.rx_frame_errors++;
++
++ return NULL;
++ }
++
++ skb = napi_get_frags(&gmac->napi);
++ if (!skb)
++ return NULL;
++
++ if (rx_csum == RX_CHKSUM_IP_UDP_TCP_OK)
++ skb->ip_summed = CHECKSUM_UNNECESSARY;
++
++ gmac->stats.rx_bytes += frame_len;
++ gmac->stats.rx_packets++;
++ return skb;
++}
++
++static unsigned gmac_rx(struct net_device *dev, unsigned budget)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ void __iomem *ptr_reg = gmac->rxq_rwptr;
++
++ static struct sk_buff *skb;
++
++ DMA_RWPTR_T rw;
++ unsigned short r, w;
++ unsigned short m = (1 << gmac->rxq_order) -1;
++ GMAC_RXDESC_T *rx = NULL;
++ struct page* page = NULL;
++ unsigned page_offs;
++ unsigned int frame_len, frag_len;
++ int frag_nr = 0;
++
++ GMAC_RXDESC_0_T word0;
++ GMAC_RXDESC_1_T word1;
++ dma_addr_t mapping;
++ GMAC_RXDESC_3_T word3;
++
++ rw.bits32 = readl(ptr_reg);
++ /* Reset interrupt as all packages until here are taken into account */
++ writel(DEFAULT_Q0_INT_BIT << dev->dev_id,
++ toe->iomem + GLOBAL_INTERRUPT_STATUS_1_REG);
++ r = rw.bits.rptr;
++ w = rw.bits.wptr;
++
++ while (budget && w != r) {
++ rx = gmac->rxq_ring + r;
++ word0 = rx->word0;
++ word1 = rx->word1;
++ mapping = rx->word2.buf_adr;
++ word3 = rx->word3;
++
++ r++;
++ r &= m;
++
++ frag_len = word0.bits.buffer_size;
++ frame_len =word1.bits.byte_count;
++ page_offs = mapping & ~PAGE_MASK;
++
++ if (unlikely(!mapping)) {
++ netdev_err(dev, "rxq[%u]: HW BUG: zero DMA desc\n", r);
++ goto err_drop;
++ }
++
++ page = pfn_to_page(dma_to_pfn(toe->dev, mapping));
++
++ if (word3.bits32 & SOF_BIT) {
++ if (unlikely(skb)) {
++ napi_free_frags(&gmac->napi);
++ gmac->stats.rx_dropped++;
++ }
++
++ skb = gmac_skb_if_good_frame(gmac, word0, frame_len);
++ if (unlikely(!skb))
++ goto err_drop;
++
++ page_offs += NET_IP_ALIGN;
++ frag_len -= NET_IP_ALIGN;
++ frag_nr = 0;
++
++ } else if (!skb) {
++ put_page(page);
++ continue;
++ }
++
++ if (word3.bits32 & EOF_BIT)
++ frag_len = frame_len - skb->len;
++
++ /* append page frag to skb */
++ if (unlikely(frag_nr == MAX_SKB_FRAGS))
++ goto err_drop;
++
++ if (frag_len == 0)
++ netdev_err(dev, "Received fragment with len = 0\n");
++
++ skb_fill_page_desc(skb, frag_nr, page, page_offs, frag_len);
++ skb->len += frag_len;
++ skb->data_len += frag_len;
++ skb->truesize += frag_len;
++ frag_nr++;
++
++ if (word3.bits32 & EOF_BIT) {
++ napi_gro_frags(&gmac->napi);
++ skb = NULL;
++ --budget;
++ }
++ continue;
++
++err_drop:
++ if (skb) {
++ napi_free_frags(&gmac->napi);
++ skb = NULL;
++ }
++
++ if (mapping)
++ put_page(page);
++
++ gmac->stats.rx_dropped++;
++ }
++
++ writew(r, ptr_reg);
++ return budget;
++}
++
++static int gmac_napi_poll(struct napi_struct *napi, int budget)
++{
++ struct gmac_private *gmac = netdev_priv(napi->dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned rx;
++ unsigned freeq_threshold = 1 << (toe->freeq_order - 1);
++
++ u64_stats_update_begin(&gmac->rx_stats_syncp);
++
++ rx = budget - gmac_rx(napi->dev, budget);
++
++ if (rx == 0) {
++ napi_gro_flush(napi, false);
++ __napi_complete(napi);
++ gmac_enable_rx_irq(napi->dev, 1);
++ ++gmac->rx_napi_exits;
++ }
++
++ gmac->freeq_refill += rx;
++ if (gmac->freeq_refill > freeq_threshold) {
++ gmac->freeq_refill -= freeq_threshold;
++ toe_fill_freeq(toe, 0);
++ }
++
++ u64_stats_update_end(&gmac->rx_stats_syncp);
++ return rx;
++}
++
++static void gmac_dump_dma_state(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ void __iomem *ptr_reg;
++ unsigned reg[5];
++
++ /* Interrupt status */
++ reg[0] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG);
++ reg[1] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_1_REG);
++ reg[2] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_2_REG);
++ reg[3] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_3_REG);
++ reg[4] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG);
++ netdev_err(dev, "IRQ status: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ reg[0], reg[1], reg[2], reg[3], reg[4]);
++
++ /* Interrupt enable */
++ reg[0] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG);
++ reg[1] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG);
++ reg[2] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_2_REG);
++ reg[3] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_3_REG);
++ reg[4] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG);
++ netdev_err(dev, "IRQ enable: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ reg[0], reg[1], reg[2], reg[3], reg[4]);
++
++ /* RX DMA status */
++ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_RX_FIRST_DESC_REG);
++ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_RX_CURR_DESC_REG);
++ reg[2] = GET_RPTR(gmac->rxq_rwptr);
++ reg[3] = GET_WPTR(gmac->rxq_rwptr);
++ netdev_err(dev, "RX DMA regs: 0x%08x 0x%08x, ptr: %u %u\n",
++ reg[0], reg[1], reg[2], reg[3]);
++
++ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD0_REG);
++ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD1_REG);
++ reg[2] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD2_REG);
++ reg[3] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD3_REG);
++ netdev_err(dev, "RX DMA descriptor: 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ reg[0], reg[1], reg[2], reg[3]);
++
++ /* TX DMA status */
++ ptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE0_PTR_REG;
++
++ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_TX_FIRST_DESC_REG);
++ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_TX_CURR_DESC_REG);
++ reg[2] = GET_RPTR(ptr_reg);
++ reg[3] = GET_WPTR(ptr_reg);
++ netdev_err(dev, "TX DMA regs: 0x%08x 0x%08x, ptr: %u %u\n",
++ reg[0], reg[1], reg[2], reg[3]);
++
++ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD0_REG);
++ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD1_REG);
++ reg[2] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD2_REG);
++ reg[3] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD3_REG);
++ netdev_err(dev, "TX DMA descriptor: 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ reg[0], reg[1], reg[2], reg[3]);
++
++ /* FREE queues status */
++ ptr_reg = toe->iomem + GLOBAL_SWFQ_RWPTR_REG;
++
++ reg[0] = GET_RPTR(ptr_reg);
++ reg[1] = GET_WPTR(ptr_reg);
++
++ ptr_reg = toe->iomem + GLOBAL_HWFQ_RWPTR_REG;
++
++ reg[2] = GET_RPTR(ptr_reg);
++ reg[3] = GET_WPTR(ptr_reg);
++ netdev_err(dev, "FQ SW ptr: %u %u, HW ptr: %u %u\n",
++ reg[0], reg[1], reg[2], reg[3]);
++}
++
++static void gmac_update_hw_stats(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned long flags;
++ unsigned int rx_discards, rx_mcast, rx_bcast;
++
++ spin_lock_irqsave(&toe->irq_lock, flags);
++ u64_stats_update_begin(&gmac->ir_stats_syncp);
++
++ gmac->hw_stats[0] += rx_discards = readl(gmac->ctl_iomem + GMAC_IN_DISCARDS);
++ gmac->hw_stats[1] += readl(gmac->ctl_iomem + GMAC_IN_ERRORS);
++ gmac->hw_stats[2] += rx_mcast = readl(gmac->ctl_iomem + GMAC_IN_MCAST);
++ gmac->hw_stats[3] += rx_bcast = readl(gmac->ctl_iomem + GMAC_IN_BCAST);
++ gmac->hw_stats[4] += readl(gmac->ctl_iomem + GMAC_IN_MAC1);
++ gmac->hw_stats[5] += readl(gmac->ctl_iomem + GMAC_IN_MAC2);
++
++ gmac->stats.rx_missed_errors += rx_discards;
++ gmac->stats.multicast += rx_mcast;
++ gmac->stats.multicast += rx_bcast;
++
++ writel(GMAC0_MIB_INT_BIT << (dev->dev_id * 8),
++ toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG);
++
++ u64_stats_update_end(&gmac->ir_stats_syncp);
++ spin_unlock_irqrestore(&toe->irq_lock, flags);
++}
++
++static inline unsigned gmac_get_intr_flags(struct net_device *dev, int i)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ void __iomem *irqif_reg, *irqen_reg;
++ unsigned offs, val;
++
++ offs = i * (GLOBAL_INTERRUPT_STATUS_1_REG - GLOBAL_INTERRUPT_STATUS_0_REG);
++
++ irqif_reg = toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG + offs;
++ irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG + offs;
++
++ val = readl(irqif_reg) & readl(irqen_reg);
++ return val;
++}
++
++enum hrtimer_restart gmac_coalesce_delay_expired( struct hrtimer *timer )
++{
++ struct gmac_private *gmac = container_of(timer, struct gmac_private, rx_coalesce_timer);
++
++ napi_schedule(&gmac->napi);
++ return HRTIMER_NORESTART;
++}
++
++static irqreturn_t gmac_irq(int irq, void *data)
++{
++ struct net_device *dev = data;
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ unsigned val, orr = 0;
++
++ orr |= val = gmac_get_intr_flags(dev, 0);
++
++ if (unlikely(val & (GMAC0_IRQ0_2 << (dev->dev_id * 2)))) {
++ /* oh, crap. */
++ netdev_err(dev, "hw failure/sw bug\n");
++ gmac_dump_dma_state(dev);
++
++ /* don't know how to recover, just reduce losses */
++ gmac_enable_irq(dev, 0);
++ return IRQ_HANDLED;
++ }
++
++ if (val & (GMAC0_IRQ0_TXQ0_INTS << (dev->dev_id * 6)))
++ gmac_tx_irq(dev, 0);
++
++ orr |= val = gmac_get_intr_flags(dev, 1);
++
++ if (val & (DEFAULT_Q0_INT_BIT << dev->dev_id)) {
++
++ gmac_enable_rx_irq(dev, 0);
++
++ if (!gmac->rx_coalesce_nsecs)
++ napi_schedule(&gmac->napi);
++ else {
++ ktime_t ktime;
++ ktime = ktime_set(0, gmac->rx_coalesce_nsecs);
++ hrtimer_start(&gmac->rx_coalesce_timer, ktime, HRTIMER_MODE_REL);
++ }
++ }
++
++ orr |= val = gmac_get_intr_flags(dev, 4);
++
++ if (unlikely(val & (GMAC0_MIB_INT_BIT << (dev->dev_id * 8))))
++ gmac_update_hw_stats(dev);
++
++ if (unlikely(val & (GMAC0_RX_OVERRUN_INT_BIT << (dev->dev_id * 8)))) {
++ writel(GMAC0_RXDERR_INT_BIT << (dev->dev_id * 8),
++ toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG);
++
++ spin_lock(&toe->irq_lock);
++ u64_stats_update_begin(&gmac->ir_stats_syncp);
++ ++gmac->stats.rx_fifo_errors;
++ u64_stats_update_end(&gmac->ir_stats_syncp);
++ spin_unlock(&toe->irq_lock);
++ }
++
++ return orr ? IRQ_HANDLED : IRQ_NONE;
++}
++
++static void gmac_start_dma(struct gmac_private *gmac)
++{
++ void __iomem *dma_ctrl_reg = gmac->dma_iomem + GMAC_DMA_CTRL_REG;
+ GMAC_DMA_CTRL_T dma_ctrl;
+
-+ /* program dma control register */
-+ dma_ctrl.bits32 = __raw_readl(gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
++ dma_ctrl.bits32 = readl(dma_ctrl_reg);
+ dma_ctrl.bits.rd_enable = 1;
+ dma_ctrl.bits.td_enable = 1;
+ dma_ctrl.bits.loopback = 0;
+ dma_ctrl.bits.drop_small_ack = 0;
-+ dma_ctrl.bits.rd_prot = 0;
-+ dma_ctrl.bits.rd_burst_size = 3;
-+ dma_ctrl.bits.rd_insert_bytes = RX_INSERT_BYTES;
-+ dma_ctrl.bits.rd_bus = 3;
-+ dma_ctrl.bits.td_prot = 0;
-+ dma_ctrl.bits.td_burst_size = 3;
-+ dma_ctrl.bits.td_bus = 3;
-+
-+ __raw_writel(dma_ctrl.bits32, gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
++ dma_ctrl.bits.rd_insert_bytes = NET_IP_ALIGN;
++ dma_ctrl.bits.rd_prot = HPROT_DATA_CACHE | HPROT_PRIVILIGED;
++ dma_ctrl.bits.rd_burst_size = HBURST_INCR8;
++ dma_ctrl.bits.rd_bus = HSIZE_8;
++ dma_ctrl.bits.td_prot = HPROT_DATA_CACHE;
++ dma_ctrl.bits.td_burst_size = HBURST_INCR8;
++ dma_ctrl.bits.td_bus = HSIZE_8;
++
++ writel(dma_ctrl.bits32, dma_ctrl_reg);
+}
+
-+static void toe_gmac_hw_stop(struct gmac_private *gmac)
++static void gmac_stop_dma(struct gmac_private *gmac)
+{
++ void __iomem *dma_ctrl_reg = gmac->dma_iomem + GMAC_DMA_CTRL_REG;
+ GMAC_DMA_CTRL_T dma_ctrl;
+
-+ /* program dma control register */
-+ dma_ctrl.bits32 = __raw_readl(gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
++ dma_ctrl.bits32 = readl(dma_ctrl_reg);
+ dma_ctrl.bits.rd_enable = 0;
+ dma_ctrl.bits.td_enable = 0;
-+ __raw_writel(dma_ctrl.bits32, gmac->dma_base_addr + GMAC_DMA_CTRL_REG);
-+}
-+
-+static void toe_gmac_init_chip(struct net_device *dev)
-+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ GMAC_CONFIG2_T config2_val;
-+ GMAC_CONFIG0_T config0;
-+ GMAC_CONFIG1_T config1;
-+ GMAC_STATUS_T status;
-+ GMAC_TX_WCR0_T hw_weigh;
-+ GMAC_TX_WCR1_T sw_weigh;
-+ GMAC_RX_FLTR_T rx_filter;
-+
-+ /* set RX_FLTR register to receive all multicast packet */
-+ rx_filter.bits32 = __raw_readl(gmac->base_addr + GMAC_RX_FLTR);
-+ rx_filter.bits.unicast = 1;
-+ rx_filter.bits.multicast = 1;
-+ rx_filter.bits.broadcast = 1;
-+ __raw_writel(rx_filter.bits32, gmac->base_addr + GMAC_RX_FLTR);
-+
-+ /* set flow control threshold */
-+ config1.bits32 = 0;
-+ config1.bits.set_threshold = 32 / 2;
-+ config1.bits.rel_threshold = 32 / 4 * 3;
-+ __raw_writel(config1.bits32, gmac->base_addr + GMAC_CONFIG1);
-+
-+ /* set flow control threshold */
-+ config2_val.bits32 = 0;
-+ config2_val.bits.set_threshold = TOE_SW_FREEQ_DESC_NUM / 4;
-+ config2_val.bits.rel_threshold = TOE_SW_FREEQ_DESC_NUM / 2;
-+ __raw_writel(config2_val.bits32, gmac->base_addr + GMAC_CONFIG2);
-+
-+ /* disable TX/RX and disable internal loop back */
-+ config0.bits32 = __raw_readl(gmac->base_addr + GMAC_CONFIG0);
-+
-+ config0.bits.max_len = 2;
-+
-+ gmac->flow_control_enable = 0;
-+
-+ config0.bits.tx_fc_en = 0; /* disable tx flow control */
-+ config0.bits.rx_fc_en = 0; /* disable rx flow control */
-+ config0.bits.dis_rx = 1; /* disable rx */
-+ config0.bits.dis_tx = 1; /* disable tx */
-+ config0.bits.loop_back = 0; /* enable/disable GMAC loopback */
-+ config0.bits.rx_err_detect = 1;
-+ config0.bits.rgmii_en = 0;
-+ config0.bits.rgmm_edge = 1;
-+ config0.bits.rxc_inv = 0;
-+ config0.bits.ipv4_rx_chksum = 1; /* enable H/W to check ip checksum */
-+ config0.bits.ipv6_rx_chksum = 1; /* enable H/W to check ip checksum */
-+ config0.bits.port0_chk_hwq = 1;
-+ config0.bits.port1_chk_hwq = 1;
-+ config0.bits.port0_chk_toeq = 1;
-+ config0.bits.port1_chk_toeq = 1;
-+ config0.bits.port0_chk_classq = 1;
-+ config0.bits.port1_chk_classq = 1;
-+
-+ __raw_writel(config0.bits32, gmac->base_addr + GMAC_CONFIG0);
-+
-+ hw_weigh.bits32 = 0;
-+ hw_weigh.bits.hw_tq3 = 1;
-+ hw_weigh.bits.hw_tq2 = 1;
-+ hw_weigh.bits.hw_tq1 = 1;
-+ hw_weigh.bits.hw_tq0 = 1;
-+ __raw_writel(hw_weigh.bits32, gmac->dma_base_addr + GMAC_TX_WEIGHTING_CTRL_0_REG);
-+
-+ sw_weigh.bits32 = 0;
-+ sw_weigh.bits.sw_tq5 = 1;
-+ sw_weigh.bits.sw_tq4 = 1;
-+ sw_weigh.bits.sw_tq3 = 1;
-+ sw_weigh.bits.sw_tq2 = 1;
-+ sw_weigh.bits.sw_tq1 = 1;
-+ sw_weigh.bits.sw_tq0 = 1;
-+ __raw_writel(sw_weigh.bits32, gmac->dma_base_addr + GMAC_TX_WEIGHTING_CTRL_1_REG);
-+
-+ /* set interface type */
-+ status.bits32 = __raw_readl(gmac->base_addr + GMAC_STATUS);
-+
-+ switch (gmac->phydev->interface) {
-+ case PHY_INTERFACE_MODE_MII:
-+ status.bits.mii_rmii = GMAC_PHY_MII;
-+ break;
-+ case PHY_INTERFACE_MODE_GMII:
-+ status.bits.mii_rmii = GMAC_PHY_GMII;
-+ break;
-+ case PHY_INTERFACE_MODE_RGMII:
-+ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
-+ break;
-+ default:
-+ dev_err(&dev->dev, "Unsupported MII interface\n");
-+ return;
++ writel(dma_ctrl.bits32, dma_ctrl_reg);
++}
++
++static int gmac_open(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ int err;
++
++ if (!dev->phydev) {
++ err = gmac_setup_phy(dev);
++ if (err) {
++ netif_err(gmac, ifup, dev,
++ "PHY init failed: %d\n", err);
++ return err;
++ }
+ }
+
-+ __raw_writel(status.bits32, gmac->base_addr + GMAC_STATUS);
++ err = request_irq(dev->irq, gmac_irq,
++ IRQF_SHARED, dev->name, dev);
++ if (unlikely(err))
++ return err;
++
++ netif_carrier_off(dev);
++ phy_start(dev->phydev);
++
++ err = toe_resize_freeq(gmac->toe, dev->dev_id);
++ if (unlikely(err))
++ goto err_stop_phy;
++
++ err = gmac_setup_rxq(dev);
++ if (unlikely(err))
++ goto err_stop_phy;
++
++ err = gmac_setup_txqs(dev);
++ if (unlikely(err)) {
++ gmac_cleanup_rxq(dev);
++ goto err_stop_phy;
++ }
++
++ napi_enable(&gmac->napi);
++
++ gmac_start_dma(gmac);
++ gmac_enable_irq(dev, 1);
++ gmac_enable_tx_rx(dev);
++ netif_tx_start_all_queues(dev);
++
++ hrtimer_init(&gmac->rx_coalesce_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++ gmac->rx_coalesce_timer.function = &gmac_coalesce_delay_expired;
++ return 0;
++
++err_stop_phy:
++ phy_stop(dev->phydev);
++ free_irq(dev->irq, dev);
++ return err;
++}
++
++static int gmac_stop(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++
++ hrtimer_cancel(&gmac->rx_coalesce_timer);
++ netif_tx_stop_all_queues(dev);
++ gmac_disable_tx_rx(dev);
++ gmac_stop_dma(gmac);
++ napi_disable(&gmac->napi);
++
++ gmac_enable_irq(dev, 0);
++ gmac_cleanup_rxq(dev);
++ gmac_cleanup_txqs(dev);
++
++ phy_stop(dev->phydev);
++ free_irq(dev->irq, dev);
++
++ gmac_update_hw_stats(dev);
++ return 0;
+}
+
-+static void toe_init_gmac(struct net_device *dev)
++static void gmac_set_rx_mode(struct net_device *dev)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ u32 data;
-+
-+ /* GMAC initialization */
-+ toe_gmac_init_chip(dev);
-+
-+ /* -----------------------------------------------------------
-+ Enable GMAC interrupt & disable loopback
-+ Notes:
-+ GMACx init routine (for eCOS) or open routine (for Linux)
-+ enable the interrupt bits only which are selected for him.
-+ --------------------------------------------------------------*/
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct netdev_hw_addr *ha;
++ __u32 mc_filter[2];
++ unsigned bit_nr;
++ GMAC_RX_FLTR_T filter = { .bits = {
++ .broadcast = 1,
++ .multicast = 1,
++ .unicast = 1,
++ } };
+
-+ /* Enable Interrupt Bits */
-+ if (gmac->port_id == 0) {
-+ gmac->intr0_selected = GMAC0_TXDERR_INT_BIT | GMAC0_TXPERR_INT_BIT |
-+ GMAC0_RXDERR_INT_BIT | GMAC0_RXPERR_INT_BIT |
-+ GMAC0_SWTQ05_FIN_INT_BIT | GMAC0_SWTQ05_EOF_INT_BIT |
-+ GMAC0_SWTQ04_FIN_INT_BIT | GMAC0_SWTQ04_EOF_INT_BIT |
-+ GMAC0_SWTQ03_FIN_INT_BIT | GMAC0_SWTQ03_EOF_INT_BIT |
-+ GMAC0_SWTQ02_FIN_INT_BIT | GMAC0_SWTQ02_EOF_INT_BIT |
-+ GMAC0_SWTQ01_FIN_INT_BIT | GMAC0_SWTQ01_EOF_INT_BIT |
-+ GMAC0_SWTQ00_FIN_INT_BIT | GMAC0_SWTQ00_EOF_INT_BIT;
++ mc_filter[1] = mc_filter[0] = 0;
+
-+#ifdef GMAX_TX_INTR_DISABLED
-+ gmac->intr0_enabled = 0;
-+#else
-+ gmac->intr0_enabled = GMAC0_SWTQ00_FIN_INT_BIT | GMAC0_SWTQ00_EOF_INT_BIT;
-+#endif
++ if (dev->flags & IFF_PROMISC) {
++ filter.bits.error = 1;
++ filter.bits.promiscuous = 1;
++ } else if (!(dev->flags & IFF_ALLMULTI)) {
++ mc_filter[1] = mc_filter[0] = 0;
++ netdev_for_each_mc_addr(ha, dev) {
++ bit_nr = ~crc32_le(~0, ha->addr, ETH_ALEN) & 0x3f;
++ mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 0x1f);
++ }
++ }
+
-+ gmac->intr1_selected = TOE_IQ_ALL_BITS | TOE_CLASS_RX_INT_BITS |
-+ GMAC0_HWTQ03_EOF_INT_BIT | GMAC0_HWTQ02_EOF_INT_BIT |
-+ GMAC0_HWTQ01_EOF_INT_BIT | GMAC0_HWTQ00_EOF_INT_BIT |
-+ DEFAULT_Q0_INT_BIT;
-+ gmac->intr1_enabled = DEFAULT_Q0_INT_BIT | TOE_IQ_ALL_BITS;
-+ gmac->intr2_selected = 0xffffffff; /* TOE Queue 32-63 FUUL Intr */
-+ gmac->intr2_enabled = 0xffffffff;
-+ gmac->intr3_selected = 0xffffffff; /* TOE Queue 0-31 FUUL Intr */
-+ gmac->intr3_enabled = 0xffffffff;
-+ gmac->intr4_selected = GMAC0_INT_BITS | CLASS_RX_FULL_INT_BITS |
-+ HWFQ_EMPTY_INT_BIT | SWFQ_EMPTY_INT_BIT;
-+ gmac->intr4_enabled = GMAC0_INT_BITS | SWFQ_EMPTY_INT_BIT;
-+
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG) & ~gmac->intr0_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG) & ~gmac->intr1_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG) & ~gmac->intr2_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG) & ~gmac->intr3_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG) & ~gmac->intr4_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG);
-+ } else {
-+ gmac->intr0_selected = GMAC1_TXDERR_INT_BIT | GMAC1_TXPERR_INT_BIT |
-+ GMAC1_RXDERR_INT_BIT | GMAC1_RXPERR_INT_BIT |
-+ GMAC1_SWTQ15_FIN_INT_BIT | GMAC1_SWTQ15_EOF_INT_BIT |
-+ GMAC1_SWTQ14_FIN_INT_BIT | GMAC1_SWTQ14_EOF_INT_BIT |
-+ GMAC1_SWTQ13_FIN_INT_BIT | GMAC1_SWTQ13_EOF_INT_BIT |
-+ GMAC1_SWTQ12_FIN_INT_BIT | GMAC1_SWTQ12_EOF_INT_BIT |
-+ GMAC1_SWTQ11_FIN_INT_BIT | GMAC1_SWTQ11_EOF_INT_BIT |
-+ GMAC1_SWTQ10_FIN_INT_BIT | GMAC1_SWTQ10_EOF_INT_BIT;
-+#ifdef GMAX_TX_INTR_DISABLED
-+ gmac->intr0_enabled = 0;
-+#else
-+ gmac->intr0_enabled = GMAC1_SWTQ10_FIN_INT_BIT | GMAC1_SWTQ10_EOF_INT_BIT;
-+#endif
++ writel(mc_filter[0], gmac->ctl_iomem + GMAC_MCAST_FIL0);
++ writel(mc_filter[1], gmac->ctl_iomem + GMAC_MCAST_FIL1);
++ writel(filter.bits32, gmac->ctl_iomem + GMAC_RX_FLTR);
++}
+
-+ gmac->intr1_selected = DEFAULT_Q1_INT_BIT;
-+ gmac->intr1_enabled = DEFAULT_Q1_INT_BIT | TOE_IQ_ALL_BITS;
-+ gmac->intr2_selected = 0; /* TOE Queue 32-63 FUUL Intr */
-+ gmac->intr2_enabled = 0;
-+ gmac->intr3_selected = 0; /* TOE Queue 0-31 FUUL Intr */
-+ gmac->intr3_enabled = 0;
-+ gmac->intr4_selected = GMAC1_INT_BITS;
-+ gmac->intr4_enabled = GMAC1_INT_BITS;
-+
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG) | gmac->intr0_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_0_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG) | gmac->intr1_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_1_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG) | gmac->intr2_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_2_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG) | gmac->intr3_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_3_REG);
-+ data = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG) | gmac->intr4_selected;
-+ __raw_writel(data, toe->global_base + GLOBAL_INTERRUPT_SELECT_4_REG);
-+ }
++static void __gmac_set_mac_address(struct net_device *dev)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ __le32 addr[3];
+
-+ /* enable only selected bits */
-+ gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_0_REG,
-+ gmac->intr0_enabled, gmac->intr0_selected);
-+ gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_1_REG,
-+ gmac->intr1_enabled, gmac->intr1_selected);
-+ gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_2_REG,
-+ gmac->intr2_enabled, gmac->intr2_selected);
-+ gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_3_REG,
-+ gmac->intr3_enabled, gmac->intr3_selected);
-+ gmac_write_reg(toe->global_base, GLOBAL_INTERRUPT_ENABLE_4_REG,
-+ gmac->intr4_enabled, gmac->intr4_selected);
++ memset(addr, 0, sizeof(addr));
++ memcpy(addr, dev->dev_addr, ETH_ALEN);
+
-+ /* start DMA process */
-+ toe_gmac_hw_start(gmac);
++ writel(le32_to_cpu(addr[0]), gmac->ctl_iomem + GMAC_STA_ADD0);
++ writel(le32_to_cpu(addr[1]), gmac->ctl_iomem + GMAC_STA_ADD1);
++ writel(le32_to_cpu(addr[2]), gmac->ctl_iomem + GMAC_STA_ADD2);
+}
+
-+static void toe_gmac_enable_tx_rx(struct net_device *dev)
++static int gmac_set_mac_address(struct net_device *dev, void *addr)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ GMAC_CONFIG0_T config0;
++ struct sockaddr *sa = addr;
++
++ memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);
++ __gmac_set_mac_address(dev);
+
-+ /* enable TX/RX */
-+ config0.bits32 = __raw_readl(gmac->base_addr + GMAC_CONFIG0);
-+ config0.bits.dis_rx = 0; /* enable rx */
-+ config0.bits.dis_tx = 0; /* enable tx */
-+ __raw_writel(config0.bits32, gmac->base_addr + GMAC_CONFIG0);
++ return 0;
+}
+
-+static void toe_gmac_disable_tx_rx(struct net_device *dev)
++static void gmac_clear_hw_stats(struct net_device *dev)
+{
+ struct gmac_private *gmac = netdev_priv(dev);
-+ GMAC_CONFIG0_T config0;
-+
-+ /* enable TX/RX */
-+ config0.bits32 = __raw_readl(gmac->base_addr + GMAC_CONFIG0);
-+ config0.bits.dis_rx = 1; /* disable rx */
-+ config0.bits.dis_tx = 1; /* disable tx */
-+ __raw_writel(config0.bits32, gmac->base_addr + GMAC_CONFIG0);
-+}
-+
-+static void toe_gmac_tx_complete(struct net_device *dev, unsigned int tx_qid)
-+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ GMAC_TXDESC_T *curr_desc;
-+ GMAC_TXDESC_0_T word0;
-+ GMAC_TXDESC_1_T word1;
-+ unsigned int desc_count;
-+ GMAC_SWTXQ_T *swtxq;
-+ DMA_RWPTR_T rwptr;
-+
-+ /* get tx H/W completed descriptor virtual address */
-+ /* check tx status and accumulate tx statistics */
-+ swtxq = &gmac->swtxq[tx_qid];
-+ for (;;) {
-+ rwptr.bits32 = __raw_readl(swtxq->rwptr_reg);
-+ if (rwptr.bits.rptr == swtxq->finished_idx)
-+ break;
-+ curr_desc = (GMAC_TXDESC_T *)swtxq->desc_base + swtxq->finished_idx;
-+ dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+ swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+ sizeof(GMAC_TXDESC_T),
-+ DMA_FROM_DEVICE);
-+ word0.bits32 = curr_desc->word0.bits32;
-+ word1.bits32 = curr_desc->word1.bits32;
-+
-+ if (word0.bits.status_tx_ok) {
-+ dev->stats.tx_bytes += word1.bits.byte_count;
-+ desc_count = word0.bits.desc_count;
-+ if (desc_count == 0) {
-+ dev_err(&dev->dev, "%s::Desc 0x%x = 0x%x, desc_count=%d\n", __func__, (u32)curr_desc, word0.bits32, desc_count);
-+ BUG();
-+ }
-+ while (--desc_count) {
-+ word0.bits.status_tx_ok = 0;
-+ curr_desc->word0.bits32 = word0.bits32;
-+ dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+ swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+ sizeof(GMAC_TXDESC_T),
-+ DMA_TO_DEVICE);
-+ swtxq->finished_idx = RWPTR_ADVANCE_ONE(swtxq->finished_idx, TOE_GMAC_SWTXQ_DESC_NUM);
-+ curr_desc = (GMAC_TXDESC_T *)swtxq->desc_base + swtxq->finished_idx;
-+ dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+ swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+ sizeof(GMAC_TXDESC_T),
-+ DMA_FROM_DEVICE);
-+ word0.bits32 = curr_desc->word0.bits32;
-+ }
-+
-+ word0.bits.status_tx_ok = 0;
-+ dev_kfree_skb_any(swtxq->tx_skb[swtxq->finished_idx]);
-+ swtxq->tx_skb[swtxq->finished_idx] = NULL;
-+
-+ curr_desc->word0.bits32 = word0.bits32;
-+ dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+ swtxq->finished_idx * sizeof(GMAC_TXDESC_T),
-+ sizeof(GMAC_TXDESC_T),
-+ DMA_TO_DEVICE);
-+ dev->stats.tx_packets++;
-+ swtxq->finished_idx = RWPTR_ADVANCE_ONE(swtxq->finished_idx, TOE_GMAC_SWTXQ_DESC_NUM);
-+ } else {
-+ break;
-+ }
-+ }
+
-+ if (netif_queue_stopped(dev))
-+ netif_wake_queue(dev);
++ readl(gmac->ctl_iomem + GMAC_IN_DISCARDS);
++ readl(gmac->ctl_iomem + GMAC_IN_ERRORS);
++ readl(gmac->ctl_iomem + GMAC_IN_MCAST);
++ readl(gmac->ctl_iomem + GMAC_IN_BCAST);
++ readl(gmac->ctl_iomem + GMAC_IN_MAC1);
++ readl(gmac->ctl_iomem + GMAC_IN_MAC2);
+}
+
-+static int gmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
++static struct rtnl_link_stats64 *gmac_get_stats64(struct net_device *dev,
++ struct rtnl_link_stats64 *storage)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ DMA_RWPTR_T rwptr;
-+ GMAC_TXDESC_T *curr_desc;
-+ int snd_pages = skb_shinfo(skb)->nr_frags + 1; /* get number of descriptor */
-+ int frag_id = 0;
-+ int len, total_len = skb->len;
-+ struct net_device_stats *isPtr = &dev->stats;
-+ unsigned int free_desc;
-+ GMAC_SWTXQ_T *swtxq;
-+ register unsigned long word0, word1, word2, word3;
-+ unsigned short wptr, rptr;
-+
-+#ifdef GMAC_LEN_1_2_ISSUE
-+ int total_pages;
-+ total_pages = snd_pages;
-+#endif
++ struct gmac_private *gmac = netdev_priv(dev);
++ unsigned int start;
+
-+ if (skb->len >= 0x10000) {
-+ isPtr->tx_dropped++;
-+ dev_err(&dev->dev, "%s::skb->len %d >= 64K\n", __func__, skb->len);
-+ netif_stop_queue(dev);
-+ return 1;
-+ }
++ gmac_update_hw_stats(dev);
+
-+#ifdef GMAC_USE_TXQ0
-+ #define tx_qid 0
-+#endif
++ /* racing with RX NAPI */
++ do {
++ start = u64_stats_fetch_begin(&gmac->rx_stats_syncp);
+
-+ swtxq = &gmac->swtxq[tx_qid];
++ storage->rx_packets = gmac->stats.rx_packets;
++ storage->rx_bytes = gmac->stats.rx_bytes;
++ storage->rx_errors = gmac->stats.rx_errors;
++ storage->rx_dropped = gmac->stats.rx_dropped;
+
-+ rwptr.bits32 = __raw_readl(swtxq->rwptr_reg);
-+ wptr = rwptr.bits.wptr;
-+ rptr = rwptr.bits.rptr;
++ storage->rx_length_errors = gmac->stats.rx_length_errors;
++ storage->rx_over_errors = gmac->stats.rx_over_errors;
++ storage->rx_crc_errors = gmac->stats.rx_crc_errors;
++ storage->rx_frame_errors = gmac->stats.rx_frame_errors;
+
-+ /*
-+ * check finished desc or empty BD
-+ * cannot check by read ptr of RW PTR register,
-+ * because the HW complete to send but the SW may NOT handle it
-+ */
-+#ifdef GMAX_TX_INTR_DISABLED
-+ toe_gmac_tx_complete(dev, tx_qid);
-+#endif
-+ if (wptr >= swtxq->finished_idx)
-+ free_desc = TOE_GMAC_SWTXQ_DESC_NUM - wptr + swtxq->finished_idx;
-+ else
-+ free_desc = swtxq->finished_idx - wptr;
++ } while (u64_stats_fetch_retry(&gmac->rx_stats_syncp, start));
+
-+ if (free_desc < snd_pages) {
-+ isPtr->tx_dropped++;
-+ netif_stop_queue(dev);
-+ return 1;
-+ }
++ /* racing with MIB and TX completion interrupts */
++ do {
++ start = u64_stats_fetch_begin(&gmac->ir_stats_syncp);
+
-+ while (snd_pages) {
-+ dma_addr_t pkt_datap;
++ storage->tx_errors = gmac->stats.tx_errors;
++ storage->tx_packets = gmac->stats.tx_packets;
++ storage->tx_bytes = gmac->stats.tx_bytes;
+
-+ curr_desc = (GMAC_TXDESC_T *)swtxq->desc_base + wptr;
-+ if (frag_id == 0) {
-+ len = skb_headlen(skb);
-+ pkt_datap = dma_map_single(toe->dev, skb->data, len, DMA_TO_DEVICE);
-+ } else {
-+ skb_frag_t *frag = &skb_shinfo(skb)->frags[frag_id - 1];
-+ len = frag->size;
-+ pkt_datap = dma_map_page(toe->dev, frag->page.p, frag->page_offset, len, DMA_TO_DEVICE);
-+ }
++ storage->multicast = gmac->stats.multicast;
++ storage->rx_missed_errors = gmac->stats.rx_missed_errors;
++ storage->rx_fifo_errors = gmac->stats.rx_fifo_errors;
+
-+ /* set TX descriptor */
-+ word0 = len;
-+ word3 = (dev->mtu + 14) | EOFIE_BIT;
-+
-+#ifdef DO_HW_CHKSUM
-+ if (total_len <= 1514 && ip_hdr(skb) && (ip_hdr(skb)->frag_off & __constant_htons(0x3fff)))
-+ word1 = total_len |
-+ TSS_IP_CHKSUM_BIT |
-+ TSS_IPV6_ENABLE_BIT |
-+ TSS_MTU_ENABLE_BIT;
-+ else
-+ word1 = total_len |
-+ TSS_UDP_CHKSUM_BIT |
-+ TSS_TCP_CHKSUM_BIT |
-+ TSS_IP_CHKSUM_BIT |
-+ TSS_IPV6_ENABLE_BIT |
-+ TSS_MTU_ENABLE_BIT;
-+#else
-+ word1 = total_len | TSS_MTU_ENABLE_BIT;
-+#endif
-+ word2 = (unsigned long)pkt_datap;
++ } while (u64_stats_fetch_retry(&gmac->ir_stats_syncp, start));
+
-+ if (frag_id == 0)
-+ word3 |= SOF_BIT;
++ /* racing with hard_start_xmit */
++ do {
++ start = u64_stats_fetch_begin(&gmac->tx_stats_syncp);
+
-+ if (snd_pages == 1) {
-+ word3 |= EOF_BIT;
-+ swtxq->tx_skb[wptr] = skb;
-+ } else
-+ swtxq->tx_skb[wptr] = NULL;
-+
-+#ifdef GMAC_LEN_1_2_ISSUE
-+ if ((total_pages != snd_pages) && (len == 1 || len == 2) && ((u32)pkt_datap & 0x03)) {
-+ memcpy((void *)&_debug_prefetch_buf[_debug_prefetch_cnt][0], pkt_datap, len);
-+ pkt_datap = (char *)&_debug_prefetch_buf[_debug_prefetch_cnt][0];
-+ word2 = (unsigned long)__pa(pkt_datap);
-+ _debug_prefetch_cnt++;
-+ if (_debug_prefetch_cnt >= _DEBUG_PREFETCH_NUM)
-+ _debug_prefetch_cnt = 0;
-+ }
-+#endif
-+ curr_desc->word0.bits32 = word0;
-+ curr_desc->word1.bits32 = word1;
-+ curr_desc->word2.bits32 = word2;
-+ curr_desc->word3.bits32 = word3;
-+ free_desc--;
-+ dma_sync_single_range_for_device(toe->dev, swtxq->desc_base_dma,
-+ wptr * sizeof(GMAC_TXDESC_T),
-+ sizeof(GMAC_TXDESC_T),
-+ DMA_TO_DEVICE);
-+ wptr = RWPTR_ADVANCE_ONE(wptr, TOE_GMAC_SWTXQ_DESC_NUM);
-+ frag_id++;
-+ snd_pages--;
-+ }
++ storage->tx_dropped = gmac->stats.tx_dropped;
+
-+ SET_WPTR(swtxq->rwptr_reg, wptr);
-+ dev->trans_start = jiffies;
++ } while (u64_stats_fetch_retry(&gmac->tx_stats_syncp, start));
+
-+ return 0;
++ storage->rx_dropped += storage->rx_missed_errors;
++
++ return storage;
+}
+
-+static void __gmac_set_mac_address(struct net_device *dev)
++static int gmac_change_mtu(struct net_device *dev, int new_mtu)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ unsigned int reg_val;
++ int max_len = gmac_pick_rx_max_len(new_mtu);
+
-+ reg_val = dev->dev_addr[0] + (dev->dev_addr[1] << 8) +
-+ (dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24);
-+ __raw_writel(reg_val, gmac->base_addr + GMAC_STA_ADD0);
-+ reg_val = (__raw_readl(gmac->base_addr + GMAC_STA_ADD1) & 0xFFFF0000) +
-+ dev->dev_addr[4] + (dev->dev_addr[5] << 8);
-+ __raw_writel(reg_val, gmac->base_addr + GMAC_STA_ADD1);
-+}
++ if (max_len < 0)
++ return -EINVAL;
+
-+static int gmac_set_mac_address(struct net_device *dev, void *addr)
-+{
-+ struct sockaddr *sa = addr;
++ gmac_disable_tx_rx(dev);
+
-+ memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
++ dev->mtu = new_mtu;
++ gmac_update_config0_reg(dev,
++ max_len << CONFIG0_MAXLEN_SHIFT,
++ CONFIG0_MAXLEN_MASK);
+
-+ __gmac_set_mac_address(dev);
++ netdev_update_features(dev);
++
++ gmac_enable_tx_rx(dev);
+
+ return 0;
+}
+
-+static void gmac_get_mac_address(struct net_device *dev)
++static netdev_features_t gmac_fix_features(struct net_device *dev, netdev_features_t features)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ unsigned int reg_val;
-+
-+ reg_val = __raw_readl(gmac->base_addr + GMAC_STA_ADD0);
-+ dev->dev_addr[0] = reg_val & 0xFF;
-+ dev->dev_addr[1] = (reg_val >> 8) & 0xFF;
-+ dev->dev_addr[2] = (reg_val >> 16) & 0xFF;
-+ dev->dev_addr[3] = (reg_val >> 24) & 0xFF;
-+ reg_val = __raw_readl(gmac->base_addr + GMAC_STA_ADD1);
-+ dev->dev_addr[4] = reg_val & 0xFF;
-+ dev->dev_addr[5] = (reg_val >> 8) & 0xFF;
-+
-+ if (!is_valid_ether_addr(dev->dev_addr)) {
-+ random_ether_addr(dev->dev_addr);
-+ __gmac_set_mac_address(dev);
-+ }
++ if (dev->mtu + ETH_HLEN + VLAN_HLEN > MTU_SIZE_BIT_MASK)
++ features &= ~GMAC_OFFLOAD_FEATURES;
++
++ return features;
+}
+
-+struct net_device_stats *gmac_get_stats(struct net_device *dev)
++static int gmac_set_features(struct net_device *dev, netdev_features_t features)
+{
+ struct gmac_private *gmac = netdev_priv(dev);
++ int enable = features & NETIF_F_RXCSUM;
++ unsigned long flags;
++ u32 reg;
+
-+ if (netif_running(dev)) {
-+ unsigned short multicast;
-+
-+ multicast = __raw_readw(gmac->base_addr + GMAC_IN_MCAST) +
-+ __raw_readw(gmac->base_addr + GMAC_IN_BCAST);
-+
-+ dev->stats.rx_dropped += __raw_readw(gmac->base_addr + GMAC_IN_DISCARDS);
-+ dev->stats.rx_errors += __raw_readw(gmac->base_addr + GMAC_IN_ERRORS);
-+ dev->stats.rx_packets += __raw_readl(gmac->base_addr + GMAC_IN_MAC1) + multicast;
-+ dev->stats.multicast += multicast;
-+ }
-+
-+ return &dev->stats;
-+}
-+
-+/* TODO: If possible use crc32 from kernel lib */
-+static unsigned const ethernet_polynomial = 0x04c11db7U;
-+static unsigned int ether_crc(int length, unsigned char *data)
-+{
-+ int crc = -1;
-+ unsigned int i;
-+ unsigned int crc_val = 0;
++ spin_lock_irqsave(&gmac->config_lock, flags);
+
-+ while (--length >= 0) {
-+ unsigned char current_octet = *data++;
-+ int bit;
-+ for (bit = 0; bit < 8; bit++, current_octet >>= 1)
-+ crc = (crc << 1) ^ ((crc < 0) ^ (current_octet & 1) ?
-+ ethernet_polynomial : 0);
-+ }
-+ crc = ~crc;
-+ for (i = 0; i < 32; i++)
-+ crc_val = crc_val + (((crc << i) & 0x80000000) >> (31 - i));
++ reg = readl(gmac->ctl_iomem + GMAC_CONFIG0);
++ reg = enable ? reg | CONFIG0_RX_CHKSUM : reg & ~CONFIG0_RX_CHKSUM;
++ writel(reg, gmac->ctl_iomem + GMAC_CONFIG0);
+
-+ return crc_val;
++ spin_unlock_irqrestore(&gmac->config_lock, flags);
++ return 0;
+}
+
-+/*----------------------------------------------------------------------
-+* toe_gmac_fill_free_q
-+* allocate buffers for free queue.
-+*----------------------------------------------------------------------*/
-+static void toe_gmac_fill_free_q(struct toe_private *toe)
++static int gmac_get_sset_count(struct net_device *dev, int sset)
+{
-+ struct sk_buff *skb;
-+ DMA_RWPTR_T fq_rwptr;
-+ GMAC_RXDESC_T *fq_desc;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&toe->freeq_lock, flags);
-+ fq_rwptr.bits32 = __raw_readl(toe->global_base + GLOBAL_SWFQ_RWPTR_REG);
-+ while ((unsigned short)RWPTR_ADVANCE_ONE(fq_rwptr.bits.wptr,
-+ TOE_SW_FREEQ_DESC_NUM) != fq_rwptr.bits.rptr) {
-+ skb = dev_alloc_skb(SW_RX_BUF_SIZE);
-+ if (skb == NULL) {
-+ dev_err(toe->dev, "%s::skb allocation fail\n", __func__);
-+ break;
-+ }
-+ REG32(skb->data) = (unsigned int)skb;
-+ skb_reserve(skb, SKB_RESERVE_BYTES);
-+ fq_rwptr.bits.wptr = RWPTR_ADVANCE_ONE(fq_rwptr.bits.wptr,
-+ TOE_SW_FREEQ_DESC_NUM);
-+ fq_desc = (GMAC_RXDESC_T *)toe->swfq_desc_base + fq_rwptr.bits.wptr;
-+ fq_desc->word2.buf_adr = dma_map_single(toe->dev, skb->data,
-+ SW_RX_BUF_SIZE - SKB_RESERVE_BYTES,
-+ DMA_FROM_DEVICE);
-+ dma_sync_single_range_for_device(toe->dev,
-+ toe->sw_freeq_desc_base_dma,
-+ fq_rwptr.bits.wptr * sizeof(GMAC_RXDESC_T),
-+ sizeof(GMAC_RXDESC_T),
-+ DMA_TO_DEVICE);
-+ SET_WPTR(toe->global_base + GLOBAL_SWFQ_RWPTR_REG, fq_rwptr.bits.wptr);
-+ }
-+ spin_unlock_irqrestore(&toe->freeq_lock, flags);
++ return sset == ETH_SS_STATS ? GMAC_STATS_NUM : 0;
+}
+
-+static void fill_free_q_worker(struct work_struct *work)
++static void gmac_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+{
-+ struct toe_private *toe = container_of(work, struct toe_private, freq_work);
++ if (stringset != ETH_SS_STATS)
++ return;
+
-+ toe_gmac_fill_free_q(toe);
++ memcpy(data, gmac_stats_strings, sizeof(gmac_stats_strings));
+}
+
-+/*----------------------------------------------------------------------
-+* toe_gmac_handle_default_rxq
-+* (1) Get rx Buffer for default Rx queue
-+* (2) notify or call upper-routine to handle it
-+* (3) get a new buffer and insert it into SW free queue
-+* (4) Note: The SW free queue Read-Write Pointer should be locked when accessing
-+*----------------------------------------------------------------------*/
-+static void toe_gmac_handle_default_rxq(struct net_device *dev)
++static void gmac_get_ethtool_stats(struct net_device *dev,
++ struct ethtool_stats *estats, u64 *values)
+{
+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ GMAC_RXDESC_T *curr_desc;
-+ struct sk_buff *skb;
-+ DMA_RWPTR_T rwptr;
-+ unsigned int pkt_size;
-+ int max_cnt;
-+ unsigned int desc_count;
-+ unsigned int chksum_status, rx_status;
-+ struct net_device_stats *isPtr = &dev->stats;
-+
-+ rwptr.bits32 = __raw_readl(&gmac->default_qhdr->word1);
-+ max_cnt = DEFAULT_RXQ_MAX_CNT;
-+ while ((--max_cnt) && rwptr.bits.rptr != rwptr.bits.wptr) {
-+ curr_desc = (GMAC_RXDESC_T *)gmac->default_desc_base + rwptr.bits.rptr;
-+ dma_sync_single_range_for_device(toe->dev,
-+ gmac->default_desc_base_dma,
-+ rwptr.bits.rptr * sizeof(GMAC_RXDESC_T),
-+ sizeof(GMAC_RXDESC_T),
-+ DMA_FROM_DEVICE);
-+ rx_status = curr_desc->word0.bits.status;
-+ chksum_status = curr_desc->word0.bits.chksum_status;
-+ pkt_size = curr_desc->word1.bits.byte_count; /* total byte count in a frame */
-+ desc_count = curr_desc->word0.bits.desc_count; /* get descriptor count per frame */
-+ skb = (struct sk_buff *)(REG32(__va(curr_desc->word2.buf_adr) - SKB_RESERVE_BYTES));
-+
-+ if ((curr_desc->word0.bits32 & (GMAC_RXDESC_0_T_derr | GMAC_RXDESC_0_T_perr))
-+ || (pkt_size < 60) || (chksum_status & 0x4) || rx_status) {
-+ if (curr_desc->word0.bits32 & GMAC_RXDESC_0_T_derr)
-+ dev_err(&dev->dev, "%s::derr\n", __func__);
-+ if (curr_desc->word0.bits32 & GMAC_RXDESC_0_T_perr)
-+ dev_err(&dev->dev, "%s::perr\n", __func__);
-+ if (rx_status && (rx_status == 4 || rx_status == 7))
-+ isPtr->rx_crc_errors++;
-+
-+ dev_kfree_skb_irq(skb);
-+ goto bad_frame;
-+ }
++ unsigned int start;
++ u64 *p;
++ int i;
+
-+ if (curr_desc->word0.bits.drop)
-+ dev_warn(&dev->dev, "%s::Drop\n", __func__);
++ gmac_update_hw_stats(dev);
+
-+ /* get frame information from the first descriptor of the frame */
-+ skb_reserve(skb, RX_INSERT_BYTES); /* 16 byte align the IP fields. */
-+ skb_put(skb, pkt_size);
-+ skb->dev = dev;
-+ skb->protocol = eth_type_trans(skb, dev);
-+ if (chksum_status == RX_CHKSUM_IP_UDP_TCP_OK || chksum_status == RX_CHKSUM_IP_OK_ONLY)
-+ skb->ip_summed = CHECKSUM_UNNECESSARY;
++ /* racing with MIB interrupt */
++ do {
++ p = values;
++ start = u64_stats_fetch_begin(&gmac->ir_stats_syncp);
+
-+ netif_rx(skb); /* socket rx */
-+ dev->last_rx = jiffies;
++ for (i = 0; i < RX_STATS_NUM; ++i)
++ *p++ = gmac->hw_stats[i];
+
-+ isPtr->rx_bytes += pkt_size;
++ } while (u64_stats_fetch_retry(&gmac->ir_stats_syncp, start));
++ values = p;
+
-+bad_frame:
-+ /* advance one for Rx default Q 0/1 */
-+ rwptr.bits.rptr = RWPTR_ADVANCE_ONE(rwptr.bits.rptr, TOE_DEFAULT_Q_DESC_NUM);
-+ SET_RPTR(&gmac->default_qhdr->word1, rwptr.bits.rptr);
-+ }
++ /* racing with RX NAPI */
++ do {
++ p = values;
++ start = u64_stats_fetch_begin(&gmac->rx_stats_syncp);
+
-+ schedule_work(&toe->freq_work);
-+}
-+
-+static irqreturn_t toe_gmac_interrupt(int irq, void *dev_instance)
-+{
-+ struct net_device *dev = dev_instance;
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ struct toe_private *toe = dev->ml_priv;
-+ unsigned int status0;
-+ unsigned int status1;
-+ unsigned int status2;
-+ unsigned int status3;
-+ unsigned int status4;
-+ int handled = 0;
-+
-+ /* read Interrupt status */
-+ status0 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_0_REG);
-+ status1 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_1_REG);
-+ status2 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_2_REG);
-+ status3 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_3_REG);
-+ status4 = __raw_readl(toe->global_base + GLOBAL_INTERRUPT_STATUS_4_REG);
-+
-+ /* clear interrupts */
-+ if (status0)
-+ __raw_writel(status0, toe->global_base + GLOBAL_INTERRUPT_STATUS_0_REG);
-+ if (status1)
-+ __raw_writel(status1, toe->global_base + GLOBAL_INTERRUPT_STATUS_1_REG);
-+ if (status2)
-+ __raw_writel(status2, toe->global_base + GLOBAL_INTERRUPT_STATUS_2_REG);
-+ if (status3)
-+ __raw_writel(status3, toe->global_base + GLOBAL_INTERRUPT_STATUS_3_REG);
-+ if (status4)
-+ __raw_writel(status4, toe->global_base + GLOBAL_INTERRUPT_STATUS_4_REG);
-+
-+ /* handle freeq interrupt first */
-+ if (status4 & gmac->intr4_enabled) {
-+ if ((status4 & SWFQ_EMPTY_INT_BIT) && (gmac->intr4_enabled & SWFQ_EMPTY_INT_BIT)) {
-+ toe_gmac_fill_free_q(toe);
-+ handled = 1;
-+ }
-+ }
++ for (i = 0; i < RX_STATUS_NUM; ++i)
++ *p++ = gmac->rx_stats[i];
++ for (i = 0; i < RX_CHKSUM_NUM; ++i)
++ *p++ = gmac->rx_csum_stats[i];
++ *p++ = gmac->rx_napi_exits;
+
-+ /* Interrupt Status 1 */
-+ if (status1 & gmac->intr1_enabled) {
-+ /*
-+ * Handle GMAC 0/1 HW Tx queue 0-3 EOF events
-+ * Only count
-+ * TOE, Classification, and default queues interrupts are handled by ISR
-+ * because they should pass packets to upper layer
-+ */
-+ if (gmac->port_id == 0) {
-+ if (netif_running(dev) && (status1 & DEFAULT_Q0_INT_BIT) && (gmac->intr1_enabled & DEFAULT_Q0_INT_BIT)) {
-+ toe_gmac_handle_default_rxq(dev);
-+ handled = 1;
-+ }
-+ } else if (gmac->port_id == 1) {
-+ if (netif_running(dev) && (status1 & DEFAULT_Q1_INT_BIT) && (gmac->intr1_enabled & DEFAULT_Q1_INT_BIT)) {
-+ toe_gmac_handle_default_rxq(dev);
-+ handled = 1;
-+ }
-+ }
-+ }
++ } while (u64_stats_fetch_retry(&gmac->rx_stats_syncp, start));
++ values = p;
+
-+ /* Interrupt Status 0 */
-+ if (status0 & gmac->intr0_enabled) {
-+#ifndef GMAX_TX_INTR_DISABLED
-+ if (gmac->port_id == 1 && netif_running(dev) &&
-+ (((status0 & GMAC1_SWTQ10_FIN_INT_BIT) && (gmac->intr0_enabled & GMAC1_SWTQ10_FIN_INT_BIT))
-+ ||
-+ ((status0 & GMAC1_SWTQ10_EOF_INT_BIT) && (gmac->intr0_enabled & GMAC1_SWTQ10_EOF_INT_BIT)))) {
-+ toe_gmac_tx_complete(dev, 0);
-+ handled = 1;
-+ }
++ /* racing with TX start_xmit */
++ do {
++ p = values;
++ start = u64_stats_fetch_begin(&gmac->tx_stats_syncp);
+
-+ if (gmac->port_id == 0 && netif_running(dev) &&
-+ (((status0 & GMAC0_SWTQ00_FIN_INT_BIT) && (gmac->intr0_enabled & GMAC0_SWTQ00_FIN_INT_BIT))
-+ ||
-+ ((status0 & GMAC0_SWTQ00_EOF_INT_BIT) && (gmac->intr0_enabled & GMAC0_SWTQ00_EOF_INT_BIT)))) {
-+ toe_gmac_tx_complete(dev, 0);
-+ handled = 1;
++ for (i = 0; i < TX_MAX_FRAGS; ++i) {
++ *values++ = gmac->tx_frag_stats[i];
++ gmac->tx_frag_stats[i] = 0;
+ }
-+#endif
-+ }
++ *values++ = gmac->tx_frags_linearized;
++ *values++ = gmac->tx_hw_csummed;
+
-+ return IRQ_RETVAL(handled);
++ } while (u64_stats_fetch_retry(&gmac->tx_stats_syncp, start));
+}
+
-+static int gmac_open(struct net_device *dev)
++static int gmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
-+ int retval;
++ if (!dev->phydev)
++ return -ENXIO;
++ return phy_ethtool_gset(dev->phydev, cmd);
++}
+
-+ /* hook ISR */
-+ retval = request_irq(dev->irq, toe_gmac_interrupt, 0, dev->name, dev);
-+ if (retval)
-+ return retval;
++static int gmac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
++{
++ if (!dev->phydev)
++ return -ENXIO;
++ return phy_ethtool_sset(dev->phydev, cmd);
++}
+
-+ toe_init_gmac(dev);
++static int gmac_nway_reset(struct net_device *dev)
++{
++ if (!dev->phydev)
++ return -ENXIO;
++ return phy_start_aneg(dev->phydev);
++}
+
-+ netif_carrier_off(dev);
-+ phy_start(gmac->phydev);
++static void gmac_get_pauseparam(struct net_device *dev,
++ struct ethtool_pauseparam *pparam)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ GMAC_CONFIG0_T config0;
+
-+ netif_start_queue(dev);
++ config0.bits32 = readl(gmac->ctl_iomem + GMAC_CONFIG0);
+
-+ return 0;
++ pparam->rx_pause = config0.bits.rx_fc_en;
++ pparam->tx_pause = config0.bits.tx_fc_en;
++ pparam->autoneg = true;
+}
+
-+static int gmac_close(struct net_device *dev)
++static void gmac_get_ringparam(struct net_device *dev,
++ struct ethtool_ringparam *rp)
+{
-+ struct gmac_private *gmac = netdev_priv(dev);
++ struct gmac_private *gmac = netdev_priv(dev);
++ GMAC_CONFIG0_T config0;
+
-+ netif_stop_queue(dev);
-+ mdelay(20);
++ config0.bits32 = readl(gmac->ctl_iomem + GMAC_CONFIG0);
+
-+ if (gmac->phydev)
-+ phy_stop(gmac->phydev);
++ rp->rx_max_pending = 1 << 15;
++ rp->rx_mini_max_pending = 0;
++ rp->rx_jumbo_max_pending = 0;
++ rp->tx_max_pending = 1 << 15;
+
-+ /* stop tx/rx packet */
-+ toe_gmac_disable_tx_rx(dev);
-+ mdelay(20);
++ rp->rx_pending = 1 << gmac->rxq_order;
++ rp->rx_mini_pending = 0;
++ rp->rx_jumbo_pending = 0;
++ rp->tx_pending = 1 << gmac->txq_order;
++}
+
-+ /* stop the chip's Tx and Rx DMA processes */
-+ toe_gmac_hw_stop(gmac);
++static int toe_resize_freeq(struct toe_private *toe, int changing_dev_id);
+
-+ disable_irq(dev->irq);
-+ free_irq(dev->irq, dev);
++static int gmac_set_ringparam(struct net_device *dev,
++ struct ethtool_ringparam *rp)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
++ struct toe_private *toe = gmac->toe;
++ int err = 0;
+
-+ return 0;
++ if (netif_running(dev))
++ return -EBUSY;
++
++ if (rp->rx_pending) {
++ gmac->rxq_order = min(15, ilog2(rp->rx_pending - 1) + 1);
++ err = toe_resize_freeq(toe, dev->dev_id);
++ }
++
++ if (rp->tx_pending)
++ {
++ gmac->txq_order = min(15, ilog2(rp->tx_pending - 1) + 1);
++ gmac->irq_every_tx_packets = 1 << (gmac->txq_order - 2);
++ }
++
++ return err;
+}
+
-+static void gmac_get_phy_status(struct net_device *dev)
++static int gmac_get_coalesce(struct net_device *dev,
++ struct ethtool_coalesce *ecmd)
+{
+ struct gmac_private *gmac = netdev_priv(dev);
-+ GMAC_CONFIG0_T config0;
-+ GMAC_STATUS_T status, old_status;
-+ struct phy_device *phydev = gmac->phydev;
+
-+ old_status.bits32 = status.bits32 = __raw_readl(gmac->base_addr + GMAC_STATUS);
++ ecmd->rx_max_coalesced_frames = 1;
++ ecmd->tx_max_coalesced_frames = gmac->irq_every_tx_packets;
++ ecmd->rx_coalesce_usecs = gmac->rx_coalesce_nsecs/1000;
+
-+ status.bits.link = phydev->link;
-+ status.bits.duplex = phydev->duplex;
++ return 0;
++}
+
-+ switch (phydev->speed) {
-+ case 1000:
-+ status.bits.speed = GMAC_SPEED_1000;
-+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
-+ status.bits.mii_rmii = GMAC_PHY_RGMII_1000;
-+ break;
-+ case 100:
-+ status.bits.speed = GMAC_SPEED_100;
-+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
-+ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
-+ break;
-+ case 10:
-+ status.bits.speed = GMAC_SPEED_10;
-+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII)
-+ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
-+ break;
-+ default:
-+ dev_warn(&dev->dev, "Not supported PHY speed (%d)\n", phydev->speed);
-+ }
++static int gmac_set_coalesce(struct net_device *dev,
++ struct ethtool_coalesce *ecmd)
++{
++ struct gmac_private *gmac = netdev_priv(dev);
+
-+ if (phydev->pause) {
-+ if (gmac->flow_control_enable == 0) {
-+ config0.bits32 = __raw_readl(gmac->base_addr + GMAC_CONFIG0);
-+ config0.bits.tx_fc_en = 1; /* enable tx flow control */
-+ config0.bits.rx_fc_en = 1; /* enable rx flow control */
-+ __raw_writel(config0.bits32, gmac->base_addr + GMAC_CONFIG0);
-+ dev_info(&dev->dev, "MII flow control enabled\n");
-+ }
-+ gmac->flow_control_enable = 1;
-+ } else {
-+ if (gmac->flow_control_enable == 1) {
-+ config0.bits32 = __raw_readl(gmac->base_addr + GMAC_CONFIG0);
-+ config0.bits.tx_fc_en = 0; /* disable tx flow control */
-+ config0.bits.rx_fc_en = 0; /* disable rx flow control */
-+ __raw_writel(config0.bits32, gmac->base_addr + GMAC_CONFIG0);
-+ dev_info(&dev->dev, "MII flow control disabled\n");
-+ }
-+ gmac->flow_control_enable = 0;
-+ }
++ if (ecmd->tx_max_coalesced_frames < 1)
++ return -EINVAL;
++ if (ecmd->tx_max_coalesced_frames >= 1 << gmac->txq_order)
++ return -EINVAL;
+
-+ if (old_status.bits32 != status.bits32) {
-+ toe_gmac_disable_tx_rx(dev);
-+ phy_print_status(phydev);
-+ mdelay(10); /* let GMAC consume packet */
-+ __raw_writel(status.bits32, gmac->base_addr + GMAC_STATUS);
-+ if (status.bits.link)
-+ toe_gmac_enable_tx_rx(dev);
-+ }
++ gmac->irq_every_tx_packets = ecmd->tx_max_coalesced_frames;
++ gmac->rx_coalesce_nsecs = ecmd->rx_coalesce_usecs * 1000;
++
++ return 0;
+}
+
-+static void gmac_set_rx_mode(struct net_device *dev)
++static u32 gmac_get_msglevel(struct net_device *dev)
+{
+ struct gmac_private *gmac = netdev_priv(dev);
-+ GMAC_RX_FLTR_T filter;
-+ unsigned int mc_filter[2]; /* Multicast hash filter */
-+ int bit_nr;
-+
-+ filter.bits32 = 0;
-+ filter.bits.error = 0;
-+ if (dev->flags & IFF_PROMISC) {
-+ filter.bits.error = 1;
-+ filter.bits.promiscuous = 1;
-+ filter.bits.broadcast = 1;
-+ filter.bits.multicast = 1;
-+ filter.bits.unicast = 1;
-+ mc_filter[1] = mc_filter[0] = 0xffffffff;
-+ } else if (dev->flags & IFF_ALLMULTI) {
-+ filter.bits.broadcast = 1;
-+ filter.bits.multicast = 1;
-+ filter.bits.unicast = 1;
-+ mc_filter[1] = mc_filter[0] = 0xffffffff;
-+ } else {
-+ struct netdev_hw_addr *ha;
-+
-+ filter.bits.broadcast = 1;
-+ filter.bits.multicast = 1;
-+ filter.bits.unicast = 1;
-+ mc_filter[1] = mc_filter[0] = 0;
-+ netdev_for_each_mc_addr(ha, dev) {
-+ bit_nr = ether_crc(ETH_ALEN, ha->addr) & 0x3f;
-+ if (bit_nr <= 32)
-+ mc_filter[0] = mc_filter[0] | (1 << bit_nr);
-+ else
-+ mc_filter[1] = mc_filter[1] | (1 << (bit_nr - 32));
-+ }
-+ }
-+ __raw_writel(filter.bits32, gmac->base_addr + GMAC_RX_FLTR);
-+ __raw_writel(mc_filter[0], gmac->base_addr + GMAC_MCAST_FIL0);
-+ __raw_writel(mc_filter[1], gmac->base_addr + GMAC_MCAST_FIL1);
++ return gmac->msg_enable;
+}
+
-+static void gmac_tx_timeout(struct net_device *dev)
++static void gmac_set_msglevel(struct net_device *dev, u32 level)
+{
-+ if (!netif_queue_stopped(dev))
-+ netif_wake_queue(dev);
++ struct gmac_private *gmac = netdev_priv(dev);
++ gmac->msg_enable = level;
++}
+
-+ dev_warn(&dev->dev, "TX timeout\n");
++static void gmac_get_drvinfo(struct net_device *dev,
++ struct ethtool_drvinfo *info)
++{
++ strcpy(info->driver, DRV_NAME);
++ strcpy(info->version, DRV_VERSION);
++ strcpy(info->bus_info, dev->dev_id ? "1" : "0");
+}
+
-+const static struct net_device_ops gemini_gmac_ops = {
++static const struct net_device_ops gmac_351x_ops = {
++ .ndo_init = gmac_init,
++ .ndo_uninit = gmac_uninit,
+ .ndo_open = gmac_open,
-+ .ndo_stop = gmac_close,
++ .ndo_stop = gmac_stop,
+ .ndo_start_xmit = gmac_start_xmit,
-+ .ndo_get_stats = gmac_get_stats,
++ .ndo_tx_timeout = gmac_tx_timeout,
+ .ndo_set_rx_mode = gmac_set_rx_mode,
+ .ndo_set_mac_address = gmac_set_mac_address,
-+ .ndo_tx_timeout = gmac_tx_timeout,
++ .ndo_get_stats64 = gmac_get_stats64,
++ .ndo_change_mtu = gmac_change_mtu,
++ .ndo_fix_features = gmac_fix_features,
++ .ndo_set_features = gmac_set_features,
+};
+
-+static void mac_init_drv(struct toe_private *toe)
-+{
-+ QUEUE_THRESHOLD_T threshold;
-+ DMA_SKB_SIZE_T skb_size;
-+
-+ /* clear non TOE Queue Header Area */
-+ memset(toe->global_base + TOE_NONTOE_QUE_HDR_BASE, 0,
-+ NONTOE_Q_HDR_AREA_END - TOE_NONTOE_QUE_HDR_BASE);
-+
-+ /* clear TOE Queue Header Area */
-+ memset(toe->global_base + TOE_TOE_QUE_HDR_BASE, 0,
-+ TOE_Q_HDR_AREA_END - TOE_TOE_QUE_HDR_BASE);
-+
-+ /* Write GLOBAL_QUEUE_THRESHOLD_REG */
-+ threshold.bits32 = 0;
-+ threshold.bits.swfq_empty = (TOE_SW_FREEQ_DESC_NUM > 256) ? 255 :
-+ TOE_SW_FREEQ_DESC_NUM / 2;
-+ threshold.bits.hwfq_empty = (TOE_HW_FREEQ_DESC_NUM > 256) ? 256 / 4 :
-+ TOE_HW_FREEQ_DESC_NUM / 4;
-+ threshold.bits.toe_class = (TOE_TOE_DESC_NUM > 256) ? 256 / 4 :
-+ TOE_TOE_DESC_NUM / 4;
-+ threshold.bits.intrq = (TOE_INTR_DESC_NUM > 256) ? 256 / 4 :
-+ TOE_INTR_DESC_NUM / 4;
-+ __raw_writel(threshold.bits32, toe->global_base + GLOBAL_QUEUE_THRESHOLD_REG);
-+
-+ /* Init skb size */
-+ skb_size.bits.hw_skb_size = HW_RX_BUF_SIZE;
-+ skb_size.bits.sw_skb_size = SW_RX_BUF_SIZE;
-+ __raw_writel(skb_size.bits32, toe->global_base + GLOBAL_DMA_SKB_SIZE_REG);
-+
-+ toe_init_free_queue(toe);
-+ toe_init_interrupt_config(toe);
-+}
++static const struct ethtool_ops gmac_351x_ethtool_ops = {
++ .get_sset_count = gmac_get_sset_count,
++ .get_strings = gmac_get_strings,
++ .get_ethtool_stats = gmac_get_ethtool_stats,
++ .get_settings = gmac_get_settings,
++ .set_settings = gmac_set_settings,
++ .get_link = ethtool_op_get_link,
++ .nway_reset = gmac_nway_reset,
++ .get_pauseparam = gmac_get_pauseparam,
++ .get_ringparam = gmac_get_ringparam,
++ .set_ringparam = gmac_set_ringparam,
++ .get_coalesce = gmac_get_coalesce,
++ .set_coalesce = gmac_set_coalesce,
++ .get_msglevel = gmac_get_msglevel,
++ .set_msglevel = gmac_set_msglevel,
++ .get_drvinfo = gmac_get_drvinfo,
++};
+
-+static int gmac_init_eth(struct platform_device *pdev,
-+ unsigned int num)
++static int gmac_init_netdev(struct toe_private *toe, int num,
++ struct platform_device *pdev)
+{
-+ struct gmac_private *gmac;
-+ struct net_device *dev;
-+ struct toe_private *toe = platform_get_drvdata(pdev);
+ struct gemini_gmac_platform_data *pdata = pdev->dev.platform_data;
++ struct gmac_private *gmac;
++ struct net_device *dev;
++ int irq, err;
+
+ if (!pdata->bus_id[num])
+ return 0;
+
-+ dev = alloc_etherdev(sizeof(*gmac));
-+ if (dev == NULL) {
-+ dev_err(&pdev->dev, "Can't allocate ethernet device #%d\n", num);
++ irq = platform_get_irq(pdev, num);
++ if (irq < 0) {
++ dev_err(toe->dev, "No IRQ for ethernet device #%d\n", num);
++ return irq;
++ }
++
++ dev = alloc_etherdev_mq(sizeof(*gmac), TX_QUEUE_NUM);
++ if (!dev) {
++ dev_err(toe->dev, "Can't allocate ethernet device #%d\n", num);
+ return -ENOMEM;
+ }
+
+ gmac = netdev_priv(dev);
-+ dev->ml_priv = toe;
-+ toe->net_dev[num] = dev;
-+
-+ gmac->base_addr = toe->global_base + TOE_GMAC_BASE(num);
-+ gmac->dma_base_addr = toe->global_base + TOE_GMAC_DMA_BASE(num);
-+ gmac->port_id = num;
-+
-+ dev->base_addr = (unsigned int) gmac->base_addr;
-+ dev->irq = platform_get_irq(pdev, num);
-+ dev->netdev_ops = &gemini_gmac_ops;
-+ dev->watchdog_timeo = GMAC_DEV_TX_TIMEOUT;
-+ dev->tx_queue_len = TOE_GMAC_SWTXQ_DESC_NUM;
-+
-+#ifdef DO_HW_CHKSUM
-+ dev->features = NETIF_F_SG | NETIF_F_HW_CSUM;
-+#ifdef ENABLE_TSO
-+ dev->features |= NETIF_F_TSO;
-+#endif
-+#endif
++ gmac->num = num;
++ gmac->toe = toe;
++ SET_NETDEV_DEV(dev, toe->dev);
+
-+ toe_init_swtx_queue(dev);
-+ toe_init_default_queue(dev);
++ toe->netdev[num] = dev;
++ dev->dev_id = num;
+
-+ gmac_get_mac_address(dev);
++ gmac->ctl_iomem = toe->iomem + TOE_GMAC_BASE(num);
++ gmac->dma_iomem = toe->iomem + TOE_GMAC_DMA_BASE(num);
++ dev->irq = irq;
+
-+ /* TODO: Do we need this? */
-+ __raw_writel(0x55aa55aa, gmac->base_addr + GMAC_STA_ADD2);
++ dev->netdev_ops = &gmac_351x_ops;
++ SET_ETHTOOL_OPS(dev, &gmac_351x_ethtool_ops);
+
-+ if (register_netdev(dev))
-+ return -1;
++ spin_lock_init(&gmac->config_lock);
++ gmac_clear_hw_stats(dev);
++
++ dev->hw_features = GMAC_OFFLOAD_FEATURES;
++ dev->features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO;
++
++ gmac->freeq_refill = 0;
++ netif_napi_add(dev, &gmac->napi, gmac_napi_poll, DEFAULT_NAPI_WEIGHT);
++
++ if (is_valid_ether_addr((void *)toe->mac_addr[num]))
++ memcpy(dev->dev_addr, toe->mac_addr[num], ETH_ALEN);
++ else
++ random_ether_addr(dev->dev_addr);
++ __gmac_set_mac_address(dev);
++
++ err = gmac_setup_phy(dev);
++ if (err)
++ netif_warn(gmac, probe, dev,
++ "PHY init failed: %d, deferring to ifup time\n", err);
++
++ err = register_netdev(dev);
++ if (!err)
++ {
++ pr_info(DRV_NAME " %s: irq %d, dma base 0x%p, io base 0x%p\n",
++ dev->name, irq, gmac->dma_iomem, gmac->ctl_iomem);
++ return 0;
++ }
++
++ toe->netdev[num] = NULL;
++ free_netdev(dev);
++ return err;
++}
++
++static irqreturn_t toe_irq_thread(int irq, void *data)
++{
++ struct toe_private *toe = data;
++ void __iomem *irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG;
++ void __iomem *irqif_reg = toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG;
++ unsigned long irqmask = SWFQ_EMPTY_INT_BIT;
++ unsigned long flags;
++
++ toe_fill_freeq(toe, 0);
++
++ /* Ack and enable interrupt */
++ spin_lock_irqsave(&toe->irq_lock, flags);
++ writel(irqmask, irqif_reg);
++ irqmask |= readl(irqen_reg);
++ writel(irqmask, irqen_reg);
++ spin_unlock_irqrestore(&toe->irq_lock, flags);
++
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t toe_irq(int irq, void *data)
++{
++ struct toe_private *toe = data;
++ void __iomem *irqif_reg = toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG;
++ void __iomem *irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG;
++ unsigned long val, en;
++ irqreturn_t ret = IRQ_NONE;
++
++ spin_lock(&toe->irq_lock);
++
++ val = readl(irqif_reg);
++ en = readl(irqen_reg);
++
++ if (val & en & SWFQ_EMPTY_INT_BIT) {
++ en &= ~(SWFQ_EMPTY_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT
++ | GMAC1_RX_OVERRUN_INT_BIT);
++ writel(en, irqen_reg);
++ ret = IRQ_WAKE_THREAD;
++ }
++
++ spin_unlock(&toe->irq_lock);
++ return ret;
++}
++
++static int toe_init(struct toe_private *toe,
++ struct platform_device *pdev)
++{
++ int err;
+
-+ gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status,
-+ pdata->interface[num]);
-+ if (IS_ERR(gmac->phydev))
-+ return PTR_ERR(gmac->phydev);
++ writel(0, toe->iomem + GLOBAL_SW_FREEQ_BASE_SIZE_REG);
++ writel(0, toe->iomem + GLOBAL_HW_FREEQ_BASE_SIZE_REG);
++ writel(0, toe->iomem + GLOBAL_SWFQ_RWPTR_REG);
++ writel(0, toe->iomem + GLOBAL_HWFQ_RWPTR_REG);
+
-+ gmac->phydev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause;
-+ gmac->phydev->advertising = gmac->phydev->supported;
++ toe->freeq_frag_order = DEFAULT_RX_BUF_ORDER;
++ toe->freeq_order = ~0;
++
++ err = request_threaded_irq(toe->irq, toe_irq,
++ toe_irq_thread, IRQF_SHARED, DRV_NAME " toe", toe);
++ if (err)
++ goto err_freeq;
+
+ return 0;
++
++err_freeq:
++ toe_cleanup_freeq(toe);
++ return err;
++}
++
++static void toe_deinit(struct toe_private *toe)
++{
++ free_irq(toe->irq, toe);
++ toe_cleanup_freeq(toe);
++}
++
++static int toe_reset(struct toe_private *toe)
++{
++ unsigned int reg = 0, retry = 5;
++
++ reg = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) +
++ GLOBAL_RESET));
++ reg |= RESET_GMAC1 | RESET_GMAC0;
++ writel(reg, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) +
++ GLOBAL_RESET));
++
++ do {
++ udelay(2);
++ reg = readl((void __iomem*)(toe->iomem +
++ GLOBAL_TOE_VERSION_REG));
++ barrier();
++ } while (!reg && --retry);
++
++ return reg ? 0 : -EIO;
++}
++
++/*
++ * Interrupt config:
++ *
++ * GMAC0 intr bits ------> int0 ----> eth0
++ * GMAC1 intr bits ------> int1 ----> eth1
++ * TOE intr -------------> int1 ----> eth1
++ * Classification Intr --> int0 ----> eth0
++ * Default Q0 -----------> int0 ----> eth0
++ * Default Q1 -----------> int1 ----> eth1
++ * FreeQ intr -----------> int1 ----> eth1
++ */
++static void toe_init_irq(struct toe_private *toe)
++{
++ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG);
++ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG);
++ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_2_REG);
++ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_3_REG);
++ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG);
++
++ writel(0xCCFC0FC0, toe->iomem + GLOBAL_INTERRUPT_SELECT_0_REG);
++ writel(0x00F00002, toe->iomem + GLOBAL_INTERRUPT_SELECT_1_REG);
++ writel(0xFFFFFFFF, toe->iomem + GLOBAL_INTERRUPT_SELECT_2_REG);
++ writel(0xFFFFFFFF, toe->iomem + GLOBAL_INTERRUPT_SELECT_3_REG);
++ writel(0xFF000003, toe->iomem + GLOBAL_INTERRUPT_SELECT_4_REG);
++
++ /* edge-triggered interrupts packed to level-triggered one... */
++ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG);
++ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_1_REG);
++ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_2_REG);
++ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_3_REG);
++ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG);
++}
++
++static void toe_save_mac_addr(struct toe_private *toe,
++ struct platform_device *pdev)
++{
++ struct gemini_gmac_platform_data *pdata = pdev->dev.platform_data;
++ void __iomem *ctl;
++ int i;
++
++ for (i = 0; i < 2; i++) {
++ if (pdata->bus_id[i]) {
++ ctl = toe->iomem + TOE_GMAC_BASE(i);
++ toe->mac_addr[i][0] = cpu_to_le32(readl(ctl + GMAC_STA_ADD0));
++ toe->mac_addr[i][1] = cpu_to_le32(readl(ctl + GMAC_STA_ADD1));
++ toe->mac_addr[i][2] = cpu_to_le32(readl(ctl + GMAC_STA_ADD2));
++ }
++ }
+}
+
-+static int gmac_probe(struct platform_device *pdev)
++static int gemini_gmac_probe(struct platform_device *pdev)
+{
-+ struct resource *res;
-+ struct toe_private *toe;
-+ int retval;
++ struct resource *res;
++ struct toe_private *toe;
++ int irq, retval;
+
+ if (!pdev->dev.platform_data)
+ return -EINVAL;
+
++ irq = platform_get_irq(pdev, 1);
++ if (irq < 0)
++ return irq;
++
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(&pdev->dev, "can't get device resources\n");
+ return -ENODEV;
+ }
+
-+ toe = kzalloc(sizeof(struct toe_private), GFP_KERNEL);
++ toe = kzalloc(sizeof(*toe), GFP_KERNEL);
+ if (!toe)
+ return -ENOMEM;
+
++ platform_set_drvdata(pdev, toe);
+ toe->dev = &pdev->dev;
++ toe->irq = irq;
+
-+ toe->global_base = ioremap(res->start, resource_size(res));
-+ if (!toe->global_base) {
++ toe->iomem = ioremap(res->start, resource_size(res));
++ if (!toe->iomem) {
+ dev_err(toe->dev, "ioremap failed\n");
+ retval = -EIO;
+ goto err_data;
+ }
+
-+ platform_set_drvdata(pdev, toe);
++ toe_save_mac_addr(toe, pdev);
+
-+ mac_init_drv(toe);
++ retval = toe_reset(toe);
++ if (retval < 0)
++ goto err_unmap;
++
++ pr_info(DRV_NAME " toe: irq %d, io base 0x%08x, version %d\n",
++ irq, res->start, retval);
+
-+ INIT_WORK(&toe->freq_work, fill_free_q_worker);
++ spin_lock_init(&toe->irq_lock);
+ spin_lock_init(&toe->freeq_lock);
+
-+ retval = gmac_init_eth(pdev, GMAC_PORT0);
++ toe_init_irq(toe);
++
++ retval = toe_init(toe, pdev);
+ if (retval)
+ goto err_unmap;
-+ retval = gmac_init_eth(pdev, GMAC_PORT1);
++
++ retval = gmac_init_netdev(toe, 0, pdev);
+ if (retval)
-+ goto err_unmap;
++ goto err_uninit;
+
-+ dev_info(&pdev->dev, SL351x_DRIVER_NAME "\n");
++ retval = gmac_init_netdev(toe, 1, pdev);
++ if (retval)
++ goto err_uninit;
+
+ return 0;
+
++err_uninit:
++ if (toe->netdev[0])
++ unregister_netdev(toe->netdev[0]);
++ toe_deinit(toe);
+err_unmap:
-+ iounmap(toe->global_base);
++ iounmap(toe->iomem);
+err_data:
+ kfree(toe);
+ return retval;
+}
+
-+static int gmac_remove(struct platform_device *pdev)
++static int gemini_gmac_remove(struct platform_device *pdev)
+{
+ struct toe_private *toe = platform_get_drvdata(pdev);
+ int i;
+
+ for (i = 0; i < 2; i++)
-+ if (toe->net_dev[i]) {
-+ unregister_netdev(toe->net_dev[i]);
-+ kfree(toe->net_dev[i]);
-+ }
++ if (toe->netdev[i])
++ unregister_netdev(toe->netdev[i]);
+
-+ iounmap(toe->global_base);
++ toe_init_irq(toe);
++ toe_deinit(toe);
+
++ iounmap(toe->iomem);
+ kfree(toe);
+
+ return 0;
+}
+
+static struct platform_driver gemini_gmac_driver = {
-+ .probe = gmac_probe,
-+ .remove = gmac_remove,
-+ .driver = {
-+ .name = "gemini-gmac",
-+ .owner = THIS_MODULE,
-+ },
++ .probe = gemini_gmac_probe,
++ .remove = gemini_gmac_remove,
++ .driver.name = DRV_NAME,
++ .driver.owner = THIS_MODULE,
+};
+
+static int __init gemini_gmac_init(void)
+{
++#ifdef CONFIG_MDIO_GPIO_MODULE
++ request_module("mdio-gpio");
++#endif
+ return platform_driver_register(&gemini_gmac_driver);
+}
+
+
+module_init(gemini_gmac_init);
+module_exit(gemini_gmac_exit);
-+
-+MODULE_AUTHOR("Paulius Zaleckas");
-+MODULE_DESCRIPTION("Ethernet device driver for Gemini SoC");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:gemini-gmac");
--- /dev/null
-+++ b/drivers/net/gemini_negmac/gm_gmac.h
-@@ -0,0 +1,1489 @@
++++ b/drivers/net/ethernet/gemini/sl351x_hw.h
+@@ -0,0 +1,1436 @@
+/*
-+ * Register definitions for Gemini Ethernet device driver.
++ * Register definitions for Gemini LEPUS GMAC Ethernet device driver.
+ *
+ * Copyright (C) 2006, Storlink, Corp.
+ * Copyright (C) 2008-2009, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
++ * Copyright (C) 2010, Michał Mirosław <mirq-linux@rere.qmqm.pl>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
-+#ifndef _GMAC_SL351x_H
-+#define _GMAC_SL351x_H
-+#include <linux/skbuff.h>
-+
-+#define _PACKED_ __attribute__ ((aligned(1), packed))
-+
-+#ifndef BIT
-+#define BIT(x) (1 << (x))
-+#endif
-+
-+#define REG32(addr) (*(volatile unsigned long * const)(addr))
++#ifndef _GMAC_HW_H
++#define _GMAC_HW_H
+
-+/* Define frame size */
-+#define GMAC_MAX_ETH_FRAME_SIZE 1514
-+#define GMAC_TX_BUF_SIZE ((GMAC_MAX_ETH_FRAME_SIZE + 31) & (~31))
-+
-+#define SW_RX_BUF_SIZE 1536
-+#define HW_RX_BUF_SIZE 1536
-+
-+#define GMAC_DEV_TX_TIMEOUT (10*HZ)
-+#define SKB_RESERVE_BYTES 16
++#include <linux/bitops.h>
+
+/*
+ * Base Registers
+#define TOE_GMAC1_HW_TXQ3_QID 0x1B
+#define TOE_GMAC0_DEFAULT_QID 0x20
+#define TOE_GMAC1_DEFAULT_QID 0x21
-+#define TOE_CLASSIFICATION_QID(x) (0x22 + x) // 0x22 ~ 0x2F
-+#define TOE_TOE_QID(x) (0x40 + x) // 0x40 ~ 0x7F
++#define TOE_CLASSIFICATION_QID(x) (0x22 + x) /* 0x22 ~ 0x2F */
++#define TOE_TOE_QID(x) (0x40 + x) /* 0x40 ~ 0x7F */
+
+/*
-+ * TOE DMA Queue Number should be 2^n, n = 6...12
++ * old info:
++ * TOE DMA Queue Size should be 2^n, n = 6...12
+ * TOE DMA Queues are the following queue types:
+ * SW Free Queue, HW Free Queue,
+ * GMAC 0/1 SW TX Q0-5, and GMAC 0/1 HW TX Q0-5
-+ * They have same descriptor numbers.
+ * The base address and descriptor number are configured at
+ * DMA Queues Descriptor Ring Base Address/Size Register (offset 0x0004)
+ */
-+#define TOE_SW_FREEQ_DESC_POWER 8
-+#define TOE_SW_FREEQ_DESC_NUM (1<<TOE_SW_FREEQ_DESC_POWER)
-+#define TOE_HW_FREEQ_DESC_POWER 8
-+#define TOE_HW_FREEQ_DESC_NUM (1<<TOE_HW_FREEQ_DESC_POWER)
-+#define TOE_GMAC_SWTXQ_DESC_POWER 8
-+#define TOE_GMAC_SWTXQ_DESC_NUM (1<<TOE_GMAC_SWTXQ_DESC_POWER)
-+#define TOE_GMAC_HWTXQ_DESC_POWER 8
-+#define TOE_GMAC_HWTXQ_DESC_NUM (1<<TOE_GMAC_HWTXQ_DESC_POWER)
-+#define TOE_DEFAULT_Q_DESC_POWER 8
-+#define TOE_DEFAULT_Q_DESC_NUM (1<<TOE_DEFAULT_Q_DESC_POWER)
-+#define TOE_TOE_DESC_POWER 8
-+#define TOE_TOE_DESC_NUM (1<<TOE_TOE_DESC_POWER)
-+#define TOE_CLASS_DESC_POWER 8
-+#define TOE_CLASS_DESC_NUM (1<<TOE_CLASS_DESC_POWER)
-+#define TOE_INTR_DESC_POWER 8
-+#define TOE_INTR_DESC_NUM (1<<TOE_INTR_DESC_POWER)
-+
-+#define TOE_TOE_QUEUE_MAX 64
-+#define TOE_TOE_QUEUE_NUM 64
-+#define TOE_CLASS_QUEUE_MAX 14
-+#define TOE_CLASS_QUEUE_NUM 14
-+#define TOE_INTR_QUEUE_MAX 4
-+#define TOE_INTR_QUEUE_NUM 4
-+#define TOE_SW_TXQ_MAX 6
-+#define TOE_SW_TXQ_NUM 1
-+#define TOE_HW_TXQ_MAX 4
-+#define TOE_HW_TXQ_NUM 4
-+
-+#define RWPTR_ADVANCE_ONE(x, max) ((x == (max -1)) ? 0 : x+1)
-+#define RWPTR_RECEDE_ONE(x, max) ((x == 0) ? (max -1) : x-1)
-+#define SET_WPTR(addr, data) (*(volatile u16 * const)((u32)(addr) + 2) = (u16)data)
-+#define SET_RPTR(addr, data) (*(volatile u16 * const)((u32)(addr)) = (u16)data)
++
++#define GET_WPTR(addr) __raw_readw((addr) + 2)
++#define GET_RPTR(addr) __raw_readw((addr))
++#define SET_WPTR(addr, data) __raw_writew((data), (addr) + 2)
++#define SET_RPTR(addr, data) __raw_writew((data), (addr))
++#define __RWPTR_NEXT(x, mask) (((unsigned int)(x) + 1) & (mask))
++#define __RWPTR_PREV(x, mask) (((unsigned int)(x) - 1) & (mask))
++#define __RWPTR_DISTANCE(r, w, mask) (((unsigned int)(w) - (r)) & (mask))
++#define __RWPTR_MASK(order) ((1 << (order)) - 1)
++#define RWPTR_NEXT(x, order) __RWPTR_NEXT((x), __RWPTR_MASK((order)))
++#define RWPTR_PREV(x, order) __RWPTR_PREV((x), __RWPTR_MASK((order)))
++#define RWPTR_DISTANCE(r, w, order) __RWPTR_DISTANCE((r), (w), \
++ __RWPTR_MASK((order)))
+
+/*
+ * Global registers
+#define GMAC_SW_TX_QUEUE3_PTR_REG 0x0018
+#define GMAC_SW_TX_QUEUE4_PTR_REG 0x001C
+#define GMAC_SW_TX_QUEUE5_PTR_REG 0x0020
++#define GMAC_SW_TX_QUEUE_PTR_REG(i) (GMAC_SW_TX_QUEUE0_PTR_REG + 4 * (i))
+#define GMAC_HW_TX_QUEUE0_PTR_REG 0x0024
+#define GMAC_HW_TX_QUEUE1_PTR_REG 0x0028
+#define GMAC_HW_TX_QUEUE2_PTR_REG 0x002C
+#define GMAC_HW_TX_QUEUE3_PTR_REG 0x0030
++#define GMAC_HW_TX_QUEUE_PTR_REG(i) (GMAC_HW_TX_QUEUE0_PTR_REG + 4 * (i))
+#define GMAC_DMA_TX_FIRST_DESC_REG 0x0038
+#define GMAC_DMA_TX_CURR_DESC_REG 0x003C
+#define GMAC_DMA_TX_DESC_WORD0_REG 0x0040
+ * Base 0x6000A000 or 0x6000E000
+ */
+enum GMAC_REGISTER {
-+ GMAC_STA_ADD0 = 0x0000,
++ GMAC_STA_ADD0 = 0x0000,
+ GMAC_STA_ADD1 = 0x0004,
+ GMAC_STA_ADD2 = 0x0008,
+ GMAC_RX_FLTR = 0x000c,
+ GMAC_IN_MAC2 = 0x0044 /* for STA 2 MAC Address */
+};
+
++#define RX_STATS_NUM 6
++
+/*
+ * DMA Queues description Ring Base Address/Size Register (offset 0x0004)
+ */
+ unsigned int bits32;
+ unsigned int base_size;
+} DMA_Q_BASE_SIZE_T;
-+#define DMA_Q_BASE_MASK (~0x0f)
++#define DMA_Q_BASE_MASK (~0x0f)
+
+/*
+ * DMA SKB Buffer register (offset 0x0008)
+ */
+
+/*
-+ * Interrupt Status Register 0 (offset 0x0020)
-+ * Interrupt Mask Register 0 (offset 0x0024)
-+ * Interrupt Select Register 0 (offset 0x0028)
++ * Interrupt Status Register 0 (offset 0x0020)
++ * Interrupt Mask Register 0 (offset 0x0024)
++ * Interrupt Select Register 0 (offset 0x0028)
+ */
+typedef union {
+ unsigned int bits32;
+#define GMAC0_SWTQ00_EOF_INT_BIT BIT(0)
+
+/*
-+ * Interrupt Status Register 1 (offset 0x0030)
-+ * Interrupt Mask Register 1 (offset 0x0034)
-+ * Interrupt Select Register 1 (offset 0x0038)
++ * Interrupt Status Register 1 (offset 0x0030)
++ * Interrupt Mask Register 1 (offset 0x0034)
++ * Interrupt Select Register 1 (offset 0x0038)
+ */
+typedef union {
+ unsigned int bits32;
+#define DEFAULT_Q0_INT_BIT BIT(0)
+
+#define TOE_IQ_INT_BITS (TOE_IQ0_INT_BIT | TOE_IQ1_INT_BIT | \
-+ TOE_IQ2_INT_BIT | TOE_IQ3_INT_BIT)
++ TOE_IQ2_INT_BIT | TOE_IQ3_INT_BIT)
+#define TOE_IQ_FULL_BITS (TOE_IQ0_FULL_INT_BIT | TOE_IQ1_FULL_INT_BIT | \
+ TOE_IQ2_FULL_INT_BIT | TOE_IQ3_FULL_INT_BIT)
+#define TOE_IQ_ALL_BITS (TOE_IQ_INT_BITS | TOE_IQ_FULL_BITS)
+#define TOE_CLASS_RX_INT_BITS 0xfffc
+
+/*
-+ * Interrupt Status Register 2 (offset 0x0040)
-+ * Interrupt Mask Register 2 (offset 0x0044)
-+ * Interrupt Select Register 2 (offset 0x0048)
++ * Interrupt Status Register 2 (offset 0x0040)
++ * Interrupt Mask Register 2 (offset 0x0044)
++ * Interrupt Select Register 2 (offset 0x0048)
+ */
+typedef union {
+ unsigned int bits32;
+ struct bit_0040 {
-+ unsigned int toe_q0_full : 1; // bit 0 TOE Queue 0 Full Interrupt
-+ unsigned int toe_q1_full : 1; // bit 1 TOE Queue 1 Full Interrupt
-+ unsigned int toe_q2_full : 1; // bit 2 TOE Queue 2 Full Interrupt
-+ unsigned int toe_q3_full : 1; // bit 3 TOE Queue 3 Full Interrupt
-+ unsigned int toe_q4_full : 1; // bit 4 TOE Queue 4 Full Interrupt
-+ unsigned int toe_q5_full : 1; // bit 5 TOE Queue 5 Full Interrupt
-+ unsigned int toe_q6_full : 1; // bit 6 TOE Queue 6 Full Interrupt
-+ unsigned int toe_q7_full : 1; // bit 7 TOE Queue 7 Full Interrupt
-+ unsigned int toe_q8_full : 1; // bit 8 TOE Queue 8 Full Interrupt
-+ unsigned int toe_q9_full : 1; // bit 9 TOE Queue 9 Full Interrupt
-+ unsigned int toe_q10_full : 1; // bit 10 TOE Queue 10 Full Interrupt
-+ unsigned int toe_q11_full : 1; // bit 11 TOE Queue 11 Full Interrupt
-+ unsigned int toe_q12_full : 1; // bit 12 TOE Queue 12 Full Interrupt
-+ unsigned int toe_q13_full : 1; // bit 13 TOE Queue 13 Full Interrupt
-+ unsigned int toe_q14_full : 1; // bit 14 TOE Queue 14 Full Interrupt
-+ unsigned int toe_q15_full : 1; // bit 15 TOE Queue 15 Full Interrupt
-+ unsigned int toe_q16_full : 1; // bit 16 TOE Queue 16 Full Interrupt
-+ unsigned int toe_q17_full : 1; // bit 17 TOE Queue 17 Full Interrupt
-+ unsigned int toe_q18_full : 1; // bit 18 TOE Queue 18 Full Interrupt
-+ unsigned int toe_q19_full : 1; // bit 19 TOE Queue 19 Full Interrupt
-+ unsigned int toe_q20_full : 1; // bit 20 TOE Queue 20 Full Interrupt
-+ unsigned int toe_q21_full : 1; // bit 21 TOE Queue 21 Full Interrupt
-+ unsigned int toe_q22_full : 1; // bit 22 TOE Queue 22 Full Interrupt
-+ unsigned int toe_q23_full : 1; // bit 23 TOE Queue 23 Full Interrupt
-+ unsigned int toe_q24_full : 1; // bit 24 TOE Queue 24 Full Interrupt
-+ unsigned int toe_q25_full : 1; // bit 25 TOE Queue 25 Full Interrupt
-+ unsigned int toe_q26_full : 1; // bit 26 TOE Queue 26 Full Interrupt
-+ unsigned int toe_q27_full : 1; // bit 27 TOE Queue 27 Full Interrupt
-+ unsigned int toe_q28_full : 1; // bit 28 TOE Queue 28 Full Interrupt
-+ unsigned int toe_q29_full : 1; // bit 29 TOE Queue 29 Full Interrupt
-+ unsigned int toe_q30_full : 1; // bit 30 TOE Queue 30 Full Interrupt
-+ unsigned int toe_q31_full : 1; // bit 31 TOE Queue 31 Full Interrupt
++ unsigned int toe_q0_full : 1; /* bit 0 TOE Queue 0 Full Interrupt */
++ unsigned int toe_q1_full : 1; /* bit 1 TOE Queue 1 Full Interrupt */
++ unsigned int toe_q2_full : 1; /* bit 2 TOE Queue 2 Full Interrupt */
++ unsigned int toe_q3_full : 1; /* bit 3 TOE Queue 3 Full Interrupt */
++ unsigned int toe_q4_full : 1; /* bit 4 TOE Queue 4 Full Interrupt */
++ unsigned int toe_q5_full : 1; /* bit 5 TOE Queue 5 Full Interrupt */
++ unsigned int toe_q6_full : 1; /* bit 6 TOE Queue 6 Full Interrupt */
++ unsigned int toe_q7_full : 1; /* bit 7 TOE Queue 7 Full Interrupt */
++ unsigned int toe_q8_full : 1; /* bit 8 TOE Queue 8 Full Interrupt */
++ unsigned int toe_q9_full : 1; /* bit 9 TOE Queue 9 Full Interrupt */
++ unsigned int toe_q10_full : 1; /* bit 10 TOE Queue 10 Full Interrupt */
++ unsigned int toe_q11_full : 1; /* bit 11 TOE Queue 11 Full Interrupt */
++ unsigned int toe_q12_full : 1; /* bit 12 TOE Queue 12 Full Interrupt */
++ unsigned int toe_q13_full : 1; /* bit 13 TOE Queue 13 Full Interrupt */
++ unsigned int toe_q14_full : 1; /* bit 14 TOE Queue 14 Full Interrupt */
++ unsigned int toe_q15_full : 1; /* bit 15 TOE Queue 15 Full Interrupt */
++ unsigned int toe_q16_full : 1; /* bit 16 TOE Queue 16 Full Interrupt */
++ unsigned int toe_q17_full : 1; /* bit 17 TOE Queue 17 Full Interrupt */
++ unsigned int toe_q18_full : 1; /* bit 18 TOE Queue 18 Full Interrupt */
++ unsigned int toe_q19_full : 1; /* bit 19 TOE Queue 19 Full Interrupt */
++ unsigned int toe_q20_full : 1; /* bit 20 TOE Queue 20 Full Interrupt */
++ unsigned int toe_q21_full : 1; /* bit 21 TOE Queue 21 Full Interrupt */
++ unsigned int toe_q22_full : 1; /* bit 22 TOE Queue 22 Full Interrupt */
++ unsigned int toe_q23_full : 1; /* bit 23 TOE Queue 23 Full Interrupt */
++ unsigned int toe_q24_full : 1; /* bit 24 TOE Queue 24 Full Interrupt */
++ unsigned int toe_q25_full : 1; /* bit 25 TOE Queue 25 Full Interrupt */
++ unsigned int toe_q26_full : 1; /* bit 26 TOE Queue 26 Full Interrupt */
++ unsigned int toe_q27_full : 1; /* bit 27 TOE Queue 27 Full Interrupt */
++ unsigned int toe_q28_full : 1; /* bit 28 TOE Queue 28 Full Interrupt */
++ unsigned int toe_q29_full : 1; /* bit 29 TOE Queue 29 Full Interrupt */
++ unsigned int toe_q30_full : 1; /* bit 30 TOE Queue 30 Full Interrupt */
++ unsigned int toe_q31_full : 1; /* bit 31 TOE Queue 31 Full Interrupt */
+ } bits;
+} INTR_REG2_T;
+
+#define TOE_QL_FULL_INT_BIT(x) BIT(x)
+
+/*
-+ * Interrupt Status Register 3 (offset 0x0050)
-+ * Interrupt Mask Register 3 (offset 0x0054)
-+ * Interrupt Select Register 3 (offset 0x0058)
++ * Interrupt Status Register 3 (offset 0x0050)
++ * Interrupt Mask Register 3 (offset 0x0054)
++ * Interrupt Select Register 3 (offset 0x0058)
+ */
+typedef union {
+ unsigned int bits32;
+ struct bit_0050 {
-+ unsigned int toe_q32_full : 1; // bit 32 TOE Queue 32 Full Interrupt
-+ unsigned int toe_q33_full : 1; // bit 33 TOE Queue 33 Full Interrupt
-+ unsigned int toe_q34_full : 1; // bit 34 TOE Queue 34 Full Interrupt
-+ unsigned int toe_q35_full : 1; // bit 35 TOE Queue 35 Full Interrupt
-+ unsigned int toe_q36_full : 1; // bit 36 TOE Queue 36 Full Interrupt
-+ unsigned int toe_q37_full : 1; // bit 37 TOE Queue 37 Full Interrupt
-+ unsigned int toe_q38_full : 1; // bit 38 TOE Queue 38 Full Interrupt
-+ unsigned int toe_q39_full : 1; // bit 39 TOE Queue 39 Full Interrupt
-+ unsigned int toe_q40_full : 1; // bit 40 TOE Queue 40 Full Interrupt
-+ unsigned int toe_q41_full : 1; // bit 41 TOE Queue 41 Full Interrupt
-+ unsigned int toe_q42_full : 1; // bit 42 TOE Queue 42 Full Interrupt
-+ unsigned int toe_q43_full : 1; // bit 43 TOE Queue 43 Full Interrupt
-+ unsigned int toe_q44_full : 1; // bit 44 TOE Queue 44 Full Interrupt
-+ unsigned int toe_q45_full : 1; // bit 45 TOE Queue 45 Full Interrupt
-+ unsigned int toe_q46_full : 1; // bit 46 TOE Queue 46 Full Interrupt
-+ unsigned int toe_q47_full : 1; // bit 47 TOE Queue 47 Full Interrupt
-+ unsigned int toe_q48_full : 1; // bit 48 TOE Queue 48 Full Interrupt
-+ unsigned int toe_q49_full : 1; // bit 49 TOE Queue 49 Full Interrupt
-+ unsigned int toe_q50_full : 1; // bit 50 TOE Queue 50 Full Interrupt
-+ unsigned int toe_q51_full : 1; // bit 51 TOE Queue 51 Full Interrupt
-+ unsigned int toe_q52_full : 1; // bit 52 TOE Queue 52 Full Interrupt
-+ unsigned int toe_q53_full : 1; // bit 53 TOE Queue 53 Full Interrupt
-+ unsigned int toe_q54_full : 1; // bit 54 TOE Queue 54 Full Interrupt
-+ unsigned int toe_q55_full : 1; // bit 55 TOE Queue 55 Full Interrupt
-+ unsigned int toe_q56_full : 1; // bit 56 TOE Queue 56 Full Interrupt
-+ unsigned int toe_q57_full : 1; // bit 57 TOE Queue 57 Full Interrupt
-+ unsigned int toe_q58_full : 1; // bit 58 TOE Queue 58 Full Interrupt
-+ unsigned int toe_q59_full : 1; // bit 59 TOE Queue 59 Full Interrupt
-+ unsigned int toe_q60_full : 1; // bit 60 TOE Queue 60 Full Interrupt
-+ unsigned int toe_q61_full : 1; // bit 61 TOE Queue 61 Full Interrupt
-+ unsigned int toe_q62_full : 1; // bit 62 TOE Queue 62 Full Interrupt
-+ unsigned int toe_q63_full : 1; // bit 63 TOE Queue 63 Full Interrupt
++ unsigned int toe_q32_full : 1; /* bit 32 TOE Queue 32 Full Interrupt */
++ unsigned int toe_q33_full : 1; /* bit 33 TOE Queue 33 Full Interrupt */
++ unsigned int toe_q34_full : 1; /* bit 34 TOE Queue 34 Full Interrupt */
++ unsigned int toe_q35_full : 1; /* bit 35 TOE Queue 35 Full Interrupt */
++ unsigned int toe_q36_full : 1; /* bit 36 TOE Queue 36 Full Interrupt */
++ unsigned int toe_q37_full : 1; /* bit 37 TOE Queue 37 Full Interrupt */
++ unsigned int toe_q38_full : 1; /* bit 38 TOE Queue 38 Full Interrupt */
++ unsigned int toe_q39_full : 1; /* bit 39 TOE Queue 39 Full Interrupt */
++ unsigned int toe_q40_full : 1; /* bit 40 TOE Queue 40 Full Interrupt */
++ unsigned int toe_q41_full : 1; /* bit 41 TOE Queue 41 Full Interrupt */
++ unsigned int toe_q42_full : 1; /* bit 42 TOE Queue 42 Full Interrupt */
++ unsigned int toe_q43_full : 1; /* bit 43 TOE Queue 43 Full Interrupt */
++ unsigned int toe_q44_full : 1; /* bit 44 TOE Queue 44 Full Interrupt */
++ unsigned int toe_q45_full : 1; /* bit 45 TOE Queue 45 Full Interrupt */
++ unsigned int toe_q46_full : 1; /* bit 46 TOE Queue 46 Full Interrupt */
++ unsigned int toe_q47_full : 1; /* bit 47 TOE Queue 47 Full Interrupt */
++ unsigned int toe_q48_full : 1; /* bit 48 TOE Queue 48 Full Interrupt */
++ unsigned int toe_q49_full : 1; /* bit 49 TOE Queue 49 Full Interrupt */
++ unsigned int toe_q50_full : 1; /* bit 50 TOE Queue 50 Full Interrupt */
++ unsigned int toe_q51_full : 1; /* bit 51 TOE Queue 51 Full Interrupt */
++ unsigned int toe_q52_full : 1; /* bit 52 TOE Queue 52 Full Interrupt */
++ unsigned int toe_q53_full : 1; /* bit 53 TOE Queue 53 Full Interrupt */
++ unsigned int toe_q54_full : 1; /* bit 54 TOE Queue 54 Full Interrupt */
++ unsigned int toe_q55_full : 1; /* bit 55 TOE Queue 55 Full Interrupt */
++ unsigned int toe_q56_full : 1; /* bit 56 TOE Queue 56 Full Interrupt */
++ unsigned int toe_q57_full : 1; /* bit 57 TOE Queue 57 Full Interrupt */
++ unsigned int toe_q58_full : 1; /* bit 58 TOE Queue 58 Full Interrupt */
++ unsigned int toe_q59_full : 1; /* bit 59 TOE Queue 59 Full Interrupt */
++ unsigned int toe_q60_full : 1; /* bit 60 TOE Queue 60 Full Interrupt */
++ unsigned int toe_q61_full : 1; /* bit 61 TOE Queue 61 Full Interrupt */
++ unsigned int toe_q62_full : 1; /* bit 62 TOE Queue 62 Full Interrupt */
++ unsigned int toe_q63_full : 1; /* bit 63 TOE Queue 63 Full Interrupt */
+ } bits;
+} INTR_REG3_T;
+
+#define TOE_QH_FULL_INT_BIT(x) BIT(x-32)
+
+/*
-+ * Interrupt Status Register 4 (offset 0x0060)
-+ * Interrupt Mask Register 4 (offset 0x0064)
-+ * Interrupt Select Register 4 (offset 0x0068)
++ * Interrupt Status Register 4 (offset 0x0060)
++ * Interrupt Mask Register 4 (offset 0x0064)
++ * Interrupt Select Register 4 (offset 0x0068)
+ */
+typedef union {
+ unsigned char byte;
+ struct bit_0060 {
-+ unsigned char status_changed : 1; // Status Changed Intr for RGMII Mode
-+ unsigned char rx_overrun : 1; // GMAC Rx FIFO overrun interrupt
-+ unsigned char tx_pause_off : 1; // received pause off frame interrupt
-+ unsigned char rx_pause_off : 1; // received pause off frame interrupt
-+ unsigned char tx_pause_on : 1; // transmit pause on frame interrupt
-+ unsigned char rx_pause_on : 1; // received pause on frame interrupt
-+ unsigned char cnt_full : 1; // MIB counters half full interrupt
-+ unsigned char reserved : 1; //
-+ } _PACKED_ bits;
-+} _PACKED_ GMAC_INTR_T;
++ unsigned char status_changed : 1; /* Status Changed Intr for RGMII Mode */
++ unsigned char rx_overrun : 1; /* GMAC Rx FIFO overrun interrupt */
++ unsigned char tx_pause_off : 1; /* received pause off frame interrupt */
++ unsigned char rx_pause_off : 1; /* received pause off frame interrupt */
++ unsigned char tx_pause_on : 1; /* transmit pause on frame interrupt */
++ unsigned char rx_pause_on : 1; /* received pause on frame interrupt */
++ unsigned char cnt_full : 1; /* MIB counters half full interrupt */
++ unsigned char reserved : 1; /* */
++ } __packed bits;
++} __packed GMAC_INTR_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_0060_2 {
-+ unsigned int swfq_empty : 1; // bit 0 Software Free Queue Empty Intr.
-+ unsigned int hwfq_empty : 1; // bit 1 Hardware Free Queue Empty Intr.
-+ unsigned int class_qf_int : 14; // bit 15:2 Classification Rx Queue13-0 Full Intr.
++ unsigned int swfq_empty : 1; /* bit 0 Software Free Queue Empty Intr. */
++ unsigned int hwfq_empty : 1; /* bit 1 Hardware Free Queue Empty Intr. */
++ unsigned int class_qf_int : 14; /* bit 15:2 Classification Rx Queue13-0 Full Intr. */
+ GMAC_INTR_T gmac0;
+ GMAC_INTR_T gmac1;
+ } bits;
+#define HWFQ_EMPTY_INT_BIT BIT(1)
+#define SWFQ_EMPTY_INT_BIT BIT(0)
+
-+#if 1
-+#define GMAC0_INT_BITS (GMAC0_MIB_INT_BIT)
-+#define GMAC1_INT_BITS (GMAC1_MIB_INT_BIT)
-+#else
+#define GMAC0_INT_BITS (GMAC0_RESERVED_INT_BIT | GMAC0_MIB_INT_BIT | \
+ GMAC0_RX_PAUSE_ON_INT_BIT | GMAC0_TX_PAUSE_ON_INT_BIT | \
-+ GMAC0_RX_PAUSE_OFF_INT_BIT | GMAC0_TX_PAUSE_OFF_INT_BIT | \
++ GMAC0_RX_PAUSE_OFF_INT_BIT | GMAC0_TX_PAUSE_OFF_INT_BIT | \
+ GMAC0_RX_OVERRUN_INT_BIT | GMAC0_STATUS_CHANGE_INT_BIT)
+#define GMAC1_INT_BITS (GMAC1_RESERVED_INT_BIT | GMAC1_MIB_INT_BIT | \
+ GMAC1_RX_PAUSE_ON_INT_BIT | GMAC1_TX_PAUSE_ON_INT_BIT | \
-+ GMAC1_RX_PAUSE_OFF_INT_BIT | GMAC1_TX_PAUSE_OFF_INT_BIT | \
++ GMAC1_RX_PAUSE_OFF_INT_BIT | GMAC1_TX_PAUSE_OFF_INT_BIT | \
+ GMAC1_RX_OVERRUN_INT_BIT | GMAC1_STATUS_CHANGE_INT_BIT)
-+#endif
+
+#define CLASS_RX_FULL_INT_BITS 0xfffc
+
+/*
-+ * GLOBAL_QUEUE_THRESHOLD_REG (offset 0x0070)
++ * GLOBAL_QUEUE_THRESHOLD_REG (offset 0x0070)
+ */
+typedef union {
+ unsigned int bits32;
+ struct bit_0070_2 {
-+ unsigned int swfq_empty : 8; // 7:0 Software Free Queue Empty Threshold
-+ unsigned int hwfq_empty : 8; // 15:8 Hardware Free Queue Empty Threshold
-+ unsigned int intrq : 8; // 23:16
-+ unsigned int toe_class : 8; // 31:24
++ unsigned int swfq_empty : 8; /* 7:0 Software Free Queue Empty Threshold */
++ unsigned int hwfq_empty : 8; /* 15:8 Hardware Free Queue Empty Threshold */
++ unsigned int intrq : 8; /* 23:16 */
++ unsigned int toe_class : 8; /* 31:24 */
+ } bits;
+} QUEUE_THRESHOLD_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8000 {
-+ unsigned int td_bus : 2; // bit 1:0 Peripheral Bus Width
-+ unsigned int td_burst_size : 2; // bit 3:2 TxDMA max burst size for every AHB request
-+ unsigned int td_prot : 4; // bit 7:4 TxDMA protection control
-+ unsigned int rd_bus : 2; // bit 9:8 Peripheral Bus Width
-+ unsigned int rd_burst_size : 2; // bit 11:10 DMA max burst size for every AHB request
-+ unsigned int rd_prot : 4; // bit 15:12 DMA Protection Control
-+ unsigned int rd_insert_bytes : 2; // bit 17:16
-+ unsigned int reserved : 10; // bit 27:18
-+ unsigned int drop_small_ack : 1; // bit 28 1: Drop, 0: Accept
-+ unsigned int loopback : 1; // bit 29 Loopback TxDMA to RxDMA
-+ unsigned int td_enable : 1; // bit 30 Tx DMA Enable
-+ unsigned int rd_enable : 1; // bit 31 Rx DMA Enable
++ unsigned int td_bus : 2; /* bit 1:0 Peripheral Bus Width */
++ unsigned int td_burst_size : 2; /* bit 3:2 TxDMA max burst size for every AHB request */
++ unsigned int td_prot : 4; /* bit 7:4 TxDMA protection control */
++ unsigned int rd_bus : 2; /* bit 9:8 Peripheral Bus Width */
++ unsigned int rd_burst_size : 2; /* bit 11:10 DMA max burst size for every AHB request */
++ unsigned int rd_prot : 4; /* bit 15:12 DMA Protection Control */
++ unsigned int rd_insert_bytes : 2; /* bit 17:16 */
++ unsigned int reserved : 10; /* bit 27:18 */
++ unsigned int drop_small_ack : 1; /* bit 28 1: Drop, 0: Accept */
++ unsigned int loopback : 1; /* bit 29 Loopback TxDMA to RxDMA */
++ unsigned int td_enable : 1; /* bit 30 Tx DMA Enable */
++ unsigned int rd_enable : 1; /* bit 31 Rx DMA Enable */
+ } bits;
+} GMAC_DMA_CTRL_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8004 {
-+ unsigned int hw_tq0 : 6; // bit 5:0 HW TX Queue 3
-+ unsigned int hw_tq1 : 6; // bit 11:6 HW TX Queue 2
-+ unsigned int hw_tq2 : 6; // bit 17:12 HW TX Queue 1
-+ unsigned int hw_tq3 : 6; // bit 23:18 HW TX Queue 0
-+ unsigned int reserved : 8; // bit 31:24
++ unsigned int hw_tq0 : 6; /* bit 5:0 HW TX Queue 3 */
++ unsigned int hw_tq1 : 6; /* bit 11:6 HW TX Queue 2 */
++ unsigned int hw_tq2 : 6; /* bit 17:12 HW TX Queue 1 */
++ unsigned int hw_tq3 : 6; /* bit 23:18 HW TX Queue 0 */
++ unsigned int reserved : 8; /* bit 31:24 */
+ } bits;
+} GMAC_TX_WCR0_T; /* Weighting Control Register 0 */
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8008 {
-+ unsigned int sw_tq0 : 5; // bit 4:0 SW TX Queue 0
-+ unsigned int sw_tq1 : 5; // bit 9:5 SW TX Queue 1
-+ unsigned int sw_tq2 : 5; // bit 14:10 SW TX Queue 2
-+ unsigned int sw_tq3 : 5; // bit 19:15 SW TX Queue 3
-+ unsigned int sw_tq4 : 5; // bit 24:20 SW TX Queue 4
-+ unsigned int sw_tq5 : 5; // bit 29:25 SW TX Queue 5
-+ unsigned int reserved : 2; // bit 31:30
++ unsigned int sw_tq0 : 5; /* bit 4:0 SW TX Queue 0 */
++ unsigned int sw_tq1 : 5; /* bit 9:5 SW TX Queue 1 */
++ unsigned int sw_tq2 : 5; /* bit 14:10 SW TX Queue 2 */
++ unsigned int sw_tq3 : 5; /* bit 19:15 SW TX Queue 3 */
++ unsigned int sw_tq4 : 5; /* bit 24:20 SW TX Queue 4 */
++ unsigned int sw_tq5 : 5; /* bit 29:25 SW TX Queue 5 */
++ unsigned int reserved : 2; /* bit 31:30 */
+ } bits;
+} GMAC_TX_WCR1_T; /* Weighting Control Register 1 */
+
+ unsigned int bits32;
+ struct bit_8038 {
+ unsigned int reserved : 3;
-+ unsigned int td_busy : 1; // bit 3 1: TxDMA busy; 0: TxDMA idle
-+ unsigned int td_first_des_ptr : 28; // bit 31:4 first descriptor address
++ unsigned int td_busy : 1; /* bit 3 1: TxDMA busy; 0: TxDMA idle */
++ unsigned int td_first_des_ptr : 28; /* bit 31:4 first descriptor address */
+ } bits;
+} GMAC_TXDMA_FIRST_DESC_T;
+
+ unsigned int bits32;
+ struct bit_803C {
+ unsigned int reserved : 4;
-+ unsigned int td_curr_desc_ptr : 28; // bit 31:4 current descriptor address
++ unsigned int td_curr_desc_ptr : 28; /* bit 31:4 current descriptor address */
+ } bits;
+} GMAC_TXDMA_CURR_DESC_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8040 {
-+ unsigned int buffer_size : 16; // bit 15:0 Transfer size
-+ unsigned int desc_count : 6; // bit 21:16 number of descriptors used for the current frame
-+ unsigned int status_tx_ok : 1; // bit 22 Tx Status, 1: Successful 0: Failed
-+ unsigned int status_rvd : 6; // bit 28:23 Tx Status, Reserved bits
-+ unsigned int perr : 1; // bit 29 protocol error during processing this descriptor
-+ unsigned int derr : 1; // bit 30 data error during processing this descriptor
-+ unsigned int reserved : 1; // bit 31
++ unsigned int buffer_size : 16; /* bit 15:0 Transfer size */
++ unsigned int desc_count : 6; /* bit 21:16 number of descriptors used for the current frame */
++ unsigned int status_tx_ok : 1; /* bit 22 Tx Status, 1: Successful 0: Failed */
++ unsigned int status_rvd : 6; /* bit 28:23 Tx Status, Reserved bits */
++ unsigned int perr : 1; /* bit 29 protocol error during processing this descriptor */
++ unsigned int derr : 1; /* bit 30 data error during processing this descriptor */
++ unsigned int reserved : 1; /* bit 31 */
+ } bits;
+} GMAC_TXDESC_0_T;
+
+typedef union {
+ unsigned int bits32;
+ struct txdesc_word1 {
-+ unsigned int byte_count : 16; // bit 15: 0 Tx Frame Byte Count
-+ unsigned int mtu_enable : 1; // bit 16 TSS segmentation use MTU setting
-+ unsigned int ip_chksum : 1; // bit 17 IPV4 Header Checksum Enable
-+ unsigned int ipv6_enable : 1; // bit 18 IPV6 Tx Enable
-+ unsigned int tcp_chksum : 1; // bit 19 TCP Checksum Enable
-+ unsigned int udp_chksum : 1; // bit 20 UDP Checksum Enable
-+ unsigned int bypass_tss : 1; // bit 21
-+ unsigned int ip_fixed_len : 1; // bit 22
-+ unsigned int reserved : 9; // bit 31:23 Tx Flag, Reserved
++ unsigned int byte_count : 16; /* bit 15: 0 Tx Frame Byte Count */
++ unsigned int mtu_enable : 1; /* bit 16 TSS segmentation use MTU setting */
++ unsigned int ip_chksum : 1; /* bit 17 IPV4 Header Checksum Enable */
++ unsigned int ipv6_enable : 1; /* bit 18 IPV6 Tx Enable */
++ unsigned int tcp_chksum : 1; /* bit 19 TCP Checksum Enable */
++ unsigned int udp_chksum : 1; /* bit 20 UDP Checksum Enable */
++ unsigned int bypass_tss : 1; /* bit 21 Bypass HW offload engine */
++ unsigned int ip_fixed_len : 1; /* bit 22 Don't update IP length field */
++ unsigned int reserved : 9; /* bit 31:23 Tx Flag, Reserved */
+ } bits;
+} GMAC_TXDESC_1_T;
+
+#define TSS_IP_FIXED_LEN_BIT BIT(22)
++#define TSS_BYPASS_BIT BIT(21)
+#define TSS_UDP_CHKSUM_BIT BIT(20)
+#define TSS_TCP_CHKSUM_BIT BIT(19)
+#define TSS_IPV6_ENABLE_BIT BIT(18)
+#define TSS_IP_CHKSUM_BIT BIT(17)
+#define TSS_MTU_ENABLE_BIT BIT(16)
+
++#define TSS_CHECKUM_ENABLE \
++ (TSS_IP_CHKSUM_BIT|TSS_IPV6_ENABLE_BIT| \
++ TSS_TCP_CHKSUM_BIT|TSS_UDP_CHKSUM_BIT)
++
+/*
+ * GMAC DMA Tx Description Word 2 Register
+ * GMAC0 offset 0x8048
+ */
+typedef union {
+ unsigned int bits32;
-+ unsigned int buf_adr;
++ unsigned int buf_adr;
+} GMAC_TXDESC_2_T;
+
+/*
+typedef union {
+ unsigned int bits32;
+ struct txdesc_word3 {
-+ unsigned int mtu_size : 11; // bit 10: 0 Tx Frame Byte Count
-+ unsigned int reserved : 18; // bit 28:11
-+ unsigned int eofie : 1; // bit 29 End of frame interrupt enable
-+ unsigned int sof_eof : 2; // bit 31:30 11: only one, 10: first, 01: last, 00: linking
++ unsigned int mtu_size : 13; /* bit 12: 0 Tx Frame Byte Count */
++ unsigned int reserved : 16; /* bit 28:13 */
++ unsigned int eofie : 1; /* bit 29 End of frame interrupt enable */
++ unsigned int sof_eof : 2; /* bit 31:30 11: only one, 10: first, 01: last, 00: linking */
+ } bits;
+} GMAC_TXDESC_3_T;
+#define SOF_EOF_BIT_MASK 0x3fffffff
+#define SOF_BIT 0x80000000
+#define EOF_BIT 0x40000000
+#define EOFIE_BIT BIT(29)
-+#define MTU_SIZE_BIT_MASK 0x7ff
++#define MTU_SIZE_BIT_MASK 0x1fff
+
+/*
+ * GMAC Tx Descriptor
+typedef union {
+ unsigned int bits32;
+ struct bit_8058 {
-+ unsigned int reserved : 3; // bit 2:0
-+ unsigned int rd_busy : 1; // bit 3 1-RxDMA busy; 0-RxDMA idle
-+ unsigned int rd_first_des_ptr : 28; // bit 31:4 first descriptor address
++ unsigned int reserved : 3; /* bit 2:0 */
++ unsigned int rd_busy : 1; /* bit 3 1-RxDMA busy; 0-RxDMA idle */
++ unsigned int rd_first_des_ptr : 28; /* bit 31:4 first descriptor address */
+ } bits;
+} GMAC_RXDMA_FIRST_DESC_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_805C {
-+ unsigned int reserved : 4; // bit 3:0
-+ unsigned int rd_curr_des_ptr : 28; // bit 31:4 current descriptor address
++ unsigned int reserved : 4; /* bit 3:0 */
++ unsigned int rd_curr_des_ptr : 28; /* bit 31:4 current descriptor address */
+ } bits;
+} GMAC_RXDMA_CURR_DESC_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8060 {
-+ unsigned int buffer_size : 16; // bit 15:0 number of descriptors used for the current frame
-+ unsigned int desc_count : 6; // bit 21:16 number of descriptors used for the current frame
-+ unsigned int status : 4; // bit 24:22 Status of rx frame
-+ unsigned int chksum_status : 3; // bit 28:26 Check Sum Status
-+ unsigned int perr : 1; // bit 29 protocol error during processing this descriptor
-+ unsigned int derr : 1; // bit 30 data error during processing this descriptor
-+ unsigned int drop : 1; // bit 31 TOE/CIS Queue Full dropped packet to default queue
++ unsigned int buffer_size : 16; /* bit 15:0 number of descriptors used for the current frame */
++ unsigned int desc_count : 6; /* bit 21:16 number of descriptors used for the current frame */
++ unsigned int status : 4; /* bit 24:22 Status of rx frame */
++ unsigned int chksum_status : 3; /* bit 28:26 Check Sum Status */
++ unsigned int perr : 1; /* bit 29 protocol error during processing this descriptor */
++ unsigned int derr : 1; /* bit 30 data error during processing this descriptor */
++ unsigned int drop : 1; /* bit 31 TOE/CIS Queue Full dropped packet to default queue */
+ } bits;
+} GMAC_RXDESC_0_T;
+
+#define RX_STATUS_BUFFER_FULL 10
+#define RX_STATUS_NUM 16
+
++#define RX_ERROR_LENGTH(s) \
++ ((s) == RX_STATUS_TOO_LONG_GOOD_CRC || \
++ (s) == RX_STATUS_TOO_LONG_BAD_CRC || \
++ (s) == RX_STATUS_TOO_LONG_BAD_ALIGN)
++#define RX_ERROR_OVER(s) \
++ ((s) == RX_STATUS_BUFFER_FULL)
++#define RX_ERROR_CRC(s) \
++ ((s) == RX_STATUS_CRC_ERROR || \
++ (s) == RX_STATUS_TOO_LONG_BAD_CRC)
++#define RX_ERROR_FRAME(s) \
++ ((s) == RX_STATUS_ALIGNMENT_ERROR || \
++ (s) == RX_STATUS_TOO_LONG_BAD_ALIGN)
++#define RX_ERROR_FIFO(s) \
++ (0)
+
+/*
+ * GMAC DMA Rx Description Word 1 Register
+typedef union {
+ unsigned int bits32;
+ struct rxdesc_word1 {
-+ unsigned int byte_count : 16; // bit 15: 0 Rx Frame Byte Count
-+ unsigned int sw_id : 16; // bit 31:16 Software ID
++ unsigned int byte_count : 16; /* bit 15: 0 Rx Frame Byte Count */
++ unsigned int sw_id : 16; /* bit 31:16 Software ID */
+ } bits;
+} GMAC_RXDESC_1_T;
+
+#define RX_INSERT_2_BYTE 2
+#define RX_INSERT_3_BYTE 3
+
-+#define RX_INSERT_BYTES RX_INSERT_2_BYTE
+/*
+ * GMAC DMA Rx Description Word 3 Register
+ * GMAC0 offset 0x806C
+typedef union {
+ unsigned int bits32;
+ struct rxdesc_word3 {
-+ unsigned int l3_offset : 8; // bit 7: 0 L3 data offset
-+ unsigned int l4_offset : 8; // bit 15: 8 L4 data offset
-+ unsigned int l7_offset : 8; // bit 23: 16 L7 data offset
-+ unsigned int dup_ack : 1; // bit 24 Duplicated ACK detected
-+ unsigned int abnormal : 1; // bit 25 abnormal case found
-+ unsigned int option : 1; // bit 26 IPV4 option or IPV6 extension header
-+ unsigned int out_of_seq : 1; // bit 27 Out of Sequence packet
-+ unsigned int ctrl_flag : 1; // bit 28 Control Flag is present
-+ unsigned int eofie : 1; // bit 29 End of frame interrupt enable
-+ unsigned int sof_eof : 2; // bit 31:30 11: only one, 10: first, 01: last, 00: linking
++ unsigned int l3_offset : 8; /* bit 7: 0 L3 data offset */
++ unsigned int l4_offset : 8; /* bit 15: 8 L4 data offset */
++ unsigned int l7_offset : 8; /* bit 23: 16 L7 data offset */
++ unsigned int dup_ack : 1; /* bit 24 Duplicated ACK detected */
++ unsigned int abnormal : 1; /* bit 25 abnormal case found */
++ unsigned int option : 1; /* bit 26 IPV4 option or IPV6 extension header */
++ unsigned int out_of_seq : 1; /* bit 27 Out of Sequence packet */
++ unsigned int ctrl_flag : 1; /* bit 28 Control Flag is present */
++ unsigned int eofie : 1; /* bit 29 End of frame interrupt enable */
++ unsigned int sof_eof : 2; /* bit 31:30 11: only one, 10: first, 01: last, 00: linking */
+ } bits;
+} GMAC_RXDESC_3_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8070 {
-+ unsigned int mr0hel : 6; // bit 5:0 match rule 0 hash entry size
-+ unsigned int mr0_action : 5; // bit 10:6 Matching Rule 0 action offset
-+ unsigned int reserved0 : 4; // bit 14:11
-+ unsigned int mr0en : 1; // bit 15 Enable Matching Rule 0
-+ unsigned int mr1hel : 6; // bit 21:16 match rule 1 hash entry size
-+ unsigned int mr1_action : 5; // bit 26:22 Matching Rule 1 action offset
-+ unsigned int timing : 3; // bit 29:27
-+ unsigned int reserved1 : 1; // bit 30
-+ unsigned int mr1en : 1; // bit 31 Enable Matching Rule 1
++ unsigned int mr0hel : 6; /* bit 5:0 match rule 0 hash entry size */
++ unsigned int mr0_action : 5; /* bit 10:6 Matching Rule 0 action offset */
++ unsigned int reserved0 : 4; /* bit 14:11 */
++ unsigned int mr0en : 1; /* bit 15 Enable Matching Rule 0 */
++ unsigned int mr1hel : 6; /* bit 21:16 match rule 1 hash entry size */
++ unsigned int mr1_action : 5; /* bit 26:22 Matching Rule 1 action offset */
++ unsigned int timing : 3; /* bit 29:27 */
++ unsigned int reserved1 : 1; /* bit 30 */
++ unsigned int mr1en : 1; /* bit 31 Enable Matching Rule 1 */
+ } bits;
+} GMAC_HASH_ENABLE_REG0_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8074 {
-+ unsigned int mr2hel : 6; // bit 5:0 match rule 2 hash entry size
-+ unsigned int mr2_action : 5; // bit 10:6 Matching Rule 2 action offset
-+ unsigned int reserved2 : 4; // bit 14:11
-+ unsigned int mr2en : 1; // bit 15 Enable Matching Rule 2
-+ unsigned int mr3hel : 6; // bit 21:16 match rule 3 hash entry size
-+ unsigned int mr3_action : 5; // bit 26:22 Matching Rule 3 action offset
-+ unsigned int reserved1 : 4; // bit 30:27
-+ unsigned int mr3en : 1; // bit 31 Enable Matching Rule 3
++ unsigned int mr2hel : 6; /* bit 5:0 match rule 2 hash entry size */
++ unsigned int mr2_action : 5; /* bit 10:6 Matching Rule 2 action offset */
++ unsigned int reserved2 : 4; /* bit 14:11 */
++ unsigned int mr2en : 1; /* bit 15 Enable Matching Rule 2 */
++ unsigned int mr3hel : 6; /* bit 21:16 match rule 3 hash entry size */
++ unsigned int mr3_action : 5; /* bit 26:22 Matching Rule 3 action offset */
++ unsigned int reserved1 : 4; /* bit 30:27 */
++ unsigned int mr3en : 1; /* bit 31 Enable Matching Rule 3 */
+ } bits;
+} GMAC_HASH_ENABLE_REG1_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8078 {
-+ unsigned int sprx : 8; // bit 7:0 Support Protocol Register 7:0
-+ unsigned int reserved2 : 4; // bit 11:8
-+ unsigned int tos_traffic : 1; // bit 12 IPV4 TOS or IPV6 Traffice Class
-+ unsigned int flow_lable : 1; // bit 13 IPV6 Flow label
-+ unsigned int ip_hdr_len : 1; // bit 14 IPV4 Header length
-+ unsigned int ip_version : 1; // bit 15 0: IPV4, 1: IPV6
-+ unsigned int reserved1 : 3; // bit 18:16
-+ unsigned int pppoe : 1; // bit 19 PPPoE Session ID enable
-+ unsigned int vlan : 1; // bit 20 VLAN ID enable
-+ unsigned int ether_type : 1; // bit 21 Ethernet type enable
-+ unsigned int sa : 1; // bit 22 MAC SA enable
-+ unsigned int da : 1; // bit 23 MAC DA enable
-+ unsigned int priority : 3; // bit 26:24 priority if multi-rules matched
-+ unsigned int port : 1; // bit 27 PORT ID matching enable
-+ unsigned int l7 : 1; // bit 28 L7 matching enable
-+ unsigned int l4 : 1; // bit 29 L4 matching enable
-+ unsigned int l3 : 1; // bit 30 L3 matching enable
-+ unsigned int l2 : 1; // bit 31 L2 matching enable
++ unsigned int sprx : 8; /* bit 7:0 Support Protocol Register 7:0 */
++ unsigned int reserved2 : 4; /* bit 11:8 */
++ unsigned int tos_traffic : 1; /* bit 12 IPV4 TOS or IPV6 Traffice Class */
++ unsigned int flow_lable : 1; /* bit 13 IPV6 Flow label */
++ unsigned int ip_hdr_len : 1; /* bit 14 IPV4 Header length */
++ unsigned int ip_version : 1; /* bit 15 0: IPV4, 1: IPV6 */
++ unsigned int reserved1 : 3; /* bit 18:16 */
++ unsigned int pppoe : 1; /* bit 19 PPPoE Session ID enable */
++ unsigned int vlan : 1; /* bit 20 VLAN ID enable */
++ unsigned int ether_type : 1; /* bit 21 Ethernet type enable */
++ unsigned int sa : 1; /* bit 22 MAC SA enable */
++ unsigned int da : 1; /* bit 23 MAC DA enable */
++ unsigned int priority : 3; /* bit 26:24 priority if multi-rules matched */
++ unsigned int port : 1; /* bit 27 PORT ID matching enable */
++ unsigned int l7 : 1; /* bit 28 L7 matching enable */
++ unsigned int l4 : 1; /* bit 29 L4 matching enable */
++ unsigned int l3 : 1; /* bit 30 L3 matching enable */
++ unsigned int l2 : 1; /* bit 31 L2 matching enable */
+ } bits;
+} GMAC_MRxCR0_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_807C {
-+ unsigned int l4_byte0_15 : 16; // bit 15: 0
-+ unsigned int dip_netmask : 7; // bit 22:16 Dest IP net mask, number of mask bits
-+ unsigned int dip : 1; // bit 23 Dest IP
-+ unsigned int sip_netmask : 7; // bit 30:24 Srce IP net mask, number of mask bits
-+ unsigned int sip : 1; // bit 31 Srce IP
++ unsigned int l4_byte0_15 : 16; /* bit 15: 0 */
++ unsigned int dip_netmask : 7; /* bit 22:16 Dest IP net mask, number of mask bits */
++ unsigned int dip : 1; /* bit 23 Dest IP */
++ unsigned int sip_netmask : 7; /* bit 30:24 Srce IP net mask, number of mask bits */
++ unsigned int sip : 1; /* bit 31 Srce IP */
+ } bits;
+} GMAC_MRxCR1_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_8080 {
-+ unsigned int l7_byte0_23 : 24; // bit 23:0
-+ unsigned int l4_byte16_24 : 8; // bit 31: 24
++ unsigned int l7_byte0_23 : 24; /* bit 23:0 */
++ unsigned int l4_byte16_24 : 8; /* bit 31: 24 */
+ } bits;
+} GMAC_MRxCR2_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_80A8 {
-+ unsigned int protocol : 8; // bit 7:0 Supported protocol
-+ unsigned int swap : 3; // bit 10:8 Swap
-+ unsigned int reserved : 21; // bit 31:11
++ unsigned int protocol : 8; /* bit 7:0 Supported protocol */
++ unsigned int swap : 3; /* bit 10:8 Swap */
++ unsigned int reserved : 21; /* bit 31:11 */
+ } bits;
+} GMAC_SPR_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_80C8 {
-+ unsigned int hash_weight : 5; // 4:0
-+ unsigned int rx_weight : 5; // 9:5
-+ unsigned int tx_weight : 5; // 14:10
-+ unsigned int pre_req : 5; // 19:15 Rx Data Pre Request FIFO Threshold
-+ unsigned int tqDV_threshold : 5; // 24:20 DMA TqCtrl to Start tqDV FIFO Threshold
-+ unsigned int reserved : 7; // 31:25
++ unsigned int hash_weight : 5; /* 4:0 */
++ unsigned int rx_weight : 5; /* 9:5 */
++ unsigned int tx_weight : 5; /* 14:10 */
++ unsigned int pre_req : 5; /* 19:15 Rx Data Pre Request FIFO Threshold */
++ unsigned int tqDV_threshold : 5; /* 24:20 DMA TqCtrl to Start tqDV FIFO Threshold */
++ unsigned int reserved : 7; /* 31:25 */
+ } bits;
+} GMAC_AHB_WEIGHT_T;
+
+ unsigned int broadcast : 1; /* enable receive of broadcast frames */
+ unsigned int promiscuous : 1; /* enable receive of all frames */
+ unsigned int error : 1; /* enable receive of all error frames */
-+ unsigned int : 27;
++ unsigned int : 27;
+ } bits;
+} GMAC_RX_FLTR_T;
+
+ unsigned int ipv4_rx_chksum : 1; /* 17: IPv4 RX Checksum enable */
+ unsigned int ipv6_rx_chksum : 1; /* 18: IPv6 RX Checksum enable */
+ unsigned int rx_tag_remove : 1; /* 19: Remove Rx VLAN tag */
-+ unsigned int rgmm_edge : 1; // 20
-+ unsigned int rxc_inv : 1; // 21
-+ unsigned int ipv6_exthdr_order : 1; // 22
-+ unsigned int rx_err_detect : 1; // 23
-+ unsigned int port0_chk_hwq : 1; // 24
-+ unsigned int port1_chk_hwq : 1; // 25
-+ unsigned int port0_chk_toeq : 1; // 26
-+ unsigned int port1_chk_toeq : 1; // 27
-+ unsigned int port0_chk_classq : 1; // 28
-+ unsigned int port1_chk_classq : 1; // 29
-+ unsigned int reserved : 2; // 31
++ unsigned int rgmm_edge : 1; /* 20 */
++ unsigned int rxc_inv : 1; /* 21 */
++ unsigned int ipv6_exthdr_order : 1; /* 22 */
++ unsigned int rx_err_detect : 1; /* 23 */
++ unsigned int port0_chk_hwq : 1; /* 24 */
++ unsigned int port1_chk_hwq : 1; /* 25 */
++ unsigned int port0_chk_toeq : 1; /* 26 */
++ unsigned int port1_chk_toeq : 1; /* 27 */
++ unsigned int port0_chk_classq : 1; /* 28 */
++ unsigned int port1_chk_classq : 1; /* 29 */
++ unsigned int reserved : 2; /* 31 */
+ } bits;
+} GMAC_CONFIG0_T;
+
++#define CONFIG0_TX_RX_DISABLE (BIT(1)|BIT(0))
++#define CONFIG0_RX_CHKSUM (BIT(18)|BIT(17))
++#define CONFIG0_FLOW_RX (BIT(14))
++#define CONFIG0_FLOW_TX (BIT(15))
++#define CONFIG0_FLOW_TX_RX (BIT(14)|BIT(15))
++#define CONFIG0_FLOW_CTL (BIT(14)|BIT(15))
++
++#define CONFIG0_MAXLEN_SHIFT 8
++#define CONFIG0_MAXLEN_MASK (7 << CONFIG0_MAXLEN_SHIFT)
++#define CONFIG0_MAXLEN_1536 0
++#define CONFIG0_MAXLEN_1518 1
++#define CONFIG0_MAXLEN_1522 2
++#define CONFIG0_MAXLEN_1542 3
++#define CONFIG0_MAXLEN_9k 4 /* 9212 */
++#define CONFIG0_MAXLEN_10k 5 /* 10236 */
++#define CONFIG0_MAXLEN_1518__6 6
++#define CONFIG0_MAXLEN_1518__7 7
++
+/*
+ * GMAC Configuration 1
+ * GMAC0 Offset 0xA01C
+typedef union {
+ unsigned int bits32;
+ struct bit1_001c {
-+ unsigned int set_threshold : 8; /* flow control set threshold */
++ unsigned int set_threshold : 8; /* flow control set threshold */
+ unsigned int rel_threshold : 8; /* flow control release threshold */
+ unsigned int reserved : 16;
+ } bits;
+typedef union {
+ unsigned int bits32;
+ struct bit1_0020 {
-+ unsigned int set_threshold : 16; /* flow control set threshold */
++ unsigned int set_threshold : 16; /* flow control set threshold */
+ unsigned int rel_threshold : 16; /* flow control release threshold */
+ } bits;
+} GMAC_CONFIG2_T;
+typedef union {
+ unsigned int bits32;
+ struct bit1_0024 {
-+ unsigned int set_threshold : 16; /* flow control set threshold */
++ unsigned int set_threshold : 16; /* flow control set threshold */
+ unsigned int rel_threshold : 16; /* flow control release threshold */
+ } bits;
+} GMAC_CONFIG3_T;
+ unsigned int duplex : 1; /* duplex mode */
+ unsigned int reserved : 1;
+ unsigned int mii_rmii : 2; /* PHY interface type */
-+ unsigned int : 25;
++ unsigned int : 25;
+ } bits;
+} GMAC_STATUS_T;
+
+ *
+ * memory Layout
+ * TOE Queue Header
-+ * 0x60003000 +---------------------------+ 0x0000
-+ * | TOE Queue 0 Header |
++ * 0x60003000 +---------------------------+ 0x0000
++ * | TOE Queue 0 Header |
+ * | 8 * 4 Bytes |
+ * +---------------------------+ 0x0020
-+ * | TOE Queue 1 Header |
-+ * | 8 * 4 Bytes |
++ * | TOE Queue 1 Header |
++ * | 8 * 4 Bytes |
+ * +---------------------------+ 0x0040
-+ * | ...... |
-+ * | |
++ * | ...... |
++ * | |
+ * +---------------------------+
+ *
+ * Non TOE Queue Header
-+ * 0x60002000 +---------------------------+ 0x0000
++ * 0x60002000 +---------------------------+ 0x0000
+ * | Default Queue 0 Header |
-+ * | 2 * 4 Bytes |
++ * | 2 * 4 Bytes |
+ * +---------------------------+ 0x0008
-+ * | Default Queue 1 Header |
-+ * | 2 * 4 Bytes |
++ * | Default Queue 1 Header |
++ * | 2 * 4 Bytes |
+ * +---------------------------+ 0x0010
-+ * | Classification Queue 0 |
-+ * | 2 * 4 Bytes |
++ * | Classification Queue 0 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+
-+ * | Classification Queue 1 |
-+ * | 2 * 4 Bytes |
++ * | Classification Queue 1 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+ (n * 8 + 0x10)
-+ * | ... |
-+ * | 2 * 4 Bytes |
++ * | ... |
++ * | 2 * 4 Bytes |
+ * +---------------------------+ (13 * 8 + 0x10)
-+ * | Classification Queue 13 |
-+ * | 2 * 4 Bytes |
++ * | Classification Queue 13 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+ 0x80
-+ * | Interrupt Queue 0 |
-+ * | 2 * 4 Bytes |
++ * | Interrupt Queue 0 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+
-+ * | Interrupt Queue 1 |
-+ * | 2 * 4 Bytes |
++ * | Interrupt Queue 1 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+
-+ * | Interrupt Queue 2 |
-+ * | 2 * 4 Bytes |
++ * | Interrupt Queue 2 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+
-+ * | Interrupt Queue 3 |
-+ * | 2 * 4 Bytes |
++ * | Interrupt Queue 3 |
++ * | 2 * 4 Bytes |
+ * +---------------------------+
+ *
+ */
+ unsigned int base_size;
+} TOE_QHDR0_T;
+
-+#define TOE_QHDR0_BASE_MASK (~0x0f)
++#define TOE_QHDR0_BASE_MASK (~0x0f)
+
+/*
+ * TOE Queue Header Word 1
+typedef union {
+ unsigned int bits32;
+ struct bit_qhdr1 {
-+ unsigned int rptr : 16; // bit 15:0
-+ unsigned int wptr : 16; // bit 31:16
++ unsigned int rptr : 16; /* bit 15:0 */
++ unsigned int wptr : 16; /* bit 31:16 */
+ } bits;
+} TOE_QHDR1_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_qhdr2 {
-+ unsigned int TotalPktSize : 17; // bit 16: 0 Total packet size
-+ unsigned int reserved : 7; // bit 23:17
-+ unsigned int dack : 1; // bit 24 1: Duplicated ACK
-+ unsigned int abn : 1; // bit 25 1: Abnormal case Found
-+ unsigned int tcp_opt : 1; // bit 26 1: Have TCP option
-+ unsigned int ip_opt : 1; // bit 27 1: have IPV4 option or IPV6 Extension header
-+ unsigned int sat : 1; // bit 28 1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold
-+ unsigned int osq : 1; // bit 29 1: out of sequence
-+ unsigned int ctl : 1; // bit 30 1: have control flag bits (except ack)
-+ unsigned int usd : 1; // bit 31 0: if no data assembled yet
++ unsigned int TotalPktSize : 17; /* bit 16: 0 Total packet size */
++ unsigned int reserved : 7; /* bit 23:17 */
++ unsigned int dack : 1; /* bit 24 1: Duplicated ACK */
++ unsigned int abn : 1; /* bit 25 1: Abnormal case Found */
++ unsigned int tcp_opt : 1; /* bit 26 1: Have TCP option */
++ unsigned int ip_opt : 1; /* bit 27 1: have IPV4 option or IPV6 Extension header */
++ unsigned int sat : 1; /* bit 28 1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold */
++ unsigned int osq : 1; /* bit 29 1: out of sequence */
++ unsigned int ctl : 1; /* bit 30 1: have control flag bits (except ack) */
++ unsigned int usd : 1; /* bit 31 0: if no data assembled yet */
+ } bits;
+} TOE_QHDR2_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_qhdr5 {
-+ unsigned int AckCnt : 16; // bit 15:0
-+ unsigned int SeqCnt : 16; // bit 31:16
++ unsigned int AckCnt : 16; /* bit 15:0 */
++ unsigned int SeqCnt : 16; /* bit 31:16 */
+ } bits;
+} TOE_QHDR5_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_qhdr6 {
-+ unsigned int WinSize : 16; // bit 15:0
-+ unsigned int iq_num : 2; // bit 17:16
-+ unsigned int MaxPktSize : 14; // bit 31:18
++ unsigned int WinSize : 16; /* bit 15:0 */
++ unsigned int iq_num : 2; /* bit 17:16 */
++ unsigned int MaxPktSize : 14; /* bit 31:18 */
+ } bits;
+} TOE_QHDR6_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_qhdr7 {
-+ unsigned int AckThreshold : 16; // bit 15:0
-+ unsigned int SeqThreshold : 16; // bit 31:16
++ unsigned int AckThreshold : 16; /* bit 15:0 */
++ unsigned int SeqThreshold : 16; /* bit 31:16 */
+ } bits;
+} TOE_QHDR7_T;
+
+ unsigned int base_size;
+} NONTOE_QHDR0_T;
+
-+#define NONTOE_QHDR0_BASE_MASK (~0x0f)
++#define NONTOE_QHDR0_BASE_MASK (~0x0f)
+
+/*
+ * NONTOE Queue Header Word 1
+typedef union {
+ unsigned int bits32;
+ struct bit_nonqhdr1 {
-+ unsigned int rptr : 16; // bit 15:0
-+ unsigned int wptr : 16; // bit 31:16
++ unsigned int rptr : 16; /* bit 15:0 */
++ unsigned int wptr : 16; /* bit 31:16 */
+ } bits;
+} NONTOE_QHDR1_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_intrqhdr0 {
-+ unsigned int win_size : 16; // bit 15:0 Descriptor Ring Size
-+ unsigned int wptr : 16; // bit 31:16 Write Pointer where hw stopped
++ unsigned int win_size : 16; /* bit 15:0 Descriptor Ring Size */
++ unsigned int wptr : 16; /* bit 31:16 Write Pointer where hw stopped */
+ } bits;
+} INTR_QHDR0_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_intrqhdr1 {
-+ unsigned int TotalPktSize : 17; // bit 16: 0 Total packet size
-+ unsigned int tcp_qid : 8; // bit 24:17 TCP Queue ID
-+ unsigned int dack : 1; // bit 25 1: Duplicated ACK
-+ unsigned int abn : 1; // bit 26 1: Abnormal case Found
-+ unsigned int tcp_opt : 1; // bit 27 1: Have TCP option
-+ unsigned int ip_opt : 1; // bit 28 1: have IPV4 option or IPV6 Extension header
-+ unsigned int sat : 1; // bit 29 1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold
-+ unsigned int osq : 1; // bit 30 1: out of sequence
-+ unsigned int ctl : 1; // bit 31 1: have control flag bits (except ack)
++ unsigned int TotalPktSize : 17; /* bit 16: 0 Total packet size */
++ unsigned int tcp_qid : 8; /* bit 24:17 TCP Queue ID */
++ unsigned int dack : 1; /* bit 25 1: Duplicated ACK */
++ unsigned int abn : 1; /* bit 26 1: Abnormal case Found */
++ unsigned int tcp_opt : 1; /* bit 27 1: Have TCP option */
++ unsigned int ip_opt : 1; /* bit 28 1: have IPV4 option or IPV6 Extension header */
++ unsigned int sat : 1; /* bit 29 1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold */
++ unsigned int osq : 1; /* bit 30 1: out of sequence */
++ unsigned int ctl : 1; /* bit 31 1: have control flag bits (except ack) */
+ } bits;
+} INTR_QHDR1_T;
+
+typedef union {
+ unsigned int bits32;
+ struct bit_intrqhdr4 {
-+ unsigned int AckCnt : 16; // bit 15:0 Ack# change since last ack# intr.
-+ unsigned int SeqCnt : 16; // bit 31:16 Seq# change since last seq# intr.
++ unsigned int AckCnt : 16; /* bit 15:0 Ack# change since last ack# intr. */
++ unsigned int SeqCnt : 16; /* bit 31:16 Seq# change since last seq# intr. */
+ } bits;
+} INTR_QHDR4_T;
+
+ unsigned int word7;
+} INTR_QHDR_T;
+
-+/*
-+ * GMAC private data
-+ */
-+typedef struct {
-+ void __iomem *rwptr_reg;
-+ unsigned int desc_base;
-+ unsigned int desc_base_dma;
-+ unsigned short finished_idx;
-+ struct sk_buff *tx_skb[TOE_GMAC_SWTXQ_DESC_NUM];
-+} GMAC_SWTXQ_T;
-+
-+struct gmac_private {
-+ struct phy_device *phydev;
-+ unsigned int port_id;
-+ void __iomem *base_addr;
-+ void __iomem *dma_base_addr;
-+ unsigned int swtxq_desc_base;
-+ GMAC_SWTXQ_T swtxq[TOE_SW_TXQ_NUM];
-+ NONTOE_QHDR_T *default_qhdr;
-+ unsigned int default_desc_base;
-+ dma_addr_t default_desc_base_dma;
-+ dma_addr_t swtxq_desc_base_dma;
-+ unsigned int flow_control_enable;
-+ unsigned int intr0_enabled;
-+ unsigned int intr1_enabled;
-+ unsigned int intr2_enabled;
-+ unsigned int intr3_enabled;
-+ unsigned int intr4_enabled;
-+ unsigned int intr0_selected;
-+ unsigned int intr1_selected;
-+ unsigned int intr2_selected;
-+ unsigned int intr3_selected;
-+ unsigned int intr4_selected;
-+};
-+
-+struct toe_private {
-+ void __iomem *global_base;
-+ struct net_device *net_dev[2];
-+ struct device *dev;
-+ struct work_struct freq_work;
-+ spinlock_t freeq_lock;
-+ unsigned int swfq_desc_base;
-+ unsigned int hwfq_desc_base;
-+ unsigned int hwfq_buf_base;
-+ dma_addr_t sw_freeq_desc_base_dma;
-+ dma_addr_t hw_freeq_desc_base_dma;
-+ dma_addr_t hwfq_buf_base_dma;
-+ dma_addr_t hwfq_buf_end_dma;
-+};
-+
-+#define GMAC_PORT0 0
-+#define GMAC_PORT1 1
-+
+#endif /* _GMAC_SL351x_H */
---- /dev/null
-+++ b/drivers/net/gemini_negmac/Makefile
-@@ -0,0 +1,3 @@
-+obj-$(CONFIG_GEMINI_NET_ENGINE_GMAC)+= gemini_negmac.o
-+
-+gemini_negmac-objs := gm_gmac.o
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -100,6 +100,13 @@ config NET_FC
- adaptor below. You also should have said Y to "SCSI support" and
- "SCSI generic support".
-
-+config GEMINI_NET_ENGINE_GMAC
-+ tristate "Gemini Gigabit Ethernet support"
-+ depends on ARCH_GEMINI
-+ select PHYLIB
-+ help
-+ This driver supports Gemini TOE and NAT dual Gigabit Ethernet.
-+
- config MII
- tristate "Generic Media Independent Interface device support"
- help
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_ETRAX_ETHERNET) += cris/
- obj-$(CONFIG_NET_DSA) += dsa/
- obj-$(CONFIG_ETHERNET) += ethernet/
- obj-$(CONFIG_FDDI) += fddi/
-+obj-$(CONFIG_GEMINI_NET_ENGINE_GMAC) += gemini_negmac/
- obj-$(CONFIG_HIPPI) += hippi/
- obj-$(CONFIG_HAMRADIO) += hamradio/
- obj-$(CONFIG_IRDA) += irda/
projects / openwrt / staging / zorun.git / commitdiff