net: npcm: add NPCM7xx EMC
Subsystems (3)
Tomer Maimon
maintainercover net: npcm: add NPCM7xx EMC
This patch set adds Ethernet MAC controller support for the Nuvoton NPCM7xx Baseboard Management Controller (BMC).
The NPCM750x contain two Ethernet MAC Controllers (10/100) for WAN/LAN applications
Tomer Maimon (2):
dt-binding: net: document NPCM7xx EMC DT bindings
net: npcm: add NPCM7xx Ethernet MAC controller
.../bindings/net/nuvoton,npcm7xx-emc.txt | 24 + drivers/net/ethernet/nuvoton/Kconfig | 23 +- drivers/net/ethernet/nuvoton/Makefile | 2 + drivers/net/ethernet/nuvoton/npcm7xx_emc.c | 2248 ++++++++++++++++++++ 4 files changed, 2296 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/net/nuvoton,npcm7xx-emc.txt create mode 100644 drivers/net/ethernet/nuvoton/npcm7xx_emc.c
Signature · 1 line
2.14.1
Tomer Maimon
maintainerPATCH 1/2 dt-binding: net: document NPCM7xx EMC DT bindings
Added device tree binding documentation for
Nuvoton NPCM7xx Ethernet MAC Controller (EMC).
Signed-off-by Tomer Maimon <[email protected]>
--- .../bindings/net/nuvoton,npcm7xx-emc.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/nuvoton,npcm7xx-emc.txt
Documentation/devicetree/bindings/net/nuvoton,npcm7xx-emc.txt new file +24 -0
@@ -0,0 +1,24 @@ +Nuvoton NPCM7XX 10/100 Ethernet MAC Controller (EMC) + +The NPCM750x provides two identical Ethernet MAC Controllers +for WAN/LAN applications + +Required properties: +- compatible : "nuvoton,npcm750-emc" for Poleg NPCM750. +- reg : Offset and length of the register set for the device. +- interrupts : Contain the emc interrupts with flags for falling edge. + first interrupt dedicated to Txirq + second interrupt dedicated to Rxirq +- clocks : phandle of emc reference clock. +- device_type : Should be "network" + +Example: + +emc0: eth@f0825000 { + device_type = "network"; + compatible = "nuvoton,npcm750-emc"; + reg = <0xf0825000 0x1000>; + interrupts = <0 16 4>, <0 15 4>; + clocks = <&clk NPCM7XX_CLK_EMC>; +}; +
Signature · 1 line
2.14.1
Tomer Maimon
maintainerPATCH 2/2 net: npcm: add NPCM7xx Ethernet MAC controller
In reply to Tomer MaimonAdd Nuvoton BMC NPCM7xx Ethernet MAC
controller (EMC) driver.
Signed-off-by Tomer Maimon <[email protected]>
--- drivers/net/ethernet/nuvoton/Kconfig | 23 +- drivers/net/ethernet/nuvoton/Makefile | 2 + drivers/net/ethernet/nuvoton/npcm7xx_emc.c | 2248 ++++++++++++++++++++++++++++ 3 files changed, 2272 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/nuvoton/npcm7xx_emc.c
drivers/net/ethernet/nuvoton/Kconfig +22 -1
@@ -5,7 +5,7 @@ config NET_VENDOR_NUVOTON bool "Nuvoton devices" default y - depends on ARM && ARCH_W90X900 + depends on ARM && (ARCH_W90X900 || ARCH_NPCM7XX) ---help--- If you have a network (Ethernet) card belonging to this class, say Y.
@@ -25,4 +25,25 @@ config W90P910_ETH Say Y here if you want to use built-in Ethernet ports on w90p910 processor. +config NPCM7XX_EMC_ETH + bool "Nuvoton NPCM7XX Ethernet EMC" + depends on ARM && ARCH_NPCM7XX + select PHYLIB + select MII + ---help--- + Say Y here if you want to use built-in Ethernet MAC + on NPCM750 MCU. + +config NPCM7XX_EMC_ETH_DEBUG + bool "Nuvoton NPCM7XX Ethernet EMC debug" + depends on NPCM7XX_EMC_ETH + ---help--- + Say Y here if you want debug info via /proc/driver/npcm7xx_emc.x + +config NPCM7XX_EMC_ETH_DEBUG_EXT + bool "Nuvoton NPCM7XX Ethernet EMC extra debug" + depends on NPCM7XX_EMC_ETH_DEBUG + ---help--- + Say Y here if you want extra debug info via /proc/driver/npcm7xx_emc.x + endif # NET_VENDOR_NUVOTON
drivers/net/ethernet/nuvoton/Makefile +2 -0
@@ -2,4 +2,6 @@ # Makefile for the Nuvoton network device drivers. # +#Eternet 10/100 EMC obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o +obj-$(CONFIG_NPCM7XX_EMC_ETH) += npcm7xx_emc.o
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +2248 -0
2,248 lines not on this page · raw message
Signature · 1 line
2.14.1
Re: [PATCH linux dev-4.13 v1 2/2] net: npcm: add NPCM7xx Ethernet MAC controller
Hi Tomer,
Quoted 2 lines · Tomer Maimon
Add Nuvoton BMC NPCM7xx Ethernet MAC
controller (EMC) driver.
I've made some comments about the coding style and a few other things. I'm new to the network driver part of the kernel, so I've cc'd Ben to offer advice there.
I suggest you follow the suggestions I made and then submit to the upstream list, pending Ben's suggestions.
Quoted 112 lines
Signed-off-by Tomer Maimon <[email protected]>--- drivers/net/ethernet/nuvoton/Kconfig | 23 +- drivers/net/ethernet/nuvoton/Makefile | 2 + drivers/net/ethernet/nuvoton/npcm7xx_emc.c | 2248 ++++++++++++++++++++++++++++ 3 files changed, 2272 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/nuvoton/npcm7xx_emc.cdrivers/net/ethernet/nuvoton/Kconfig +22
-1@@ -5,7 +5,7 @@ config NET_VENDOR_NUVOTON bool "Nuvoton devices" default y - depends on ARM && ARCH_W90X900 + depends on ARM && (ARCH_W90X900 || ARCH_NPCM7XX) ---help--- If you have a network (Ethernet) card belonging to this class, say Y.@@ -25,4 +25,25 @@ config W90P910_ETH Say Y here if you want to use built-in Ethernet ports on w90p910 processor. +config NPCM7XX_EMC_ETH + bool "Nuvoton NPCM7XX Ethernet EMC" + depends on ARM && ARCH_NPCM7XX + select PHYLIB + select MII + ---help--- + Say Y here if you want to use built-in Ethernet MAC + on NPCM750 MCU. + +config NPCM7XX_EMC_ETH_DEBUG + bool "Nuvoton NPCM7XX Ethernet EMC debug" + depends on NPCM7XX_EMC_ETH + ---help--- + Say Y here if you want debug info via /proc/driver/npcm7xx_emc.x + +config NPCM7XX_EMC_ETH_DEBUG_EXT + bool "Nuvoton NPCM7XX Ethernet EMC extra debug" + depends on NPCM7XX_EMC_ETH_DEBUG + ---help--- + Say Y here if you want extra debug info via /proc/driver/npcm7xx_emc.x + endif # NET_VENDOR_NUVOTONdrivers/net/ethernet/nuvoton/Makefile +2
-0@@ -2,4 +2,6 @@ # Makefile for the Nuvoton network device drivers. # +#Eternet 10/100 EMC obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o +obj-$(CONFIG_NPCM7XX_EMC_ETH) += npcm7xx_emc.odrivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +47
-0@@ -0,0 +1,2248 @@ +/* +* Copyright (c) 2014-2017 Nuvoton Technology corporation. +* +* Released under the GPLv2 only. +* SPDX-License-Identifier: GPL-2.0 +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/mii.h> +#include <linux/phy.h> +#include <linux/netdevice.h> +#include <linux/etherdevice.h> +#include <linux/skbuff.h> +#include <linux/ethtool.h> +#include <linux/platform_device.h> +#include <linux/gfp.h> +#include <linux/kthread.h> +#include <linux/interrupt.h> +#include <linux/spinlock.h> +#include <linux/ctype.h> +#include <linux/proc_fs.h> +#include <linux/clk.h> + +#include <linux/of.h> +#include <linux/of_net.h> +#include <linux/of_device.h> +#include <linux/dma-mapping.h> + +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> + +#include <linux/if_ether.h> + +static struct regmap *gcr_regmap; + +#define MFSEL1_OFFSET 0x00C +#define MFSEL3_OFFSET 0x064 +#define INTCR_OFFSET 0x03C + +static struct regmap *rst_regmap; + +#define IPSRST1_OFFSET 0x020 + +#define DRV_MODULE_NAME "npcm7xx-emc" +#define DRV_MODULE_VERSION "3.87" +
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 57
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+//#define CONFIG_NPCM7XX_EMC_ETH_DEBUG +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG + #define dev_err(a, f, x...) pr_err("NPCM7XX-EMC: %s() dev_err:" \ + f, __func__, ## x) + #define EMC_DEBUG(f, x...) pr_info("NPCM7XX-EMC: %s():%s " f, \ + __func__, ether->ndev->name, \ + ## x) +#else + #define EMC_DEBUG(f, x...) +#endif
Remove this. Please use drv_dbg, drv_err, drv_info, etc.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 61
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +4
-0+ + +/* Ethernet MAC Registers */ +#define REG_CAMCMR (ether->reg + 0x00)
use:
#define REG_FOO 0x00
And do the readl(ether->reg + REG_FOO) at the call site.
Quoted 39 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +39
-0+#define REG_CAMEN (ether->reg + 0x04) +#define REG_CAMM_BASE (ether->reg + 0x08) +#define REG_CAML_BASE (ether->reg + 0x0c) +#define REG_TXDLSA (ether->reg + 0x88) +#define REG_RXDLSA (ether->reg + 0x8C) +#define REG_MCMDR (ether->reg + 0x90) +#define REG_MIID (ether->reg + 0x94) +#define REG_MIIDA (ether->reg + 0x98) +#define REG_FFTCR (ether->reg + 0x9C) +#define REG_TSDR (ether->reg + 0xa0) +#define REG_RSDR (ether->reg + 0xa4) +#define REG_DMARFC (ether->reg + 0xa8) +#define REG_MIEN (ether->reg + 0xac) +#define REG_MISTA (ether->reg + 0xb0) +#define REG_MGSTA (ether->reg + 0xb4) +#define REG_MPCNT (ether->reg + 0xb8) +#define REG_MRPC (ether->reg + 0xbc) +#define REG_MRPCC (ether->reg + 0xc0) +#define REG_MREPC (ether->reg + 0xc4) +#define REG_DMARFS (ether->reg + 0xc8) +#define REG_CTXDSA (ether->reg + 0xcc) +#define REG_CTXBSA (ether->reg + 0xd0) +#define REG_CRXDSA (ether->reg + 0xd4) +#define REG_CRXBSA (ether->reg + 0xd8) + +/* EMC Diagnostic Registers */ +#define REG_RXFSM (ether->reg + 0x200) +#define REG_TXFSM (ether->reg + 0x204) +#define REG_FSM0 (ether->reg + 0x208) +#define REG_FSM1 (ether->reg + 0x20c) +#define REG_DCR (ether->reg + 0x210) +#define REG_DMMIR (ether->reg + 0x214) +#define REG_BISTR (ether->reg + 0x300) + +/* mac controller bit */ +#define MCMDR_RXON (0x01 << 0) +#define MCMDR_ALP (0x01 << 1) +#define MCMDR_ACP (0x01 << 3) +#define MCMDR_SPCRC (0x01 << 5)
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 110
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+#define MCMDR_TXON (0x01 << 8) +#define MCMDR_NDEF (0x01 << 9) +#define MCMDR_FDUP (0x01 << 18) +#define MCMDR_ENMDC (0x01 << 19) +#define MCMDR_OPMOD (0x01 << 20) +#define SWR (0x01 << 24) + +/* cam command regiser */ +#define CAMCMR_AUP 0x01 +#define CAMCMR_AMP (0x01 << 1)
BIT(1)
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 111
Quoted 1 line
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +1
-0+#define CAMCMR_ABP (0x01 << 2)
BIT(2)
etc.
Quoted 99 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +99
-0+#define CAMCMR_CCAM (0x01 << 3) +#define CAMCMR_ECMP (0x01 << 4) +#define CAM0EN 0x01 + +/* mac mii controller bit */ +#define MDCON (0x01 << 19) +#define PHYAD (0x01 << 8) +#define PHYWR (0x01 << 16) +#define PHYBUSY (0x01 << 17) +#define PHYPRESP (0x01 << 18) +#define CAM_ENTRY_SIZE 0x08 + +/* rx and tx status */ +#define TXDS_TXCP (0x01 << 19) +#define RXDS_CRCE (0x01 << 17) +#define RXDS_PTLE (0x01 << 19) +#define RXDS_RXGD (0x01 << 20) +#define RXDS_ALIE (0x01 << 21) +#define RXDS_RP (0x01 << 22) + +/* mac interrupt status*/ +#define MISTA_RXINTR (0x01 << 0) +#define MISTA_CRCE (0x01 << 1) +#define MISTA_RXOV (0x01 << 2) +#define MISTA_PTLE (0x01 << 3) +#define MISTA_RXGD (0x01 << 4) +#define MISTA_ALIE (0x01 << 5) +#define MISTA_RP (0x01 << 6) +#define MISTA_MMP (0x01 << 7) +#define MISTA_DFOI (0x01 << 8) +#define MISTA_DENI (0x01 << 9) +#define MISTA_RDU (0x01 << 10) +#define MISTA_RXBERR (0x01 << 11) +#define MISTA_CFR (0x01 << 14) +#define MISTA_TXINTR (0x01 << 16) +#define MISTA_TXEMP (0x01 << 17) +#define MISTA_TXCP (0x01 << 18) +#define MISTA_EXDEF (0x01 << 19) +#define MISTA_NCS (0x01 << 20) +#define MISTA_TXABT (0x01 << 21) +#define MISTA_LC (0x01 << 22) +#define MISTA_TDU (0x01 << 23) +#define MISTA_TXBERR (0x01 << 24) + +#define ENSTART 0x01 +#define ENRXINTR (0x01 << 0) +#define ENCRCE (0x01 << 1) +#define EMRXOV (0x01 << 2) +#define ENPTLE (0x01 << 3) +#define ENRXGD (0x01 << 4) +#define ENALIE (0x01 << 5) +#define ENRP (0x01 << 6) +#define ENMMP (0x01 << 7) +#define ENDFO (0x01 << 8) +#define ENDENI (0x01 << 9) +#define ENRDU (0x01 << 10) +#define ENRXBERR (0x01 << 11) +#define ENCFR (0x01 << 14) +#define ENTXINTR (0x01 << 16) +#define ENTXEMP (0x01 << 17) +#define ENTXCP (0x01 << 18) +#define ENTXDEF (0x01 << 19) +#define ENNCS (0x01 << 20) +#define ENTXABT (0x01 << 21) +#define ENLC (0x01 << 22) +#define ENTDU (0x01 << 23) +#define ENTXBERR (0x01 << 24) + +/* rx and tx owner bit */ +#define RX_OWEN_DMA (0x01 << 31) +#define RX_OWEN_CPU (~(0x03 << 30)) +#define TX_OWEN_DMA (0x01 << 31) +#define TX_OWEN_CPU (~(0x01 << 31)) + +/* tx frame desc controller bit */ +#define MACTXINTEN 0x04 +#define CRCMODE 0x02 +#define PADDINGMODE 0x01 + +/* fftcr controller bit */ +#define RXTHD (0x03 << 0) +#define TXTHD (0x02 << 8) +#define BLENGTH (0x02 << 20) + +/* global setting for driver */ +#define RX_DESC_SIZE 128 +#define TX_DESC_SIZE 64 +#define MAX_RBUFF_SZ 0x600 +#define MAX_TBUFF_SZ 0x600 +#define TX_TIMEOUT 50 +#define DELAY 1000 +#define CAM0 0x0 +#define RX_POLL_SIZE 16 + +#ifdef CONFIG_VLAN_8021Q +#define VLAN_SUPPORT +#endif + +#ifdef VLAN_SUPPORT
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 220
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+#define MAX_PACKET_SIZE 1518 +#define MAX_PACKET_SIZE_W_CRC (MAX_PACKET_SIZE + 4) // 1522 +#else +#define MAX_PACKET_SIZE 1514 +#define MAX_PACKET_SIZE_W_CRC (MAX_PACKET_SIZE + 4) // 1518 +#endif +#define MII_TIMEOUT 100 + + +#define ETH_TRIGGER_RX do { __raw_writel(ENSTART, REG_RSDR); } while (0)
Get rid of these macros.
Quoted 92 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +92
-0+#define ETH_TRIGGER_TX do { __raw_writel(ENSTART, REG_TSDR); } while (0) +#define ETH_ENABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_ENABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_RXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_RXON, REG_MCMDR); } while (0) + +struct plat_npcm7xx_emc_data { +char *phy_bus_name; +int phy_addr; +unsigned char mac_addr[ETH_ALEN ]; +}; + +struct npcm7xx_rxbd { +unsigned int sl; +unsigned int buffer; +unsigned int reserved; +unsigned int next; +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff; +unsigned int ts; +unsigned int r2; +unsigned int r3; +#endif +}; + +struct npcm7xx_txbd { +unsigned int mode;/* Ownership bit and some other bits */ +unsigned int buffer;/* Transmit Buffer Starting Address */ +unsigned int sl;/* Transmit Byte Count and status bits */ +unsigned int next;/* Next Tx Descriptor Starting Address */ +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff; +unsigned int ts; +unsigned int t2; +unsigned int t3; +#endif +}; + + +struct npcm7xx_ether { +struct sk_buff *rx_skb[RX_DESC_SIZE ]; +struct sk_buff *tx_skb[TX_DESC_SIZE ]; +spinlock_t lock; +struct npcm7xx_rxbd *rdesc; +struct npcm7xx_txbd *tdesc; +dma_addr_t rdesc_phys; +dma_addr_t tdesc_phys; +struct net_device_stats stats; +struct platform_device *pdev; +struct net_device *ndev; +struct resource *res; +//struct sk_buff *skb; +unsigned int msg_enable; +struct mii_bus *mii_bus; +struct phy_device *phy_dev; +struct napi_struct napi; +void __iomem *reg; +int rxirq; +int txirq; +unsigned int cur_tx; +unsigned int cur_rx; +unsigned int finish_tx; +unsigned int pending_tx; +unsigned int start_tx_ptr; +unsigned int start_rx_ptr; +unsigned int rx_berr; +unsigned int rx_err; +unsigned int rdu; +unsigned int rxov; +unsigned int camcmr; +unsigned int rx_stuck; +int link; +int speed; +int duplex; +int need_reset; +char *dump_buf; + +// debug counters +unsigned int max_waiting_rx; +unsigned int rx_count_pool; +unsigned int count_xmit; +unsigned int rx_int_count; +unsigned int rx_err_count; +unsigned int tx_int_count; +unsigned int tx_tdu; +unsigned int tx_tdu_i; +unsigned int tx_cp_i; +unsigned int count_finish;
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 322
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+}; + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev); +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev); +#endif +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +void npcm7xx_clk_GetTimeStamp (u32 time_quad[2 ]); +#endif
Avoid forward declarations where you can.
Quoted 57 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +57
-0+ +static void adjust_link (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +unsigned int val; +bool status_change = false; +unsigned long flags; + +// clear GPIO interrupt status whihc indicates PHY statu change? + +spin_lock_irqsave (ðer->lock, flags); + +if (phydev->link) { +if ((ether->speed != phydev->speed) || + (ether->duplex != phydev->duplex)) { + ether->speed = phydev->speed; + ether->duplex = phydev->duplex; + status_change = true; + } + }else { + ether->speed =0 ; + ether->duplex =-1 ; + } + +if (phydev->link != ether->link) { + + ether->link = phydev->link; + + status_change = true; + } + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status_change) { + + val =__raw_readl (REG_MCMDR ); + +if (ether->speed ==100 ) + val |=MCMDR_OPMOD ; +else + val &= ~MCMDR_OPMOD ; + +if (ether->duplex ==DUPLEX_FULL ) + val |=MCMDR_FDUP ; +else + val &= ~MCMDR_FDUP ; + +__raw_writel (val,REG_MCMDR ); + } +} + + + +static void npcm7xx_write_cam (struct net_device *dev, +unsigned int x,unsigned char *pval) +{
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 389
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int msw, lsw; + + msw = (pval[0 ] <<24 ) | (pval[1 ] <<16 ) | (pval[2 ] <<8 ) | pval[3 ]; + + lsw = (pval[4 ] <<24 ) | (pval[5 ] <<16 ); + +__raw_writel (lsw,REG_CAML_BASE + x *CAM_ENTRY_SIZE ); +__raw_writel (msw,REG_CAMM_BASE + x *CAM_ENTRY_SIZE ); +//EMC_DEBUG("REG_CAML_BASE = 0x%08X REG_CAMH_BASE = 0x%08X", lsw, msw);
Delete commented out code before submitting.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 349
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+} + +
Whitespace.
Quoted 125 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +125
-0+static struct sk_buff *get_new_skb (struct net_device *dev,u32 i) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct sk_buff *skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (skb ==NULL ) +return NULL ; + +/* Do not unmark the following skb_reserve() Receive Buffer Starting +* Address must be aligned to 4 bytes and the following line +* if unmarked will make it align to 2 and this likely will +* hult the RX and crash the linux skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + (ether->rdesc + i)->buffer =dma_map_single (&dev->dev, skb->data, +roundup ( +MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); + ether->rx_skb[i] = skb; + +return skb; +} + +static int npcm7xx_init_desc (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +struct npcm7xx_txbd *tdesc; +struct npcm7xx_rxbd *rdesc; +struct platform_device *pdev; +unsigned int i; + + ether =netdev_priv (dev); + pdev = ether->pdev; + +if (ether->tdesc ==NULL ) { + ether->tdesc = (struct npcm7xx_txbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ðer->tdesc_phys, +GFP_KERNEL ); + +if (!ether->tdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"tx desc\n" ); +return -ENOMEM ; + } + } + +if (ether->rdesc ==NULL ) { + ether->rdesc = (struct npcm7xx_rxbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ðer->rdesc_phys, +GFP_KERNEL ); + +if (!ether->rdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"rx desc\n" ); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , ether->tdesc, + ether->tdesc_phys); + ether->tdesc =NULL ; +return -ENOMEM ; + } + } + +for (i =0 ; i <TX_DESC_SIZE ; i++) { +unsigned int offset; + + tdesc = (ether->tdesc + i); + +if (i ==TX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_txbd ) * (i +1 ); + + tdesc->next = ether->tdesc_phys + offset; + tdesc->buffer = (unsigned int )NULL ; + tdesc->sl =0 ; + tdesc->mode =0 ; + } + + ether->start_tx_ptr = ether->tdesc_phys; + +for (i =0 ; i <RX_DESC_SIZE ; i++) { +unsigned int offset; + + rdesc = (ether->rdesc + i); + +if (i ==RX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_rxbd ) * (i +1 ); + + rdesc->next = ether->rdesc_phys + offset; + rdesc->sl =RX_OWEN_DMA ; + +if (get_new_skb (dev, i) ==NULL ) { +dev_err (&pdev->dev,"get_new_skb() failed\n" ); + +for (; i !=0 ; i--) { +dma_unmap_single (&dev->dev, (dma_addr_t) + ((ether->rdesc + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); +dev_kfree_skb_any (ether->rx_skb[i]); + ether->rx_skb[i] =NULL ; + } + +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + +return -ENOMEM ; + } + }
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 527
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ + ether->start_rx_ptr = ether->rdesc_phys; +wmb (); +for (i =0 ; i <TX_DESC_SIZE ; i++) + ether->tx_skb[i] =NULL ; + +return 0 ; +} + +// This API must call with Tx/Rx stopped
C style comments /* foo */
Quoted 180 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +180
-0+static void npcm7xx_free_desc (struct net_device *dev,bool free_also_descriptors) +{ +struct sk_buff *skb; +u32 i; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; + +for (i =0 ; i <TX_DESC_SIZE ; i++) { + skb = ether->tx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->tdesc + + i)->buffer), + skb->len,DMA_TO_DEVICE ); +dev_kfree_skb_any (skb); + ether->tx_skb[i] =NULL ; + } + } + +for (i =0 ; i <RX_DESC_SIZE ; i++) { + skb = ether->rx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->rdesc + + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); +dev_kfree_skb_any (skb); + ether->rx_skb[i] =NULL ; + } + } + +if (free_also_descriptors) { +if (ether->tdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); + ether->tdesc =NULL ; + +if (ether->rdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + ether->rdesc =NULL ; + } + +} + +static void npcm7xx_set_fifo_threshold (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =RXTHD |TXTHD |BLENGTH ; +__raw_writel (val,REG_FFTCR ); +} + +static void npcm7xx_return_default_idle (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; +unsigned int saved_bits; + + val =__raw_readl (REG_MCMDR ); + saved_bits = val & (MCMDR_FDUP |MCMDR_OPMOD ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + val |=SWR ; +__raw_writel (val,REG_MCMDR ); + +/* During the EMC reset the AHB will read 0 from all registers, +* so in order to see if the reset finished we can't count on +* REG_MCMDR.SWR to become 0, instead we read another +* register that its reset value is not 0, we choos REG_FFTCR. +*/ +do { + val =__raw_readl (REG_FFTCR ); + }while (val ==0 ); + +// Now we can verify if REG_MCMDR.SWR became 0 (probably it will be 0 on the first read). +do { + val =__raw_readl (REG_MCMDR ); + }while (val &SWR ); + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); +// restore values +__raw_writel (saved_bits,REG_MCMDR ); +} + + +static void npcm7xx_enable_mac_interrupt (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val = ENRXINTR | // Start of RX interrupts + ENCRCE | + EMRXOV | +#ifndef VLAN_SUPPORT +ENPTLE |// Since we don't support VLAN we want interrupt on long packets +#endif +ENRXGD | +ENALIE | +ENRP | +ENMMP | +ENDFO | +/* ENDENI | */ // We don't need interrupt on DMA Early Notification +ENRDU |// We don't need interrupt on Receive Descriptor Unavailable Interrupt +ENRXBERR | +/* ENCFR | */ +ENTXINTR |// Start of TX interrupts +ENTXEMP | +ENTXCP | +ENTXDEF | +ENNCS | +ENTXABT | +ENLC | +/* ENTDU | */ // We don't need interrupt on Transmit Descriptor Unavailable at start of operation +ENTXBERR ; +__raw_writel (val,REG_MIEN ); +} + +static void npcm7xx_get_and_clear_int (struct net_device *dev, +unsigned int *val,unsigned int mask) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + *val =__raw_readl (REG_MISTA ) & mask; +__raw_writel (*val,REG_MISTA ); +} + +static void npcm7xx_set_global_maccmd (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =__raw_readl (REG_MCMDR ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + + val |=MCMDR_SPCRC |MCMDR_ENMDC |MCMDR_ACP |MCMDR_NDEF ; +#ifdef VLAN_SUPPORT +// we set ALP accept long packets since VLAN packets are 4 bytes longer than 1518 + val |=MCMDR_ALP ; +// limit receive length to 1522 bytes due to VLAN +__raw_writel (MAX_PACKET_SIZE_W_CRC ,REG_DMARFC ); +#endif +__raw_writel (val,REG_MCMDR ); +} + +static void npcm7xx_enable_cam (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + + val =__raw_readl (REG_CAMEN ); + val |=CAM0EN ; +__raw_writel (val,REG_CAMEN ); +} + + +static void npcm7xx_set_curdest (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +__raw_writel (ether->start_rx_ptr,REG_RXDLSA ); +__raw_writel (ether->start_tx_ptr,REG_TXDLSA ); +} + +static void npcm7xx_reset_mac (struct net_device *dev,int need_free) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +netif_tx_lock (dev); + +ETH_DISABLE_TX ; +ETH_DISABLE_RX ; + +npcm7xx_return_default_idle (dev); +npcm7xx_set_fifo_threshold (dev);
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 717
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +/*if (!netif_queue_stopped(dev)) +netif_stop_queue(dev);*/ + +if (need_free) +npcm7xx_free_desc (dev, false); + +npcm7xx_init_desc (dev); + +//dev->trans_start = jiffies; /* prevent tx timeout */
Remove commented out code.
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+ ether->cur_tx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; + +npcm7xx_set_curdest (dev); +npcm7xx_enable_cam (dev); +npcm7xx_ether_set_multicast_list (dev); +npcm7xx_enable_mac_interrupt (dev); +npcm7xx_set_global_maccmd (dev); +ETH_ENABLE_TX ;
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 741
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ETH_ENABLE_RX ; + +ETH_TRIGGER_RX ; + +//dev->trans_start = jiffies; /* prevent tx timeout */ + +/*if (netif_queue_stopped(dev)) +netif_wake_queue(dev);*/ + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", __raw_readl(REG_MCMDR));
Remove this.
Quoted 372 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +372
-0+ + ether->need_reset =0 ; + +netif_wake_queue (dev); +netif_tx_unlock (dev); +} + +static int npcm7xx_mdio_write (struct mii_bus *bus,int phy_id,int regnum, +u16 value) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + +__raw_writel (value,REG_MIID ); +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY |PHYWR ,REG_MIIDA ); + + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return 0 ; + +} + +static int npcm7xx_mdio_read (struct mii_bus *bus,int phy_id,int regnum) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + + +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY ,REG_MIIDA ); + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return __raw_readl (REG_MIID ); +} + +static int npcm7xx_mdio_reset (struct mii_bus *bus) +{ + +// reser ENAC engine?? +return 0 ; +} + +static int npcm7xx_set_mac_address (struct net_device *dev,void *addr) +{ +struct sockaddr *address = addr; + +if (!is_valid_ether_addr ((u8 *)address->sa_data)) +return -EADDRNOTAVAIL ; + +memcpy (dev->dev_addr, address->sa_data, dev->addr_len); +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + +return 0 ; +} + +static int npcm7xx_ether_close (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +if (ether->phy_dev) +phy_stop (ether->phy_dev); + +npcm7xx_return_default_idle (dev); + +msleep (10 ); + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +netif_stop_queue (dev); +napi_disable (ðer->napi); + +npcm7xx_free_desc (dev, true); + +if (ether->dump_buf) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static struct net_device_stats *npcm7xx_ether_stats (struct net_device *dev) +{ +struct npcm7xx_ether *ether; + + ether =netdev_priv (dev); + +return ðer->stats; +} + + +static int npcm7xx_clean_tx (struct net_device *dev,bool from_xmit) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct sk_buff *s; +unsigned int cur_entry, entry, sl; + +if (ether->pending_tx ==0 ) +return (0 ); + + cur_entry =__raw_readl (REG_CTXDSA ); + +// Release old used buffers + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + +while (entry != cur_entry) { + txbd = (ether->tdesc + ether->finish_tx); + s = ether->tx_skb[ether->finish_tx]; +if (s ==NULL ) +break ; + + ether->count_finish++; + +dma_unmap_single (&dev->dev, txbd->buffer, s->len, +DMA_TO_DEVICE ); +consume_skb (s); + ether->tx_skb[ether->finish_tx] =NULL ; + +if (++ether->finish_tx >=TX_DESC_SIZE ) + ether->finish_tx =0 ; + ether->pending_tx--; + + sl = txbd->sl; +if (sl &TXDS_TXCP ) { + ether->stats.tx_packets++; + ether->stats.tx_bytes += (sl &0xFFFF ); + }else { + ether->stats.tx_errors++; + } + + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + } + +if (!from_xmit &&unlikely (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 )) { +netif_tx_lock (dev); +if (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 ) { +netif_wake_queue (dev); + } +netif_tx_unlock (dev); + } + +return (0 ); +} + +static int npcm7xx_ether_start_xmit (struct sk_buff *skb,struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +unsigned long flags; + +/* This is a hard error log it. */ +if (ether->pending_tx >= (TX_DESC_SIZE -1 )) { +dev_err (ðer->pdev->dev,"%s: BUG! Tx Ring full when queue " +"awake!\n" , dev->name); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +netif_stop_queue (dev); +return NETDEV_TX_BUSY ; + } + + ether->count_xmit++; + +// Insert new buffer + + txbd = (ether->tdesc + ether->cur_tx); + + txbd->buffer =dma_map_single (&dev->dev, skb->data, + skb->len,DMA_TO_DEVICE ); + + ether->tx_skb[ether->cur_tx] = skb; + +if (skb->len >MAX_PACKET_SIZE ) +dev_err (ðer->pdev->dev,"skb->len (= %d) > MAX_PACKET_SIZE " +"(= %d)\n" , skb->len, +MAX_PACKET_SIZE ); + + txbd->sl = skb->len >MAX_PACKET_SIZE ?MAX_PACKET_SIZE : skb->len; +wmb (); + + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE ; +wmb (); + +ETH_TRIGGER_TX ; + +if (++ether->cur_tx >=TX_DESC_SIZE ) + ether->cur_tx =0 ; +spin_lock_irqsave (ðer->lock, flags); + ether->pending_tx++; + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +//spin_lock_irqsave(ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +//pin_unlock_irqrestore(ðer->lock, flags); + txbd->diff = (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + txbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + txbd->t2 =__raw_readl (REG_MISTA ); + txbd->t3 =__raw_readl (REG_MIEN ); + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ]; + } +#endif + +npcm7xx_clean_tx (dev, true); + +if (ether->pending_tx >=TX_DESC_SIZE -1 ) { +unsigned int reg_mien; +unsigned int index_to_wake = ether->cur_tx + (TX_DESC_SIZE *3 /4 ); + +if (index_to_wake >=TX_DESC_SIZE ) + index_to_wake -=TX_DESC_SIZE ; + + txbd = (ether->tdesc + index_to_wake); + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE |MACTXINTEN ; +wmb (); + +__raw_writel (MISTA_TDU ,REG_MISTA );// Clear TDU interrupt + reg_mien =__raw_readl (REG_MIEN ); + +if (reg_mien !=0 ) +__raw_writel (reg_mien |ENTDU ,REG_MIEN );// Enable TDU interrupt + + ether->tx_tdu++; +netif_stop_queue (dev); + } + +spin_unlock_irqrestore (ðer->lock, flags); + +return 0 ; +} + +static irqreturn_t npcm7xx_tx_interrupt (int irq,void *dev_id) +{ +struct npcm7xx_ether *ether; +struct platform_device *pdev; +struct net_device *dev; +unsigned int status; +unsigned long flags; + + dev = dev_id; + ether =netdev_priv (dev); + pdev = ether->pdev; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF0000 ); +spin_unlock_irqrestore (ðer->lock, flags); + + ether->tx_int_count++; + +if (status &MISTA_EXDEF ) +dev_err (&pdev->dev,"emc defer exceed interrupt status=0x%08X\n" + , status); +else if (status &MISTA_TXBERR ) { +dev_err (&pdev->dev,"emc bus error interrupt status=0x%08X\n" , + status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; + }else if (status & ~(MISTA_TXINTR |MISTA_TXCP |MISTA_TDU )) +dev_err (&pdev->dev,"emc other error interrupt status=0x%08X\n" , + status); + +// if we got MISTA_TXCP | MISTA_TDU remove those interrupt and call napi +if (status & (MISTA_TXCP |MISTA_TDU ) &__raw_readl (REG_MIEN )) { +unsigned int reg_mien; + +spin_lock_irqsave (ðer->lock, flags); + reg_mien =__raw_readl (REG_MIEN ); +if (reg_mien &ENTDU ) +__raw_writel (reg_mien & (~ENTDU ),REG_MIEN );// Disable TDU interrupt + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status &MISTA_TXCP ) + ether->tx_cp_i++; +if (status &MISTA_TDU ) + ether->tx_tdu_i++; + }else +EMC_DEBUG ("status=0x%08X\n" , status); + +napi_schedule (ðer->napi); + +return IRQ_HANDLED ; +} + +static int npcm7xx_poll (struct napi_struct *napi,int budget) +{ +struct npcm7xx_ether *ether = + container_of(napi, struct npcm7xx_ether, napi); +struct npcm7xx_rxbd *rxbd; +struct net_device *dev = ether->ndev; +struct platform_device *pdev = ether->pdev; +struct sk_buff *skb, *s; +unsigned int length, status; +unsigned long flags; +int rx_cnt =0 ; +int complete =0 ; +unsigned int rx_offset = (__raw_readl (REG_CRXDSA ) - + ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); +unsigned int local_count = (rx_offset >= ether->cur_rx) ? + rx_offset - ether->cur_rx : rx_offset + +RX_DESC_SIZE - ether->cur_rx; + +if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count; + +if (local_count > (4 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR ); + +if (local_count <= budget) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR ); + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_clean_tx (dev, false); +spin_unlock_irqrestore (ðer->lock, flags); + + rxbd = (ether->rdesc + ether->cur_rx); + +while (rx_cnt < budget) { + + status = rxbd->sl; +if ((status &RX_OWEN_DMA ) ==RX_OWEN_DMA ) { + complete =1 ; +break ; + } +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ];
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1123
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +spin_unlock_irqrestore (ðer->lock, flags); + rxbd->diff = ((rx_cnt+1 )<<28 ) + + (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + rxbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ];
This chunk needs reworking.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1130
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +7
-0+ } +#endif + rxbd->reserved = status;// for debug puposes we save the previous value + s = ether->rx_skb[ether->cur_rx]; + length = status &0xFFFF ; + +#ifdef VLAN_SUPPORT
Remove these guards.
Is there a reason you can't have vlan always enabled?
Quoted 415 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +415
-0+ if (likely((status & (RXDS_RXGD|RXDS_CRCE|RXDS_ALIE|RXDS_RP)) + == RXDS_RXGD) && likely(length <= MAX_PACKET_SIZE)) { +#else + if (likely((status & (RXDS_RXGD|RXDS_CRCE|RXDS_ALIE|RXDS_RP + |RXDS_PTLE)) == RXDS_RXGD) && + likely(length <= MAX_PACKET_SIZE)) { +#endif + dma_unmap_single(&dev->dev, (dma_addr_t)rxbd->buffer, + roundup(MAX_PACKET_SIZE_W_CRC, 4), + DMA_FROM_DEVICE); + + skb_put(s, length); + s->protocol = eth_type_trans(s, dev); + netif_receive_skb(s); + ether->stats.rx_packets++; + ether->stats.rx_bytes += length; + rx_cnt++; + ether->rx_count_pool++; + + // now we allocate new skb instead if the used one. + skb = dev_alloc_skb(roundup(MAX_PACKET_SIZE_W_CRC, 4)); + + if (!skb) { + dev_err(&pdev->dev, "get skb buffer error\n"); + ether->stats.rx_dropped++; + goto rx_out; + } + + /* Do not unmark the following skb_reserve() Receive + * Buffer Starting Address must be aligned + * to 4 bytes and the following line if unmarked + * will make it align to 2 and this likely + * will hult the RX and crash the linux + * skb_reserve(skb, NET_IP_ALIGN); + */ + skb->dev = dev; + + rxbd->buffer = dma_map_single(&dev->dev, skb->data, + roundup(MAX_PACKET_SIZE_W_CRC, 4), + DMA_FROM_DEVICE); + ether->rx_skb[ether->cur_rx] = skb; + } else { + ether->rx_err_count++; + ether->stats.rx_errors++; + EMC_DEBUG("rx_errors = %lu status = 0x%08X\n", + ether->stats.rx_errors, status); + + if (status & RXDS_RP) { + ether->stats.rx_length_errors++; + EMC_DEBUG("rx_length_errors = %lu\n", + ether->stats.rx_length_errors); + } else if (status & RXDS_CRCE) { + ether->stats.rx_crc_errors++; + EMC_DEBUG("rx_crc_errors = %lu\n", + ether->stats.rx_crc_errors); + } else if (status & RXDS_ALIE) { + ether->stats.rx_frame_errors++; + EMC_DEBUG("rx_frame_errors = %lu\n", + ether->stats.rx_frame_errors); + } +#ifndef VLAN_SUPPORT + else if (status & RXDS_PTLE) { + ether->stats.rx_length_errors++; + EMC_DEBUG("rx_length_errors = %lu\n", + ether->stats.rx_length_errors); + } +#endif + else if (length > MAX_PACKET_SIZE) { + ether->stats.rx_length_errors++; + EMC_DEBUG("rx_length_errors = %lu\n", + ether->stats.rx_length_errors); + } + } + + wmb(); + rxbd->sl = RX_OWEN_DMA; + wmb(); + + if (++ether->cur_rx >= RX_DESC_SIZE) + ether->cur_rx = 0; + + rxbd = (ether->rdesc + ether->cur_rx); + + } + + if (complete) { + napi_complete(napi); + + if (ether->need_reset) { + EMC_DEBUG("Reset\n"); + npcm7xx_reset_mac(dev, 1); + } + + spin_lock_irqsave(ðer->lock, flags); + __raw_writel(__raw_readl(REG_MIEN) | ENRXGD, REG_MIEN); + spin_unlock_irqrestore(ðer->lock, flags); + } else { + rx_offset = (__raw_readl(REG_CRXDSA)-ether->start_rx_ptr)/ + sizeof(struct npcm7xx_txbd); + local_count = (rx_offset >= ether->cur_rx) ? rx_offset - + ether->cur_rx : rx_offset + RX_DESC_SIZE - + ether->cur_rx; + + if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count; + + if (local_count > (3*RX_POLL_SIZE)) + // we are porbably in a storm of short packets and we don't want to get + // into RDU since short packets in RDU cause many RXOV which may cause + // EMC halt, so we filter out all comming packets + __raw_writel(0, REG_CAMCMR); + if (local_count <= RX_POLL_SIZE) + // we can restore accepting of packets + __raw_writel(ether->camcmr, REG_CAMCMR); + } +rx_out: + + ETH_TRIGGER_RX; + return rx_cnt; +} + +static irqreturn_t npcm7xx_rx_interrupt(int irq, void *dev_id) +{ + struct net_device *dev = (struct net_device *)dev_id; + struct npcm7xx_ether *ether = netdev_priv(dev); + struct platform_device *pdev = ether->pdev; + unsigned int status; + unsigned long flags; + unsigned int any_err = 0; + u32 RXFSM; + + spin_lock_irqsave(ðer->lock, flags); + npcm7xx_get_and_clear_int(dev, &status, 0xFFFF); + spin_unlock_irqrestore(ðer->lock, flags); + + ether->rx_int_count++; + + + if (unlikely(status & MISTA_RXBERR)) { + ether->rx_berr++; + dev_err(&pdev->dev, "emc rx bus error status=0x%08X\n", status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG + npcm7xx_info_print(dev); +#endif + spin_lock_irqsave(ðer->lock, flags); + __raw_writel(0, REG_MIEN); // disable any interrupt + spin_unlock_irqrestore(ðer->lock, flags); + ether->need_reset = 1; + napi_schedule(ðer->napi); + return IRQ_HANDLED; + } + + if (unlikely(status & (MISTA_RXOV | MISTA_RDU))) { + // filter out all received packets until we have enough avaiable buffer descriptors + __raw_writel(0, REG_CAMCMR); + any_err = 1; + if (status & (MISTA_RXOV)) + ether->rxov++; + if (status & (MISTA_RDU)) + ether->rdu++; + + // workaround Errata 1.36: EMC Hangs on receiving 253-256 byte packet + RXFSM = __raw_readl(REG_RXFSM); + + if ((RXFSM & 0xFFFFF000) == 0x08044000) { + int i; + for (i = 0; i < 32; i++) { + RXFSM = __raw_readl(REG_RXFSM); + if ((RXFSM & 0xFFFFF000) != 0x08044000) + break; + } + if (i == 32) { + ether->rx_stuck++; + spin_lock_irqsave(ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG + npcm7xx_info_print(dev); +#endif + __raw_writel(0, REG_MIEN); + spin_unlock_irqrestore(ðer->lock, flags); + ether->need_reset = 1; + napi_schedule(ðer->napi); + dev_err(&pdev->dev, "stuck on REG_RXFSM = " + "0x%08X status=%08X doing " + "reset!\n", RXFSM, status); + return IRQ_HANDLED; + } + } + } + + // echo MISTA status on unexpected flags although we don't do anithing with them + if (unlikely(status & ( + // MISTA_RXINTR | // Receive - all RX interrupt set this + MISTA_CRCE | // CRC Error + // MISTA_RXOV | // Receive FIFO Overflow - we alread handled it +#ifndef VLAN_SUPPORT + MISTA_PTLE | // Packet Too Long is needed since VLAN is not supported +#endif + // MISTA_RXGD | // Receive Good - this is the common good case + MISTA_ALIE | // Alignment Error + MISTA_RP | // Runt Packet + MISTA_MMP | // More Missed Packet + MISTA_DFOI | // Maximum Frame Length + // MISTA_DENI | // DMA Early Notification - every packet get this + // MISTA_RDU | // Receive Descriptor Unavailable + // MISTA_RXBERR | // Receive Bus Error Interrupt - we alread handled it + // MISTA_CFR | // Control Frame Receive - not an error + 0))) { + EMC_DEBUG("emc rx MISTA status=0x%08X\n", status); + any_err = 1; + ether->rx_err++; + } + + if ((any_err == 0) && ((status & MISTA_RXGD) == 0)) + dev_err(&pdev->dev, "emc rx MISTA status=0x%08X\n", status); + + spin_lock_irqsave(ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { + struct npcm7xx_rxbd *rxbd = (ether->rdesc + ether->cur_rx); + static u32 last_iUsCnt1[2] = {0}; + u32 iUsCnt2[2]; + + npcm7xx_clk_GetTimeStamp(iUsCnt2); + /* rxbd->r2 = (_1MHz_ * (iUsCnt2[1] - last_iUsCnt1[1])) + + *iUsCnt2[0]/25 - last_iUsCnt1[0]/25; + */ + rxbd->r2 = status; + rxbd->r3 = (_1MHz_ * iUsCnt2[1]) + iUsCnt2[0]/25; + last_iUsCnt1[0] = iUsCnt2[0]; + last_iUsCnt1[1] = iUsCnt2[1]; + } +#endif + __raw_writel(__raw_readl(REG_MIEN) & ~ENRXGD, REG_MIEN); + spin_unlock_irqrestore(ðer->lock, flags); + napi_schedule(ðer->napi); + + return IRQ_HANDLED; +} + + +static int npcm7xx_ether_open(struct net_device *dev) +{ + struct npcm7xx_ether *ether; + struct platform_device *pdev; + + ether = netdev_priv(dev); + pdev = ether->pdev; + + ether->need_reset = 1; + npcm7xx_reset_mac(dev, 0); + + if (request_irq(ether->txirq, npcm7xx_tx_interrupt, + 0x0, pdev->name, dev)) { + dev_err(&pdev->dev, "register irq tx failed\n"); + return -EAGAIN; + } + + if (request_irq(ether->rxirq, npcm7xx_rx_interrupt, + 0x0, pdev->name, dev)) { + dev_err(&pdev->dev, "register irq rx failed\n"); + free_irq(ether->txirq, dev); + return -EAGAIN; + } + + if (ether->phy_dev) + phy_start(ether->phy_dev); + + netif_start_queue(dev); + napi_enable(ðer->napi); + + ETH_TRIGGER_RX; + + dev_info(&pdev->dev, "%s is OPENED\n", dev->name); + + return 0; +} + +static void npcm7xx_ether_set_multicast_list(struct net_device *dev) +{ + struct npcm7xx_ether *ether; + unsigned int rx_mode; + + ether = netdev_priv(dev); + + EMC_DEBUG("%s CAMCMR_AUP\n", (dev->flags & IFF_PROMISC) ? + "Set" : "Clear"); + if (dev->flags & IFF_PROMISC) + rx_mode = CAMCMR_AUP | CAMCMR_AMP | CAMCMR_ABP | CAMCMR_ECMP; + else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) + rx_mode = CAMCMR_AMP | CAMCMR_ABP | CAMCMR_ECMP; + else + rx_mode = CAMCMR_ECMP | CAMCMR_ABP; + __raw_writel(rx_mode, REG_CAMCMR); + ether->camcmr = rx_mode; +} + +static int npcm7xx_ether_ioctl(struct net_device *dev, + struct ifreq *ifr, int cmd) +{ + struct npcm7xx_ether *ether = netdev_priv(dev); + struct phy_device *phydev = ether->phy_dev; + + if (!netif_running(dev)) + return -EINVAL; + + if (!phydev) + return -ENODEV; + + return phy_mii_ioctl(phydev, ifr, cmd); +} + +static void npcm7xx_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info) +{ + strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver)); + strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version)); + strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strlcpy(info->bus_info, "N/A", sizeof(info->bus_info)); +} + +static int npcm7xx_get_settings(struct net_device *dev, + struct ethtool_link_ksettings *cmd) +{ + struct npcm7xx_ether *ether = netdev_priv(dev); + struct phy_device *phydev = ether->phy_dev; + + if (phydev == NULL) + return -ENODEV; + + pr_info("\n\nnpcm7xx_get_settings\n"); + phy_ethtool_ksettings_get(phydev, cmd); + + return 0; +} + +static int npcm7xx_set_settings(struct net_device *dev, + const struct ethtool_link_ksettings *cmd) +{ + struct npcm7xx_ether *ether = netdev_priv(dev); + struct phy_device *phydev = ether->phy_dev; + int ret; + unsigned long flags; + + if (phydev == NULL) + return -ENODEV; + + pr_info("\n\nnpcm7xx_set_settings\n"); + spin_lock_irqsave(ðer->lock, flags); + ret = phy_ethtool_ksettings_set(phydev, cmd); + spin_unlock_irqrestore(ðer->lock, flags); + + return ret; +} + +static u32 npcm7xx_get_msglevel(struct net_device *dev) +{ + struct npcm7xx_ether *ether = netdev_priv(dev); + + return ether->msg_enable; +} + +static void npcm7xx_set_msglevel(struct net_device *dev, u32 level) +{ + struct npcm7xx_ether *ether = netdev_priv(dev); + + ether->msg_enable = level; +} + +static const struct ethtool_ops npcm7xx_ether_ethtool_ops = { + .get_link_ksettings = npcm7xx_get_settings, + .set_link_ksettings = npcm7xx_set_settings, + .get_drvinfo = npcm7xx_get_drvinfo, + .get_msglevel = npcm7xx_get_msglevel, + .set_msglevel = npcm7xx_set_msglevel, + .get_link = ethtool_op_get_link, +}; + +static const struct net_device_ops npcm7xx_ether_netdev_ops = { + .ndo_open = npcm7xx_ether_open, + .ndo_stop = npcm7xx_ether_close, + .ndo_start_xmit = npcm7xx_ether_start_xmit, + .ndo_get_stats = npcm7xx_ether_stats, + .ndo_set_rx_mode = npcm7xx_ether_set_multicast_list, + .ndo_set_mac_address = npcm7xx_set_mac_address, + .ndo_do_ioctl = npcm7xx_ether_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +}; + +#ifndef CONFIG_OF +static unsigned char char2hex(unsigned char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + + return 0; +} + +static void _mac_setup(char *line, u8 *mac) +{ + int i; + + for (i = 0; i < 6; i++) + mac[i] = (char2hex(line[i*3])<<4) + char2hex(line[i*3+1]); +} + +static int find_option(char *str, char *mac) +{ + extern char *saved_command_line; + char *p; +
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1555
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ p = strstr(saved_command_line, str) + +if (!p) +return 0 ; + + p +=strlen (str); +_mac_setup (p, mac); + +return 1 ; +}
These above options can be done with common helpers. Take a look at another driver such as the ftgmac100.c.
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#endif + +static void get_mac_address (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; +struct device_node *np = ether->pdev->dev.of_node; +const u8 *mac_address =NULL ; +#ifndef CONFIG_OF
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1574
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct plat_npcm7xx_emc_data *plat_dat = pdev->dev.platform_data; +#endif + +#ifdef CONFIG_OF + mac_address =of_get_mac_address (np); + +if (mac_address !=0 ) +ether_addr_copy (dev->dev_addr, mac_address); +#else +if (find_option ("basemac=" , mac_address)) {
See above comment.
Quoted 93 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +93
-0+memcpy (dev->dev_addr, mac_address,ETH_ALEN ); +if (pdev->id ==1 ) + dev->dev_addr[5 ] +=1 ; + } else +memcpy (dev->dev_addr, (const void *)plat_dat->mac_addr, +ETH_ALEN ); +#endif + +if (is_valid_ether_addr (dev->dev_addr)) { +pr_info ("%s: device MAC address : %pM\n" , pdev->name, + dev->dev_addr); + }else { +eth_hw_addr_random (dev); +pr_info ("%s: device MAC address (random generator) %pM\n" , + dev->name, dev->dev_addr); + } + +} + + +static int npcm7xx_mii_setup (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev; +struct phy_device *phydev =NULL ; +int i, err =0 ; + + pdev = ether->pdev; + + ether->mii_bus =mdiobus_alloc (); +if (!ether->mii_bus) { + err = -ENOMEM ; +dev_err (&pdev->dev,"mdiobus_alloc() failed\n" ); + goto out0; + } + + ether->mii_bus->name ="npcm7xx_rmii" ; + ether->mii_bus->read = &npcm7xx_mdio_read; + ether->mii_bus->write = &npcm7xx_mdio_write; + ether->mii_bus->reset = &npcm7xx_mdio_reset; +snprintf (ether->mii_bus->id,MII_BUS_ID_SIZE ,"%s-%x" , + ether->pdev->name, ether->pdev->id); +EMC_DEBUG ("%s ether->mii_bus->id=%s\n" , __func__, ether->mii_bus->id); + ether->mii_bus->priv = ether; + ether->mii_bus->parent = ðer->pdev->dev; + +for (i =0 ; i <PHY_MAX_ADDR ; i++) + ether->mii_bus->irq[i] =PHY_POLL ; + +platform_set_drvdata (ether->pdev, ether->mii_bus); + +/* Enable MDIO Clock */ +__raw_writel (__raw_readl (REG_MCMDR ) |MCMDR_ENMDC ,REG_MCMDR ); + + +if (mdiobus_register (ether->mii_bus)) { +dev_err (&pdev->dev,"mdiobus_register() failed\n" ); + goto out2; + } + + + phydev =phy_find_first (ether->mii_bus); +if (phydev ==NULL ) { +dev_err (&pdev->dev,"phy_find_first() failed\n" ); + goto out3; + } + +dev_info (&pdev->dev," name = %s ETH-Phy-Id = 0x%x\n" , +phydev_name (phydev), phydev->phy_id); + + phydev =phy_connect (dev,phydev_name (phydev), + &adjust_link, +PHY_INTERFACE_MODE_RMII ); + +dev_info (&pdev->dev," ETH-Phy-Id = 0x%x name = %s\n" , + phydev->phy_id, phydev->drv->name); + +if (IS_ERR (phydev)) { + err =PTR_ERR (phydev); +dev_err (&pdev->dev,"phy_connect() failed - %d\n" , err); + goto out3; + } + + phydev->supported &=PHY_BASIC_FEATURES ; + phydev->advertising = phydev->supported; + ether->phy_dev = phydev; + +return 0 ; + +out3: +mdiobus_unregister (ether->mii_bus); +out2: +kfree (ether->mii_bus->irq);
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1677
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+mdiobus_free (ether->mii_bus); +out0: + +return err; +} + +#include <linux/seq_file.h> +#include <linux/proc_fs.h> + +#define PROC_FILENAME "driver/npcm7xx_emc"
I think use debugfs for these internal details, or omit them.
Quoted 289 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +289
-0+ +#define REG_PRINT (reg_name) {t = scnprintf(next, size, "%-10s = %08X\n", \ + #reg_name, __raw_readl(reg_name)); size -= t; next += t; } +#define PROC_PRINT(f, x...) {t = scnprintf(next, size, f, ## x); size -= t; \ + next += t; } + +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct npcm7xx_rxbd *rxbd; +unsigned long flags; +unsigned int i, cur, txd_offset, rxd_offset; +char *next = buf; +unsigned int size = count; +int t; +int is_locked =spin_is_locked (ðer->lock); + +if (!is_locked) +spin_lock_irqsave (ðer->lock, flags); + +/* ------basic driver information ---- */ +PROC_PRINT ("NPCM7XX EMC %s driver version: %s\n" , dev->name, +DRV_MODULE_VERSION ); + +REG_PRINT (REG_CAMCMR ); +REG_PRINT (REG_CAMEN ); +REG_PRINT (REG_CAMM_BASE ); +REG_PRINT (REG_CAML_BASE ); +REG_PRINT (REG_TXDLSA ); +REG_PRINT (REG_RXDLSA ); +REG_PRINT (REG_MCMDR ); +REG_PRINT (REG_MIID ); +REG_PRINT (REG_MIIDA ); +REG_PRINT (REG_FFTCR ); +REG_PRINT (REG_TSDR ); +REG_PRINT (REG_RSDR ); +REG_PRINT (REG_DMARFC ); +REG_PRINT (REG_MIEN ); +REG_PRINT (REG_MISTA ); +REG_PRINT (REG_MGSTA ); +REG_PRINT (REG_MPCNT ); +__raw_writel (0x7FFF ,REG_MPCNT ); +REG_PRINT (REG_MRPC ); +REG_PRINT (REG_MRPCC ); +REG_PRINT (REG_MREPC ); +REG_PRINT (REG_DMARFS ); +REG_PRINT (REG_CTXDSA ); +REG_PRINT (REG_CTXBSA ); +REG_PRINT (REG_CRXDSA ); +REG_PRINT (REG_CRXBSA ); +REG_PRINT (REG_RXFSM ); +REG_PRINT (REG_TXFSM ); +REG_PRINT (REG_FSM0 ); +REG_PRINT (REG_FSM1 ); +REG_PRINT (REG_DCR ); +REG_PRINT (REG_DMMIR ); +REG_PRINT (REG_BISTR ); +PROC_PRINT ("\n" ); + +PROC_PRINT ("netif_queue %s\n\n" ,netif_queue_stopped (dev) ? +"Stopped" :"Running" ); +if (ether->rdesc) +PROC_PRINT ("napi is %s\n\n" ,test_bit (NAPI_STATE_SCHED , + ðer->napi.state) ? +"scheduled" : +"not scheduled" ); + + txd_offset = (__raw_readl (REG_CTXDSA ) - +__raw_readl (REG_TXDLSA ))/sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("TXD offset %6d\n" , txd_offset); +PROC_PRINT ("cur_tx %6d\n" , ether->cur_tx); +PROC_PRINT ("finish_tx %6d\n" , ether->finish_tx); +PROC_PRINT ("pending_tx %6d\n" , ether->pending_tx); +/* debug counters */ +PROC_PRINT ("tx_tdu %6d\n" , ether->tx_tdu); + ether->tx_tdu =0 ; +PROC_PRINT ("tx_tdu_i %6d\n" , ether->tx_tdu_i); + ether->tx_tdu_i =0 ; +PROC_PRINT ("tx_cp_i %6d\n" , ether->tx_cp_i); + ether->tx_cp_i =0 ; +PROC_PRINT ("tx_int_count %6d\n" , ether->tx_int_count); + ether->tx_int_count =0 ; +PROC_PRINT ("count_xmit tx %6d\n" , ether->count_xmit); + ether->count_xmit =0 ; +PROC_PRINT ("count_finish %6d\n" , ether->count_finish); + ether->count_finish =0 ; +PROC_PRINT ("\n" ); + + rxd_offset = (__raw_readl (REG_CRXDSA )-__raw_readl (REG_RXDLSA )) + /sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("RXD offset %6d\n" , rxd_offset); +PROC_PRINT ("cur_rx %6d\n" , ether->cur_rx); +PROC_PRINT ("rx_err %6d\n" , ether->rx_err); + ether->rx_err =0 ; +PROC_PRINT ("rx_berr %6d\n" , ether->rx_berr); + ether->rx_berr =0 ; +PROC_PRINT ("rx_stuck %6d\n" , ether->rx_stuck); + ether->rx_stuck =0 ; +PROC_PRINT ("rdu %6d\n" , ether->rdu); + ether->rdu =0 ; +PROC_PRINT ("rxov rx %6d\n" , ether->rxov); + ether->rxov =0 ; +// debug counters +PROC_PRINT ("rx_int_count %6d\n" , ether->rx_int_count); + ether->rx_int_count =0 ; +PROC_PRINT ("rx_err_count %6d\n" , ether->rx_err_count); + ether->rx_err_count =0 ; +PROC_PRINT ("rx_count_pool %6d\n" , ether->rx_count_pool); + ether->rx_count_pool =0 ; +PROC_PRINT ("max_waiting_rx %5d\n" , ether->max_waiting_rx); + ether->max_waiting_rx =0 ; +PROC_PRINT ("\n" ); +PROC_PRINT ("need_reset %5d\n" , ether->need_reset); + +if (ether->tdesc && ether->rdesc) { + cur = ether->finish_tx -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("finish %3d txbd mode %08X buffer %08X sl " +"%08X next %08X tx_skb %p\n" , cur, + txbd->mode, txbd->buffer, txbd->sl, + txbd->next, ether->tx_skb[cur]); + } +PROC_PRINT ("\n" ); + + cur = txd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("txd_of %3d txbd mode %08X buffer %08X sl " +"%08X next %08X\n" , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); + } +PROC_PRINT ("\n" ); + + cur = ether->cur_tx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("cur_tx %3d txbd mode %08X buffer %08X sl " +"%08X next %08X " , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X MISTA %08X MIEN %08X\n" , + txbd->diff, txbd->ts, txbd->t2, txbd->t3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = ether->cur_rx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("cur_rx %3d rxbd sl %08X buffer %08X sl " +"%08X next %08X " , cur, rxbd->sl, + rxbd->buffer, rxbd->reserved, rxbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X i_diff %08X i_ts %08X\n" , + rxbd->diff, rxbd->ts, rxbd->r2, rxbd->r3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = rxd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("rxd_of %3d rxbd sl %08X buffer %08X sl %08X" +" next %08X\n" , cur, rxbd->sl, rxbd->buffer, + rxbd->reserved, rxbd->next); + } +PROC_PRINT ("\n" ); + } + +if (!is_locked) +spin_unlock_irqrestore (ðer->lock, flags); + +return count - size; +} + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev) +{ +char *emc_dump_buf; +int count; +struct npcm7xx_ether *ether; +struct platform_device *pdev; +const size_t print_size =5 *PAGE_SIZE ; + + ether =netdev_priv (dev); + pdev = ether->pdev; + + emc_dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!emc_dump_buf) +dev_err (&pdev->dev,"emc_dump_buf = kmalloc(PAGE_SIZE, " +"GFP_KERNEL) failed\n" ); +else { +char c; +char *tmp_buf = emc_dump_buf; + + count =npcm7xx_info_dump (emc_dump_buf, print_size, dev); +while (count >512 ) { + c = tmp_buf[512 ]; + tmp_buf[512 ] =0 ; +pr_info ("%s" , tmp_buf); + tmp_buf +=512 ; + tmp_buf[0 ] = c; + count -=512 ; + } +printk ("%s" , tmp_buf); +kfree (emc_dump_buf); + } +} +#endif + +static int npcm7xx_proc_read (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +const size_t print_size =5 *PAGE_SIZE ; + +if (ether->dump_buf ==NULL ) { + ether->dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!ether->dump_buf) +return -1 ; +npcm7xx_info_dump (ether->dump_buf, print_size, dev); + } + +seq_printf (sf,"%s" , ether->dump_buf); + +if (sf->count < sf->size) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static int npcm7xx_ether_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_read,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops = { + .open = npcm7xx_ether_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int npcm7xx_proc_reset (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned long flags; + +seq_printf (sf,"Ask to reset the module\n" ); +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); + +return 0 ; +} + +static int npcm7xx_ether_proc_reset (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_reset,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops_reset = { + .open = npcm7xx_ether_proc_reset, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static const struct of_device_id emc_dt_id[] = { + { .compatible ="nuvoton,npcm750-emc" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, emc_dt_id);
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1976
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +static int npcm7xx_ether_probe (struct platform_device *pdev) +{ +struct npcm7xx_ether *ether; +struct net_device *dev; +int error; +char proc_filename[32 ]; + + +#ifdef CONFIG_OF
Remove these guards. We will be using OF to probe the driver in the common case.
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+struct clk *emc_clk =NULL ; +const struct of_device_id *of_id; +struct device_node *np = pdev->dev.of_node; + + pdev->id =of_alias_get_id (np,"ethernet" ); +if (pdev->id <0 ) + pdev->id =0 ; + + emc_clk =devm_clk_get (&pdev->dev,NULL ); + +if (IS_ERR (emc_clk)) +return PTR_ERR (emc_clk); + +/* Enable Clock */
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2000
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+clk_prepare_enable (emc_clk); +#endif + + +/* disable for now - need to check if necessary */ + gcr_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-gcr" ); +if (IS_ERR (gcr_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-gcr\n" , __func__); +return IS_ERR (gcr_regmap); + }
Remove the GCR and muxing code. This will be handled by your pinmux driver.
Quoted 237 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +237
-0+ + rst_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-rst" ); +if (IS_ERR (rst_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-rst\n" , __func__); +return IS_ERR (rst_regmap); + } + +/* Muxing RMII MDIO */ +if (pdev->id ==0 ) { +regmap_update_bits (gcr_regmap,MFSEL3_OFFSET , (0x1 <<9 ), + (0x1 <<9 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<13 ), + (0x1 <<13 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<12 ), + (0x1 <<12 )); +regmap_update_bits (gcr_regmap,INTCR_OFFSET , (0x1 <<5 ), + (0x1 <<5 )); + } +if (pdev->id ==1 ) { +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<14 ), + (0x1 <<14 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<16 ), + (0x1 <<16 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<15 ), + (0x1 <<15 )); + } + +/* Reset EMC module */ +if (pdev->id ==0 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ), + (0x1 <<6 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ),0 ); + } +if (pdev->id ==1 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ), + (0x1 <<21 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ),0 ); + } + +#ifdef CONFIG_OF + of_id =of_match_device (emc_dt_id, &pdev->dev); +if (!of_id) { +dev_err (&pdev->dev,"Error: No device match found\n" ); +return -ENODEV ; + } +/* +* Right now device-tree probed devices don't get dma_mask set. +* Since shared usb code relies on it, set it here for now. +* Once we have dma capability bindings this can go away. +*/ + error =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (error) +return -ENODEV ; +#endif + + dev =alloc_etherdev (sizeof (struct npcm7xx_ether )); +if (!dev) +return -ENOMEM ; + +snprintf (dev->name,IFNAMSIZ ,"eth%d" , pdev->id); + + ether =netdev_priv (dev); + + ether->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (ether->res ==NULL ) { +dev_err (&pdev->dev,"failed to get I/O memory\n" ); + error = -ENXIO ; + goto failed_free; + } + +if (!request_mem_region (ether->res->start, +resource_size (ether->res), pdev->name)) { +dev_err (&pdev->dev,"failed to request I/O memory\n" ); + error = -EBUSY ; + goto failed_free; + } + + + ether->reg =ioremap (ether->res->start,resource_size (ether->res)); +EMC_DEBUG (" ether->reg = 0x%x\n" , __func__, (unsigned int )ether->reg); + +if (ether->reg ==NULL ) { +dev_err (&pdev->dev,"failed to remap I/O memory\n" ); + error = -ENXIO ; + goto failed_free_mem; + } + + ether->txirq =platform_get_irq (pdev,0 ); +if (ether->txirq <0 ) { +dev_err (&pdev->dev,"failed to get ether tx irq\n" ); + error = -ENXIO ; + goto failed_free_io; + } + + ether->rxirq =platform_get_irq (pdev,1 ); +if (ether->rxirq <0 ) { +dev_err (&pdev->dev,"failed to get ether rx irq\n" ); + error = -ENXIO ; + goto failed_free_txirq; + } + +SET_NETDEV_DEV (dev, &pdev->dev); +platform_set_drvdata (pdev, dev); + ether->ndev = dev; + + ether->pdev = pdev; + ether->msg_enable =NETIF_MSG_LINK ; + + dev->netdev_ops = &npcm7xx_ether_netdev_ops; + dev->ethtool_ops = &npcm7xx_ether_ethtool_ops; + + dev->tx_queue_len =TX_DESC_SIZE ; + dev->dma =0x0 ; + dev->watchdog_timeo =TX_TIMEOUT ; + +get_mac_address (dev); + + ether->cur_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->link =0 ; + ether->speed =100 ; + ether->duplex =DUPLEX_FULL ; + ether->need_reset =0 ; + ether->dump_buf =NULL ; + ether->rx_berr =0 ; + ether->rx_err =0 ; + ether->rdu =0 ; + ether->rxov =0 ; + ether->rx_stuck =0 ; +// debug counters + ether->max_waiting_rx =0 ; + ether->rx_count_pool =0 ; + ether->count_xmit =0 ; + ether->rx_int_count =0 ; + ether->rx_err_count =0 ; + ether->tx_int_count =0 ; + ether->count_finish =0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; + +spin_lock_init (ðer->lock); + +netif_napi_add (dev, ðer->napi, npcm7xx_poll,RX_POLL_SIZE ); + +ether_setup (dev); + + error =npcm7xx_mii_setup (dev); +if (error <0 ) { +dev_err (&pdev->dev,"npcm7xx_mii_setup err\n" ); + goto failed_free_rxirq; + } + + error =register_netdev (dev); +if (error !=0 ) { +dev_err (&pdev->dev,"register_netdev() failed\n" ); + error = -ENODEV ; + goto failed_free_rxirq; + } +snprintf (proc_filename,sizeof (proc_filename),"%s.%d" ,PROC_FILENAME , + pdev->id); +proc_create_data (proc_filename,0000 ,NULL , &npcm7xx_ether_proc_fops, + dev); + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +proc_create_data (proc_filename,0000 ,NULL , + &npcm7xx_ether_proc_fops_reset, dev); + +return 0 ; + +failed_free_rxirq: +free_irq (ether->rxirq, pdev); +platform_set_drvdata (pdev,NULL ); +failed_free_txirq: +free_irq (ether->txirq, pdev); +failed_free_io: +iounmap (ether->reg); +failed_free_mem: +release_mem_region (ether->res->start,resource_size (ether->res)); +failed_free: +free_netdev (dev); + +return error; +} + +static int npcm7xx_ether_remove (struct platform_device *pdev) +{ +struct net_device *dev =platform_get_drvdata (pdev); +struct npcm7xx_ether *ether =netdev_priv (dev); +char proc_filename[32 ]; + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d" ,PROC_FILENAME , + pdev->id); +remove_proc_entry (proc_filename,NULL ); +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +remove_proc_entry (proc_filename,NULL ); + +unregister_netdev (dev); + + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +if (ether->phy_dev) +phy_disconnect (ether->phy_dev); + +mdiobus_unregister (ether->mii_bus); +kfree (ether->mii_bus->irq); +mdiobus_free (ether->mii_bus); + +platform_set_drvdata (pdev,NULL ); + +free_netdev (dev); +return 0 ; +} + +static struct platform_driver npcm7xx_ether_driver = { + .probe = npcm7xx_ether_probe, + .remove = npcm7xx_ether_remove, + .driver = { + .name =DRV_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (emc_dt_id), + }, +}; + +#ifdef CONFIG_OF +module_platform_driver (npcm7xx_ether_driver); +#else +static int __init npcm7xx_ether_init (void ) +{ + +return platform_driver_register (&npcm7xx_ether_driver);
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2247
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+} + +static void __exit npcm7xx_ether_exit(void) +{ +platform_driver_unregister (&npcm7xx_ether_driver); +} + +module_init (npcm7xx_ether_init); +module_exit (npcm7xx_ether_exit); +#endif
platform_driver_register(npcm7xx_ether_driver);
Cheers,
Joel
Re: [PATCH linux dev-4.13 v1 2/2] net: npcm: add NPCM7xx Ethernet MAC controller
Quoted 4 lines · Joel Stanley
Quoted 1 line
+#define
ETH_TRIGGER_RXdo {__raw_writel(ENSTART, REG_RSDR); } while (0)Get rid of these macros.
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 229
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#define ETH_TRIGGER_TX do { __raw_writel(ENSTART, REG_TSDR); } while (0) +#define ETH_ENABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_ENABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_RXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_RXON, REG_MCMDR); } while (0)
Why is __raw appropriate here ? It does two things in theory (though I'm not 100% familiar with the ARM semantic for your cores), one is bypass endian conversion which might not be a great idea in your case, and one is bypass various ordering barriers, which also looks fishy unless you put explicit barriers on the call sites.
Quoted 23 lines
Quoted 23 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +23
-0+struct plat_npcm7xx_emc_data { +char *phy_bus_name; +int phy_addr; +unsigned char mac_addr[ETH_ALEN ]; +}; + +struct npcm7xx_rxbd { +unsigned int sl; +unsigned int buffer; +unsigned int reserved; +unsigned int next; +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff; +unsigned int ts; +unsigned int r2; +unsigned int r3; +#endif +}; + +struct npcm7xx_txbd { +unsigned int mode;/* Ownership bit and some other bits */ +unsigned int buffer;/* Transmit Buffer Starting Address */ +unsigned int sl;/* Transmit Byte Count and status bits */
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 261
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+unsigned int next;/* Next Tx Descriptor Starting Address */ +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff; +unsigned int ts; +unsigned int t2; +unsigned int t3; +#endif +};
Are the above HW descriptor definitions ? Then use the appropriate endian explicit and size explicit types such as __le32.
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 267
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ +struct npcm7xx_ether { +struct sk_buff *rx_skb[RX_DESC_SIZE ]; +struct sk_buff *tx_skb[TX_DESC_SIZE ]; +spinlock_t lock;
You probably don't need that lock... Most ethernet drivers with a private lock dont' actually need it. It depends what you use it for mind you but often, all the rx/tx path is handled by the tx queue lock, and there's a mutex in the PHY structure. Those two tend to be all you need.
I suggest you look at how I did it in the current version of ftgmac100 and how the reset task synchronizes with both path.
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 276
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+struct npcm7xx_rxbd *rdesc; +struct npcm7xx_txbd *tdesc; +dma_addr_t rdesc_phys; +dma_addr_t tdesc_phys; +struct net_device_stats stats; +struct platform_device *pdev; +struct net_device *ndev; +struct resource *res; +//struct sk_buff *skb;
Get rid of that :-)
Quoted 40 lines
Quoted 40 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +40
-0+unsigned int msg_enable; +struct mii_bus *mii_bus; +struct phy_device *phy_dev; +struct napi_struct napi; +void __iomem *reg; +int rxirq; +int txirq; +unsigned int cur_tx; +unsigned int cur_rx; +unsigned int finish_tx; +unsigned int pending_tx; +unsigned int start_tx_ptr; +unsigned int start_rx_ptr; +unsigned int rx_berr; +unsigned int rx_err; +unsigned int rdu; +unsigned int rxov; +unsigned int camcmr; +unsigned int rx_stuck; +int link; +int speed; +int duplex; +int need_reset; +char *dump_buf; + +// debug counters +unsigned int max_waiting_rx; +unsigned int rx_count_pool; +unsigned int count_xmit; +unsigned int rx_int_count; +unsigned int rx_err_count; +unsigned int tx_int_count; +unsigned int tx_tdu; +unsigned int tx_tdu_i; +unsigned int tx_cp_i; +unsigned int count_finish; +}; + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev); +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev);
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 322
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev); +#endif +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +void npcm7xx_clk_GetTimeStamp (u32 time_quad[2 ]); +#endif Avoid forward declarations where you can.
Also avoid CamelCaps
Quoted 205 lines
Quoted 57 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +57
-0+ +static void adjust_link (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +unsigned int val; +bool status_change = false; +unsigned long flags; + +// clear GPIO interrupt status whihc indicates PHY statu change? + +spin_lock_irqsave (ðer->lock, flags); + +if (phydev->link) { +if ((ether->speed != phydev->speed) || + (ether->duplex != phydev->duplex)) { + ether->speed = phydev->speed; + ether->duplex = phydev->duplex; + status_change = true; + } + }else { + ether->speed =0 ; + ether->duplex =-1 ; + } + +if (phydev->link != ether->link) { + + ether->link = phydev->link; + + status_change = true; + } + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status_change) { + + val =__raw_readl (REG_MCMDR ); + +if (ether->speed ==100 ) + val |=MCMDR_OPMOD ; +else + val &= ~MCMDR_OPMOD ; + +if (ether->duplex ==DUPLEX_FULL ) + val |=MCMDR_FDUP ; +else + val &= ~MCMDR_FDUP ; + +__raw_writel (val,REG_MCMDR ); + } +} + + + +static void npcm7xx_write_cam (struct net_device *dev, +unsigned int x,unsigned char *pval) +{drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 389
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int msw, lsw; + + msw = (pval[0 ] <<24 ) | (pval[1 ] <<16 ) | (pval[2 ] <<8 ) | pval[3 ]; + + lsw = (pval[4 ] <<24 ) | (pval[5 ] <<16 ); + +__raw_writel (lsw,REG_CAML_BASE + x *CAM_ENTRY_SIZE ); +__raw_writel (msw,REG_CAMM_BASE + x *CAM_ENTRY_SIZE ); +//EMC_DEBUG("REG_CAML_BASE = 0x%08X REG_CAMH_BASE = 0x%08X", lsw, msw); Delete commented out code before submitting.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 349
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+} + +Whitespace.
Quoted 129 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +129
-0+static struct sk_buff *get_new_skb (struct net_device *dev,u32 i) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct sk_buff *skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (skb ==NULL ) +return NULL ; + +/* Do not unmark the following skb_reserve() Receive Buffer Starting +* Address must be aligned to 4 bytes and the following line +* if unmarked will make it align to 2 and this likely will +* hult the RX and crash the linux skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + (ether->rdesc + i)->buffer =dma_map_single (&dev->dev, skb->data, +roundup ( +MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); + ether->rx_skb[i] = skb; + +return skb; +} + +static int npcm7xx_init_desc (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +struct npcm7xx_txbd *tdesc; +struct npcm7xx_rxbd *rdesc; +struct platform_device *pdev; +unsigned int i; + + ether =netdev_priv (dev); + pdev = ether->pdev; + +if (ether->tdesc ==NULL ) { + ether->tdesc = (struct npcm7xx_txbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ðer->tdesc_phys, +GFP_KERNEL ); + +if (!ether->tdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"tx desc\n" ); +return -ENOMEM ; + } + } + +if (ether->rdesc ==NULL ) { + ether->rdesc = (struct npcm7xx_rxbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ðer->rdesc_phys, +GFP_KERNEL ); + +if (!ether->rdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"rx desc\n" ); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , ether->tdesc, + ether->tdesc_phys); + ether->tdesc =NULL ; +return -ENOMEM ; + } + } + +for (i =0 ; i <TX_DESC_SIZE ; i++) { +unsigned int offset; + + tdesc = (ether->tdesc + i); + +if (i ==TX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_txbd ) * (i +1 ); + + tdesc->next = ether->tdesc_phys + offset; + tdesc->buffer = (unsigned int )NULL ; + tdesc->sl =0 ; + tdesc->mode =0 ; + } + + ether->start_tx_ptr = ether->tdesc_phys; + +for (i =0 ; i <RX_DESC_SIZE ; i++) { +unsigned int offset; + + rdesc = (ether->rdesc + i); + +if (i ==RX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_rxbd ) * (i +1 ); + + rdesc->next = ether->rdesc_phys + offset; + rdesc->sl =RX_OWEN_DMA ; + +if (get_new_skb (dev, i) ==NULL ) { +dev_err (&pdev->dev,"get_new_skb() failed\n" ); + +for (; i !=0 ; i--) { +dma_unmap_single (&dev->dev, (dma_addr_t) + ((ether->rdesc + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); +dev_kfree_skb_any (ether->rx_skb[i]); + ether->rx_skb[i] =NULL ; + } + +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + +return -ENOMEM ; + } + } + + ether->start_rx_ptr = ether->rdesc_phys; +wmb (); +for (i =0 ; i <TX_DESC_SIZE ; i++)
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 527
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether->tx_skb[i] =NULL ; + +return 0 ; +} + +// This API must call with Tx/Rx stopped C style comments /* foo */
I would split things a bit. See ftgmac100. Also I would keep a scratch pad to point RX to if you fail to allocate a packet in the rx path.
Quoted 330 lines
Quoted 181 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +180
-0+static void npcm7xx_free_desc (struct net_device *dev,bool free_also_descriptors) +{ +struct sk_buff *skb; +u32 i; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; + +for (i =0 ; i <TX_DESC_SIZE ; i++) { + skb = ether->tx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->tdesc + + i)->buffer), + skb->len,DMA_TO_DEVICE ); +dev_kfree_skb_any (skb); + ether->tx_skb[i] =NULL ; + } + } + +for (i =0 ; i <RX_DESC_SIZE ; i++) { + skb = ether->rx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->rdesc + + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); +dev_kfree_skb_any (skb); + ether->rx_skb[i] =NULL ; + } + } + +if (free_also_descriptors) { +if (ether->tdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); + ether->tdesc =NULL ; + +if (ether->rdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + ether->rdesc =NULL ; + } + +} + +static void npcm7xx_set_fifo_threshold (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =RXTHD |TXTHD |BLENGTH ; +__raw_writel (val,REG_FFTCR ); +} + +static void npcm7xx_return_default_idle (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; +unsigned int saved_bits; + + val =__raw_readl (REG_MCMDR ); + saved_bits = val & (MCMDR_FDUP |MCMDR_OPMOD ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + val |=SWR ; +__raw_writel (val,REG_MCMDR ); + +/* During the EMC reset the AHB will read 0 from all registers, +* so in order to see if the reset finished we can't count on +* REG_MCMDR.SWR to become 0, instead we read another +* register that its reset value is not 0, we choos REG_FFTCR. +*/ +do { + val =__raw_readl (REG_FFTCR ); + }while (val ==0 ); + +// Now we can verify if REG_MCMDR.SWR became 0 (probably it will be 0 on the first read). +do { + val =__raw_readl (REG_MCMDR ); + }while (val &SWR ); + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); +// restore values +__raw_writel (saved_bits,REG_MCMDR ); +} + + +static void npcm7xx_enable_mac_interrupt (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val = ENRXINTR | // Start of RX interrupts + ENCRCE | + EMRXOV | +#ifndef VLAN_SUPPORT +ENPTLE |// Since we don't support VLAN we want interrupt on long packets +#endif +ENRXGD | +ENALIE | +ENRP | +ENMMP | +ENDFO | +/* ENDENI | */ // We don't need interrupt on DMA Early Notification +ENRDU |// We don't need interrupt on Receive Descriptor Unavailable Interrupt +ENRXBERR | +/* ENCFR | */ +ENTXINTR |// Start of TX interrupts +ENTXEMP | +ENTXCP | +ENTXDEF | +ENNCS | +ENTXABT | +ENLC | +/* ENTDU | */ // We don't need interrupt on Transmit Descriptor Unavailable at start of operation +ENTXBERR ; +__raw_writel (val,REG_MIEN ); +} + +static void npcm7xx_get_and_clear_int (struct net_device *dev, +unsigned int *val,unsigned int mask) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + *val =__raw_readl (REG_MISTA ) & mask; +__raw_writel (*val,REG_MISTA ); +} + +static void npcm7xx_set_global_maccmd (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =__raw_readl (REG_MCMDR ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + + val |=MCMDR_SPCRC |MCMDR_ENMDC |MCMDR_ACP |MCMDR_NDEF ; +#ifdef VLAN_SUPPORT +// we set ALP accept long packets since VLAN packets are 4 bytes longer than 1518 + val |=MCMDR_ALP ; +// limit receive length to 1522 bytes due to VLAN +__raw_writel (MAX_PACKET_SIZE_W_CRC ,REG_DMARFC ); +#endif +__raw_writel (val,REG_MCMDR ); +} + +static void npcm7xx_enable_cam (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + + val =__raw_readl (REG_CAMEN ); + val |=CAM0EN ; +__raw_writel (val,REG_CAMEN ); +} + + +static void npcm7xx_set_curdest (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +__raw_writel (ether->start_rx_ptr,REG_RXDLSA ); +__raw_writel (ether->start_tx_ptr,REG_TXDLSA ); +} + +static void npcm7xx_reset_mac (struct net_device *dev,int need_free) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +netif_tx_lock (dev); + +ETH_DISABLE_TX ; +ETH_DISABLE_RX ; + +npcm7xx_return_default_idle (dev); +npcm7xx_set_fifo_threshold (dev);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 717
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +/*if (!netif_queue_stopped(dev)) +netif_stop_queue(dev);*/ + +if (need_free) +npcm7xx_free_desc (dev, false); + +npcm7xx_init_desc (dev); + +//dev->trans_start = jiffies; /* prevent tx timeout */ Remove commented out code.
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+ ether->cur_tx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; + +npcm7xx_set_curdest (dev); +npcm7xx_enable_cam (dev); +npcm7xx_ether_set_multicast_list (dev); +npcm7xx_enable_mac_interrupt (dev); +npcm7xx_set_global_maccmd (dev); +ETH_ENABLE_TX ;drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 741
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ETH_ENABLE_RX ; + +ETH_TRIGGER_RX ; + +//dev->trans_start = jiffies; /* prevent tx timeout */ + +/*if (netif_queue_stopped(dev)) +netif_wake_queue(dev);*/ + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", __raw_readl(REG_MCMDR)); Remove this.
Quoted 109 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +109
-0+ + ether->need_reset =0 ; + +netif_wake_queue (dev); +netif_tx_unlock (dev); +} + +static int npcm7xx_mdio_write (struct mii_bus *bus,int phy_id,int regnum, +u16 value) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + +__raw_writel (value,REG_MIID ); +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY |PHYWR ,REG_MIIDA ); + + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return 0 ; + +} + +static int npcm7xx_mdio_read (struct mii_bus *bus,int phy_id,int regnum) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + + +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY ,REG_MIIDA ); + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return __raw_readl (REG_MIID ); +} + +static int npcm7xx_mdio_reset (struct mii_bus *bus) +{ + +// reser ENAC engine?? +return 0 ; +} + +static int npcm7xx_set_mac_address (struct net_device *dev,void *addr) +{ +struct sockaddr *address = addr; + +if (!is_valid_ether_addr ((u8 *)address->sa_data)) +return -EADDRNOTAVAIL ; + +memcpy (dev->dev_addr, address->sa_data, dev->addr_len); +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + +return 0 ; +} + +static int npcm7xx_ether_close (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +if (ether->phy_dev) +phy_stop (ether->phy_dev); + +npcm7xx_return_default_idle (dev); + +msleep (10 ); + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +netif_stop_queue (dev); +napi_disable (ðer->napi); + +npcm7xx_free_desc (dev, true); + +if (ether->dump_buf) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static struct net_device_stats *npcm7xx_ether_stats (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 858
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ ether =netdev_priv (dev); + +return ðer->stats; +} + + +static int npcm7xx_clean_tx (struct net_device *dev,bool from_xmit) +{
This should be done from NAPI, see below or see other drivers.
Quoted 64 lines
Quoted 64 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +63
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct sk_buff *s; +unsigned int cur_entry, entry, sl; + +if (ether->pending_tx ==0 ) +return (0 ); + + cur_entry =__raw_readl (REG_CTXDSA ); + +// Release old used buffers + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + +while (entry != cur_entry) { + txbd = (ether->tdesc + ether->finish_tx); + s = ether->tx_skb[ether->finish_tx]; +if (s ==NULL ) +break ; + + ether->count_finish++; + +dma_unmap_single (&dev->dev, txbd->buffer, s->len, +DMA_TO_DEVICE ); +consume_skb (s); + ether->tx_skb[ether->finish_tx] =NULL ; + +if (++ether->finish_tx >=TX_DESC_SIZE ) + ether->finish_tx =0 ; + ether->pending_tx--; + + sl = txbd->sl; +if (sl &TXDS_TXCP ) { + ether->stats.tx_packets++; + ether->stats.tx_bytes += (sl &0xFFFF ); + }else { + ether->stats.tx_errors++; + } + + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + } + +if (!from_xmit &&unlikely (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 )) { +netif_tx_lock (dev); +if (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 ) { +netif_wake_queue (dev); + } +netif_tx_unlock (dev); + } + +return (0 ); +} + +static int npcm7xx_ether_start_xmit (struct sk_buff *skb,struct net_device *dev) +{struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +unsigned long flags; + +/* This is a hard error log it. */ +if (ether->pending_tx >= (TX_DESC_SIZE -1 )) {
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 930
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+dev_err (ðer->pdev->dev,"%s: BUG! Tx Ring full when queue " +"awake!\n" , dev->name); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +netif_stop_queue (dev); +return NETDEV_TX_BUSY ; + }
Did it ever happen ? Most drivers don't check that these days, it would be a pretty gross SW bug.
Quoted 1 line
Quoted 1 line
+ ether->count_xmit++;
You are duplicating existing counters here...
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 941
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+// Insert new buffer + + txbd = (ether->tdesc + ether->cur_tx); + + txbd->buffer =dma_map_single (&dev->dev, skb->data, + skb->len,DMA_TO_DEVICE ); + + ether->tx_skb[ether->cur_tx] = skb;
You're HW can't do fragmented tx ? That's unfortunate as it will kill performance. What about HW checksum ? VLAN injection ?
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 952
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+if (skb->len >MAX_PACKET_SIZE ) +dev_err (ðer->pdev->dev,"skb->len (= %d) > MAX_PACKET_SIZE " +"(= %d)\n" , skb->len, +MAX_PACKET_SIZE ); + + txbd->sl = skb->len >MAX_PACKET_SIZE ?MAX_PACKET_SIZE : skb->len; +wmb (); + + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE ; +wmb ();
Do you need two wmb's ? I would think all you need is one dma_wmb() before setting the OWN (not OWEN !) bit. If you don't use the __raw accessors you should be fine.
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 958
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ETH_TRIGGER_TX ; + +if (++ether->cur_tx >=TX_DESC_SIZE ) + ether->cur_tx =0 ; +spin_lock_irqsave (ðer->lock, flags);
Why the lock ? The network stack is holding a tx lock for you
Quoted 13 lines
Quoted 13 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ ether->pending_tx++; + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +//spin_lock_irqsave(ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +//pin_unlock_irqrestore(ðer->lock, flags); + txbd->diff = (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + txbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ;
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 979
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ txbd->t2 =__raw_readl (REG_MISTA ); + txbd->t3 =__raw_readl (REG_MIEN ); + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1] = iUsCnt2[1]; + } +#endif + +npcm7xx_clean_tx (dev, true);
Why there ? TX cleaning should be done from NAPI only.
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 986
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+if (ether->pending_tx >=TX_DESC_SIZE -1 ) { +unsigned int reg_mien; +unsigned int index_to_wake = ether->cur_tx + (TX_DESC_SIZE *3 /4 ); + +if (index_to_wake >=TX_DESC_SIZE ) + index_to_wake -=TX_DESC_SIZE ;
Does it help at all to have that hysteresis on wakes ? If the cleaning is done from NAPI as it should be you'll already be cleanning up in bulks, so that doesn't look necessary.
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 990
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+ txbd = (ether->tdesc + index_to_wake); + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE |MACTXINTEN ; +wmb ();
This is very fishy and allegedly racy.
Why can't you just turn TX interrupts off when doing NAPI and simply keep NAPI going as long as either TX or RX isn't complete ?
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 999
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+__raw_writel (MISTA_TDU ,REG_MISTA );// Clear TDU interrupt + reg_mien =__raw_readl (REG_MIEN ); + +if (reg_mien !=0 ) +__raw_writel (reg_mien |ENTDU ,REG_MIEN );// Enable TDU interrupt + + ether->tx_tdu++; +netif_stop_queue (dev);
Once you remove your custom lock you need to use a construct like this (from ftgmac100 but a lot of drivers do the same):
/* If there isn't enough room for all the fragments of a new packet
* in the TX ring, stop the queue. The sequence below is race free
* vs. a concurrent restart in ftgmac100_poll()
*/
if (unlikely(ftgmac100_tx_buf_avail(priv) < TX_THRESHOLD)) {
netif_stop_queue(netdev);
/* Order the queue stop with the test below */
smp_mb();
if (ftgmac100_tx_buf_avail(priv) >= TX_THRESHOLD)
netif_wake_queue(netdev);
}On the NAPI side, you need to take the tx queue lock.
Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+ } + +spin_unlock_irqrestore (ðer->lock, flags); + +return 0 ; +} + +static irqreturn_t npcm7xx_tx_interrupt (int irq,void *dev_id) +{ +struct npcm7xx_ether *ether; +struct platform_device *pdev; +struct net_device *dev; +unsigned int status; +unsigned long flags;
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1021
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ + dev = dev_id; + ether =netdev_priv (dev); + pdev = ether->pdev; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF0000 ); +spin_unlock_irqrestore (ðer->lock, flags);
I would handle all interrupts from the NAPI code. Lock is pointless.
For reset, schedule a reset task like ftgmac100 or sungem (or many other drivers).
Also move the interrupt handler before the NAPI code, it's clearer that way.
Quoted 30 lines
Quoted 30 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +30
-0+ ether->tx_int_count++; + +if (status &MISTA_EXDEF ) +dev_err (&pdev->dev,"emc defer exceed interrupt status=0x%08X\n" + , status); +else if (status &MISTA_TXBERR ) { +dev_err (&pdev->dev,"emc bus error interrupt status=0x%08X\n" , + status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; + }else if (status & ~(MISTA_TXINTR |MISTA_TXCP |MISTA_TDU )) +dev_err (&pdev->dev,"emc other error interrupt status=0x%08X\n" , + status); + +// if we got MISTA_TXCP | MISTA_TDU remove those interrupt and call napi +if (status & (MISTA_TXCP |MISTA_TDU ) &__raw_readl (REG_MIEN )) { +unsigned int reg_mien; + +spin_lock_irqsave (ðer->lock, flags); + reg_mien =__raw_readl (REG_MIEN ); +if (reg_mien &ENTDU ) +__raw_writel (reg_mien & (~ENTDU ),REG_MIEN );// Disable TDU interrupt + +spin_unlock_irqrestore (ðer->lock, flags); +
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1060
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+if (status &MISTA_TXCP ) + ether->tx_cp_i++; +if (status &MISTA_TDU ) + ether->tx_tdu_i++; + }else +EMC_DEBUG ("status=0x%08X\n" , status); + +napi_schedule (ðer->napi);
_irqoff
Quoted 22 lines
Quoted 22 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +22
-0+return IRQ_HANDLED ; +} + +static int npcm7xx_poll (struct napi_struct *napi,int budget) +{ +struct npcm7xx_ether *ether = + container_of(napi, struct npcm7xx_ether, napi); +struct npcm7xx_rxbd *rxbd; +struct net_device *dev = ether->ndev; +struct platform_device *pdev = ether->pdev; +struct sk_buff *skb, *s; +unsigned int length, status; +unsigned long flags; +int rx_cnt =0 ; +int complete =0 ; +unsigned int rx_offset = (__raw_readl (REG_CRXDSA ) - + ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); +unsigned int local_count = (rx_offset >= ether->cur_rx) ? + rx_offset - ether->cur_rx : rx_offset + +RX_DESC_SIZE - ether->cur_rx; +
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1091
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count; + +if (local_count > (4 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR );
-ETOOMANYACRONYMS. Please explain.
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1095
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+if (local_count <= budget) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR );
Not now. At the end, and only if you are also done with TX reclaims.
Quoted 1 line
Quoted 1 line
+
spin_lock_irqsave(ðer->lock, flags);
Lock is pointless
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1103
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+npcm7xx_clean_tx (dev, false); +spin_unlock_irqrestore (ðer->lock, flags); + + rxbd = (ether->rdesc + ether->cur_rx); + +while (rx_cnt < budget) {
Move the RX reclaim to a separate function.
Quoted 13 lines
Quoted 13 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ status = rxbd->sl; +if ((status &RX_OWEN_DMA ) ==RX_OWEN_DMA ) { + complete =1 ; +break ; + } +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +spin_unlock_irqrestore (ðer->lock, flags);
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1123
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ rxbd->diff = ((rx_cnt+1 )<<28 ) + + (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + rxbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ];This chunk needs reworking.
Just remove that gunk.
Quoted 138 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1130
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +7
-0+ } +#endif + rxbd->reserved = status;// for debug puposes we save the previous value + s = ether->rx_skb[ether->cur_rx]; + length = status &0xFFFF ; + +#ifdef VLAN_SUPPORT Remove these guards.
Is there a reason you can't have vlan always enabled?
Quoted 126 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +126
-0+if (likely ((status & (RXDS_RXGD |RXDS_CRCE |RXDS_ALIE |RXDS_RP )) + ==RXDS_RXGD ) &&likely (length <=MAX_PACKET_SIZE )) { +#else +if (likely ((status & (RXDS_RXGD |RXDS_CRCE |RXDS_ALIE |RXDS_RP + |RXDS_PTLE )) ==RXDS_RXGD ) && +likely (length <=MAX_PACKET_SIZE )) { +#endif +dma_unmap_single (&dev->dev, (dma_addr_t )rxbd->buffer, +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); + +skb_put (s, length); + s->protocol =eth_type_trans (s, dev); +netif_receive_skb (s); + ether->stats.rx_packets++; + ether->stats.rx_bytes += length; + rx_cnt++; + ether->rx_count_pool++; + +// now we allocate new skb instead if the used one. + skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (!skb) { +dev_err (&pdev->dev,"get skb buffer error\n" ); + ether->stats.rx_dropped++; + goto rx_out; + } + +/* Do not unmark the following skb_reserve() Receive +* Buffer Starting Address must be aligned +* to 4 bytes and the following line if unmarked +* will make it align to 2 and this likely +* will hult the RX and crash the linux +* skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + rxbd->buffer =dma_map_single (&dev->dev, skb->data, +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); + ether->rx_skb[ether->cur_rx] = skb; + }else { + ether->rx_err_count++; + ether->stats.rx_errors++; +EMC_DEBUG ("rx_errors = %lu status = 0x%08X\n" , + ether->stats.rx_errors, status); + +if (status &RXDS_RP ) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + }else if (status &RXDS_CRCE ) { + ether->stats.rx_crc_errors++; +EMC_DEBUG ("rx_crc_errors = %lu\n" , + ether->stats.rx_crc_errors); + }else if (status &RXDS_ALIE ) { + ether->stats.rx_frame_errors++; +EMC_DEBUG ("rx_frame_errors = %lu\n" , + ether->stats.rx_frame_errors); + } +#ifndef VLAN_SUPPORT + else if (status & RXDS_PTLE) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + } +#endif + else if (length > MAX_PACKET_SIZE) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + } + } + +wmb (); + rxbd->sl =RX_OWEN_DMA ; +wmb (); + +if (++ether->cur_rx >=RX_DESC_SIZE ) + ether->cur_rx =0 ; + + rxbd = (ether->rdesc + ether->cur_rx); + + } + +if (complete) { +napi_complete (napi); + +if (ether->need_reset) { +EMC_DEBUG ("Reset\n" ); +npcm7xx_reset_mac (dev,1 ); + } + +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (__raw_readl (REG_MIEN ) |ENRXGD ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + }else { + rx_offset = (__raw_readl (REG_CRXDSA )-ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); + local_count = (rx_offset >= ether->cur_rx) ? rx_offset - + ether->cur_rx : rx_offset +RX_DESC_SIZE - + ether->cur_rx; + +if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count; + +if (local_count > (3 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR ); +if (local_count <=RX_POLL_SIZE ) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR ); + } +rx_out: + +ETH_TRIGGER_RX ; + return rx_cnt; +} + +static irqreturn_t npcm7xx_rx_interrupt (int irq,void *dev_id) +{ +struct net_device *dev = (struct net_device *)dev_id; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev;
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1264
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+unsigned int status; +unsigned long flags; +unsigned int any_err =0 ; +u32 RXFSM ; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF ); +spin_unlock_irqrestore (ðer->lock, flags);
Lock is probably pointless.
Quoted 107 lines
Quoted 107 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +107
-0+ ether->rx_int_count++; + + +if (unlikely (status &MISTA_RXBERR )) { + ether->rx_berr++; +dev_err (&pdev->dev,"emc rx bus error status=0x%08X\n" , status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); +return IRQ_HANDLED ; + } + +if (unlikely (status & (MISTA_RXOV |MISTA_RDU ))) { +// filter out all received packets until we have enough avaiable buffer descriptors +__raw_writel (0 ,REG_CAMCMR ); + any_err =1 ; +if (status & (MISTA_RXOV )) + ether->rxov++; +if (status & (MISTA_RDU )) + ether->rdu++; + +// workaround Errata 1.36: EMC Hangs on receiving 253-256 byte packet +RXFSM =__raw_readl (REG_RXFSM ); + +if ((RXFSM &0xFFFFF000 ) ==0x08044000 ) { +int i; +for (i =0 ; i <32 ; i++) { +RXFSM =__raw_readl (REG_RXFSM ); +if ((RXFSM &0xFFFFF000 ) !=0x08044000 ) +break ; + } +if (i ==32 ) { + ether->rx_stuck++; +spin_lock_irqsave (ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); +dev_err (&pdev->dev,"stuck on REG_RXFSM = " +"0x%08X status=%08X doing " +"reset!\n" ,RXFSM , status); +return IRQ_HANDLED ; + } + } + } + +// echo MISTA status on unexpected flags although we don't do anithing with them +if (unlikely (status & ( +// MISTA_RXINTR | // Receive - all RX interrupt set this +MISTA_CRCE |// CRC Error +// MISTA_RXOV | // Receive FIFO Overflow - we alread handled it +#ifndef VLAN_SUPPORT +MISTA_PTLE |// Packet Too Long is needed since VLAN is not supported +#endif +// MISTA_RXGD | // Receive Good - this is the common good case +MISTA_ALIE |// Alignment Error +MISTA_RP |// Runt Packet +MISTA_MMP |// More Missed Packet +MISTA_DFOI |// Maximum Frame Length +// MISTA_DENI | // DMA Early Notification - every packet get this +// MISTA_RDU | // Receive Descriptor Unavailable +// MISTA_RXBERR | // Receive Bus Error Interrupt - we alread handled it +// MISTA_CFR | // Control Frame Receive - not an error +0 ))) { +EMC_DEBUG ("emc rx MISTA status=0x%08X\n" , status); + any_err =1 ; + ether->rx_err++; + } + +if ((any_err ==0 ) && ((status &MISTA_RXGD ) ==0 )) +dev_err (&pdev->dev,"emc rx MISTA status=0x%08X\n" , status); + +spin_lock_irqsave (ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +struct npcm7xx_rxbd *rxbd = (ether->rdesc + ether->cur_rx); +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +npcm7xx_clk_GetTimeStamp (iUsCnt2); +/* rxbd->r2 = (_1MHz_ * (iUsCnt2[1] - last_iUsCnt1[1])) + +*iUsCnt2[0]/25 - last_iUsCnt1[0]/25; +*/ + rxbd->r2 = status; + rxbd->r3 = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ]; + } +#endif +__raw_writel (__raw_readl (REG_MIEN ) & ~ENRXGD ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); +napi_schedule (ðer->napi); + +return IRQ_HANDLED ; +} + + +static int npcm7xx_ether_open (struct net_device *dev) +{
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1380
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+struct npcm7xx_ether *ether; +struct platform_device *pdev; + + ether =netdev_priv (dev); + pdev = ether->pdev; + + ether->need_reset =1 ; +npcm7xx_reset_mac (dev,0 );
What's the logic between that need_reset and a function called "reset"
?
Quoted 36 lines
Quoted 36 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +36
-0+if (request_irq (ether->txirq, npcm7xx_tx_interrupt, +0x0 , pdev->name, dev)) { +dev_err (&pdev->dev,"register irq tx failed\n" ); +return -EAGAIN ; + } + +if (request_irq (ether->rxirq, npcm7xx_rx_interrupt, +0x0 , pdev->name, dev)) { +dev_err (&pdev->dev,"register irq rx failed\n" ); +free_irq (ether->txirq, dev); +return -EAGAIN ; + } + +if (ether->phy_dev) +phy_start (ether->phy_dev); + +netif_start_queue (dev); +napi_enable (ðer->napi); + +ETH_TRIGGER_RX ; + +dev_info (&pdev->dev,"%s is OPENED\n" , dev->name); + +return 0 ; +} + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +unsigned int rx_mode; + + ether =netdev_priv (dev); + +EMC_DEBUG ("%s CAMCMR_AUP\n" , (dev->flags &IFF_PROMISC ) ? +"Set" :"Clear" ); +if (dev->flags &IFF_PROMISC )
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1425
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ rx_mode =CAMCMR_AUP |CAMCMR_AMP |CAMCMR_ABP |CAMCMR_ECMP ; + else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) + rx_mode = CAMCMR_AMP | CAMCMR_ABP | CAMCMR_ECMP; + else + rx_mode =CAMCMR_ECMP |CAMCMR_ABP ; +__raw_writel (rx_mode,REG_CAMCMR ); + ether->camcmr = rx_mode; +}
Name this set_rx_mode. You can't do better in your "CAM" for multicast filtering ? Usual comment about use of __raw MMIO accessors. You may also want to make sure the interface is running before writing to the HW.
Quoted 47 lines
Quoted 47 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +47
-0+static int npcm7xx_ether_ioctl (struct net_device *dev, +struct ifreq *ifr,int cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; + +if (!netif_running (dev)) +return -EINVAL ; + +if (!phydev) +return -ENODEV ; + +return phy_mii_ioctl (phydev, ifr, cmd); +} + +static void npcm7xx_get_drvinfo (struct net_device *dev, +struct ethtool_drvinfo *info) +{ +strlcpy (info->driver,DRV_MODULE_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_MODULE_VERSION ,sizeof (info->version)); +strlcpy (info->fw_version,"N/A" ,sizeof (info->fw_version)); +strlcpy (info->bus_info,"N/A" ,sizeof (info->bus_info)); +} + +static int npcm7xx_get_settings (struct net_device *dev, +struct ethtool_link_ksettings *cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; + +if (phydev ==NULL ) +return -ENODEV ; + +pr_info ("\n\nnpcm7xx_get_settings\n" ); +phy_ethtool_ksettings_get (phydev, cmd); + +return 0 ; +} + +static int npcm7xx_set_settings (struct net_device *dev, +const struct ethtool_link_ksettings *cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +int ret; +unsigned long flags; +
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+if (phydev ==NULL ) +return -ENODEV ; + +pr_info ("\n\nnpcm7xx_set_settings\n" ); +spin_lock_irqsave (ðer->lock, flags); + ret = phy_ethtool_ksettings_set(phydev, cmd);
+spin_unlock_irqrestore(ðer->lock, flags);
Ditch the lock. You can directly hookup phy_ethtool_ksettings_set and get into the ethtool_ops without wrappers.
Quoted 110 lines
Quoted 64 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +64
-0+return ret; +} + +static u32 npcm7xx_get_msglevel (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +return ether->msg_enable; +} + +static void npcm7xx_set_msglevel (struct net_device *dev,u32 level) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + ether->msg_enable = level; +} + +static const struct ethtool_ops npcm7xx_ether_ethtool_ops = { + .get_link_ksettings = npcm7xx_get_settings, + .set_link_ksettings = npcm7xx_set_settings, + .get_drvinfo = npcm7xx_get_drvinfo, + .get_msglevel = npcm7xx_get_msglevel, + .set_msglevel = npcm7xx_set_msglevel, + .get_link = ethtool_op_get_link, +}; + +static const struct net_device_ops npcm7xx_ether_netdev_ops = { + .ndo_open = npcm7xx_ether_open, + .ndo_stop = npcm7xx_ether_close, + .ndo_start_xmit = npcm7xx_ether_start_xmit, + .ndo_get_stats = npcm7xx_ether_stats, + .ndo_set_rx_mode = npcm7xx_ether_set_multicast_list, + .ndo_set_mac_address = npcm7xx_set_mac_address, + .ndo_do_ioctl = npcm7xx_ether_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +}; + +#ifndef CONFIG_OF +static unsigned char char2hex (unsigned char c) +{ +if (c >='0' && c <='9' ) +return c -'0' ; +if (c >='a' && c <='f' ) +return c -'a' +10 ; +if (c >='A' && c <='F' ) +return c -'A' +10 ; + +return 0 ; +} + +static void _mac_setup (char *line,u8 *mac) +{ +int i; + +for (i =0 ; i <6 ; i++) + mac[i] = (char2hex (line[i*3 ])<<4 ) +char2hex (line[i*3 +1 ]); +} + +static int find_option (char *str,char *mac) +{ +extern char *saved_command_line; +char *p; +drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1555
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ p = strstr(saved_command_line, str) + +if (!p) +return 0 ; + + p +=strlen (str); +_mac_setup (p, mac); + +return 1 ; +}These above options can be done with common helpers. Take a look at another driver such as the
ftgmac100.c.Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#endif + +static void get_mac_address (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; +struct device_node *np = ether->pdev->dev.of_node; +const u8 *mac_address =NULL ; +#ifndef CONFIG_OF drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1574
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct plat_npcm7xx_emc_data *plat_dat = pdev->dev.platform_data; +#endif + +#ifdef CONFIG_OF + mac_address =of_get_mac_address (np); + +if (mac_address !=0 ) +ether_addr_copy (dev->dev_addr, mac_address); +#else +if (find_option ("basemac=" , mac_address)) {See above comment.
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+memcpy (dev->dev_addr, mac_address,ETH_ALEN ); +if (pdev->id ==1 ) + dev->dev_addr[5 ] +=1 ; + } else +memcpy (dev->dev_addr, (const void *)plat_dat->mac_addr, +ETH_ALEN ); +#endif + +if (is_valid_ether_addr (dev->dev_addr)) { + pr_info("%s: device MAC address : %pM\n", pdev->name,
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1592
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ dev->dev_addr); + }else { +eth_hw_addr_random (dev); +pr_info ("%s: device MAC address (random generator) %pM\n" , + dev->name, dev->dev_addr); + } + +}
As Joel says, look at other drivers, this is too messy.
Quoted 26 lines
Quoted 26 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +26
-0+ +static int npcm7xx_mii_setup (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev; +struct phy_device *phydev =NULL ; +int i, err =0 ; + + pdev = ether->pdev; + + ether->mii_bus =mdiobus_alloc (); +if (!ether->mii_bus) { + err = -ENOMEM ; +dev_err (&pdev->dev,"mdiobus_alloc() failed\n" ); + goto out0; + } + + ether->mii_bus->name ="npcm7xx_rmii" ; + ether->mii_bus->read = &npcm7xx_mdio_read; + ether->mii_bus->write = &npcm7xx_mdio_write; + ether->mii_bus->reset = &npcm7xx_mdio_reset; +snprintf (ether->mii_bus->id,MII_BUS_ID_SIZE ,"%s-%x" , + ether->pdev->name, ether->pdev->id); +EMC_DEBUG ("%s ether->mii_bus->id=%s\n" , __func__, ether->mii_bus->id); + ether->mii_bus->priv = ether; + ether->mii_bus->parent = ðer->pdev->dev;
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1627
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ +for (i =0 ; i <PHY_MAX_ADDR ; i++) + ether->mii_bus->irq[i] =PHY_POLL ; + +platform_set_drvdata (ether->pdev, ether->mii_bus); + +/* Enable MDIO Clock */ +__raw_writel (__raw_readl (REG_MCMDR ) |MCMDR_ENMDC ,REG_MCMDR );
Why raw ?
Quoted 327 lines
Quoted 39 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +39
-0+ +if (mdiobus_register (ether->mii_bus)) { +dev_err (&pdev->dev,"mdiobus_register() failed\n" ); + goto out2; + } + + + phydev =phy_find_first (ether->mii_bus); +if (phydev ==NULL ) { +dev_err (&pdev->dev,"phy_find_first() failed\n" ); + goto out3; + } + +dev_info (&pdev->dev," name = %s ETH-Phy-Id = 0x%x\n" , +phydev_name (phydev), phydev->phy_id); + + phydev =phy_connect (dev,phydev_name (phydev), + &adjust_link, +PHY_INTERFACE_MODE_RMII ); + +dev_info (&pdev->dev," ETH-Phy-Id = 0x%x name = %s\n" , + phydev->phy_id, phydev->drv->name); + +if (IS_ERR (phydev)) { + err =PTR_ERR (phydev); +dev_err (&pdev->dev,"phy_connect() failed - %d\n" , err); + goto out3; + } + + phydev->supported &=PHY_BASIC_FEATURES ; + phydev->advertising = phydev->supported; + ether->phy_dev = phydev; + +return 0 ; + +out3: +mdiobus_unregister (ether->mii_bus); +out2: +kfree (ether->mii_bus->irq);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1677
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+mdiobus_free (ether->mii_bus); +out0: + +return err; +} + +#include <linux/seq_file.h> +#include <linux/proc_fs.h> + +#define PROC_FILENAME "driver/npcm7xx_emc"I think use debugfs for these internal details, or omit them.
Quoted 275 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +275
-0+ +#define REG_PRINT (reg_name) {t = scnprintf(next, size, "%-10s = %08X\n", \ + #reg_name, __raw_readl(reg_name)); size -= t; next += t; } +#define PROC_PRINT(f, x...) {t = scnprintf(next, size, f, ## x); size -= t; \ + next += t; } + +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct npcm7xx_rxbd *rxbd; +unsigned long flags; +unsigned int i, cur, txd_offset, rxd_offset; +char *next = buf; +unsigned int size = count; +int t; +int is_locked =spin_is_locked (ðer->lock); + +if (!is_locked) +spin_lock_irqsave (ðer->lock, flags); + +/* ------basic driver information ---- */ +PROC_PRINT ("NPCM7XX EMC %s driver version: %s\n" , dev->name, +DRV_MODULE_VERSION ); + +REG_PRINT (REG_CAMCMR ); +REG_PRINT (REG_CAMEN ); +REG_PRINT (REG_CAMM_BASE ); +REG_PRINT (REG_CAML_BASE ); +REG_PRINT (REG_TXDLSA ); +REG_PRINT (REG_RXDLSA ); +REG_PRINT (REG_MCMDR ); +REG_PRINT (REG_MIID ); +REG_PRINT (REG_MIIDA ); +REG_PRINT (REG_FFTCR ); +REG_PRINT (REG_TSDR ); +REG_PRINT (REG_RSDR ); +REG_PRINT (REG_DMARFC ); +REG_PRINT (REG_MIEN ); +REG_PRINT (REG_MISTA ); +REG_PRINT (REG_MGSTA ); +REG_PRINT (REG_MPCNT ); +__raw_writel (0x7FFF ,REG_MPCNT ); +REG_PRINT (REG_MRPC ); +REG_PRINT (REG_MRPCC ); +REG_PRINT (REG_MREPC ); +REG_PRINT (REG_DMARFS ); +REG_PRINT (REG_CTXDSA ); +REG_PRINT (REG_CTXBSA ); +REG_PRINT (REG_CRXDSA ); +REG_PRINT (REG_CRXBSA ); +REG_PRINT (REG_RXFSM ); +REG_PRINT (REG_TXFSM ); +REG_PRINT (REG_FSM0 ); +REG_PRINT (REG_FSM1 ); +REG_PRINT (REG_DCR ); +REG_PRINT (REG_DMMIR ); +REG_PRINT (REG_BISTR ); +PROC_PRINT ("\n" ); + +PROC_PRINT ("netif_queue %s\n\n" ,netif_queue_stopped (dev) ? +"Stopped" :"Running" ); +if (ether->rdesc) +PROC_PRINT ("napi is %s\n\n" ,test_bit (NAPI_STATE_SCHED , + ðer->napi.state) ? +"scheduled" : +"not scheduled" ); + + txd_offset = (__raw_readl (REG_CTXDSA ) - +__raw_readl (REG_TXDLSA ))/sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("TXD offset %6d\n" , txd_offset); +PROC_PRINT ("cur_tx %6d\n" , ether->cur_tx); +PROC_PRINT ("finish_tx %6d\n" , ether->finish_tx); +PROC_PRINT ("pending_tx %6d\n" , ether->pending_tx); +/* debug counters */ +PROC_PRINT ("tx_tdu %6d\n" , ether->tx_tdu); + ether->tx_tdu =0 ; +PROC_PRINT ("tx_tdu_i %6d\n" , ether->tx_tdu_i); + ether->tx_tdu_i =0 ; +PROC_PRINT ("tx_cp_i %6d\n" , ether->tx_cp_i); + ether->tx_cp_i =0 ; +PROC_PRINT ("tx_int_count %6d\n" , ether->tx_int_count); + ether->tx_int_count =0 ; +PROC_PRINT ("count_xmit tx %6d\n" , ether->count_xmit); + ether->count_xmit =0 ; +PROC_PRINT ("count_finish %6d\n" , ether->count_finish); + ether->count_finish =0 ; +PROC_PRINT ("\n" ); + + rxd_offset = (__raw_readl (REG_CRXDSA )-__raw_readl (REG_RXDLSA )) + /sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("RXD offset %6d\n" , rxd_offset); +PROC_PRINT ("cur_rx %6d\n" , ether->cur_rx); +PROC_PRINT ("rx_err %6d\n" , ether->rx_err); + ether->rx_err =0 ; +PROC_PRINT ("rx_berr %6d\n" , ether->rx_berr); + ether->rx_berr =0 ; +PROC_PRINT ("rx_stuck %6d\n" , ether->rx_stuck); + ether->rx_stuck =0 ; +PROC_PRINT ("rdu %6d\n" , ether->rdu); + ether->rdu =0 ; +PROC_PRINT ("rxov rx %6d\n" , ether->rxov); + ether->rxov =0 ; +// debug counters +PROC_PRINT ("rx_int_count %6d\n" , ether->rx_int_count); + ether->rx_int_count =0 ; +PROC_PRINT ("rx_err_count %6d\n" , ether->rx_err_count); + ether->rx_err_count =0 ; +PROC_PRINT ("rx_count_pool %6d\n" , ether->rx_count_pool); + ether->rx_count_pool =0 ; +PROC_PRINT ("max_waiting_rx %5d\n" , ether->max_waiting_rx); + ether->max_waiting_rx =0 ; +PROC_PRINT ("\n" ); +PROC_PRINT ("need_reset %5d\n" , ether->need_reset); + +if (ether->tdesc && ether->rdesc) { + cur = ether->finish_tx -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("finish %3d txbd mode %08X buffer %08X sl " +"%08X next %08X tx_skb %p\n" , cur, + txbd->mode, txbd->buffer, txbd->sl, + txbd->next, ether->tx_skb[cur]); + } +PROC_PRINT ("\n" ); + + cur = txd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("txd_of %3d txbd mode %08X buffer %08X sl " +"%08X next %08X\n" , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); + } +PROC_PRINT ("\n" ); + + cur = ether->cur_tx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("cur_tx %3d txbd mode %08X buffer %08X sl " +"%08X next %08X " , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X MISTA %08X MIEN %08X\n" , + txbd->diff, txbd->ts, txbd->t2, txbd->t3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = ether->cur_rx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("cur_rx %3d rxbd sl %08X buffer %08X sl " +"%08X next %08X " , cur, rxbd->sl, + rxbd->buffer, rxbd->reserved, rxbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X i_diff %08X i_ts %08X\n" , + rxbd->diff, rxbd->ts, rxbd->r2, rxbd->r3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = rxd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("rxd_of %3d rxbd sl %08X buffer %08X sl %08X" +" next %08X\n" , cur, rxbd->sl, rxbd->buffer, + rxbd->reserved, rxbd->next); + } +PROC_PRINT ("\n" ); + } + +if (!is_locked) +spin_unlock_irqrestore (ðer->lock, flags); + +return count - size; +} + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev) +{ +char *emc_dump_buf; +int count; +struct npcm7xx_ether *ether; +struct platform_device *pdev; +const size_t print_size =5 *PAGE_SIZE ; + + ether =netdev_priv (dev); + pdev = ether->pdev; + + emc_dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!emc_dump_buf) +dev_err (&pdev->dev,"emc_dump_buf = kmalloc(PAGE_SIZE, " +"GFP_KERNEL) failed\n" ); +else { +char c; +char *tmp_buf = emc_dump_buf; + + count =npcm7xx_info_dump (emc_dump_buf, print_size, dev); +while (count >512 ) { + c = tmp_buf[512 ]; + tmp_buf[512 ] =0 ; +pr_info ("%s" , tmp_buf); + tmp_buf +=512 ; + tmp_buf[0 ] = c; + count -=512 ; + } +printk ("%s" , tmp_buf); +kfree (emc_dump_buf); + } +} +#endif + +static int npcm7xx_proc_read (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +const size_t print_size =5 *PAGE_SIZE ; + +if (ether->dump_buf ==NULL ) { + ether->dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!ether->dump_buf) +return -1 ; +npcm7xx_info_dump (ether->dump_buf, print_size, dev); + } + +seq_printf (sf,"%s" , ether->dump_buf); + +if (sf->count < sf->size) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static int npcm7xx_ether_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_read,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops = { + .open = npcm7xx_ether_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int npcm7xx_proc_reset (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned long flags; + +seq_printf (sf,"Ask to reset the module\n" ); +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); + +return 0 ; +} + +static int npcm7xx_ether_proc_reset (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_reset,PDE_DATA (inode));
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1960
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+} + +static const struct file_operations npcm7xx_ether_proc_fops_reset = { + .open = npcm7xx_ether_proc_reset, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};
Get rid of all the proc stuff. Use ethtool for register dumps if needed.
Quoted 75 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+static const struct of_device_id emc_dt_id[] = { + { .compatible ="nuvoton,npcm750-emc" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, emc_dt_id);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1976
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +static int npcm7xx_ether_probe (struct platform_device *pdev) +{ +struct npcm7xx_ether *ether; +struct net_device *dev; +int error; +char proc_filename[32 ]; + + +#ifdef CONFIG_OF Remove these guards. We will be using OF to probe the driver in the common case.
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+struct clk *emc_clk =NULL ; +const struct of_device_id *of_id; +struct device_node *np = pdev->dev.of_node; + + pdev->id =of_alias_get_id (np,"ethernet" ); +if (pdev->id <0 ) + pdev->id =0 ; + + emc_clk =devm_clk_get (&pdev->dev,NULL ); + +if (IS_ERR (emc_clk)) +return PTR_ERR (emc_clk); + +/* Enable Clock */ drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2000
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+clk_prepare_enable (emc_clk); +#endif + + +/* disable for now - need to check if necessary */ + gcr_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-gcr" ); +if (IS_ERR (gcr_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-gcr\n" , __func__); +return IS_ERR (gcr_regmap); + }Remove the GCR and muxing code. This will be handled by your pinmux driver.
Quoted 30 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +30
-0+ + rst_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-rst" ); +if (IS_ERR (rst_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-rst\n" , __func__); +return IS_ERR (rst_regmap); + } + +/* Muxing RMII MDIO */ +if (pdev->id ==0 ) { +regmap_update_bits (gcr_regmap,MFSEL3_OFFSET , (0x1 <<9 ), + (0x1 <<9 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<13 ), + (0x1 <<13 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<12 ), + (0x1 <<12 )); +regmap_update_bits (gcr_regmap,INTCR_OFFSET , (0x1 <<5 ), + (0x1 <<5 )); + } +if (pdev->id ==1 ) { +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<14 ), + (0x1 <<14 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<16 ), + (0x1 <<16 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<15 ), + (0x1 <<15 )); + } + +/* Reset EMC module */ +if (pdev->id ==0 ) { + regmap_update_bits(rst_regmap, IPSRST1_OFFSET, (0x1 << 6),
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2038
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ (0x1 << 6)); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ),0 ); + } +if (pdev->id ==1 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ), + (0x1 <<21 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ),0 ); + }
A reset or clk driver should take care of the above.
Quoted 1 line
Quoted 1 line
+ #ifdef
CONFIG_OF
As Joel says, remove all the CONFIG_OF.
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2046
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ of_id =of_match_device (emc_dt_id, &pdev->dev); +if (!of_id) { +dev_err (&pdev->dev,"Error: No device match found\n" ); +return -ENODEV ; + } +/*
Why do you need that ? You've already been matched.
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ * Right now device-tree probed devices don't get dma_mask set. + * Since shared usb code
USB ?
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2054
Quoted 7 lines
relies on it, set it here for now.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+* Once we have dma capability bindings this can go away. +*/ + error =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (error) +return -ENODEV ; +#endif
That looks odd... Joel, I fogot now, how do we get the dma_mask established on aspeed ? I don't remember the need to use the "coerce" forms.
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2060
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ dev =alloc_etherdev (sizeof (struct npcm7xx_ether )); +if (!dev) +return -ENOMEM ; + +snprintf (dev->name,IFNAMSIZ ,"eth%d" , pdev->id);
That might cause you surprises if another ethernet driver has picked up those numbers already... I wouldn't do that, I would just leave the network stack pick a name.
Quoted 44 lines
Quoted 44 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +42
-0+ ether =netdev_priv (dev); + + ether->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (ether->res ==NULL ) { +dev_err (&pdev->dev,"failed to get I/O memory\n" ); + error = -ENXIO ; + goto failed_free; + } + +if (!request_mem_region (ether->res->start, +resource_size (ether->res), pdev->name)) { +dev_err (&pdev->dev,"failed to request I/O memory\n" ); + error = -EBUSY ; + goto failed_free; + } + + ether->reg =ioremap (ether->res->start,resource_size (ether->res)); +EMC_DEBUG (" ether->reg = 0x%x\n" , __func__, (unsigned int )ether->reg); + +if (ether->reg ==NULL ) { +dev_err (&pdev->dev,"failed to remap I/O memory\n" ); + error = -ENXIO ; + goto failed_free_mem; + } + + ether->txirq =platform_get_irq (pdev,0 ); +if (ether->txirq <0 ) { +dev_err (&pdev->dev,"failed to get ether tx irq\n" ); + error = -ENXIO ; + goto failed_free_io; + } + + ether->rxirq =platform_get_irq (pdev,1 ); +if (ether->rxirq <0 ) { +dev_err (&pdev->dev,"failed to get ether rx irq\n" ); + error = -ENXIO ; + goto failed_free_txirq; + } + +SET_NETDEV_DEV (dev, &pdev->dev); +platform_set_drvdata (pdev, dev); + ether->ndev = dev;
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2112
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ + ether->pdev = pdev; + ether->msg_enable =NETIF_MSG_LINK ; + + dev->netdev_ops = &npcm7xx_ether_netdev_ops; + dev->ethtool_ops = &npcm7xx_ether_ethtool_ops; + + dev->tx_queue_len =TX_DESC_SIZE ;
The name is ambiguous ... is it a queue lenght or a descriptor size ...
Quoted 28 lines
Quoted 28 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +28
-0+ dev->dma =0x0 ; + dev->watchdog_timeo =TX_TIMEOUT ; + +get_mac_address (dev); + + ether->cur_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->link =0 ; + ether->speed =100 ; + ether->duplex =DUPLEX_FULL ; + ether->need_reset =0 ; + ether->dump_buf =NULL ; + ether->rx_berr =0 ; + ether->rx_err =0 ; + ether->rdu =0 ; + ether->rxov =0 ; + ether->rx_stuck =0 ; +// debug counters + ether->max_waiting_rx =0 ; + ether->rx_count_pool =0 ; + ether->count_xmit =0 ; + ether->rx_int_count =0 ; + ether->rx_err_count =0 ; + ether->tx_int_count =0 ; + ether->count_finish =0 ; + ether->tx_tdu =0 ;
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2148
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; + +spin_lock_init (ðer->lock); + +netif_napi_add (dev, ðer->napi, npcm7xx_poll,RX_POLL_SIZE ); + +ether_setup (dev);
Do you need that ether_setup ? Normally drivers don't need that, alloc_etherdev does it.
Quoted 13 lines
Quoted 13 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ error =npcm7xx_mii_setup (dev); +if (error <0 ) { +dev_err (&pdev->dev,"npcm7xx_mii_setup err\n" ); + goto failed_free_rxirq; + } + + error =register_netdev (dev); +if (error !=0 ) { +dev_err (&pdev->dev,"register_netdev() failed\n" ); + error = -ENODEV ; + goto failed_free_rxirq; + } + snprintf(proc_filename, sizeof(proc_filename), "%s.%d", PROC_FILENAME,
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2170
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ pdev->id); +proc_create_data (proc_filename,0000 ,NULL , &npcm7xx_ether_proc_fops, + dev); + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +proc_create_data (proc_filename,0000 ,NULL , + &npcm7xx_ether_proc_fops_reset, dev);
Kill the proc gunk.
Quoted 80 lines
Quoted 66 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +66
-0+return 0 ; + +failed_free_rxirq: +free_irq (ether->rxirq, pdev); +platform_set_drvdata (pdev,NULL ); +failed_free_txirq: +free_irq (ether->txirq, pdev); +failed_free_io: +iounmap (ether->reg); +failed_free_mem: +release_mem_region (ether->res->start,resource_size (ether->res)); +failed_free: +free_netdev (dev); + +return error; +} + +static int npcm7xx_ether_remove (struct platform_device *pdev) +{ +struct net_device *dev =platform_get_drvdata (pdev); +struct npcm7xx_ether *ether =netdev_priv (dev); +char proc_filename[32 ]; + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d" ,PROC_FILENAME , + pdev->id); +remove_proc_entry (proc_filename,NULL ); +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +remove_proc_entry (proc_filename,NULL ); + +unregister_netdev (dev); + + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +if (ether->phy_dev) +phy_disconnect (ether->phy_dev); + +mdiobus_unregister (ether->mii_bus); +kfree (ether->mii_bus->irq); +mdiobus_free (ether->mii_bus); + +platform_set_drvdata (pdev,NULL ); + +free_netdev (dev); +return 0 ; +} + +static struct platform_driver npcm7xx_ether_driver = { + .probe = npcm7xx_ether_probe, + .remove = npcm7xx_ether_remove, + .driver = { + .name =DRV_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (emc_dt_id), + }, +}; + +#ifdef CONFIG_OF +module_platform_driver (npcm7xx_ether_driver); +#else +static int __init npcm7xx_ether_init (void ) +{ + +return platform_driver_register (&npcm7xx_ether_driver);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2247
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+} + +static void __exit npcm7xx_ether_exit(void) +{ +platform_driver_unregister (&npcm7xx_ether_driver); +} + +module_init (npcm7xx_ether_init); +module_exit (npcm7xx_ether_exit); +#endif
platform_driver_register(npcm7xx_ether_driver);Cheers,
Avi Fishman
maintainerRe: [PATCH linux dev-4.13 v1 2/2] net: npcm: add NPCM7xx Ethernet MAC controller
Hi,
Thank you Joel and Benjamin/
My inputs also on Joel remarks, if I didn't comment I accept the comment. My original driver was heavily tested by our customer. I am a little afraid of big changes.
Can you let me kow what is a must for now, and what can be done later.
Quoted 5 lines · Benjamin Herrenschmidt
Quoted 4 lines · Joel Stanley
Quoted 1 line
+#define
ETH_TRIGGER_RXdo {__raw_writel(ENSTART, REG_RSDR); } while (0)Get rid of these macros.
Quoted 17 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 229
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#define ETH_TRIGGER_TX do { __raw_writel(ENSTART, REG_TSDR); } while (0) +#define ETH_ENABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_ENABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_RXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_RXON, REG_MCMDR); } while (0)Why is
__rawappropriate here ? It does two things in theory (though I'm not 100% familiar with the ARM semantic for your cores), one is bypass endian conversion which might not be a great idea in your case, and one is bypass various ordering barriers, which also looks fishy unless you put explicit barriers on the call sites.
OK - it was taken from old code, we will change
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +26
-0+struct plat_npcm7xx_emc_data { +char *phy_bus_name; +int phy_addr; +unsigned char mac_addr[ETH_ALEN ]; +}; + +struct npcm7xx_rxbd { +unsigned int sl; +unsigned int buffer; +unsigned int reserved; +unsigned int next; +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff; +unsigned int ts; +unsigned int r2; +unsigned int r3; +#endif +}; + +struct npcm7xx_txbd { +unsigned int mode;/* Ownership bit and some other bits */ +unsigned int buffer;/* Transmit Buffer Starting Address */ +unsigned int sl;/* Transmit Byte Count and status bits */ +unsigned int next;/* Next Tx Descriptor Starting Address */ +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff;
Quoted 9 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 261
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+unsigned int ts; +unsigned int t2; +unsigned int t3; +#endif +};Are the above HW descriptor definitions ? Then use the appropriate endian explicit and size explicit types such as
__le32.
Is it fine to use __u32 or since it is HW we should use __le32?
Quoted 12 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 267
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ +struct npcm7xx_ether { +struct sk_buff *rx_skb[RX_DESC_SIZE ]; +struct sk_buff *tx_skb[TX_DESC_SIZE ]; +spinlock_t lock;You probably don't need that lock... Most ethernet drivers with a private lock dont' actually need it. It depends what you use it for mind you but often, all the rx/tx path is handled by the tx queue lock, and there's a mutex in the PHY structure. Those two tend to be all you need.
Quoted 3 lines
I suggest you look at how I did it in the current version of ftgmac100 and how the reset task synchronizes with both path.
So both npcm750_ether_start_xmit() and npcm750_poll() can't run at the same time, even in SMP mode?
What about interrupts if they are accesing some shaered resources I still need to protect for example REG_MIEN register writing.
Quoted 10 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 276
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+struct npcm7xx_rxbd *rdesc; +struct npcm7xx_txbd *tdesc; +dma_addr_t rdesc_phys; +dma_addr_t tdesc_phys; +struct net_device_stats stats; +struct platform_device *pdev; +struct net_device *ndev; +struct resource *res; +//struct sk_buff *skb;
Quoted 50 lines
Get rid of that :-)
Quoted 48 lines
Quoted 36 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +36
-0+unsigned int msg_enable; +struct mii_bus *mii_bus; +struct phy_device *phy_dev; +struct napi_struct napi; +void __iomem *reg; +int rxirq; +int txirq; +unsigned int cur_tx; +unsigned int cur_rx; +unsigned int finish_tx; +unsigned int pending_tx; +unsigned int start_tx_ptr; +unsigned int start_rx_ptr; +unsigned int rx_berr; +unsigned int rx_err; +unsigned int rdu; +unsigned int rxov; +unsigned int camcmr; +unsigned int rx_stuck; +int link; +int speed; +int duplex; +int need_reset; +char *dump_buf; + +// debug counters +unsigned int max_waiting_rx; +unsigned int rx_count_pool; +unsigned int count_xmit; +unsigned int rx_int_count; +unsigned int rx_err_count; +unsigned int tx_int_count; +unsigned int tx_tdu; +unsigned int tx_tdu_i; +unsigned int tx_cp_i; +unsigned int count_finish;drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 322
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+}; + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev); +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev); +#endif +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +void npcm7xx_clk_GetTimeStamp (u32 time_quad[2 ]); +#endif Avoid forward declarations where you can.
Do you mean to put it at the beginning?
BTW, I will probably get rid of all CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT
Quoted 217 lines
Also avoid CamelCaps
Quoted 205 lines
Quoted 57 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +57
-0+ +static void adjust_link (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +unsigned int val; +bool status_change = false; +unsigned long flags; + +// clear GPIO interrupt status whihc indicates PHY statu change? + +spin_lock_irqsave (ðer->lock, flags); + +if (phydev->link) { +if ((ether->speed != phydev->speed) || + (ether->duplex != phydev->duplex)) { + ether->speed = phydev->speed; + ether->duplex = phydev->duplex; + status_change = true; + } + }else { + ether->speed =0 ; + ether->duplex =-1 ; + } + +if (phydev->link != ether->link) { + + ether->link = phydev->link; + + status_change = true; + } + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status_change) { + + val =__raw_readl (REG_MCMDR ); + +if (ether->speed ==100 ) + val |=MCMDR_OPMOD ; +else + val &= ~MCMDR_OPMOD ; + +if (ether->duplex ==DUPLEX_FULL ) + val |=MCMDR_FDUP ; +else + val &= ~MCMDR_FDUP ; + +__raw_writel (val,REG_MCMDR ); + } +} + + + +static void npcm7xx_write_cam (struct net_device *dev, +unsigned int x,unsigned char *pval) +{drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 389
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int msw, lsw; + + msw = (pval[0 ] <<24 ) | (pval[1 ] <<16 ) | (pval[2 ] <<8 ) | pval[3 ]; + + lsw = (pval[4 ] <<24 ) | (pval[5 ] <<16 ); + +__raw_writel (lsw,REG_CAML_BASE + x *CAM_ENTRY_SIZE ); +__raw_writel (msw,REG_CAMM_BASE + x *CAM_ENTRY_SIZE ); +//EMC_DEBUG("REG_CAML_BASE = 0x%08X REG_CAMH_BASE = 0x%08X", lsw, msw); Delete commented out code before submitting.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 349
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+} + +Whitespace.
Quoted 129 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +129
-0+static struct sk_buff *get_new_skb (struct net_device *dev,u32 i) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct sk_buff *skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (skb ==NULL ) +return NULL ; + +/* Do not unmark the following skb_reserve() Receive Buffer Starting +* Address must be aligned to 4 bytes and the following line +* if unmarked will make it align to 2 and this likely will +* hult the RX and crash the linux skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + (ether->rdesc + i)->buffer =dma_map_single (&dev->dev, skb->data, +roundup ( +MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); + ether->rx_skb[i] = skb; + +return skb; +} + +static int npcm7xx_init_desc (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +struct npcm7xx_txbd *tdesc; +struct npcm7xx_rxbd *rdesc; +struct platform_device *pdev; +unsigned int i; + + ether =netdev_priv (dev); + pdev = ether->pdev; + +if (ether->tdesc ==NULL ) { + ether->tdesc = (struct npcm7xx_txbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ðer->tdesc_phys, +GFP_KERNEL ); + +if (!ether->tdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"tx desc\n" ); +return -ENOMEM ; + } + } + +if (ether->rdesc ==NULL ) { + ether->rdesc = (struct npcm7xx_rxbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ðer->rdesc_phys, +GFP_KERNEL ); + +if (!ether->rdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"rx desc\n" ); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , ether->tdesc, + ether->tdesc_phys); + ether->tdesc =NULL ; +return -ENOMEM ; + } + } + +for (i =0 ; i <TX_DESC_SIZE ; i++) { +unsigned int offset; + + tdesc = (ether->tdesc + i); + +if (i ==TX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_txbd ) * (i +1 ); + + tdesc->next = ether->tdesc_phys + offset; + tdesc->buffer = (unsigned int )NULL ; + tdesc->sl =0 ; + tdesc->mode =0 ; + } + + ether->start_tx_ptr = ether->tdesc_phys; + +for (i =0 ; i <RX_DESC_SIZE ; i++) { +unsigned int offset; + + rdesc = (ether->rdesc + i); + +if (i ==RX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_rxbd ) * (i +1 ); + + rdesc->next = ether->rdesc_phys + offset; + rdesc->sl =RX_OWEN_DMA ; + +if (get_new_skb (dev, i) ==NULL ) { +dev_err (&pdev->dev,"get_new_skb() failed\n" ); + +for (; i !=0 ; i--) { +dma_unmap_single (&dev->dev, (dma_addr_t) + ((ether->rdesc + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); +dev_kfree_skb_any (ether->rx_skb[i]); + ether->rx_skb[i] =NULL ; + } + +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + +return -ENOMEM ; + } + } + + ether->start_rx_ptr = ether->rdesc_phys; +wmb (); +for (i =0 ; i <TX_DESC_SIZE ; i++)Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 527
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether->tx_skb[i] =NULL ; + +return 0 ; +} + +// This API must call with Tx/Rx stopped C style comments /* foo */
Quoted 2 lines
I would split things a bit. See ftgmac100. Also I would keep a scratch pad to point RX to if you fail to allocate a packet in the rx path.
Do you mean that in error cases I should do somthing like 'goto free tdesc;' so the error cases will be at the end?
Quoted 332 lines
Quoted 332 lines
Quoted 181 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +180
-0+static void npcm7xx_free_desc (struct net_device *dev,bool free_also_descriptors) +{ +struct sk_buff *skb; +u32 i; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; + +for (i =0 ; i <TX_DESC_SIZE ; i++) { + skb = ether->tx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->tdesc + + i)->buffer), + skb->len,DMA_TO_DEVICE ); +dev_kfree_skb_any (skb); + ether->tx_skb[i] =NULL ; + } + } + +for (i =0 ; i <RX_DESC_SIZE ; i++) { + skb = ether->rx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->rdesc + + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); +dev_kfree_skb_any (skb); + ether->rx_skb[i] =NULL ; + } + } + +if (free_also_descriptors) { +if (ether->tdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); + ether->tdesc =NULL ; + +if (ether->rdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + ether->rdesc =NULL ; + } + +} + +static void npcm7xx_set_fifo_threshold (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =RXTHD |TXTHD |BLENGTH ; +__raw_writel (val,REG_FFTCR ); +} + +static void npcm7xx_return_default_idle (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; +unsigned int saved_bits; + + val =__raw_readl (REG_MCMDR ); + saved_bits = val & (MCMDR_FDUP |MCMDR_OPMOD ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + val |=SWR ; +__raw_writel (val,REG_MCMDR ); + +/* During the EMC reset the AHB will read 0 from all registers, +* so in order to see if the reset finished we can't count on +* REG_MCMDR.SWR to become 0, instead we read another +* register that its reset value is not 0, we choos REG_FFTCR. +*/ +do { + val =__raw_readl (REG_FFTCR ); + }while (val ==0 ); + +// Now we can verify if REG_MCMDR.SWR became 0 (probably it will be 0 on the first read). +do { + val =__raw_readl (REG_MCMDR ); + }while (val &SWR ); + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); +// restore values +__raw_writel (saved_bits,REG_MCMDR ); +} + + +static void npcm7xx_enable_mac_interrupt (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val = ENRXINTR | // Start of RX interrupts + ENCRCE | + EMRXOV | +#ifndef VLAN_SUPPORT +ENPTLE |// Since we don't support VLAN we want interrupt on long packets +#endif +ENRXGD | +ENALIE | +ENRP | +ENMMP | +ENDFO | +/* ENDENI | */ // We don't need interrupt on DMA Early Notification +ENRDU |// We don't need interrupt on Receive Descriptor Unavailable Interrupt +ENRXBERR | +/* ENCFR | */ +ENTXINTR |// Start of TX interrupts +ENTXEMP | +ENTXCP | +ENTXDEF | +ENNCS | +ENTXABT | +ENLC | +/* ENTDU | */ // We don't need interrupt on Transmit Descriptor Unavailable at start of operation +ENTXBERR ; +__raw_writel (val,REG_MIEN ); +} + +static void npcm7xx_get_and_clear_int (struct net_device *dev, +unsigned int *val,unsigned int mask) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + *val =__raw_readl (REG_MISTA ) & mask; +__raw_writel (*val,REG_MISTA ); +} + +static void npcm7xx_set_global_maccmd (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =__raw_readl (REG_MCMDR ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + + val |=MCMDR_SPCRC |MCMDR_ENMDC |MCMDR_ACP |MCMDR_NDEF ; +#ifdef VLAN_SUPPORT +// we set ALP accept long packets since VLAN packets are 4 bytes longer than 1518 + val |=MCMDR_ALP ; +// limit receive length to 1522 bytes due to VLAN +__raw_writel (MAX_PACKET_SIZE_W_CRC ,REG_DMARFC ); +#endif +__raw_writel (val,REG_MCMDR ); +} + +static void npcm7xx_enable_cam (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + + val =__raw_readl (REG_CAMEN ); + val |=CAM0EN ; +__raw_writel (val,REG_CAMEN ); +} + + +static void npcm7xx_set_curdest (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +__raw_writel (ether->start_rx_ptr,REG_RXDLSA ); +__raw_writel (ether->start_tx_ptr,REG_TXDLSA ); +} + +static void npcm7xx_reset_mac (struct net_device *dev,int need_free) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +netif_tx_lock (dev); + +ETH_DISABLE_TX ; +ETH_DISABLE_RX ; + +npcm7xx_return_default_idle (dev); +npcm7xx_set_fifo_threshold (dev);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 717
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +/*if (!netif_queue_stopped(dev)) +netif_stop_queue(dev);*/ + +if (need_free) +npcm7xx_free_desc (dev, false); + +npcm7xx_init_desc (dev); + +//dev->trans_start = jiffies; /* prevent tx timeout */ Remove commented out code.
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+ ether->cur_tx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; + +npcm7xx_set_curdest (dev); +npcm7xx_enable_cam (dev); +npcm7xx_ether_set_multicast_list (dev); +npcm7xx_enable_mac_interrupt (dev); +npcm7xx_set_global_maccmd (dev); +ETH_ENABLE_TX ;drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 741
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ETH_ENABLE_RX ; + +ETH_TRIGGER_RX ; + +//dev->trans_start = jiffies; /* prevent tx timeout */ + +/*if (netif_queue_stopped(dev)) +netif_wake_queue(dev);*/ + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", __raw_readl(REG_MCMDR)); Remove this.
Quoted 111 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +111
-0+ + ether->need_reset =0 ; + +netif_wake_queue (dev); +netif_tx_unlock (dev); +} + +static int npcm7xx_mdio_write (struct mii_bus *bus,int phy_id,int regnum, +u16 value) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + +__raw_writel (value,REG_MIID ); +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY |PHYWR ,REG_MIIDA ); + + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return 0 ; + +} + +static int npcm7xx_mdio_read (struct mii_bus *bus,int phy_id,int regnum) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + + +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY ,REG_MIIDA ); + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return __raw_readl (REG_MIID ); +} + +static int npcm7xx_mdio_reset (struct mii_bus *bus) +{ + +// reser ENAC engine?? +return 0 ; +} + +static int npcm7xx_set_mac_address (struct net_device *dev,void *addr) +{ +struct sockaddr *address = addr; + +if (!is_valid_ether_addr ((u8 *)address->sa_data)) +return -EADDRNOTAVAIL ; + +memcpy (dev->dev_addr, address->sa_data, dev->addr_len); +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + +return 0 ; +} + +static int npcm7xx_ether_close (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +if (ether->phy_dev) +phy_stop (ether->phy_dev); + +npcm7xx_return_default_idle (dev); + +msleep (10 ); + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +netif_stop_queue (dev); +napi_disable (ðer->napi); + +npcm7xx_free_desc (dev, true); + +if (ether->dump_buf) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static struct net_device_stats *npcm7xx_ether_stats (struct net_device *dev) +{ +struct npcm7xx_ether *ether; + + ether =netdev_priv (dev); +
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 858
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+return ðer->stats; +} + + +static int npcm7xx_clean_tx (struct net_device *dev,bool from_xmit) +{This should be done from NAPI, see below or see other drivers.
I am calling this both from napi and from the xmit since there are cases that I miss the tx interrupt (due to HW issue) and nobady will clear the pending_tx counter so for xmit I also check to clean those
Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +66
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct sk_buff *s; +unsigned int cur_entry, entry, sl; + +if (ether->pending_tx ==0 ) +return (0 ); + + cur_entry =__raw_readl (REG_CTXDSA ); + +// Release old used buffers + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + +while (entry != cur_entry) { + txbd = (ether->tdesc + ether->finish_tx); + s = ether->tx_skb[ether->finish_tx]; +if (s ==NULL ) +break ; + + ether->count_finish++; + +dma_unmap_single (&dev->dev, txbd->buffer, s->len, +DMA_TO_DEVICE ); +consume_skb (s); + ether->tx_skb[ether->finish_tx] =NULL ; + +if (++ether->finish_tx >=TX_DESC_SIZE ) + ether->finish_tx =0 ; + ether->pending_tx--; + + sl = txbd->sl; +if (sl &TXDS_TXCP ) { + ether->stats.tx_packets++; + ether->stats.tx_bytes += (sl &0xFFFF ); + }else { + ether->stats.tx_errors++; + } + + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + } + +if (!from_xmit &&unlikely (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 )) { +netif_tx_lock (dev); +if (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 ) { +netif_wake_queue (dev); + } +netif_tx_unlock (dev); + } + +return (0 ); +} + +static int npcm7xx_ether_start_xmit (struct sk_buff *skb,struct net_device *dev) +{struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +unsigned long flags; + +/* This is a hard error log it. */ +if (ether->pending_tx >= (TX_DESC_SIZE -1 )) { +dev_err (ðer->pdev->dev,"%s: BUG! Tx Ring full when queue " +"awake!\n" , dev->name); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG
Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 930
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+npcm7xx_info_print (dev); +#endif +netif_stop_queue (dev); +return NETDEV_TX_BUSY ; + }Did it ever happen ? Most drivers don't check that these days, it would be a pretty gross SW bug.
It happend in the past maybe due to SW bug, indeed for a long time I didn't see it, I will remove.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
+ ether->count_xmit++;
You are duplicating existing counters here...
ether->count_xmit is a debug counter that always counts up and only clears after I print it.
Quoted 12 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 941
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+// Insert new buffer + + txbd = (ether->tdesc + ether->cur_tx); + + txbd->buffer =dma_map_single (&dev->dev, skb->data, + skb->len,DMA_TO_DEVICE ); + + ether->tx_skb[ether->cur_tx] = skb;You're HW can't do fragmented tx ? That's unfortunate as it will kill performance. What about HW checksum ? VLAN injection ?
If fragmants meaning issuing an interrupt only on the last fragment than we can support (as said due to HW issue in rare cases we miss that interrupt)
It does the checsum see CRCMODE bit below, no VLAN injection by HW (actually I am not sure what it is).
Quoted 15 lines
Quoted 11 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 952
Quoted 11 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+if (skb->len >MAX_PACKET_SIZE ) +dev_err (ðer->pdev->dev,"skb->len (= %d) > MAX_PACKET_SIZE " +"(= %d)\n" , skb->len, +MAX_PACKET_SIZE ); + + txbd->sl = skb->len >MAX_PACKET_SIZE ?MAX_PACKET_SIZE : skb->len; +wmb (); + + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE ; +wmb ();Do you need two wmb's ? I would think all you need is one
dma_wmb()before setting the OWN (not OWEN !) bit. If you don't use the__rawaccessors you should be fine.
I guess you are right if I will remove the __raw.
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 958
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ETH_TRIGGER_TX ; + +if (++ether->cur_tx >=TX_DESC_SIZE ) + ether->cur_tx =0 ; +spin_lock_irqsave (ðer->lock, flags);Why the lock ? The network stack is holding a tx lock for you
Here for example I want to protect ether->pending_tx and ether->finish_tx, if you are sure that the napi poll and the xmit can't run in parallel, I can remove that.
I will still need to protect with lock resources that are changed both by interrupt and non-interrupt code.
I see that your driver at 4.10 you still had locks, are you sure that network stack tx lock also locked the poll in 4.10?
Quoted 23 lines
Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ ether->pending_tx++; + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +//spin_lock_irqsave(ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +//pin_unlock_irqrestore(ðer->lock, flags); + txbd->diff = (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + txbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ;Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 979
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ txbd->t2 =__raw_readl (REG_MISTA ); + txbd->t3 =__raw_readl (REG_MIEN ); + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1] = iUsCnt2[1]; + } +#endif + +npcm7xx_clean_tx (dev, true);
Quoted 1 line
Why there ? TX cleaning should be done from NAPI only.
See above my comment on missed interrupts.
Quoted 11 lines
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 986
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+if (ether->pending_tx >=TX_DESC_SIZE -1 ) { +unsigned int reg_mien; +unsigned int index_to_wake = ether->cur_tx + (TX_DESC_SIZE *3 /4 ); + +if (index_to_wake >=TX_DESC_SIZE ) + index_to_wake -=TX_DESC_SIZE ;Does it help at all to have that hysteresis on wakes ? If the cleaning is done from NAPI as it should be you'll already be cleanning up in bulks, so that doesn't look necessary.
What if there is a storm of TX before the NAPI will be scheduled, I am setting interrupt here to make ?
Quoted 9 lines
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 990
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+ txbd = (ether->tdesc + index_to_wake); + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE |MACTXINTEN ; +wmb ();This is very fishy and allegedly racy.
Why can't you just turn TX interrupts off when doing NAPI and simply keep NAPI going as long as either TX or RX isn't complete ?
Maybe I am missing somthing:
Isn't the NAPI made for RX, for TX I can continue transmit untill I have no room and then only wait for interrupts that will inform me that I have new room for new packets.
Here I am stopping the transmit when I see that the pending transmits are becomming full, and also enable the TDU that triggers an interrupt when all packets had transmitted due to the HW issue that I might miss the last packet interrupt.
Quoted 26 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 999
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+__raw_writel (MISTA_TDU ,REG_MISTA );// Clear TDU interrupt + reg_mien =__raw_readl (REG_MIEN ); + +if (reg_mien !=0 ) +__raw_writel (reg_mien |ENTDU ,REG_MIEN );// Enable TDU interrupt + + ether->tx_tdu++; +netif_stop_queue (dev);Once you remove your custom lock you need to use a construct like this (from ftgmac100 but a lot of drivers do the same):
/* If there isn't enough room for all the fragments of a new packet * in the TX ring, stop the queue. The sequence below is race free * vs. a concurrent restart in ftgmac100_poll() */ if (unlikely(ftgmac100_tx_buf_avail(priv) < TX_THRESHOLD)) { netif_stop_queue(netdev); /* Order the queue stop with the test below */ smp_mb(); if (ftgmac100_tx_buf_avail(priv) >= TX_THRESHOLD) netif_wake_queue(netdev); }
Quoted 1 line
On the NAPI side, you need to take the tx queue lock.
Isn't my code is quite the same? I am calling netif_stop_queue() when getting full and in clean_tx() that is called from napi poll I am calling netif_wake_queue() (note that in that case only if the clean_tx() is called from poll, if it is called from xmit() I am not calling netif_wake_queue())
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +16
-0+ } + +spin_unlock_irqrestore (ðer->lock, flags); + +return 0 ; +} + +static irqreturn_t npcm7xx_tx_interrupt (int irq,void *dev_id) +{ +struct npcm7xx_ether *ether; +struct platform_device *pdev; +struct net_device *dev; +unsigned int status; +unsigned long flags; + + dev = dev_id;
Quoted 9 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1021
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether =netdev_priv (dev); + pdev = ether->pdev; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF0000 ); +spin_unlock_irqrestore (ðer->lock, flags);I would handle all interrupts from the NAPI code. Lock is pointless.
Indeed I can remove the lock here since the status register is write 1 to cleare.
Quoted 2 lines
For reset, schedule a reset task like ftgmac100 or sungem (or many other drivers).
I see in ftgmac100 that it also does: priv->need_mac_restart = true;
Quoted 3 lines
Also move the interrupt handler before the NAPI code, it's clearer that way.
OK
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +32
-0+ ether->tx_int_count++; + +if (status &MISTA_EXDEF ) +dev_err (&pdev->dev,"emc defer exceed interrupt status=0x%08X\n" + , status); +else if (status &MISTA_TXBERR ) { +dev_err (&pdev->dev,"emc bus error interrupt status=0x%08X\n" , + status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; + }else if (status & ~(MISTA_TXINTR |MISTA_TXCP |MISTA_TDU )) +dev_err (&pdev->dev,"emc other error interrupt status=0x%08X\n" , + status); + +// if we got MISTA_TXCP | MISTA_TDU remove those interrupt and call napi +if (status & (MISTA_TXCP |MISTA_TDU ) &__raw_readl (REG_MIEN )) { +unsigned int reg_mien; + +spin_lock_irqsave (ðer->lock, flags); + reg_mien =__raw_readl (REG_MIEN ); +if (reg_mien &ENTDU ) +__raw_writel (reg_mien & (~ENTDU ),REG_MIEN );// Disable TDU interrupt + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status &MISTA_TXCP ) + ether->tx_cp_i++;
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1060
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+if (status &MISTA_TDU ) + ether->tx_tdu_i++; + }else +EMC_DEBUG ("status=0x%08X\n" , status); + +napi_schedule (ðer->napi);
_irqoff
OK
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +24
-0+return IRQ_HANDLED ; +} + +static int npcm7xx_poll (struct napi_struct *napi,int budget) +{ +struct npcm7xx_ether *ether = + container_of(napi, struct npcm7xx_ether, napi); +struct npcm7xx_rxbd *rxbd; +struct net_device *dev = ether->ndev; +struct platform_device *pdev = ether->pdev; +struct sk_buff *skb, *s; +unsigned int length, status; +unsigned long flags; +int rx_cnt =0 ; +int complete =0 ; +unsigned int rx_offset = (__raw_readl (REG_CRXDSA ) - + ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); +unsigned int local_count = (rx_offset >= ether->cur_rx) ? + rx_offset - ether->cur_rx : rx_offset + +RX_DESC_SIZE - ether->cur_rx; + +if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count;
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1091
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ +if (local_count > (4 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR );
-ETOOMANYACRONYMS. Please explain.
Due to HW issue I want to avoid getting RDU, Recieve Descriptor Unavalable, since it cause a lot of RX overrun interrupts, so I block accepting new packets
Quoted 6 lines
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1095
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+if (local_count <= budget) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR );Not now. At the end, and only if you are also done with TX reclaims.
I blocked any RX and I have in my chain less than 'budget' of packets, I want to renew the recieving of packets as soon as possible.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
+
spin_lock_irqsave(ðer->lock, flags);Lock is pointless
Again, clean_tx is called in 2 places and has shared resources.
Quoted 9 lines
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1103
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+npcm7xx_clean_tx (dev, false); +spin_unlock_irqrestore (ðer->lock, flags); + + rxbd = (ether->rdesc + ether->cur_rx); + +while (rx_cnt < budget) {Move the RX reclaim to a separate function.
OK
Quoted 23 lines
Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ status = rxbd->sl; +if ((status &RX_OWEN_DMA ) ==RX_OWEN_DMA ) { + complete =1 ; +break ; + } +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +spin_unlock_irqrestore (ðer->lock, flags);Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1123
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ rxbd->diff = ((rx_cnt+1 )<<28 ) + + (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + rxbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ];This chunk needs reworking.
Quoted 1 line
Just remove that gunk.
I will remove the CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT code
Quoted 141 lines
Quoted 141 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1130
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +7
-0+ } +#endif + rxbd->reserved = status;// for debug puposes we save the previous value + s = ether->rx_skb[ether->cur_rx]; + length = status &0xFFFF ; + +#ifdef VLAN_SUPPORT Remove these guards.
Is there a reason you can't have vlan always enabled?
Quoted 128 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +128
-0+if (likely ((status & (RXDS_RXGD |RXDS_CRCE |RXDS_ALIE |RXDS_RP )) + ==RXDS_RXGD ) &&likely (length <=MAX_PACKET_SIZE )) { +#else +if (likely ((status & (RXDS_RXGD |RXDS_CRCE |RXDS_ALIE |RXDS_RP + |RXDS_PTLE )) ==RXDS_RXGD ) && +likely (length <=MAX_PACKET_SIZE )) { +#endif +dma_unmap_single (&dev->dev, (dma_addr_t )rxbd->buffer, +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); + +skb_put (s, length); + s->protocol =eth_type_trans (s, dev); +netif_receive_skb (s); + ether->stats.rx_packets++; + ether->stats.rx_bytes += length; + rx_cnt++; + ether->rx_count_pool++; + +// now we allocate new skb instead if the used one. + skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (!skb) { +dev_err (&pdev->dev,"get skb buffer error\n" ); + ether->stats.rx_dropped++; + goto rx_out; + } + +/* Do not unmark the following skb_reserve() Receive +* Buffer Starting Address must be aligned +* to 4 bytes and the following line if unmarked +* will make it align to 2 and this likely +* will hult the RX and crash the linux +* skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + rxbd->buffer =dma_map_single (&dev->dev, skb->data, +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); + ether->rx_skb[ether->cur_rx] = skb; + }else { + ether->rx_err_count++; + ether->stats.rx_errors++; +EMC_DEBUG ("rx_errors = %lu status = 0x%08X\n" , + ether->stats.rx_errors, status); + +if (status &RXDS_RP ) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + }else if (status &RXDS_CRCE ) { + ether->stats.rx_crc_errors++; +EMC_DEBUG ("rx_crc_errors = %lu\n" , + ether->stats.rx_crc_errors); + }else if (status &RXDS_ALIE ) { + ether->stats.rx_frame_errors++; +EMC_DEBUG ("rx_frame_errors = %lu\n" , + ether->stats.rx_frame_errors); + } +#ifndef VLAN_SUPPORT + else if (status & RXDS_PTLE) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + } +#endif + else if (length > MAX_PACKET_SIZE) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + } + } + +wmb (); + rxbd->sl =RX_OWEN_DMA ; +wmb (); + +if (++ether->cur_rx >=RX_DESC_SIZE ) + ether->cur_rx =0 ; + + rxbd = (ether->rdesc + ether->cur_rx); + + } + +if (complete) { +napi_complete (napi); + +if (ether->need_reset) { +EMC_DEBUG ("Reset\n" ); +npcm7xx_reset_mac (dev,1 ); + } + +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (__raw_readl (REG_MIEN ) |ENRXGD ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + }else { + rx_offset = (__raw_readl (REG_CRXDSA )-ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); + local_count = (rx_offset >= ether->cur_rx) ? rx_offset - + ether->cur_rx : rx_offset +RX_DESC_SIZE - + ether->cur_rx; + +if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count; + +if (local_count > (3 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR ); +if (local_count <=RX_POLL_SIZE ) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR ); + } +rx_out: + +ETH_TRIGGER_RX ; + return rx_cnt; +} + +static irqreturn_t npcm7xx_rx_interrupt (int irq,void *dev_id) +{ +struct net_device *dev = (struct net_device *)dev_id; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; +unsigned int status; +unsigned long flags;
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1264
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+unsigned int any_err =0 ; +u32 RXFSM ; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF ); +spin_unlock_irqrestore (ðer->lock, flags);Lock is probably pointless.
I agreed above for that
Quoted 111 lines
Quoted 111 lines
Quoted 111 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +110
-0+ ether->rx_int_count++; + + +if (unlikely (status &MISTA_RXBERR )) { + ether->rx_berr++; +dev_err (&pdev->dev,"emc rx bus error status=0x%08X\n" , status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); +return IRQ_HANDLED ; + } + +if (unlikely (status & (MISTA_RXOV |MISTA_RDU ))) { +// filter out all received packets until we have enough avaiable buffer descriptors +__raw_writel (0 ,REG_CAMCMR ); + any_err =1 ; +if (status & (MISTA_RXOV )) + ether->rxov++; +if (status & (MISTA_RDU )) + ether->rdu++; + +// workaround Errata 1.36: EMC Hangs on receiving 253-256 byte packet +RXFSM =__raw_readl (REG_RXFSM ); + +if ((RXFSM &0xFFFFF000 ) ==0x08044000 ) { +int i; +for (i =0 ; i <32 ; i++) { +RXFSM =__raw_readl (REG_RXFSM ); +if ((RXFSM &0xFFFFF000 ) !=0x08044000 ) +break ; + } +if (i ==32 ) { + ether->rx_stuck++; +spin_lock_irqsave (ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); +dev_err (&pdev->dev,"stuck on REG_RXFSM = " +"0x%08X status=%08X doing " +"reset!\n" ,RXFSM , status); +return IRQ_HANDLED ; + } + } + } + +// echo MISTA status on unexpected flags although we don't do anithing with them +if (unlikely (status & ( +// MISTA_RXINTR | // Receive - all RX interrupt set this +MISTA_CRCE |// CRC Error +// MISTA_RXOV | // Receive FIFO Overflow - we alread handled it +#ifndef VLAN_SUPPORT +MISTA_PTLE |// Packet Too Long is needed since VLAN is not supported +#endif +// MISTA_RXGD | // Receive Good - this is the common good case +MISTA_ALIE |// Alignment Error +MISTA_RP |// Runt Packet +MISTA_MMP |// More Missed Packet +MISTA_DFOI |// Maximum Frame Length +// MISTA_DENI | // DMA Early Notification - every packet get this +// MISTA_RDU | // Receive Descriptor Unavailable +// MISTA_RXBERR | // Receive Bus Error Interrupt - we alread handled it +// MISTA_CFR | // Control Frame Receive - not an error +0 ))) { +EMC_DEBUG ("emc rx MISTA status=0x%08X\n" , status); + any_err =1 ; + ether->rx_err++; + } + +if ((any_err ==0 ) && ((status &MISTA_RXGD ) ==0 )) +dev_err (&pdev->dev,"emc rx MISTA status=0x%08X\n" , status); + +spin_lock_irqsave (ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +struct npcm7xx_rxbd *rxbd = (ether->rdesc + ether->cur_rx); +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +npcm7xx_clk_GetTimeStamp (iUsCnt2); +/* rxbd->r2 = (_1MHz_ * (iUsCnt2[1] - last_iUsCnt1[1])) + +*iUsCnt2[0]/25 - last_iUsCnt1[0]/25; +*/ + rxbd->r2 = status; + rxbd->r3 = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ]; + } +#endif +__raw_writel (__raw_readl (REG_MIEN ) & ~ENRXGD ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); +napi_schedule (ðer->napi); + +return IRQ_HANDLED ; +} + + +static int npcm7xx_ether_open (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +struct platform_device *pdev; +
Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1380
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ ether =netdev_priv (dev); + pdev = ether->pdev; + + ether->need_reset =1 ; +npcm7xx_reset_mac (dev,0 );What's the logic between that
need_resetand a function called "reset"
?
Agree it is pointless here.
Quoted 42 lines
Quoted 42 lines
Quoted 42 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +41
-0+if (request_irq (ether->txirq, npcm7xx_tx_interrupt, +0x0 , pdev->name, dev)) { +dev_err (&pdev->dev,"register irq tx failed\n" ); +return -EAGAIN ; + } + +if (request_irq (ether->rxirq, npcm7xx_rx_interrupt, +0x0 , pdev->name, dev)) { +dev_err (&pdev->dev,"register irq rx failed\n" ); +free_irq (ether->txirq, dev); +return -EAGAIN ; + } + +if (ether->phy_dev) +phy_start (ether->phy_dev); + +netif_start_queue (dev); +napi_enable (ðer->napi); + +ETH_TRIGGER_RX ; + +dev_info (&pdev->dev,"%s is OPENED\n" , dev->name); + +return 0 ; +} + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +unsigned int rx_mode; + + ether =netdev_priv (dev); + +EMC_DEBUG ("%s CAMCMR_AUP\n" , (dev->flags &IFF_PROMISC ) ? +"Set" :"Clear" ); +if (dev->flags &IFF_PROMISC ) + rx_mode =CAMCMR_AUP |CAMCMR_AMP |CAMCMR_ABP |CAMCMR_ECMP ; +else if ((dev->flags &IFF_ALLMULTI ) || !netdev_mc_empty (dev)) + rx_mode =CAMCMR_AMP |CAMCMR_ABP |CAMCMR_ECMP ; +else + rx_mode =CAMCMR_ECMP |CAMCMR_ABP ;
Quoted 8 lines
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1425
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+__raw_writel (rx_mode,REG_CAMCMR ); + ether->camcmr = rx_mode; +}Name this
set_rx_mode. You can't do better in your "CAM" for multicast filtering ? Usual comment about use of__rawMMIO accessors. You may also want to make sure the interface is running before writing to the HW.
I see in ftgmac100_set_rx_mode() that it does some more things than just setting the CAM options, sould I do the same? (note that I don't have the spec of ftgmac100 so I don't know what each register does).
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +50
-0+static int npcm7xx_ether_ioctl (struct net_device *dev, +struct ifreq *ifr,int cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; + +if (!netif_running (dev)) +return -EINVAL ; + +if (!phydev) +return -ENODEV ; + +return phy_mii_ioctl (phydev, ifr, cmd); +} + +static void npcm7xx_get_drvinfo (struct net_device *dev, +struct ethtool_drvinfo *info) +{ +strlcpy (info->driver,DRV_MODULE_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_MODULE_VERSION ,sizeof (info->version)); +strlcpy (info->fw_version,"N/A" ,sizeof (info->fw_version)); +strlcpy (info->bus_info,"N/A" ,sizeof (info->bus_info)); +} + +static int npcm7xx_get_settings (struct net_device *dev, +struct ethtool_link_ksettings *cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; + +if (phydev ==NULL ) +return -ENODEV ; + +pr_info ("\n\nnpcm7xx_get_settings\n" ); +phy_ethtool_ksettings_get (phydev, cmd); + +return 0 ; +} + +static int npcm7xx_set_settings (struct net_device *dev, +const struct ethtool_link_ksettings *cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +int ret; +unsigned long flags; + +if (phydev ==NULL ) +return -ENODEV ; +
Quoted 9 lines
Quoted 5 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+pr_info ("\n\nnpcm7xx_set_settings\n" ); +spin_lock_irqsave (ðer->lock, flags); + ret = phy_ethtool_ksettings_set(phydev, cmd);
+spin_unlock_irqrestore(ðer->lock, flags);Ditch the lock. You can directly hookup
phy_ethtool_ksettings_setand get into theethtool_opswithout wrappers.
OK
Quoted 70 lines
Quoted 70 lines
Quoted 70 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +69
-0+return ret; +} + +static u32 npcm7xx_get_msglevel (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +return ether->msg_enable; +} + +static void npcm7xx_set_msglevel (struct net_device *dev,u32 level) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + ether->msg_enable = level; +} + +static const struct ethtool_ops npcm7xx_ether_ethtool_ops = { + .get_link_ksettings = npcm7xx_get_settings, + .set_link_ksettings = npcm7xx_set_settings, + .get_drvinfo = npcm7xx_get_drvinfo, + .get_msglevel = npcm7xx_get_msglevel, + .set_msglevel = npcm7xx_set_msglevel, + .get_link = ethtool_op_get_link, +}; + +static const struct net_device_ops npcm7xx_ether_netdev_ops = { + .ndo_open = npcm7xx_ether_open, + .ndo_stop = npcm7xx_ether_close, + .ndo_start_xmit = npcm7xx_ether_start_xmit, + .ndo_get_stats = npcm7xx_ether_stats, + .ndo_set_rx_mode = npcm7xx_ether_set_multicast_list, + .ndo_set_mac_address = npcm7xx_set_mac_address, + .ndo_do_ioctl = npcm7xx_ether_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +}; + +#ifndef CONFIG_OF +static unsigned char char2hex (unsigned char c) +{ +if (c >='0' && c <='9' ) +return c -'0' ; +if (c >='a' && c <='f' ) +return c -'a' +10 ; +if (c >='A' && c <='F' ) +return c -'A' +10 ; + +return 0 ; +} + +static void _mac_setup (char *line,u8 *mac) +{ +int i; + +for (i =0 ; i <6 ; i++) + mac[i] = (char2hex (line[i*3 ])<<4 ) +char2hex (line[i*3 +1 ]); +} + +static int find_option (char *str,char *mac) +{ +extern char *saved_command_line; +char *p; + + p = strstr(saved_command_line, str) + +if (!p) +return 0 ; +
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1555
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ p +=strlen (str); +_mac_setup (p, mac); + +return 1 ; +}These above options can be done with common helpers. Take a look at another driver such as the
ftgmac100.c.
I will try
Quoted 72 lines
Quoted 33 lines
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#endif + +static void get_mac_address (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; +struct device_node *np = ether->pdev->dev.of_node; +const u8 *mac_address =NULL ; +#ifndef CONFIG_OF drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1574
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct plat_npcm7xx_emc_data *plat_dat = pdev->dev.platform_data; +#endif + +#ifdef CONFIG_OF + mac_address =of_get_mac_address (np); + +if (mac_address !=0 ) +ether_addr_copy (dev->dev_addr, mac_address); +#else +if (find_option ("basemac=" , mac_address)) {See above comment.
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+memcpy (dev->dev_addr, mac_address,ETH_ALEN ); +if (pdev->id ==1 ) + dev->dev_addr[5 ] +=1 ; + } else +memcpy (dev->dev_addr, (const void *)plat_dat->mac_addr, +ETH_ALEN ); +#endif + +if (is_valid_ether_addr (dev->dev_addr)) { + pr_info("%s: device MAC address : %pM\n", pdev->name,Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1592
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ dev->dev_addr); + }else { +eth_hw_addr_random (dev); +pr_info ("%s: device MAC address (random generator) %pM\n" , + dev->name, dev->dev_addr); + } + +}As Joel says, look at other drivers, this is too messy.
Quoted 28 lines
Quoted 28 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +28
-0+ +static int npcm7xx_mii_setup (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev; +struct phy_device *phydev =NULL ; +int i, err =0 ; + + pdev = ether->pdev; + + ether->mii_bus =mdiobus_alloc (); +if (!ether->mii_bus) { + err = -ENOMEM ; +dev_err (&pdev->dev,"mdiobus_alloc() failed\n" ); + goto out0; + } + + ether->mii_bus->name ="npcm7xx_rmii" ; + ether->mii_bus->read = &npcm7xx_mdio_read; + ether->mii_bus->write = &npcm7xx_mdio_write; + ether->mii_bus->reset = &npcm7xx_mdio_reset; +snprintf (ether->mii_bus->id,MII_BUS_ID_SIZE ,"%s-%x" , + ether->pdev->name, ether->pdev->id); +EMC_DEBUG ("%s ether->mii_bus->id=%s\n" , __func__, ether->mii_bus->id); + ether->mii_bus->priv = ether; + ether->mii_bus->parent = ðer->pdev->dev; + +for (i =0 ; i <PHY_MAX_ADDR ; i++)
Quoted 60 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1627
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether->mii_bus->irq[i] =PHY_POLL ; + +platform_set_drvdata (ether->pdev, ether->mii_bus); + +/* Enable MDIO Clock */ +__raw_writel (__raw_readl (REG_MCMDR ) |MCMDR_ENMDC ,REG_MCMDR );Why raw ?
Quoted 51 lines
Quoted 39 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +39
-0+ +if (mdiobus_register (ether->mii_bus)) { +dev_err (&pdev->dev,"mdiobus_register() failed\n" ); + goto out2; + } + + + phydev =phy_find_first (ether->mii_bus); +if (phydev ==NULL ) { +dev_err (&pdev->dev,"phy_find_first() failed\n" ); + goto out3; + } + +dev_info (&pdev->dev," name = %s ETH-Phy-Id = 0x%x\n" , +phydev_name (phydev), phydev->phy_id); + + phydev =phy_connect (dev,phydev_name (phydev), + &adjust_link, +PHY_INTERFACE_MODE_RMII ); + +dev_info (&pdev->dev," ETH-Phy-Id = 0x%x name = %s\n" , + phydev->phy_id, phydev->drv->name); + +if (IS_ERR (phydev)) { + err =PTR_ERR (phydev); +dev_err (&pdev->dev,"phy_connect() failed - %d\n" , err); + goto out3; + } + + phydev->supported &=PHY_BASIC_FEATURES ; + phydev->advertising = phydev->supported; + ether->phy_dev = phydev; + +return 0 ; + +out3: +mdiobus_unregister (ether->mii_bus); +out2: +kfree (ether->mii_bus->irq);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1677
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+mdiobus_free (ether->mii_bus); +out0: + +return err; +} + +#include <linux/seq_file.h> +#include <linux/proc_fs.h> + +#define PROC_FILENAME "driver/npcm7xx_emc"I think use debugfs for these internal details, or omit them.
I will try
Quoted 279 lines
Quoted 279 lines
Quoted 279 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +278
-0+ +#define REG_PRINT (reg_name) {t = scnprintf(next, size, "%-10s = %08X\n", \ + #reg_name, __raw_readl(reg_name)); size -= t; next += t; } +#define PROC_PRINT(f, x...) {t = scnprintf(next, size, f, ## x); size -= t; \ + next += t; } + +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct npcm7xx_rxbd *rxbd; +unsigned long flags; +unsigned int i, cur, txd_offset, rxd_offset; +char *next = buf; +unsigned int size = count; +int t; +int is_locked =spin_is_locked (ðer->lock); + +if (!is_locked) +spin_lock_irqsave (ðer->lock, flags); + +/* ------basic driver information ---- */ +PROC_PRINT ("NPCM7XX EMC %s driver version: %s\n" , dev->name, +DRV_MODULE_VERSION ); + +REG_PRINT (REG_CAMCMR ); +REG_PRINT (REG_CAMEN ); +REG_PRINT (REG_CAMM_BASE ); +REG_PRINT (REG_CAML_BASE ); +REG_PRINT (REG_TXDLSA ); +REG_PRINT (REG_RXDLSA ); +REG_PRINT (REG_MCMDR ); +REG_PRINT (REG_MIID ); +REG_PRINT (REG_MIIDA ); +REG_PRINT (REG_FFTCR ); +REG_PRINT (REG_TSDR ); +REG_PRINT (REG_RSDR ); +REG_PRINT (REG_DMARFC ); +REG_PRINT (REG_MIEN ); +REG_PRINT (REG_MISTA ); +REG_PRINT (REG_MGSTA ); +REG_PRINT (REG_MPCNT ); +__raw_writel (0x7FFF ,REG_MPCNT ); +REG_PRINT (REG_MRPC ); +REG_PRINT (REG_MRPCC ); +REG_PRINT (REG_MREPC ); +REG_PRINT (REG_DMARFS ); +REG_PRINT (REG_CTXDSA ); +REG_PRINT (REG_CTXBSA ); +REG_PRINT (REG_CRXDSA ); +REG_PRINT (REG_CRXBSA ); +REG_PRINT (REG_RXFSM ); +REG_PRINT (REG_TXFSM ); +REG_PRINT (REG_FSM0 ); +REG_PRINT (REG_FSM1 ); +REG_PRINT (REG_DCR ); +REG_PRINT (REG_DMMIR ); +REG_PRINT (REG_BISTR ); +PROC_PRINT ("\n" ); + +PROC_PRINT ("netif_queue %s\n\n" ,netif_queue_stopped (dev) ? +"Stopped" :"Running" ); +if (ether->rdesc) +PROC_PRINT ("napi is %s\n\n" ,test_bit (NAPI_STATE_SCHED , + ðer->napi.state) ? +"scheduled" : +"not scheduled" ); + + txd_offset = (__raw_readl (REG_CTXDSA ) - +__raw_readl (REG_TXDLSA ))/sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("TXD offset %6d\n" , txd_offset); +PROC_PRINT ("cur_tx %6d\n" , ether->cur_tx); +PROC_PRINT ("finish_tx %6d\n" , ether->finish_tx); +PROC_PRINT ("pending_tx %6d\n" , ether->pending_tx); +/* debug counters */ +PROC_PRINT ("tx_tdu %6d\n" , ether->tx_tdu); + ether->tx_tdu =0 ; +PROC_PRINT ("tx_tdu_i %6d\n" , ether->tx_tdu_i); + ether->tx_tdu_i =0 ; +PROC_PRINT ("tx_cp_i %6d\n" , ether->tx_cp_i); + ether->tx_cp_i =0 ; +PROC_PRINT ("tx_int_count %6d\n" , ether->tx_int_count); + ether->tx_int_count =0 ; +PROC_PRINT ("count_xmit tx %6d\n" , ether->count_xmit); + ether->count_xmit =0 ; +PROC_PRINT ("count_finish %6d\n" , ether->count_finish); + ether->count_finish =0 ; +PROC_PRINT ("\n" ); + + rxd_offset = (__raw_readl (REG_CRXDSA )-__raw_readl (REG_RXDLSA )) + /sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("RXD offset %6d\n" , rxd_offset); +PROC_PRINT ("cur_rx %6d\n" , ether->cur_rx); +PROC_PRINT ("rx_err %6d\n" , ether->rx_err); + ether->rx_err =0 ; +PROC_PRINT ("rx_berr %6d\n" , ether->rx_berr); + ether->rx_berr =0 ; +PROC_PRINT ("rx_stuck %6d\n" , ether->rx_stuck); + ether->rx_stuck =0 ; +PROC_PRINT ("rdu %6d\n" , ether->rdu); + ether->rdu =0 ; +PROC_PRINT ("rxov rx %6d\n" , ether->rxov); + ether->rxov =0 ; +// debug counters +PROC_PRINT ("rx_int_count %6d\n" , ether->rx_int_count); + ether->rx_int_count =0 ; +PROC_PRINT ("rx_err_count %6d\n" , ether->rx_err_count); + ether->rx_err_count =0 ; +PROC_PRINT ("rx_count_pool %6d\n" , ether->rx_count_pool); + ether->rx_count_pool =0 ; +PROC_PRINT ("max_waiting_rx %5d\n" , ether->max_waiting_rx); + ether->max_waiting_rx =0 ; +PROC_PRINT ("\n" ); +PROC_PRINT ("need_reset %5d\n" , ether->need_reset); + +if (ether->tdesc && ether->rdesc) { + cur = ether->finish_tx -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("finish %3d txbd mode %08X buffer %08X sl " +"%08X next %08X tx_skb %p\n" , cur, + txbd->mode, txbd->buffer, txbd->sl, + txbd->next, ether->tx_skb[cur]); + } +PROC_PRINT ("\n" ); + + cur = txd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("txd_of %3d txbd mode %08X buffer %08X sl " +"%08X next %08X\n" , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); + } +PROC_PRINT ("\n" ); + + cur = ether->cur_tx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("cur_tx %3d txbd mode %08X buffer %08X sl " +"%08X next %08X " , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X MISTA %08X MIEN %08X\n" , + txbd->diff, txbd->ts, txbd->t2, txbd->t3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = ether->cur_rx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("cur_rx %3d rxbd sl %08X buffer %08X sl " +"%08X next %08X " , cur, rxbd->sl, + rxbd->buffer, rxbd->reserved, rxbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X i_diff %08X i_ts %08X\n" , + rxbd->diff, rxbd->ts, rxbd->r2, rxbd->r3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = rxd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("rxd_of %3d rxbd sl %08X buffer %08X sl %08X" +" next %08X\n" , cur, rxbd->sl, rxbd->buffer, + rxbd->reserved, rxbd->next); + } +PROC_PRINT ("\n" ); + } + +if (!is_locked) +spin_unlock_irqrestore (ðer->lock, flags); + +return count - size; +} + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev) +{ +char *emc_dump_buf; +int count; +struct npcm7xx_ether *ether; +struct platform_device *pdev; +const size_t print_size =5 *PAGE_SIZE ; + + ether =netdev_priv (dev); + pdev = ether->pdev; + + emc_dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!emc_dump_buf) +dev_err (&pdev->dev,"emc_dump_buf = kmalloc(PAGE_SIZE, " +"GFP_KERNEL) failed\n" ); +else { +char c; +char *tmp_buf = emc_dump_buf; + + count =npcm7xx_info_dump (emc_dump_buf, print_size, dev); +while (count >512 ) { + c = tmp_buf[512 ]; + tmp_buf[512 ] =0 ; +pr_info ("%s" , tmp_buf); + tmp_buf +=512 ; + tmp_buf[0 ] = c; + count -=512 ; + } +printk ("%s" , tmp_buf); +kfree (emc_dump_buf); + } +} +#endif + +static int npcm7xx_proc_read (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +const size_t print_size =5 *PAGE_SIZE ; + +if (ether->dump_buf ==NULL ) { + ether->dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!ether->dump_buf) +return -1 ; +npcm7xx_info_dump (ether->dump_buf, print_size, dev); + } + +seq_printf (sf,"%s" , ether->dump_buf); + +if (sf->count < sf->size) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static int npcm7xx_ether_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_read,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops = { + .open = npcm7xx_ether_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int npcm7xx_proc_reset (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned long flags; + +seq_printf (sf,"Ask to reset the module\n" ); +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); + +return 0 ; +} + +static int npcm7xx_ether_proc_reset (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_reset,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops_reset = {
Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1960
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ .open = npcm7xx_ether_proc_reset, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};Get rid of all the proc stuff. Use ethtool for register dumps if needed.
Is it a must? iit means I will have to count on eth tool existance.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+static const struct of_device_id emc_dt_id[] = { + { .compatible ="nuvoton,npcm750-emc" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, emc_dt_id); + +static int npcm7xx_ether_probe (struct platform_device *pdev) +{ +struct npcm7xx_ether *ether;
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1976
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+struct net_device *dev; +int error; +char proc_filename[32 ]; + + +#ifdef CONFIG_OF Remove these guards. We will be using OF to probe the driver in the common case.
OK
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +18
-0+struct clk *emc_clk =NULL ; +const struct of_device_id *of_id; +struct device_node *np = pdev->dev.of_node; + + pdev->id =of_alias_get_id (np,"ethernet" ); +if (pdev->id <0 ) + pdev->id =0 ; + + emc_clk =devm_clk_get (&pdev->dev,NULL ); + +if (IS_ERR (emc_clk)) +return PTR_ERR (emc_clk); + +/* Enable Clock */ +clk_prepare_enable (emc_clk); +#endif + +
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2000
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+/* disable for now - need to check if necessary */ + gcr_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-gcr" ); +if (IS_ERR (gcr_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-gcr\n" , __func__); +return IS_ERR (gcr_regmap); + }Remove the GCR and muxing code. This will be handled by your pinmux driver.
OK
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +32
-0+ + rst_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-rst" ); +if (IS_ERR (rst_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-rst\n" , __func__); +return IS_ERR (rst_regmap); + } + +/* Muxing RMII MDIO */ +if (pdev->id ==0 ) { +regmap_update_bits (gcr_regmap,MFSEL3_OFFSET , (0x1 <<9 ), + (0x1 <<9 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<13 ), + (0x1 <<13 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<12 ), + (0x1 <<12 )); +regmap_update_bits (gcr_regmap,INTCR_OFFSET , (0x1 <<5 ), + (0x1 <<5 )); + } +if (pdev->id ==1 ) { +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<14 ), + (0x1 <<14 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<16 ), + (0x1 <<16 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<15 ), + (0x1 <<15 )); + } + +/* Reset EMC module */ +if (pdev->id ==0 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ), + (0x1 <<6 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ),0 );
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2038
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ } +if (pdev->id ==1 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ), + (0x1 <<21 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ),0 ); + }A reset or clk driver should take care of the above.
OK
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
+ #ifdef
CONFIG_OFAs Joel says, remove all the
CONFIG_OF.
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2046
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ of_id =of_match_device (emc_dt_id, &pdev->dev); +if (!of_id) { +dev_err (&pdev->dev,"Error: No device match found\n" ); +return -ENODEV ; + } +/* Why do you need that ? You've already been matched.
OK.
Quoted 24 lines
Quoted 3 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ * Right now device-tree probed devices don't get dma_mask set. + * Since shared usb codeUSB ?
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2054
Quoted 7 lines
relies on it, set it here for now.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+* Once we have dma capability bindings this can go away. +*/ + error =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (error) +return -ENODEV ; +#endif That looks odd... Joel, I fogot now, how do we get the
dma_maskestablished on aspeed ? I don't remember the need to use the "coerce" forms.Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2060
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ dev =alloc_etherdev (sizeof (struct npcm7xx_ether )); +if (!dev) +return -ENOMEM ; + +snprintf (dev->name,IFNAMSIZ ,"eth%d" , pdev->id);
Quoted 3 lines
That might cause you surprises if another ethernet driver has picked up those numbers already... I wouldn't do that, I would just leave the network stack pick a name.
OK.
Quoted 47 lines
Quoted 47 lines
Quoted 47 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +44
-0+ ether =netdev_priv (dev); + + ether->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (ether->res ==NULL ) { +dev_err (&pdev->dev,"failed to get I/O memory\n" ); + error = -ENXIO ; + goto failed_free; + } + +if (!request_mem_region (ether->res->start, +resource_size (ether->res), pdev->name)) { +dev_err (&pdev->dev,"failed to request I/O memory\n" ); + error = -EBUSY ; + goto failed_free; + } + + ether->reg =ioremap (ether->res->start,resource_size (ether->res)); +EMC_DEBUG (" ether->reg = 0x%x\n" , __func__, (unsigned int )ether->reg); + +if (ether->reg ==NULL ) { +dev_err (&pdev->dev,"failed to remap I/O memory\n" ); + error = -ENXIO ; + goto failed_free_mem; + } + + ether->txirq =platform_get_irq (pdev,0 ); +if (ether->txirq <0 ) { +dev_err (&pdev->dev,"failed to get ether tx irq\n" ); + error = -ENXIO ; + goto failed_free_io; + } + + ether->rxirq =platform_get_irq (pdev,1 ); +if (ether->rxirq <0 ) { +dev_err (&pdev->dev,"failed to get ether rx irq\n" ); + error = -ENXIO ; + goto failed_free_txirq; + } + +SET_NETDEV_DEV (dev, &pdev->dev); +platform_set_drvdata (pdev, dev); + ether->ndev = dev; + + ether->pdev = pdev;
Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2112
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether->msg_enable =NETIF_MSG_LINK ; + + dev->netdev_ops = &npcm7xx_ether_netdev_ops; + dev->ethtool_ops = &npcm7xx_ether_ethtool_ops; + + dev->tx_queue_len =TX_DESC_SIZE ;The name is ambiguous ... is it a queue lenght or a descriptor size ...
I will change
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +31
-0+ dev->dma =0x0 ; + dev->watchdog_timeo =TX_TIMEOUT ; + +get_mac_address (dev); + + ether->cur_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->link =0 ; + ether->speed =100 ; + ether->duplex =DUPLEX_FULL ; + ether->need_reset =0 ; + ether->dump_buf =NULL ; + ether->rx_berr =0 ; + ether->rx_err =0 ; + ether->rdu =0 ; + ether->rxov =0 ; + ether->rx_stuck =0 ; +// debug counters + ether->max_waiting_rx =0 ; + ether->rx_count_pool =0 ; + ether->count_xmit =0 ; + ether->rx_int_count =0 ; + ether->rx_err_count =0 ; + ether->tx_int_count =0 ; + ether->count_finish =0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; +
Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2148
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+spin_lock_init (ðer->lock); + +netif_napi_add (dev, ðer->napi, npcm7xx_poll,RX_POLL_SIZE ); + +ether_setup (dev);Do you need that
ether_setup? Normally drivers don't need that,alloc_etherdevdoes it.
If you are sure I will try to remove that.
Quoted 105 lines
Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ error =npcm7xx_mii_setup (dev); +if (error <0 ) { +dev_err (&pdev->dev,"npcm7xx_mii_setup err\n" ); + goto failed_free_rxirq; + } + + error =register_netdev (dev); +if (error !=0 ) { +dev_err (&pdev->dev,"register_netdev() failed\n" ); + error = -ENODEV ; + goto failed_free_rxirq; + } + snprintf(proc_filename, sizeof(proc_filename), "%s.%d", PROC_FILENAME,Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2170
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ pdev->id); +proc_create_data (proc_filename,0000 ,NULL , &npcm7xx_ether_proc_fops, + dev); + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +proc_create_data (proc_filename,0000 ,NULL , + &npcm7xx_ether_proc_fops_reset, dev);Kill the proc gunk.
Quoted 80 lines
Quoted 66 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +66
-0+return 0 ; + +failed_free_rxirq: +free_irq (ether->rxirq, pdev); +platform_set_drvdata (pdev,NULL ); +failed_free_txirq: +free_irq (ether->txirq, pdev); +failed_free_io: +iounmap (ether->reg); +failed_free_mem: +release_mem_region (ether->res->start,resource_size (ether->res)); +failed_free: +free_netdev (dev); + +return error; +} + +static int npcm7xx_ether_remove (struct platform_device *pdev) +{ +struct net_device *dev =platform_get_drvdata (pdev); +struct npcm7xx_ether *ether =netdev_priv (dev); +char proc_filename[32 ]; + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d" ,PROC_FILENAME , + pdev->id); +remove_proc_entry (proc_filename,NULL ); +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +remove_proc_entry (proc_filename,NULL ); + +unregister_netdev (dev); + + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +if (ether->phy_dev) +phy_disconnect (ether->phy_dev); + +mdiobus_unregister (ether->mii_bus); +kfree (ether->mii_bus->irq); +mdiobus_free (ether->mii_bus); + +platform_set_drvdata (pdev,NULL ); + +free_netdev (dev); +return 0 ; +} + +static struct platform_driver npcm7xx_ether_driver = { + .probe = npcm7xx_ether_probe, + .remove = npcm7xx_ether_remove, + .driver = { + .name =DRV_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (emc_dt_id), + }, +}; + +#ifdef CONFIG_OF +module_platform_driver (npcm7xx_ether_driver); +#else +static int __init npcm7xx_ether_init (void ) +{ + +return platform_driver_register (&npcm7xx_ether_driver);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2247
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+} + +static void __exit npcm7xx_ether_exit(void) +{ +platform_driver_unregister (&npcm7xx_ether_driver); +} + +module_init (npcm7xx_ether_init); +module_exit (npcm7xx_ether_exit); +#endif
platform_driver_register(npcm7xx_ether_driver);Cheers,
Re: [PATCH linux dev-4.13 v1 2/2] net: npcm: add NPCM7xx Ethernet MAC controller
Quoted 6 lines · Avi Fishman
Hi,
Thank you Joel and Benjamin/
My inputs also on Joel remarks, if I didn't comment I accept the comment. My original driver was heavily tested by our customer. I am a little afraid of big changes.
You will have to do them if you want a chance to get upstream.
Quoted 1 line
Can you let me kow what is a must for now, and what can be done later.
No, this is not how things work. To get upstream, you need to write a driver that complies to the various practices for such things. The way you do your Tx reclaim is wrong and needs to be fixed for example.
Quoted 64 lines
Quoted 5 lines · Benjamin Herrenschmidt
Quoted 4 lines · Joel Stanley
Quoted 1 line
+#define
ETH_TRIGGER_RXdo {__raw_writel(ENSTART, REG_RSDR); } while (0)Get rid of these macros.
Quoted 17 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 229
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#define ETH_TRIGGER_TX do { __raw_writel(ENSTART, REG_TSDR); } while (0) +#define ETH_ENABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_ENABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) | \ + MCMDR_RXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_TX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_TXON, REG_MCMDR); } while (0) +#define ETH_DISABLE_RX do { __raw_writel(__raw_readl(REG_MCMDR) & \ + ~MCMDR_RXON, REG_MCMDR); } while (0)Why is
__rawappropriate here ? It does two things in theory (though I'm not 100% familiar with the ARM semantic for your cores), one is bypass endian conversion which might not be a great idea in your case, and one is bypass various ordering barriers, which also looks fishy unless you put explicit barriers on the call sites.OK - it was taken from old code, we will change
Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +26
-0+struct plat_npcm7xx_emc_data { +char *phy_bus_name; +int phy_addr; +unsigned char mac_addr[ETH_ALEN ]; +}; + +struct npcm7xx_rxbd { +unsigned int sl; +unsigned int buffer; +unsigned int reserved; +unsigned int next; +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff; +unsigned int ts; +unsigned int r2; +unsigned int r3; +#endif +}; + +struct npcm7xx_txbd { +unsigned int mode;/* Ownership bit and some other bits */ +unsigned int buffer;/* Transmit Buffer Starting Address */ +unsigned int sl;/* Transmit Byte Count and status bits */ +unsigned int next;/* Next Tx Descriptor Starting Address */ +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +unsigned int diff;Quoted 9 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 261
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+unsigned int ts; +unsigned int t2; +unsigned int t3; +#endif +};Are the above HW descriptor definitions ? Then use the appropriate endian explicit and size explicit types such as
__le32.
Quoted 1 line
Is it fine to use
__u32or since it is HW we should use__le32?
__le32. Also build with endian checking enabled with sparse, to check you aren't missing the varous accessors.
Quoted 12 lines
Quoted 12 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 267
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ +struct npcm7xx_ether { +struct sk_buff *rx_skb[RX_DESC_SIZE ]; +struct sk_buff *tx_skb[TX_DESC_SIZE ]; +spinlock_t lock;You probably don't need that lock... Most ethernet drivers with a private lock dont' actually need it. It depends what you use it for mind you but often, all the rx/tx path is handled by the tx queue lock, and there's a mutex in the PHY structure. Those two tend to be all you need.
Quoted 6 lines
Quoted 3 lines
I suggest you look at how I did it in the current version of ftgmac100 and how the reset task synchronizes with both path.
So both
npcm750_ether_start_xmit()andnpcm750_poll()can't run at the same time, even in SMP mode?
They can, I've explained why things would work as long as you are careful. start_xmit is run with the tx lock. poll shouldn't be touching anything that start_xmit touches, with the main excpetion being when poll() decides to restart the queue. This is typically when you "re- check" by taking the lock.
You should look at how other network drivers do it. I pointed you to ftgmac100 because this is a driver I reworked recently, but there are many others.
Quoted 2 lines
What about interrupts if they are accesing some shaered resources I still need to protect for example
REG_MIENregister writing.
Why ? A register write is atomic.
The way things typically work is that you have *either* poll or interrupts. On the first interrupt, you start NAPI and mask interrupts. You only re-enable interrupts when NAPI is done.
If there's any exclusion needed, use the queue TX lock.
Quoted 281 lines
Quoted 10 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 276
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+struct npcm7xx_rxbd *rdesc; +struct npcm7xx_txbd *tdesc; +dma_addr_t rdesc_phys; +dma_addr_t tdesc_phys; +struct net_device_stats stats; +struct platform_device *pdev; +struct net_device *ndev; +struct resource *res; +//struct sk_buff *skb; Quoted 50 lines
Get rid of that :-)
Quoted 48 lines
Quoted 36 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +36
-0+unsigned int msg_enable; +struct mii_bus *mii_bus; +struct phy_device *phy_dev; +struct napi_struct napi; +void __iomem *reg; +int rxirq; +int txirq; +unsigned int cur_tx; +unsigned int cur_rx; +unsigned int finish_tx; +unsigned int pending_tx; +unsigned int start_tx_ptr; +unsigned int start_rx_ptr; +unsigned int rx_berr; +unsigned int rx_err; +unsigned int rdu; +unsigned int rxov; +unsigned int camcmr; +unsigned int rx_stuck; +int link; +int speed; +int duplex; +int need_reset; +char *dump_buf; + +// debug counters +unsigned int max_waiting_rx; +unsigned int rx_count_pool; +unsigned int count_xmit; +unsigned int rx_int_count; +unsigned int rx_err_count; +unsigned int tx_int_count; +unsigned int tx_tdu; +unsigned int tx_tdu_i; +unsigned int tx_cp_i; +unsigned int count_finish;drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 322
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+}; + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev); +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev); +#endif +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +void npcm7xx_clk_GetTimeStamp (u32 time_quad[2 ]); +#endif Avoid forward declarations where you can.
Do you mean to put it at the beginning?
BTW, I will probably get rid of allCONFIG_NPCM7XX_EMC_ETH_DEBUG_EXTQuoted 217 lines
Also avoid CamelCaps
Quoted 213 lines
Quoted 57 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +57
-0+ +static void adjust_link (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +unsigned int val; +bool status_change = false; +unsigned long flags; + +// clear GPIO interrupt status whihc indicates PHY statu change? + +spin_lock_irqsave (ðer->lock, flags); + +if (phydev->link) { +if ((ether->speed != phydev->speed) || + (ether->duplex != phydev->duplex)) { + ether->speed = phydev->speed; + ether->duplex = phydev->duplex; + status_change = true; + } + }else { + ether->speed =0 ; + ether->duplex =-1 ; + } + +if (phydev->link != ether->link) { + + ether->link = phydev->link; + + status_change = true; + } + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status_change) { + + val =__raw_readl (REG_MCMDR ); + +if (ether->speed ==100 ) + val |=MCMDR_OPMOD ; +else + val &= ~MCMDR_OPMOD ; + +if (ether->duplex ==DUPLEX_FULL ) + val |=MCMDR_FDUP ; +else + val &= ~MCMDR_FDUP ; + +__raw_writel (val,REG_MCMDR ); + } +} + + + +static void npcm7xx_write_cam (struct net_device *dev, +unsigned int x,unsigned char *pval) +{drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 389
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int msw, lsw; + + msw = (pval[0 ] <<24 ) | (pval[1 ] <<16 ) | (pval[2 ] <<8 ) | pval[3 ]; + + lsw = (pval[4 ] <<24 ) | (pval[5 ] <<16 ); + +__raw_writel (lsw,REG_CAML_BASE + x *CAM_ENTRY_SIZE ); +__raw_writel (msw,REG_CAMM_BASE + x *CAM_ENTRY_SIZE ); +//EMC_DEBUG("REG_CAML_BASE = 0x%08X REG_CAMH_BASE = 0x%08X", lsw, msw); Delete commented out code before submitting.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 349
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+} + +Whitespace.
Quoted 125 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +125
-0+static struct sk_buff *get_new_skb (struct net_device *dev,u32 i) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct sk_buff *skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (skb ==NULL ) +return NULL ; + +/* Do not unmark the following skb_reserve() Receive Buffer Starting +* Address must be aligned to 4 bytes and the following line +* if unmarked will make it align to 2 and this likely will +* hult the RX and crash the linux skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + (ether->rdesc + i)->buffer =dma_map_single (&dev->dev, skb->data, +roundup ( +MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); + ether->rx_skb[i] = skb; + +return skb; +} + +static int npcm7xx_init_desc (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +struct npcm7xx_txbd *tdesc; +struct npcm7xx_rxbd *rdesc; +struct platform_device *pdev; +unsigned int i; + + ether =netdev_priv (dev); + pdev = ether->pdev; + +if (ether->tdesc ==NULL ) { + ether->tdesc = (struct npcm7xx_txbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ðer->tdesc_phys, +GFP_KERNEL ); + +if (!ether->tdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"tx desc\n" ); +return -ENOMEM ; + } + } + +if (ether->rdesc ==NULL ) { + ether->rdesc = (struct npcm7xx_rxbd *) +dma_alloc_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ðer->rdesc_phys, +GFP_KERNEL ); + +if (!ether->rdesc) { +dev_err (&pdev->dev,"Failed to allocate memory for " +"rx desc\n" ); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , ether->tdesc, + ether->tdesc_phys); + ether->tdesc =NULL ; +return -ENOMEM ; + } + } + +for (i =0 ; i <TX_DESC_SIZE ; i++) { +unsigned int offset; + + tdesc = (ether->tdesc + i); + +if (i ==TX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_txbd ) * (i +1 ); + + tdesc->next = ether->tdesc_phys + offset; + tdesc->buffer = (unsigned int )NULL ; + tdesc->sl =0 ; + tdesc->mode =0 ; + } + + ether->start_tx_ptr = ether->tdesc_phys; + +for (i =0 ; i <RX_DESC_SIZE ; i++) { +unsigned int offset; + + rdesc = (ether->rdesc + i); + +if (i ==RX_DESC_SIZE -1 ) + offset =0 ; +else + offset =sizeof (struct npcm7xx_rxbd ) * (i +1 ); + + rdesc->next = ether->rdesc_phys + offset; + rdesc->sl =RX_OWEN_DMA ; + +if (get_new_skb (dev, i) ==NULL ) { +dev_err (&pdev->dev,"get_new_skb() failed\n" ); + +for (; i !=0 ; i--) { +dma_unmap_single (&dev->dev, (dma_addr_t) + ((ether->rdesc + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC , +4 ),DMA_FROM_DEVICE ); +dev_kfree_skb_any (ether->rx_skb[i]); + ether->rx_skb[i] =NULL ; + } + +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + +return -ENOMEM ; + } + }drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 527
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ + ether->start_rx_ptr = ether->rdesc_phys; +wmb (); +for (i =0 ; i <TX_DESC_SIZE ; i++) + ether->tx_skb[i] =NULL ; + +return 0 ; +} + +// This API must call with Tx/Rx stopped C style comments /* foo */
Quoted 5 lines
Quoted 2 lines
I would split things a bit. See ftgmac100. Also I would keep a scratch pad to point RX to if you fail to allocate a packet in the rx path.
Do you mean that in error cases I should do somthing like 'goto free tdesc;' so the error cases will be at the end?
No, what I mean is that if you cannot allocate a RX buffer for that ring entry, don't leaeve the descriptor stale, instead point it to some scratch page so the HW has somewhere safe to write to. This is useful when doing the dynamic reallocation of skbs in the RX path as it can be that under memory pressure, you occasionally fail to allocate an skb.
Quoted 341 lines
Quoted 332 lines
Quoted 332 lines
Quoted 181 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +180
-0+static void npcm7xx_free_desc (struct net_device *dev,bool free_also_descriptors) +{ +struct sk_buff *skb; +u32 i; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; + +for (i =0 ; i <TX_DESC_SIZE ; i++) { + skb = ether->tx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->tdesc + + i)->buffer), + skb->len,DMA_TO_DEVICE ); +dev_kfree_skb_any (skb); + ether->tx_skb[i] =NULL ; + } + } + +for (i =0 ; i <RX_DESC_SIZE ; i++) { + skb = ether->rx_skb[i]; +if (skb !=NULL ) { +dma_unmap_single (&dev->dev, (dma_addr_t)((ether->rdesc + + i)->buffer), +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); +dev_kfree_skb_any (skb); + ether->rx_skb[i] =NULL ; + } + } + +if (free_also_descriptors) { +if (ether->tdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_txbd ) * +TX_DESC_SIZE , + ether->tdesc, ether->tdesc_phys); + ether->tdesc =NULL ; + +if (ether->rdesc) +dma_free_coherent (&pdev->dev, +sizeof (struct npcm7xx_rxbd ) * +RX_DESC_SIZE , + ether->rdesc, ether->rdesc_phys); + ether->rdesc =NULL ; + } + +} + +static void npcm7xx_set_fifo_threshold (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =RXTHD |TXTHD |BLENGTH ; +__raw_writel (val,REG_FFTCR ); +} + +static void npcm7xx_return_default_idle (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; +unsigned int saved_bits; + + val =__raw_readl (REG_MCMDR ); + saved_bits = val & (MCMDR_FDUP |MCMDR_OPMOD ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + val |=SWR ; +__raw_writel (val,REG_MCMDR ); + +/* During the EMC reset the AHB will read 0 from all registers, +* so in order to see if the reset finished we can't count on +* REG_MCMDR.SWR to become 0, instead we read another +* register that its reset value is not 0, we choos REG_FFTCR. +*/ +do { + val =__raw_readl (REG_FFTCR ); + }while (val ==0 ); + +// Now we can verify if REG_MCMDR.SWR became 0 (probably it will be 0 on the first read). +do { + val =__raw_readl (REG_MCMDR ); + }while (val &SWR ); + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); +// restore values +__raw_writel (saved_bits,REG_MCMDR ); +} + + +static void npcm7xx_enable_mac_interrupt (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val = ENRXINTR | // Start of RX interrupts + ENCRCE | + EMRXOV | +#ifndef VLAN_SUPPORT +ENPTLE |// Since we don't support VLAN we want interrupt on long packets +#endif +ENRXGD | +ENALIE | +ENRP | +ENMMP | +ENDFO | +/* ENDENI | */ // We don't need interrupt on DMA Early Notification +ENRDU |// We don't need interrupt on Receive Descriptor Unavailable Interrupt +ENRXBERR | +/* ENCFR | */ +ENTXINTR |// Start of TX interrupts +ENTXEMP | +ENTXCP | +ENTXDEF | +ENNCS | +ENTXABT | +ENLC | +/* ENTDU | */ // We don't need interrupt on Transmit Descriptor Unavailable at start of operation +ENTXBERR ; +__raw_writel (val,REG_MIEN ); +} + +static void npcm7xx_get_and_clear_int (struct net_device *dev, +unsigned int *val,unsigned int mask) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + *val =__raw_readl (REG_MISTA ) & mask; +__raw_writel (*val,REG_MISTA ); +} + +static void npcm7xx_set_global_maccmd (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + + val =__raw_readl (REG_MCMDR ); +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", val); + + val |=MCMDR_SPCRC |MCMDR_ENMDC |MCMDR_ACP |MCMDR_NDEF ; +#ifdef VLAN_SUPPORT +// we set ALP accept long packets since VLAN packets are 4 bytes longer than 1518 + val |=MCMDR_ALP ; +// limit receive length to 1522 bytes due to VLAN +__raw_writel (MAX_PACKET_SIZE_W_CRC ,REG_DMARFC ); +#endif +__raw_writel (val,REG_MCMDR ); +} + +static void npcm7xx_enable_cam (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned int val; + +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + + val =__raw_readl (REG_CAMEN ); + val |=CAM0EN ; +__raw_writel (val,REG_CAMEN ); +} + + +static void npcm7xx_set_curdest (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +__raw_writel (ether->start_rx_ptr,REG_RXDLSA ); +__raw_writel (ether->start_tx_ptr,REG_TXDLSA ); +} + +static void npcm7xx_reset_mac (struct net_device *dev,int need_free) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +netif_tx_lock (dev); + +ETH_DISABLE_TX ; +ETH_DISABLE_RX ; + +npcm7xx_return_default_idle (dev); +npcm7xx_set_fifo_threshold (dev);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 717
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ +/*if (!netif_queue_stopped(dev)) +netif_stop_queue(dev);*/ + +if (need_free) +npcm7xx_free_desc (dev, false); + +npcm7xx_init_desc (dev); + +//dev->trans_start = jiffies; /* prevent tx timeout */ Remove commented out code.
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +14
-0+ ether->cur_tx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; + +npcm7xx_set_curdest (dev); +npcm7xx_enable_cam (dev); +npcm7xx_ether_set_multicast_list (dev); +npcm7xx_enable_mac_interrupt (dev); +npcm7xx_set_global_maccmd (dev); +ETH_ENABLE_TX ;drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 741
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+ETH_ENABLE_RX ; + +ETH_TRIGGER_RX ; + +//dev->trans_start = jiffies; /* prevent tx timeout */ + +/*if (netif_queue_stopped(dev)) +netif_wake_queue(dev);*/ + +//EMC_DEBUG("REG_MCMDR = 0x%08X\n", __raw_readl(REG_MCMDR)); Remove this.
Quoted 111 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +111
-0+ + ether->need_reset =0 ; + +netif_wake_queue (dev); +netif_tx_unlock (dev); +} + +static int npcm7xx_mdio_write (struct mii_bus *bus,int phy_id,int regnum, +u16 value) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + +__raw_writel (value,REG_MIID ); +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY |PHYWR ,REG_MIIDA ); + + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return 0 ; + +} + +static int npcm7xx_mdio_read (struct mii_bus *bus,int phy_id,int regnum) +{ +struct npcm7xx_ether *ether = bus->priv; +unsigned long timeout = jiffies +msecs_to_jiffies (MII_TIMEOUT *100 ); + + +__raw_writel ((phy_id <<0x08 ) | regnum |PHYBUSY ,REG_MIIDA ); + +/* Wait for completion */ +while (__raw_readl (REG_MIIDA ) &PHYBUSY ) { +if (time_after (jiffies, timeout)) { +EMC_DEBUG ("mdio read timed out\n" +"ether->reg = 0x%x phy_id=0x%x " +"REG_MIIDA=0x%x\n" , + (unsigned int )ether->reg, phy_id + ,__raw_readl (REG_MIIDA )); +return -ETIMEDOUT ; + } +cpu_relax (); + } + +return __raw_readl (REG_MIID ); +} + +static int npcm7xx_mdio_reset (struct mii_bus *bus) +{ + +// reser ENAC engine?? +return 0 ; +} + +static int npcm7xx_set_mac_address (struct net_device *dev,void *addr) +{ +struct sockaddr *address = addr; + +if (!is_valid_ether_addr ((u8 *)address->sa_data)) +return -EADDRNOTAVAIL ; + +memcpy (dev->dev_addr, address->sa_data, dev->addr_len); +npcm7xx_write_cam (dev,CAM0 , dev->dev_addr); + +return 0 ; +} + +static int npcm7xx_ether_close (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +if (ether->phy_dev) +phy_stop (ether->phy_dev); + +npcm7xx_return_default_idle (dev); + +msleep (10 ); + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +netif_stop_queue (dev); +napi_disable (ðer->napi); + +npcm7xx_free_desc (dev, true); + +if (ether->dump_buf) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static struct net_device_stats *npcm7xx_ether_stats (struct net_device *dev) +{ +struct npcm7xx_ether *ether; + + ether =netdev_priv (dev); +Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 858
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+return ðer->stats; +} + + +static int npcm7xx_clean_tx (struct net_device *dev,bool from_xmit) +{This should be done from NAPI, see below or see other drivers.
Quoted 3 lines
I am calling this both from napi and from the xmit since there are cases that I miss the tx interrupt (due to HW issue) and nobady will clear the
pending_txcounter so for xmit I also check to clean those
Under what precise circumstances do you miss the TX interrupts ? You should just do it only in NAPI anyway, worst case, if you are in start _xmit and think reclaim is necessary, you can restart NAPI.
Quoted 80 lines
Quoted 67 lines
Quoted 67 lines
Quoted 67 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +66
-0+struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct sk_buff *s; +unsigned int cur_entry, entry, sl; + +if (ether->pending_tx ==0 ) +return (0 ); + + cur_entry =__raw_readl (REG_CTXDSA ); + +// Release old used buffers + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + +while (entry != cur_entry) { + txbd = (ether->tdesc + ether->finish_tx); + s = ether->tx_skb[ether->finish_tx]; +if (s ==NULL ) +break ; + + ether->count_finish++; + +dma_unmap_single (&dev->dev, txbd->buffer, s->len, +DMA_TO_DEVICE ); +consume_skb (s); + ether->tx_skb[ether->finish_tx] =NULL ; + +if (++ether->finish_tx >=TX_DESC_SIZE ) + ether->finish_tx =0 ; + ether->pending_tx--; + + sl = txbd->sl; +if (sl &TXDS_TXCP ) { + ether->stats.tx_packets++; + ether->stats.tx_bytes += (sl &0xFFFF ); + }else { + ether->stats.tx_errors++; + } + + entry = ether->tdesc_phys +sizeof (struct npcm7xx_txbd ) * + (ether->finish_tx); + } + +if (!from_xmit &&unlikely (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 )) { +netif_tx_lock (dev); +if (netif_queue_stopped (dev) && + (TX_DESC_SIZE - ether->pending_tx) >1 ) { +netif_wake_queue (dev); + } +netif_tx_unlock (dev); + } + +return (0 ); +} + +static int npcm7xx_ether_start_xmit (struct sk_buff *skb,struct net_device *dev) +{struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +unsigned long flags; + +/* This is a hard error log it. */ +if (ether->pending_tx >= (TX_DESC_SIZE -1 )) { +dev_err (ðer->pdev->dev,"%s: BUG! Tx Ring full when queue " +"awake!\n" , dev->name); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 930
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+npcm7xx_info_print (dev); +#endif +netif_stop_queue (dev); +return NETDEV_TX_BUSY ; + }Did it ever happen ? Most drivers don't check that these days, it would be a pretty gross SW bug.
It happend in the past maybe due to SW bug, indeed for a long time I didn't see it, I will remove.
Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
+ ether->count_xmit++;
You are duplicating existing counters here...
ether->count_xmitis a debug counter that always counts up and only clears after I print it.
I wouldn't keep these things in a release of the driver.
Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 941
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+// Insert new buffer + + txbd = (ether->tdesc + ether->cur_tx); + + txbd->buffer =dma_map_single (&dev->dev, skb->data, + skb->len,DMA_TO_DEVICE ); + + ether->tx_skb[ether->cur_tx] = skb;You're HW can't do fragmented tx ? That's unfortunate as it will kill performance. What about HW checksum ? VLAN injection ?
Quoted 5 lines
If fragmants meaning issuing an interrupt only on the last fragment than we can support (as said due to HW issue in rare cases we miss that interrupt)
It does the checsum see CRCMODE bit below, no VLAN injection by HW (actually I am not sure what it is).
No, what I mean is if the packet can be sent using multiple descriptors. As it is, your driver forces the nextwork stack to linearize the packet into a single skb, which slows things down a lot.
If you support fragmented sends (aka scatter gather), then you can set the NETIF_SG flag and you'll get fragmented packets in start_xmit. The main skb will have typically the header and the frags will point to the pages where the packet data is.
Quoted 26 lines
Quoted 16 lines
Quoted 12 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 952
Quoted 12 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+if (skb->len >MAX_PACKET_SIZE ) +dev_err (ðer->pdev->dev,"skb->len (= %d) > MAX_PACKET_SIZE " +"(= %d)\n" , skb->len, +MAX_PACKET_SIZE ); + + txbd->sl = skb->len >MAX_PACKET_SIZE ?MAX_PACKET_SIZE : skb->len; +wmb (); + + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE ; +wmb ();Do you need two wmb's ? I would think all you need is one
dma_wmb()before setting the OWN (not OWEN !) bit. If you don't use the__rawaccessors you should be fine.I guess you are right if I will remove the
__raw.Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ETH_TRIGGER_TX ; + +if (++ether->cur_tx >=TX_DESC_SIZE ) + ether->cur_tx =0 ; +spin_lock_irqsave (ðer->lock, flags);
Quoted 5 lines
Quoted 1 line
Why the lock ? The network stack is holding a tx lock for you
Here for example I want to protect
ether->pending_txandether->finish_tx, if you are sure that the napi poll and the xmit can't run in parallel, I can remove that.
They can and you do't need to protect, in part because you shouldn't be doing reclaim in start_xmit. You should do reclaim ony from NAPI which means that you have a clean consumer/producer model and the lock is only necessary in the edge condition when you try to restart the queue from the relaim path.
Quoted 2 lines
I will still need to protect with lock resources that are changed both by interrupt and non-interrupt code.
No. Mostly you don't. As I said, look at other drivers.
Quoted 2 lines
I see that your driver at 4.10 you still had locks, are you sure that network stack tx lock also locked the poll in 4.10?
Look at upstream. The only lock taken here is the queue TX lock and only in very specific circumstances.
Quoted 35 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +15
-0+ ether->pending_tx++; + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +//spin_lock_irqsave(ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +//pin_unlock_irqrestore(ðer->lock, flags); + txbd->diff = (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + txbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + txbd->t2 =__raw_readl (REG_MISTA ); + txbd->t3 =__raw_readl (REG_MIEN );Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 979
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1] = iUsCnt2[1]; + } +#endif + +npcm7xx_clean_tx (dev, true);Why there ? TX cleaning should be done from NAPI only.
See above my comment on missed interrupts.
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+if (ether->pending_tx >=TX_DESC_SIZE -1 ) { +unsigned int reg_mien; +unsigned int index_to_wake = ether->cur_tx + (TX_DESC_SIZE *3 /4 ); + +if (index_to_wake >=TX_DESC_SIZE ) + index_to_wake -=TX_DESC_SIZE ;
Quoted 6 lines
Quoted 3 lines
Does it help at all to have that hysteresis on wakes ? If the cleaning is done from NAPI as it should be you'll already be cleanning up in bulks, so that doesn't look necessary.
What if there is a storm of TX before the NAPI will be scheduled, I am setting interrupt here to make ?
Sorry I'm not sure I understand what you mean. I don't see other drivers needing the above, I would check things without it first and only add that sort of mechanism if you can observe a problem. NAPI should schedule fast enough, you should be masking the interrupt after it occurs for the first time anyway.
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 990
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+ txbd = (ether->tdesc + index_to_wake); + txbd->mode =TX_OWEN_DMA |PADDINGMODE |CRCMODE |MACTXINTEN ; +wmb ();This is very fishy and allegedly racy.
Quoted 7 lines
Quoted 2 lines
Why can't you just turn TX interrupts off when doing NAPI and simply keep NAPI going as long as either TX or RX isn't complete ?
Maybe I am missing somthing:
Isn't the NAPI made for RX, for TX I can continue transmit untill I have no room and then only wait for interrupts that will inform me that I have new room for new packets.
No, this is very inefficient. You should be doing TX reclaim from NAPI as well.
Quoted 31 lines
Here I am stopping the transmit when I see that the pending transmits are becomming full, and also enable the TDU that triggers an interrupt when all packets had transmitted due to the HW issue that I might miss the last packet interrupt.
Quoted 26 lines
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 999
Quoted 9 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+__raw_writel (MISTA_TDU ,REG_MISTA );// Clear TDU interrupt + reg_mien =__raw_readl (REG_MIEN ); + +if (reg_mien !=0 ) +__raw_writel (reg_mien |ENTDU ,REG_MIEN );// Enable TDU interrupt + + ether->tx_tdu++; +netif_stop_queue (dev);Once you remove your custom lock you need to use a construct like this (from ftgmac100 but a lot of drivers do the same):
/* If there isn't enough room for all the fragments of a new packet * in the TX ring, stop the queue. The sequence below is race free * vs. a concurrent restart in ftgmac100_poll() */ if (unlikely(ftgmac100_tx_buf_avail(priv) < TX_THRESHOLD)) { netif_stop_queue(netdev); /* Order the queue stop with the test below */ smp_mb(); if (ftgmac100_tx_buf_avail(priv) >= TX_THRESHOLD) netif_wake_queue(netdev); }
Quoted 7 lines
Quoted 1 line
On the NAPI side, you need to take the tx queue lock.
Isn't my code is quite the same? I am calling
netif_stop_queue()when getting full and inclean_tx()that is called from napi poll I am callingnetif_wake_queue()(note that in that case only if theclean_tx()is called from poll, if it is called fromxmit()I am not callingnetif_wake_queue())
Yes but you need to handle the races. Drop your lock and handle the races as shown above.
Quoted 27 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +16
-0+ } + +spin_unlock_irqrestore (ðer->lock, flags); + +return 0 ; +} + +static irqreturn_t npcm7xx_tx_interrupt (int irq,void *dev_id) +{ +struct npcm7xx_ether *ether; +struct platform_device *pdev; +struct net_device *dev; +unsigned int status; +unsigned long flags; + + dev = dev_id;Quoted 9 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1021
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether =netdev_priv (dev); + pdev = ether->pdev; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF0000 ); +spin_unlock_irqrestore (ðer->lock, flags);I would handle all interrupts from the NAPI code. Lock is pointless.
Quoted 6 lines
Indeed I can remove the lock here since the status register is write 1 to cleare.
Quoted 2 lines
For reset, schedule a reset task like ftgmac100 or sungem (or many other drivers).
I see in ftgmac100 that it also does:
priv->need_mac_restart= true;
This is specific to ftgmac to workaround a HW bug. We restart the MAC when it hits an overflow condition.
Quoted 85 lines
Quoted 4 lines
Also move the interrupt handler before the NAPI code, it's clearer that way.
OK
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +32
-0+ ether->tx_int_count++; + +if (status &MISTA_EXDEF ) +dev_err (&pdev->dev,"emc defer exceed interrupt status=0x%08X\n" + , status); +else if (status &MISTA_TXBERR ) { +dev_err (&pdev->dev,"emc bus error interrupt status=0x%08X\n" , + status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; + }else if (status & ~(MISTA_TXINTR |MISTA_TXCP |MISTA_TDU )) +dev_err (&pdev->dev,"emc other error interrupt status=0x%08X\n" , + status); + +// if we got MISTA_TXCP | MISTA_TDU remove those interrupt and call napi +if (status & (MISTA_TXCP |MISTA_TDU ) &__raw_readl (REG_MIEN )) { +unsigned int reg_mien; + +spin_lock_irqsave (ðer->lock, flags); + reg_mien =__raw_readl (REG_MIEN ); +if (reg_mien &ENTDU ) +__raw_writel (reg_mien & (~ENTDU ),REG_MIEN );// Disable TDU interrupt + +spin_unlock_irqrestore (ðer->lock, flags); + +if (status &MISTA_TXCP ) + ether->tx_cp_i++;Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1060
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+if (status &MISTA_TDU ) + ether->tx_tdu_i++; + }else +EMC_DEBUG ("status=0x%08X\n" , status); + +napi_schedule (ðer->napi);
_irqoffOK
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +24
-0+return IRQ_HANDLED ; +} + +static int npcm7xx_poll (struct napi_struct *napi,int budget) +{ +struct npcm7xx_ether *ether = + container_of(napi, struct npcm7xx_ether, napi); +struct npcm7xx_rxbd *rxbd; +struct net_device *dev = ether->ndev; +struct platform_device *pdev = ether->pdev; +struct sk_buff *skb, *s; +unsigned int length, status; +unsigned long flags; +int rx_cnt =0 ; +int complete =0 ; +unsigned int rx_offset = (__raw_readl (REG_CRXDSA ) - + ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); +unsigned int local_count = (rx_offset >= ether->cur_rx) ? + rx_offset - ether->cur_rx : rx_offset + +RX_DESC_SIZE - ether->cur_rx; + +if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count;Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1091
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ +if (local_count > (4 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR );
-ETOOMANYACRONYMS. Please explain.
Quoted 3 lines
Due to HW issue I want to avoid getting RDU, Recieve Descriptor Unavalable, since it cause a lot of RX overrun interrupts, so I block accepting new packets
I'm not sure how that helps other than kill traffic if you have a lot of genuine short packtes. In general, if the driver is working properly it shouldn't hit overruns anyway.
I'd say leave that out for now, and if you really have a problem with RXOV, we can look into working around it differently.
Quoted 378 lines
Quoted 6 lines
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1095
Quoted 4 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+if (local_count <= budget) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR );Not now. At the end, and only if you are also done with TX reclaims.
I blocked any RX and I have in my chain less than 'budget' of packets, I want to renew the recieving of packets as soon as possible.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
+
spin_lock_irqsave(ðer->lock, flags);Lock is pointless
Again,
clean_txis called in 2 places and has shared resources.Quoted 9 lines
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1103
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+npcm7xx_clean_tx (dev, false); +spin_unlock_irqrestore (ðer->lock, flags); + + rxbd = (ether->rdesc + ether->cur_rx); + +while (rx_cnt < budget) {Move the RX reclaim to a separate function.
OK
Quoted 23 lines
Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ status = rxbd->sl; +if ((status &RX_OWEN_DMA ) ==RX_OWEN_DMA ) { + complete =1 ; +break ; + } +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_clk_GetTimeStamp (iUsCnt2); +spin_unlock_irqrestore (ðer->lock, flags);Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1123
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ rxbd->diff = ((rx_cnt+1 )<<28 ) + + (_1MHz_ * (iUsCnt2[1 ] - last_iUsCnt1[1 ])) + + iUsCnt2[0 ]/25 - last_iUsCnt1[0 ]/25 ; + rxbd->ts = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ];This chunk needs reworking.
Quoted 1 line
Just remove that gunk.
I will remove the
CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXTcodeQuoted 141 lines
Quoted 141 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1130
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +7
-0+ } +#endif + rxbd->reserved = status;// for debug puposes we save the previous value + s = ether->rx_skb[ether->cur_rx]; + length = status &0xFFFF ; + +#ifdef VLAN_SUPPORT Remove these guards.
Is there a reason you can't have vlan always enabled?
Quoted 128 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +128
-0+if (likely ((status & (RXDS_RXGD |RXDS_CRCE |RXDS_ALIE |RXDS_RP )) + ==RXDS_RXGD ) &&likely (length <=MAX_PACKET_SIZE )) { +#else +if (likely ((status & (RXDS_RXGD |RXDS_CRCE |RXDS_ALIE |RXDS_RP + |RXDS_PTLE )) ==RXDS_RXGD ) && +likely (length <=MAX_PACKET_SIZE )) { +#endif +dma_unmap_single (&dev->dev, (dma_addr_t )rxbd->buffer, +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); + +skb_put (s, length); + s->protocol =eth_type_trans (s, dev); +netif_receive_skb (s); + ether->stats.rx_packets++; + ether->stats.rx_bytes += length; + rx_cnt++; + ether->rx_count_pool++; + +// now we allocate new skb instead if the used one. + skb =dev_alloc_skb (roundup (MAX_PACKET_SIZE_W_CRC ,4 )); + +if (!skb) { +dev_err (&pdev->dev,"get skb buffer error\n" ); + ether->stats.rx_dropped++; + goto rx_out; + } + +/* Do not unmark the following skb_reserve() Receive +* Buffer Starting Address must be aligned +* to 4 bytes and the following line if unmarked +* will make it align to 2 and this likely +* will hult the RX and crash the linux +* skb_reserve(skb, NET_IP_ALIGN); +*/ + skb->dev = dev; + + rxbd->buffer =dma_map_single (&dev->dev, skb->data, +roundup (MAX_PACKET_SIZE_W_CRC ,4 ), +DMA_FROM_DEVICE ); + ether->rx_skb[ether->cur_rx] = skb; + }else { + ether->rx_err_count++; + ether->stats.rx_errors++; +EMC_DEBUG ("rx_errors = %lu status = 0x%08X\n" , + ether->stats.rx_errors, status); + +if (status &RXDS_RP ) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + }else if (status &RXDS_CRCE ) { + ether->stats.rx_crc_errors++; +EMC_DEBUG ("rx_crc_errors = %lu\n" , + ether->stats.rx_crc_errors); + }else if (status &RXDS_ALIE ) { + ether->stats.rx_frame_errors++; +EMC_DEBUG ("rx_frame_errors = %lu\n" , + ether->stats.rx_frame_errors); + } +#ifndef VLAN_SUPPORT + else if (status & RXDS_PTLE) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + } +#endif + else if (length > MAX_PACKET_SIZE) { + ether->stats.rx_length_errors++; +EMC_DEBUG ("rx_length_errors = %lu\n" , + ether->stats.rx_length_errors); + } + } + +wmb (); + rxbd->sl =RX_OWEN_DMA ; +wmb (); + +if (++ether->cur_rx >=RX_DESC_SIZE ) + ether->cur_rx =0 ; + + rxbd = (ether->rdesc + ether->cur_rx); + + } + +if (complete) { +napi_complete (napi); + +if (ether->need_reset) { +EMC_DEBUG ("Reset\n" ); +npcm7xx_reset_mac (dev,1 ); + } + +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (__raw_readl (REG_MIEN ) |ENRXGD ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + }else { + rx_offset = (__raw_readl (REG_CRXDSA )-ether->start_rx_ptr)/ +sizeof (struct npcm7xx_txbd ); + local_count = (rx_offset >= ether->cur_rx) ? rx_offset - + ether->cur_rx : rx_offset +RX_DESC_SIZE - + ether->cur_rx; + +if (local_count > ether->max_waiting_rx) + ether->max_waiting_rx = local_count; + +if (local_count > (3 *RX_POLL_SIZE )) +// we are porbably in a storm of short packets and we don't want to get +// into RDU since short packets in RDU cause many RXOV which may cause +// EMC halt, so we filter out all comming packets +__raw_writel (0 ,REG_CAMCMR ); +if (local_count <=RX_POLL_SIZE ) +// we can restore accepting of packets +__raw_writel (ether->camcmr,REG_CAMCMR ); + } +rx_out: + +ETH_TRIGGER_RX ; + return rx_cnt; +} + +static irqreturn_t npcm7xx_rx_interrupt (int irq,void *dev_id) +{ +struct net_device *dev = (struct net_device *)dev_id; +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; +unsigned int status; +unsigned long flags;Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1264
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+unsigned int any_err =0 ; +u32 RXFSM ; + +spin_lock_irqsave (ðer->lock, flags); +npcm7xx_get_and_clear_int (dev, &status,0xFFFF ); +spin_unlock_irqrestore (ðer->lock, flags);Lock is probably pointless.
I agreed above for that
Quoted 111 lines
Quoted 111 lines
Quoted 111 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +110
-0+ ether->rx_int_count++; + + +if (unlikely (status &MISTA_RXBERR )) { + ether->rx_berr++; +dev_err (&pdev->dev,"emc rx bus error status=0x%08X\n" , status); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN );// disable any interrupt +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); +return IRQ_HANDLED ; + } + +if (unlikely (status & (MISTA_RXOV |MISTA_RDU ))) { +// filter out all received packets until we have enough avaiable buffer descriptors +__raw_writel (0 ,REG_CAMCMR ); + any_err =1 ; +if (status & (MISTA_RXOV )) + ether->rxov++; +if (status & (MISTA_RDU )) + ether->rdu++; + +// workaround Errata 1.36: EMC Hangs on receiving 253-256 byte packet +RXFSM =__raw_readl (REG_RXFSM ); + +if ((RXFSM &0xFFFFF000 ) ==0x08044000 ) { +int i; +for (i =0 ; i <32 ; i++) { +RXFSM =__raw_readl (REG_RXFSM ); +if ((RXFSM &0xFFFFF000 ) !=0x08044000 ) +break ; + } +if (i ==32 ) { + ether->rx_stuck++; +spin_lock_irqsave (ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +npcm7xx_info_print (dev); +#endif +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); +dev_err (&pdev->dev,"stuck on REG_RXFSM = " +"0x%08X status=%08X doing " +"reset!\n" ,RXFSM , status); +return IRQ_HANDLED ; + } + } + } + +// echo MISTA status on unexpected flags although we don't do anithing with them +if (unlikely (status & ( +// MISTA_RXINTR | // Receive - all RX interrupt set this +MISTA_CRCE |// CRC Error +// MISTA_RXOV | // Receive FIFO Overflow - we alread handled it +#ifndef VLAN_SUPPORT +MISTA_PTLE |// Packet Too Long is needed since VLAN is not supported +#endif +// MISTA_RXGD | // Receive Good - this is the common good case +MISTA_ALIE |// Alignment Error +MISTA_RP |// Runt Packet +MISTA_MMP |// More Missed Packet +MISTA_DFOI |// Maximum Frame Length +// MISTA_DENI | // DMA Early Notification - every packet get this +// MISTA_RDU | // Receive Descriptor Unavailable +// MISTA_RXBERR | // Receive Bus Error Interrupt - we alread handled it +// MISTA_CFR | // Control Frame Receive - not an error +0 ))) { +EMC_DEBUG ("emc rx MISTA status=0x%08X\n" , status); + any_err =1 ; + ether->rx_err++; + } + +if ((any_err ==0 ) && ((status &MISTA_RXGD ) ==0 )) +dev_err (&pdev->dev,"emc rx MISTA status=0x%08X\n" , status); + +spin_lock_irqsave (ðer->lock, flags); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT + { +struct npcm7xx_rxbd *rxbd = (ether->rdesc + ether->cur_rx); +static u32 last_iUsCnt1[2 ] = {0 }; +u32 iUsCnt2[2 ]; + +npcm7xx_clk_GetTimeStamp (iUsCnt2); +/* rxbd->r2 = (_1MHz_ * (iUsCnt2[1] - last_iUsCnt1[1])) + +*iUsCnt2[0]/25 - last_iUsCnt1[0]/25; +*/ + rxbd->r2 = status; + rxbd->r3 = (_1MHz_ * iUsCnt2[1 ]) + iUsCnt2[0 ]/25 ; + last_iUsCnt1[0 ] = iUsCnt2[0 ]; + last_iUsCnt1[1 ] = iUsCnt2[1 ]; + } +#endif +__raw_writel (__raw_readl (REG_MIEN ) & ~ENRXGD ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); +napi_schedule (ðer->napi); + +return IRQ_HANDLED ; +} + + +static int npcm7xx_ether_open (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +struct platform_device *pdev; +Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1380
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ ether =netdev_priv (dev); + pdev = ether->pdev; + + ether->need_reset =1 ; +npcm7xx_reset_mac (dev,0 );What's the logic between that
need_resetand a function called "reset"
?Agree it is pointless here.
Quoted 42 lines
Quoted 42 lines
Quoted 42 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +41
-0+if (request_irq (ether->txirq, npcm7xx_tx_interrupt, +0x0 , pdev->name, dev)) { +dev_err (&pdev->dev,"register irq tx failed\n" ); +return -EAGAIN ; + } + +if (request_irq (ether->rxirq, npcm7xx_rx_interrupt, +0x0 , pdev->name, dev)) { +dev_err (&pdev->dev,"register irq rx failed\n" ); +free_irq (ether->txirq, dev); +return -EAGAIN ; + } + +if (ether->phy_dev) +phy_start (ether->phy_dev); + +netif_start_queue (dev); +napi_enable (ðer->napi); + +ETH_TRIGGER_RX ; + +dev_info (&pdev->dev,"%s is OPENED\n" , dev->name); + +return 0 ; +} + +static void npcm7xx_ether_set_multicast_list (struct net_device *dev) +{ +struct npcm7xx_ether *ether; +unsigned int rx_mode; + + ether =netdev_priv (dev); + +EMC_DEBUG ("%s CAMCMR_AUP\n" , (dev->flags &IFF_PROMISC ) ? +"Set" :"Clear" ); +if (dev->flags &IFF_PROMISC ) + rx_mode =CAMCMR_AUP |CAMCMR_AMP |CAMCMR_ABP |CAMCMR_ECMP ; +else if ((dev->flags &IFF_ALLMULTI ) || !netdev_mc_empty (dev)) + rx_mode =CAMCMR_AMP |CAMCMR_ABP |CAMCMR_ECMP ; +else + rx_mode =CAMCMR_ECMP |CAMCMR_ABP ;Quoted 8 lines
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1425
Quoted 3 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+__raw_writel (rx_mode,REG_CAMCMR ); + ether->camcmr = rx_mode; +}Name this
set_rx_mode. You can't do better in your "CAM" for multicast filtering ? Usual comment about use of__rawMMIO accessors. You may also want to make sure the interface is running before writing to the HW.
Quoted 3 lines
I see in
ftgmac100_set_rx_mode()that it does some more things than just setting the CAM options, sould I do the same? (note that I don't have the spec of ftgmac100 so I don't know what each register does).
Well, it calculates the multicast hash and programs it, that's about it.
Quoted 910 lines
Quoted 50 lines
Quoted 50 lines
Quoted 50 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +50
-0+static int npcm7xx_ether_ioctl (struct net_device *dev, +struct ifreq *ifr,int cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; + +if (!netif_running (dev)) +return -EINVAL ; + +if (!phydev) +return -ENODEV ; + +return phy_mii_ioctl (phydev, ifr, cmd); +} + +static void npcm7xx_get_drvinfo (struct net_device *dev, +struct ethtool_drvinfo *info) +{ +strlcpy (info->driver,DRV_MODULE_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_MODULE_VERSION ,sizeof (info->version)); +strlcpy (info->fw_version,"N/A" ,sizeof (info->fw_version)); +strlcpy (info->bus_info,"N/A" ,sizeof (info->bus_info)); +} + +static int npcm7xx_get_settings (struct net_device *dev, +struct ethtool_link_ksettings *cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; + +if (phydev ==NULL ) +return -ENODEV ; + +pr_info ("\n\nnpcm7xx_get_settings\n" ); +phy_ethtool_ksettings_get (phydev, cmd); + +return 0 ; +} + +static int npcm7xx_set_settings (struct net_device *dev, +const struct ethtool_link_ksettings *cmd) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct phy_device *phydev = ether->phy_dev; +int ret; +unsigned long flags; + +if (phydev ==NULL ) +return -ENODEV ; +Quoted 9 lines
Quoted 5 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +3
-0+pr_info ("\n\nnpcm7xx_set_settings\n" ); +spin_lock_irqsave (ðer->lock, flags); + ret = phy_ethtool_ksettings_set(phydev, cmd);
+spin_unlock_irqrestore(ðer->lock, flags);Ditch the lock. You can directly hookup
phy_ethtool_ksettings_setand get into theethtool_opswithout wrappers.OK
Quoted 70 lines
Quoted 70 lines
Quoted 70 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +69
-0+return ret; +} + +static u32 npcm7xx_get_msglevel (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + +return ether->msg_enable; +} + +static void npcm7xx_set_msglevel (struct net_device *dev,u32 level) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); + + ether->msg_enable = level; +} + +static const struct ethtool_ops npcm7xx_ether_ethtool_ops = { + .get_link_ksettings = npcm7xx_get_settings, + .set_link_ksettings = npcm7xx_set_settings, + .get_drvinfo = npcm7xx_get_drvinfo, + .get_msglevel = npcm7xx_get_msglevel, + .set_msglevel = npcm7xx_set_msglevel, + .get_link = ethtool_op_get_link, +}; + +static const struct net_device_ops npcm7xx_ether_netdev_ops = { + .ndo_open = npcm7xx_ether_open, + .ndo_stop = npcm7xx_ether_close, + .ndo_start_xmit = npcm7xx_ether_start_xmit, + .ndo_get_stats = npcm7xx_ether_stats, + .ndo_set_rx_mode = npcm7xx_ether_set_multicast_list, + .ndo_set_mac_address = npcm7xx_set_mac_address, + .ndo_do_ioctl = npcm7xx_ether_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +}; + +#ifndef CONFIG_OF +static unsigned char char2hex (unsigned char c) +{ +if (c >='0' && c <='9' ) +return c -'0' ; +if (c >='a' && c <='f' ) +return c -'a' +10 ; +if (c >='A' && c <='F' ) +return c -'A' +10 ; + +return 0 ; +} + +static void _mac_setup (char *line,u8 *mac) +{ +int i; + +for (i =0 ; i <6 ; i++) + mac[i] = (char2hex (line[i*3 ])<<4 ) +char2hex (line[i*3 +1 ]); +} + +static int find_option (char *str,char *mac) +{ +extern char *saved_command_line; +char *p; + + p = strstr(saved_command_line, str) + +if (!p) +return 0 ; +Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1555
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ p +=strlen (str); +_mac_setup (p, mac); + +return 1 ; +}These above options can be done with common helpers. Take a look at another driver such as the
ftgmac100.c.I will try
Quoted 72 lines
Quoted 33 lines
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+#endif + +static void get_mac_address (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev = ether->pdev; +struct device_node *np = ether->pdev->dev.of_node; +const u8 *mac_address =NULL ; +#ifndef CONFIG_OF drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1574
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+struct plat_npcm7xx_emc_data *plat_dat = pdev->dev.platform_data; +#endif + +#ifdef CONFIG_OF + mac_address =of_get_mac_address (np); + +if (mac_address !=0 ) +ether_addr_copy (dev->dev_addr, mac_address); +#else +if (find_option ("basemac=" , mac_address)) {See above comment.
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+memcpy (dev->dev_addr, mac_address,ETH_ALEN ); +if (pdev->id ==1 ) + dev->dev_addr[5 ] +=1 ; + } else +memcpy (dev->dev_addr, (const void *)plat_dat->mac_addr, +ETH_ALEN ); +#endif + +if (is_valid_ether_addr (dev->dev_addr)) { + pr_info("%s: device MAC address : %pM\n", pdev->name,Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1592
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ dev->dev_addr); + }else { +eth_hw_addr_random (dev); +pr_info ("%s: device MAC address (random generator) %pM\n" , + dev->name, dev->dev_addr); + } + +}As Joel says, look at other drivers, this is too messy.
Quoted 28 lines
Quoted 28 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +28
-0+ +static int npcm7xx_mii_setup (struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct platform_device *pdev; +struct phy_device *phydev =NULL ; +int i, err =0 ; + + pdev = ether->pdev; + + ether->mii_bus =mdiobus_alloc (); +if (!ether->mii_bus) { + err = -ENOMEM ; +dev_err (&pdev->dev,"mdiobus_alloc() failed\n" ); + goto out0; + } + + ether->mii_bus->name ="npcm7xx_rmii" ; + ether->mii_bus->read = &npcm7xx_mdio_read; + ether->mii_bus->write = &npcm7xx_mdio_write; + ether->mii_bus->reset = &npcm7xx_mdio_reset; +snprintf (ether->mii_bus->id,MII_BUS_ID_SIZE ,"%s-%x" , + ether->pdev->name, ether->pdev->id); +EMC_DEBUG ("%s ether->mii_bus->id=%s\n" , __func__, ether->mii_bus->id); + ether->mii_bus->priv = ether; + ether->mii_bus->parent = ðer->pdev->dev; + +for (i =0 ; i <PHY_MAX_ADDR ; i++)Quoted 60 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1627
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether->mii_bus->irq[i] =PHY_POLL ; + +platform_set_drvdata (ether->pdev, ether->mii_bus); + +/* Enable MDIO Clock */ +__raw_writel (__raw_readl (REG_MCMDR ) |MCMDR_ENMDC ,REG_MCMDR );Why raw ?
Quoted 51 lines
Quoted 39 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +39
-0+ +if (mdiobus_register (ether->mii_bus)) { +dev_err (&pdev->dev,"mdiobus_register() failed\n" ); + goto out2; + } + + + phydev =phy_find_first (ether->mii_bus); +if (phydev ==NULL ) { +dev_err (&pdev->dev,"phy_find_first() failed\n" ); + goto out3; + } + +dev_info (&pdev->dev," name = %s ETH-Phy-Id = 0x%x\n" , +phydev_name (phydev), phydev->phy_id); + + phydev =phy_connect (dev,phydev_name (phydev), + &adjust_link, +PHY_INTERFACE_MODE_RMII ); + +dev_info (&pdev->dev," ETH-Phy-Id = 0x%x name = %s\n" , + phydev->phy_id, phydev->drv->name); + +if (IS_ERR (phydev)) { + err =PTR_ERR (phydev); +dev_err (&pdev->dev,"phy_connect() failed - %d\n" , err); + goto out3; + } + + phydev->supported &=PHY_BASIC_FEATURES ; + phydev->advertising = phydev->supported; + ether->phy_dev = phydev; + +return 0 ; + +out3: +mdiobus_unregister (ether->mii_bus); +out2: +kfree (ether->mii_bus->irq);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1677
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+mdiobus_free (ether->mii_bus); +out0: + +return err; +} + +#include <linux/seq_file.h> +#include <linux/proc_fs.h> + +#define PROC_FILENAME "driver/npcm7xx_emc"I think use debugfs for these internal details, or omit them.
I will try
Quoted 279 lines
Quoted 279 lines
Quoted 279 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +278
-0+ +#define REG_PRINT (reg_name) {t = scnprintf(next, size, "%-10s = %08X\n", \ + #reg_name, __raw_readl(reg_name)); size -= t; next += t; } +#define PROC_PRINT(f, x...) {t = scnprintf(next, size, f, ## x); size -= t; \ + next += t; } + +static int npcm7xx_info_dump (char *buf,int count,struct net_device *dev) +{ +struct npcm7xx_ether *ether =netdev_priv (dev); +struct npcm7xx_txbd *txbd; +struct npcm7xx_rxbd *rxbd; +unsigned long flags; +unsigned int i, cur, txd_offset, rxd_offset; +char *next = buf; +unsigned int size = count; +int t; +int is_locked =spin_is_locked (ðer->lock); + +if (!is_locked) +spin_lock_irqsave (ðer->lock, flags); + +/* ------basic driver information ---- */ +PROC_PRINT ("NPCM7XX EMC %s driver version: %s\n" , dev->name, +DRV_MODULE_VERSION ); + +REG_PRINT (REG_CAMCMR ); +REG_PRINT (REG_CAMEN ); +REG_PRINT (REG_CAMM_BASE ); +REG_PRINT (REG_CAML_BASE ); +REG_PRINT (REG_TXDLSA ); +REG_PRINT (REG_RXDLSA ); +REG_PRINT (REG_MCMDR ); +REG_PRINT (REG_MIID ); +REG_PRINT (REG_MIIDA ); +REG_PRINT (REG_FFTCR ); +REG_PRINT (REG_TSDR ); +REG_PRINT (REG_RSDR ); +REG_PRINT (REG_DMARFC ); +REG_PRINT (REG_MIEN ); +REG_PRINT (REG_MISTA ); +REG_PRINT (REG_MGSTA ); +REG_PRINT (REG_MPCNT ); +__raw_writel (0x7FFF ,REG_MPCNT ); +REG_PRINT (REG_MRPC ); +REG_PRINT (REG_MRPCC ); +REG_PRINT (REG_MREPC ); +REG_PRINT (REG_DMARFS ); +REG_PRINT (REG_CTXDSA ); +REG_PRINT (REG_CTXBSA ); +REG_PRINT (REG_CRXDSA ); +REG_PRINT (REG_CRXBSA ); +REG_PRINT (REG_RXFSM ); +REG_PRINT (REG_TXFSM ); +REG_PRINT (REG_FSM0 ); +REG_PRINT (REG_FSM1 ); +REG_PRINT (REG_DCR ); +REG_PRINT (REG_DMMIR ); +REG_PRINT (REG_BISTR ); +PROC_PRINT ("\n" ); + +PROC_PRINT ("netif_queue %s\n\n" ,netif_queue_stopped (dev) ? +"Stopped" :"Running" ); +if (ether->rdesc) +PROC_PRINT ("napi is %s\n\n" ,test_bit (NAPI_STATE_SCHED , + ðer->napi.state) ? +"scheduled" : +"not scheduled" ); + + txd_offset = (__raw_readl (REG_CTXDSA ) - +__raw_readl (REG_TXDLSA ))/sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("TXD offset %6d\n" , txd_offset); +PROC_PRINT ("cur_tx %6d\n" , ether->cur_tx); +PROC_PRINT ("finish_tx %6d\n" , ether->finish_tx); +PROC_PRINT ("pending_tx %6d\n" , ether->pending_tx); +/* debug counters */ +PROC_PRINT ("tx_tdu %6d\n" , ether->tx_tdu); + ether->tx_tdu =0 ; +PROC_PRINT ("tx_tdu_i %6d\n" , ether->tx_tdu_i); + ether->tx_tdu_i =0 ; +PROC_PRINT ("tx_cp_i %6d\n" , ether->tx_cp_i); + ether->tx_cp_i =0 ; +PROC_PRINT ("tx_int_count %6d\n" , ether->tx_int_count); + ether->tx_int_count =0 ; +PROC_PRINT ("count_xmit tx %6d\n" , ether->count_xmit); + ether->count_xmit =0 ; +PROC_PRINT ("count_finish %6d\n" , ether->count_finish); + ether->count_finish =0 ; +PROC_PRINT ("\n" ); + + rxd_offset = (__raw_readl (REG_CRXDSA )-__raw_readl (REG_RXDLSA )) + /sizeof (struct npcm7xx_txbd ); +PROC_PRINT ("RXD offset %6d\n" , rxd_offset); +PROC_PRINT ("cur_rx %6d\n" , ether->cur_rx); +PROC_PRINT ("rx_err %6d\n" , ether->rx_err); + ether->rx_err =0 ; +PROC_PRINT ("rx_berr %6d\n" , ether->rx_berr); + ether->rx_berr =0 ; +PROC_PRINT ("rx_stuck %6d\n" , ether->rx_stuck); + ether->rx_stuck =0 ; +PROC_PRINT ("rdu %6d\n" , ether->rdu); + ether->rdu =0 ; +PROC_PRINT ("rxov rx %6d\n" , ether->rxov); + ether->rxov =0 ; +// debug counters +PROC_PRINT ("rx_int_count %6d\n" , ether->rx_int_count); + ether->rx_int_count =0 ; +PROC_PRINT ("rx_err_count %6d\n" , ether->rx_err_count); + ether->rx_err_count =0 ; +PROC_PRINT ("rx_count_pool %6d\n" , ether->rx_count_pool); + ether->rx_count_pool =0 ; +PROC_PRINT ("max_waiting_rx %5d\n" , ether->max_waiting_rx); + ether->max_waiting_rx =0 ; +PROC_PRINT ("\n" ); +PROC_PRINT ("need_reset %5d\n" , ether->need_reset); + +if (ether->tdesc && ether->rdesc) { + cur = ether->finish_tx -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("finish %3d txbd mode %08X buffer %08X sl " +"%08X next %08X tx_skb %p\n" , cur, + txbd->mode, txbd->buffer, txbd->sl, + txbd->next, ether->tx_skb[cur]); + } +PROC_PRINT ("\n" ); + + cur = txd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("txd_of %3d txbd mode %08X buffer %08X sl " +"%08X next %08X\n" , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); + } +PROC_PRINT ("\n" ); + + cur = ether->cur_tx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%TX_DESC_SIZE ; + txbd = (ether->tdesc + cur); +PROC_PRINT ("cur_tx %3d txbd mode %08X buffer %08X sl " +"%08X next %08X " , cur, txbd->mode, + txbd->buffer, txbd->sl, txbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X MISTA %08X MIEN %08X\n" , + txbd->diff, txbd->ts, txbd->t2, txbd->t3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = ether->cur_rx -63 ; +for (i =0 ; i <64 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("cur_rx %3d rxbd sl %08X buffer %08X sl " +"%08X next %08X " , cur, rxbd->sl, + rxbd->buffer, rxbd->reserved, rxbd->next); +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG_EXT +PROC_PRINT ("diff %08X ts %08X i_diff %08X i_ts %08X\n" , + rxbd->diff, rxbd->ts, rxbd->r2, rxbd->r3); +#else +PROC_PRINT ("\n" ); +#endif + } +PROC_PRINT ("\n" ); + + cur = rxd_offset -2 ; +for (i =0 ; i <3 ; i++) { + cur = (cur +1 )%RX_DESC_SIZE ; + rxbd = (ether->rdesc + cur); +PROC_PRINT ("rxd_of %3d rxbd sl %08X buffer %08X sl %08X" +" next %08X\n" , cur, rxbd->sl, rxbd->buffer, + rxbd->reserved, rxbd->next); + } +PROC_PRINT ("\n" ); + } + +if (!is_locked) +spin_unlock_irqrestore (ðer->lock, flags); + +return count - size; +} + +#ifdef CONFIG_NPCM7XX_EMC_ETH_DEBUG +static void npcm7xx_info_print (struct net_device *dev) +{ +char *emc_dump_buf; +int count; +struct npcm7xx_ether *ether; +struct platform_device *pdev; +const size_t print_size =5 *PAGE_SIZE ; + + ether =netdev_priv (dev); + pdev = ether->pdev; + + emc_dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!emc_dump_buf) +dev_err (&pdev->dev,"emc_dump_buf = kmalloc(PAGE_SIZE, " +"GFP_KERNEL) failed\n" ); +else { +char c; +char *tmp_buf = emc_dump_buf; + + count =npcm7xx_info_dump (emc_dump_buf, print_size, dev); +while (count >512 ) { + c = tmp_buf[512 ]; + tmp_buf[512 ] =0 ; +pr_info ("%s" , tmp_buf); + tmp_buf +=512 ; + tmp_buf[0 ] = c; + count -=512 ; + } +printk ("%s" , tmp_buf); +kfree (emc_dump_buf); + } +} +#endif + +static int npcm7xx_proc_read (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +const size_t print_size =5 *PAGE_SIZE ; + +if (ether->dump_buf ==NULL ) { + ether->dump_buf =kmalloc (print_size,GFP_KERNEL ); +if (!ether->dump_buf) +return -1 ; +npcm7xx_info_dump (ether->dump_buf, print_size, dev); + } + +seq_printf (sf,"%s" , ether->dump_buf); + +if (sf->count < sf->size) { +kfree (ether->dump_buf); + ether->dump_buf =NULL ; + } + +return 0 ; +} + +static int npcm7xx_ether_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_read,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops = { + .open = npcm7xx_ether_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int npcm7xx_proc_reset (struct seq_file *sf,void *v) +{ +struct net_device *dev = (struct net_device *)sf->private; +struct npcm7xx_ether *ether =netdev_priv (dev); +unsigned long flags; + +seq_printf (sf,"Ask to reset the module\n" ); +spin_lock_irqsave (ðer->lock, flags); +__raw_writel (0 ,REG_MIEN ); +spin_unlock_irqrestore (ðer->lock, flags); + ether->need_reset =1 ; +napi_schedule (ðer->napi); + +return 0 ; +} + +static int npcm7xx_ether_proc_reset (struct inode *inode,struct file *file) +{ +return single_open (file, npcm7xx_proc_reset,PDE_DATA (inode)); +} + +static const struct file_operations npcm7xx_ether_proc_fops_reset = {Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1960
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ .open = npcm7xx_ether_proc_reset, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};Get rid of all the proc stuff. Use ethtool for register dumps if needed.
Is it a must? iit means I will have to count on eth tool existance.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +9
-0+static const struct of_device_id emc_dt_id[] = { + { .compatible ="nuvoton,npcm750-emc" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, emc_dt_id); + +static int npcm7xx_ether_probe (struct platform_device *pdev) +{ +struct npcm7xx_ether *ether;Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 1976
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+struct net_device *dev; +int error; +char proc_filename[32 ]; + + +#ifdef CONFIG_OF Remove these guards. We will be using OF to probe the driver in the common case.
OK
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +18
-0+struct clk *emc_clk =NULL ; +const struct of_device_id *of_id; +struct device_node *np = pdev->dev.of_node; + + pdev->id =of_alias_get_id (np,"ethernet" ); +if (pdev->id <0 ) + pdev->id =0 ; + + emc_clk =devm_clk_get (&pdev->dev,NULL ); + +if (IS_ERR (emc_clk)) +return PTR_ERR (emc_clk); + +/* Enable Clock */ +clk_prepare_enable (emc_clk); +#endif + +Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2000
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+/* disable for now - need to check if necessary */ + gcr_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-gcr" ); +if (IS_ERR (gcr_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-gcr\n" , __func__); +return IS_ERR (gcr_regmap); + }Remove the GCR and muxing code. This will be handled by your pinmux driver.
OK
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +32
-0+ + rst_regmap =syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-rst" ); +if (IS_ERR (rst_regmap)) { +pr_err ("%s: failed to find nuvoton,npcm750-rst\n" , __func__); +return IS_ERR (rst_regmap); + } + +/* Muxing RMII MDIO */ +if (pdev->id ==0 ) { +regmap_update_bits (gcr_regmap,MFSEL3_OFFSET , (0x1 <<9 ), + (0x1 <<9 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<13 ), + (0x1 <<13 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<12 ), + (0x1 <<12 )); +regmap_update_bits (gcr_regmap,INTCR_OFFSET , (0x1 <<5 ), + (0x1 <<5 )); + } +if (pdev->id ==1 ) { +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<14 ), + (0x1 <<14 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<16 ), + (0x1 <<16 )); +regmap_update_bits (gcr_regmap,MFSEL1_OFFSET , (0x1 <<15 ), + (0x1 <<15 )); + } + +/* Reset EMC module */ +if (pdev->id ==0 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ), + (0x1 <<6 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<6 ),0 );Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2038
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ } +if (pdev->id ==1 ) { +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ), + (0x1 <<21 )); +regmap_update_bits (rst_regmap,IPSRST1_OFFSET , (0x1 <<21 ),0 ); + }A reset or clk driver should take care of the above.
OK
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
+ #ifdef
CONFIG_OFAs Joel says, remove all the
CONFIG_OF.Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2046
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ of_id =of_match_device (emc_dt_id, &pdev->dev); +if (!of_id) { +dev_err (&pdev->dev,"Error: No device match found\n" ); +return -ENODEV ; + } +/* Why do you need that ? You've already been matched.
OK.
Quoted 24 lines
Quoted 3 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ * Right now device-tree probed devices don't get dma_mask set. + * Since shared usb codeUSB ?
Quoted 7 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2054
Quoted 7 lines
relies on it, set it here for now.
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+* Once we have dma capability bindings this can go away. +*/ + error =dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (error) +return -ENODEV ; +#endif That looks odd... Joel, I fogot now, how do we get the
dma_maskestablished on aspeed ? I don't remember the need to use the "coerce" forms.Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2060
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+ dev =alloc_etherdev (sizeof (struct npcm7xx_ether )); +if (!dev) +return -ENOMEM ; + +snprintf (dev->name,IFNAMSIZ ,"eth%d" , pdev->id);Quoted 3 lines
That might cause you surprises if another ethernet driver has picked up those numbers already... I wouldn't do that, I would just leave the network stack pick a name.
OK.
Quoted 45 lines
Quoted 45 lines
Quoted 45 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +44
-0+ ether =netdev_priv (dev); + + ether->res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (ether->res ==NULL ) { +dev_err (&pdev->dev,"failed to get I/O memory\n" ); + error = -ENXIO ; + goto failed_free; + } + +if (!request_mem_region (ether->res->start, +resource_size (ether->res), pdev->name)) { +dev_err (&pdev->dev,"failed to request I/O memory\n" ); + error = -EBUSY ; + goto failed_free; + } + + ether->reg =ioremap (ether->res->start,resource_size (ether->res)); +EMC_DEBUG (" ether->reg = 0x%x\n" , __func__, (unsigned int )ether->reg); + +if (ether->reg ==NULL ) { +dev_err (&pdev->dev,"failed to remap I/O memory\n" ); + error = -ENXIO ; + goto failed_free_mem; + } + + ether->txirq =platform_get_irq (pdev,0 ); +if (ether->txirq <0 ) { +dev_err (&pdev->dev,"failed to get ether tx irq\n" ); + error = -ENXIO ; + goto failed_free_io; + } + + ether->rxirq =platform_get_irq (pdev,1 ); +if (ether->rxirq <0 ) { +dev_err (&pdev->dev,"failed to get ether rx irq\n" ); + error = -ENXIO ; + goto failed_free_txirq; + } + +SET_NETDEV_DEV (dev, &pdev->dev); +platform_set_drvdata (pdev, dev); + ether->ndev = dev; + + ether->pdev = pdev;Quoted 8 lines
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2112
Quoted 6 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +6
-0+ ether->msg_enable =NETIF_MSG_LINK ; + + dev->netdev_ops = &npcm7xx_ether_netdev_ops; + dev->ethtool_ops = &npcm7xx_ether_ethtool_ops; + + dev->tx_queue_len =TX_DESC_SIZE ;The name is ambiguous ... is it a queue lenght or a descriptor size ...
I will change
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +31
-0+ dev->dma =0x0 ; + dev->watchdog_timeo =TX_TIMEOUT ; + +get_mac_address (dev); + + ether->cur_tx =0x0 ; + ether->cur_rx =0x0 ; + ether->finish_tx =0x0 ; + ether->pending_tx =0x0 ; + ether->link =0 ; + ether->speed =100 ; + ether->duplex =DUPLEX_FULL ; + ether->need_reset =0 ; + ether->dump_buf =NULL ; + ether->rx_berr =0 ; + ether->rx_err =0 ; + ether->rdu =0 ; + ether->rxov =0 ; + ether->rx_stuck =0 ; +// debug counters + ether->max_waiting_rx =0 ; + ether->rx_count_pool =0 ; + ether->count_xmit =0 ; + ether->rx_int_count =0 ; + ether->rx_err_count =0 ; + ether->tx_int_count =0 ; + ether->count_finish =0 ; + ether->tx_tdu =0 ; + ether->tx_tdu_i =0 ; + ether->tx_cp_i =0 ; +Quoted 8 lines
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2148
Quoted 5 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +5
-0+spin_lock_init (ðer->lock); + +netif_napi_add (dev, ðer->napi, npcm7xx_poll,RX_POLL_SIZE ); + +ether_setup (dev);Do you need that
ether_setup? Normally drivers don't need that,alloc_etherdevdoes it.If you are sure I will try to remove that.
Quoted 105 lines
Quoted 14 lines
Quoted 14 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +13
-0+ error =npcm7xx_mii_setup (dev); +if (error <0 ) { +dev_err (&pdev->dev,"npcm7xx_mii_setup err\n" ); + goto failed_free_rxirq; + } + + error =register_netdev (dev); +if (error !=0 ) { +dev_err (&pdev->dev,"register_netdev() failed\n" ); + error = -ENODEV ; + goto failed_free_rxirq; + } + snprintf(proc_filename, sizeof(proc_filename), "%s.%d", PROC_FILENAME,Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2170
Quoted 8 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +8
-0+ pdev->id); +proc_create_data (proc_filename,0000 ,NULL , &npcm7xx_ether_proc_fops, + dev); + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +proc_create_data (proc_filename,0000 ,NULL , + &npcm7xx_ether_proc_fops_reset, dev);Kill the proc gunk.
Quoted 80 lines
Quoted 66 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +66
-0+return 0 ; + +failed_free_rxirq: +free_irq (ether->rxirq, pdev); +platform_set_drvdata (pdev,NULL ); +failed_free_txirq: +free_irq (ether->txirq, pdev); +failed_free_io: +iounmap (ether->reg); +failed_free_mem: +release_mem_region (ether->res->start,resource_size (ether->res)); +failed_free: +free_netdev (dev); + +return error; +} + +static int npcm7xx_ether_remove (struct platform_device *pdev) +{ +struct net_device *dev =platform_get_drvdata (pdev); +struct npcm7xx_ether *ether =netdev_priv (dev); +char proc_filename[32 ]; + +snprintf (proc_filename,sizeof (proc_filename),"%s.%d" ,PROC_FILENAME , + pdev->id); +remove_proc_entry (proc_filename,NULL ); +snprintf (proc_filename,sizeof (proc_filename),"%s.%d.reset" , +PROC_FILENAME , pdev->id); +remove_proc_entry (proc_filename,NULL ); + +unregister_netdev (dev); + + +free_irq (ether->txirq, dev); +free_irq (ether->rxirq, dev); + +if (ether->phy_dev) +phy_disconnect (ether->phy_dev); + +mdiobus_unregister (ether->mii_bus); +kfree (ether->mii_bus->irq); +mdiobus_free (ether->mii_bus); + +platform_set_drvdata (pdev,NULL ); + +free_netdev (dev); +return 0 ; +} + +static struct platform_driver npcm7xx_ether_driver = { + .probe = npcm7xx_ether_probe, + .remove = npcm7xx_ether_remove, + .driver = { + .name =DRV_MODULE_NAME , + .owner =THIS_MODULE , + .of_match_table =of_match_ptr (emc_dt_id), + }, +}; + +#ifdef CONFIG_OF +module_platform_driver (npcm7xx_ether_driver); +#else +static int __init npcm7xx_ether_init (void ) +{ + +return platform_driver_register (&npcm7xx_ether_driver);drivers/net/ethernet/nuvoton/npcm7xx_emc.c line 2247
Quoted 10 lines
drivers/net/ethernet/nuvoton/npcm7xx_emc.c new file +10
-0+} + +static void __exit npcm7xx_ether_exit(void) +{ +platform_driver_unregister (&npcm7xx_ether_driver); +} + +module_init (npcm7xx_ether_init); +module_exit (npcm7xx_ether_exit); +#endif
platform_driver_register(npcm7xx_ether_driver);Cheers,