gianfar: Fix BD_LENGTH_MASK definition
Subsystems (3)
PATCH 1/2 gianfar: Fix BD_LENGTH_MASK definition
BD_LENGTH_MASK is supposed to catch the low 16-bits of the status field, not the low byte. The old way, we would never be able to clean up tx packets with sizes divisible by 256.
--- drivers/net/gianfar.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/gianfar.h +1 -1
@@ -312,7 +312,7 @@ extern const char gfar_driver_version[];#define ATTRELI_EI (x) (x)#define BD_LFLAG (flags) ((flags) << 16) -#define BD_LENGTH_MASK 0x00ff +#define BD_LENGTH_MASK 0x0000ffff/* TxBD status field bits */ #define TXBD_READY 0x8000
Signature · 1 line
1.5.4.GIT
PATCH 2/2 gianfar: Fix potential soft reset race
SOFT_RESET must be asserted for at least 3 TX clocks in order for it to work properly. The syncs in the gfar_write() commands have been hiding this, but we need to guarantee it.
--- drivers/net/gianfar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/gianfar.c +3 -0
@@ -351,6 +351,9 @@ static int gfar_probe(struct of_device *ofdev,/* Reset MAC layer */ gfar_write (&priv->regs->maccfg1,MACCFG1_SOFT_RESET ); +/* We need to delay at least 3 TX clocks */ +udelay (2 ); + tempval = (MACCFG1_TX_FLOW |MACCFG1_RX_FLOW );gfar_write (&priv->regs->maccfg1, tempval);
Signature · 1 line
1.5.4.GIT
PATCH 1/3 netdev: Merge UCC and gianfar MDIO bus drivers
The MDIO bus drivers for the UCC and gianfar ethernet controllers are essentially the same. There's no reason to duplicate that much code.
--- drivers/net/Kconfig | 9 + drivers/net/Makefile | 5 +- drivers/net/fsl_pq_mdio.c | 463 ++++++++++++++++++++++++++++++++++++++++ drivers/net/fsl_pq_mdio.h | 45 ++++ drivers/net/gianfar.c | 23 +-- drivers/net/gianfar.h | 13 +- drivers/net/gianfar_mii.h | 54 ----- drivers/net/ucc_geth.c | 16 +- drivers/net/ucc_geth.h | 14 +- drivers/net/ucc_geth_ethtool.c | 1 - drivers/net/ucc_geth_mii.c | 295 ------------------------- drivers/net/ucc_geth_mii.h | 101 --------- 12 files changed, 549 insertions(+), 490 deletions(-) create mode 100644 drivers/net/fsl_pq_mdio.c create mode 100644 drivers/net/fsl_pq_mdio.h delete mode 100644 drivers/net/gianfar_mii.h delete mode 100644 drivers/net/ucc_geth_mii.c delete mode 100644 drivers/net/ucc_geth_mii.h
drivers/net/Kconfig +9 -0
@@ -2273,9 +2273,17 @@ config GELIC_WIRELESS_OLD_PSK_INTERFACE If unsure, say N. +config FSL_PQ_MDIO + tristate "Freescale PQ MDIO" + depends on FSL_SOC + select PHYLIB + help + This driver supports the MDIO bus used by the gianfar and UCC drivers. + config GIANFAR tristate "Gianfar Ethernet" depends on FSL_SOC + select FSL_PQ_MDIO select PHYLIB select CRC32 help
@@ -2285,6 +2293,7 @@ config GIANFAR config UCC_GETH tristate "Freescale QE Gigabit Ethernet" depends on QUICC_ENGINE + select FSL_PQ_MDIO select PHYLIB help This driver supports the Gigabit Ethernet mode of the QUICC Engine,
drivers/net/Makefile +3 -2
@@ -24,11 +24,12 @@ obj-$(CONFIG_JME) += jme.o gianfar_driver-objs := gianfar.o \ gianfar_ethtool.o \ - gianfar_mii.o \ gianfar_sysfs.o obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o -ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o ucc_geth_ethtool.o +ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o + +obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o # # link order important here
drivers/net/fsl_pq_mdio.c new file +463 -0
463 lines not on this page · raw message
drivers/net/fsl_pq_mdio.h new file +45 -0
45 lines not on this page · raw message
drivers/net/gianfar.c +7 -16
@@ -93,7 +93,7 @@#include <linux/of.h> #include "gianfar.h" -#include "gianfar_mii.h" +#include "fsl_pq_mdio.h" #define TX_TIMEOUT (1*HZ)#undef BRIEF_GFAR_ERRORS
@@ -255,7 +255,7 @@ static int gfar_of_init(struct net_device *dev)of_node_put (phy);of_node_put (mdio); -gfar_mdio_bus_name (bus_name, mdio); +fsl_pq_mdio_bus_name (bus_name, mdio);snprintf (priv->phy_bus_id,sizeof (priv->phy_bus_id),"%s:%02x" , bus_name, *id); }
@@ -425,7 +425,7 @@ static int gfar_probe(struct of_device *ofdev, priv->hash_width =8 ; priv->hash_regs[0 ] = &priv->regs->gaddr0; - priv->hash_regs[1 ] = &priv->regs->gaddr1; + priv->hash_regs[1 ] = &priv->regs->gaddr1; priv->hash_regs[2 ] = &priv->regs->gaddr2; priv->hash_regs[3 ] = &priv->regs->gaddr3; priv->hash_regs[4 ] = &priv->regs->gaddr4;
@@ -838,7 +838,7 @@ void stop_gfar(struct net_device *dev)free_irq (priv->interruptTransmit, dev);free_irq (priv->interruptReceive, dev); }else { -free_irq (priv->interruptTransmit, dev); +free_irq (priv->interruptTransmit, dev); }free_skb_resources (priv);
@@ -1829,6 +1829,8 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)skb_put (skb, pkt_len); dev->stats.rx_bytes += pkt_len; +if (in_irq () ||irqs_disabled ()) +printk ("Interrupt problem!\n" );gfar_process_frame (dev, skb, amount_pull); }else {
@@ -2302,23 +2304,12 @@ static struct of_platform_driver gfar_driver = {static int __init gfar_init (void ) { -int err =gfar_mdio_init (); - -if (err) -return err; - - err =of_register_platform_driver (&gfar_driver); - -if (err) -gfar_mdio_exit (); - -return err; +return of_register_platform_driver (&gfar_driver); } static void __exit gfar_exit(void) {of_unregister_platform_driver (&gfar_driver); -gfar_mdio_exit (); }module_init (gfar_init);
drivers/net/gianfar.h +6 -7
@@ -46,7 +46,6 @@#include <linux/workqueue.h> #include <linux/ethtool.h> #include <linux/fsl_devices.h> -#include "gianfar_mii.h" /* The maximum number of packets to be handled in one call of gfar_poll */ #define GFAR_DEV_WEIGHT 64
@@ -126,9 +125,12 @@ extern const char gfar_driver_version[];#define DEFAULT_RX_COALESCE 0#define DEFAULT_RXCOUNT 0 -#define MIIMCFG_INIT_VALUE 0x00000007 -#define MIIMCFG_RESET 0x80000000 -#define MIIMIND_BUSY 0x00000001 +#define GFAR_SUPPORTED (SUPPORTED_10baseT_Half \ + | SUPPORTED_10baseT_Full \ + | SUPPORTED_100baseT_Half \ + | SUPPORTED_100baseT_Full \ + | SUPPORTED_Autoneg \ + | SUPPORTED_MII)/* TBI register addresses */ #define MII_TBICON 0x11
@@ -826,8 +828,5 @@ extern void gfar_halt(struct net_device *dev);extern void gfar_phy_test (struct mii_bus *bus,struct phy_device *phydev,int enable,u32 regnum,u32 read);void gfar_init_sysfs (struct net_device *dev); -int gfar_local_mdio_write (struct gfar_mii __iomem *regs,int mii_id, -int regnum,u16 value); -int gfar_local_mdio_read (struct gfar_mii __iomem *regs,int mii_id,int regnum);#endif /* __GIANFAR_H */
drivers/net/gianfar_mii.h deleted +0 -54
54 lines not on this page · raw message
drivers/net/ucc_geth.c +4 -12
@@ -39,7 +39,7 @@#include <asm/ucc_fast.h> #include "ucc_geth.h" -#include "ucc_geth_mii.h" +#include "fsl_pq_mdio.h" #undef DEBUG
@@ -1557,7 +1557,7 @@ static int init_phy(struct net_device *dev)of_node_put (phy);of_node_put (mdio); -uec_mdio_bus_name (bus_name, mdio); +fsl_pq_mdio_bus_name (bus_name, mdio);snprintf (phy_id,sizeof (phy_id),"%s:%02x" , bus_name, *id);
@@ -3657,7 +3657,8 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *maif (err)return -1 ; -snprintf (ug_info->mdio_bus,MII_BUS_ID_SIZE ,"%x" , res.start); +snprintf (ug_info->mdio_bus,MII_BUS_ID_SIZE ,"%x" , + res.start&0xfffff ); }/* get the phy interface type, or default to MII */
@@ -3803,11 +3804,6 @@ static int __init ucc_geth_init(void) {int i, ret; - ret =uec_mdio_init (); - -if (ret) -return ret; -if (netif_msg_drv (&debug))printk (KERN_INFO "ucc_geth: " DRV_DESC "\n" );for (i =0 ; i <8 ; i++)
@@ -3816,16 +3812,12 @@ static int __init ucc_geth_init(void) ret =of_register_platform_driver (&ucc_geth_driver); -if (ret) -uec_mdio_exit (); -return ret; } static void __exit ucc_geth_exit(void) {of_unregister_platform_driver (&ucc_geth_driver); -uec_mdio_exit (); }module_init (ucc_geth_init);
drivers/net/ucc_geth.h +12 -2
@@ -28,8 +28,6 @@#include <asm/ucc.h> #include <asm/ucc_fast.h> -#include "ucc_geth_mii.h" -#define DRV_DESC "QE UCC Gigabit Ethernet Controller"#define DRV_NAME "ucc_geth"#define DRV_VERSION "1.1"
@@ -184,6 +182,18 @@ struct ucc_geth {#define UCCE_RX_EVENTS (UCCE_RXF | UCC_GETH_UCCE_BSY)#define UCCE_TX_EVENTS (UCCE_TXB | UCC_GETH_UCCE_TXE) +/* TBI defines */ +#define ENET_TBI_MII_CR 0x00/* Control */ +#define ENET_TBI_MII_SR 0x01/* Status */ +#define ENET_TBI_MII_ANA 0x04/* AN advertisement */ +#define ENET_TBI_MII_ANLPBPA 0x05/* AN link partner base page ability */ +#define ENET_TBI_MII_ANEX 0x06/* AN expansion */ +#define ENET_TBI_MII_ANNPT 0x07/* AN next page transmit */ +#define ENET_TBI_MII_ANLPANP 0x08/* AN link partner ability next page */ +#define ENET_TBI_MII_EXST 0x0F/* Extended status */ +#define ENET_TBI_MII_JD 0x10/* Jitter diagnostics */ +#define ENET_TBI_MII_TBICON 0x11/* TBI control */ +/* UCC GETH MACCFG1 (MAC Configuration 1 Register) */ #define MACCFG1_FLOW_RX 0x00000020/* Flow Control Rx */
drivers/net/ucc_geth_ethtool.c +0 -1
@@ -39,7 +39,6 @@#include <asm/types.h> #include "ucc_geth.h" -#include "ucc_geth_mii.h" static char hw_stat_gstrings[][ETH_GSTRING_LEN ] = {"tx-64-frames" ,
drivers/net/ucc_geth_mii.c deleted +0 -295
295 lines not on this page · raw message
drivers/net/ucc_geth_mii.h deleted +0 -101
101 lines not on this page · raw message
Signature · 1 line
1.5.4.GIT
PATCH 2/3 gianfar: Add support for skb recycling
--- drivers/net/gianfar.c | 23 +++++++++++++++++++---- drivers/net/gianfar.h | 2 ++ 2 files changed, 21 insertions(+), 4 deletions(-)
drivers/net/gianfar.c +19 -4
@@ -1183,6 +1183,8 @@ static int gfar_enet_open(struct net_device *dev)napi_enable (&priv->napi); +skb_queue_head_init (&priv->rx_recycle); +/* Initialize a bunch of registers */ init_registers (dev);
@@ -1399,6 +1401,7 @@ static int gfar_close(struct net_device *dev)napi_disable (&priv->napi); +skb_queue_purge (&priv->rx_recycle);cancel_work_sync (&priv->reset_task);stop_gfar (dev);
@@ -1595,7 +1598,17 @@ static int gfar_clean_tx_ring(struct net_device *dev) bdp =next_txbd (bdp, base, tx_ring_size); } -dev_kfree_skb_any (skb); +/* +* If there's room in the queue (limit it to rx_buffer_size) +* we add this skb back into the pool, if it's the right size +*/ +if (skb_queue_len (&priv->rx_recycle) < priv->rx_ring_size && +skb_recycle_check (skb, priv->rx_buffer_size + +RXBUF_ALIGNMENT )) +__skb_queue_head (&priv->rx_recycle, skb); +else +dev_kfree_skb_any (skb); + priv->tx_skbuff[skb_dirtytx] =NULL ; skb_dirtytx = (skb_dirtytx + 1) &
@@ -1668,8 +1681,10 @@ struct sk_buff * gfar_new_skb(struct net_device *dev)struct gfar_private *priv =netdev_priv (dev);struct sk_buff *skb =NULL ; -/* We have to allocate the skb, so keep trying till we succeed */ - skb =netdev_alloc_skb (dev, priv->rx_buffer_size +RXBUF_ALIGNMENT ); + skb =__skb_dequeue (&priv->rx_recycle); +if (!skb) + skb =netdev_alloc_skb (dev, + priv->rx_buffer_size +RXBUF_ALIGNMENT );if (!skb)return NULL ;
@@ -1817,7 +1832,7 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)if (unlikely (!newskb)) newskb = skb;else if (skb) -dev_kfree_skb_any (skb); +__skb_queue_head (&priv->rx_recycle, skb); }else {/* Increment the number of packets */ dev->stats.rx_packets++;
drivers/net/gianfar.h +2 -0
@@ -758,6 +758,8 @@ struct gfar_private {unsigned int rx_stash_size;unsigned int rx_stash_index; +struct sk_buff_head rx_recycle; +struct vlan_group *vlgrp;/* Unprotected fields */
Signature · 1 line
1.5.4.GIT
PATCH 3/3 gianfar: Fix stashing support
Stashing is only supported on the 85xx (e500-based) SoCs. The 83xx and 86xx chips don't have a proper cache for this. U-Boot has been updated to add stashing properties to the device tree nodes of gianfar devices on 85xx. So now we modify Linux to keep stashing off unless those properties are there.
--- Documentation/powerpc/dts-bindings/fsl/tsec.txt | 6 ++++++ drivers/net/gianfar.c | 23 +++++++++++++++++++++++ drivers/net/gianfar_sysfs.c | 12 +++++++++--- 3 files changed, 38 insertions(+), 3 deletions(-)
Documentation/powerpc/dts-bindings/fsl/tsec.txt +6 -0
@@ -56,6 +56,12 @@ Properties: hardware. - fsl,magic-packet : If present, indicates that the hardware supports waking up via magic packet. + - bd-stash : If present, indicates that the hardware supports stashing + buffer descriptors in the L2. + - rx-stash-len : Denotes the number of bytes of a received buffer to stash + in the L2. + - rx-stash-idx : Denotes the index of the first byte from the received + buffer to stash in the L2. Example: ethernet@24000 {
drivers/net/gianfar.c +23 -0
@@ -166,6 +166,9 @@ static int gfar_of_init(struct net_device *dev)struct gfar_private *priv =netdev_priv (dev);struct device_node *np = priv->node;char bus_name[MII_BUS_ID_SIZE ]; +const u32 *stash; +const u32 *stash_len; +const u32 *stash_idx;if (!np || !of_device_is_available (np))return -ENODEV ;
@@ -195,6 +198,26 @@ static int gfar_of_init(struct net_device *dev) } } + stash =of_get_property (np,"bd-stash" ,NULL ); + +if (stash) { + priv->device_flags |=FSL_GIANFAR_DEV_HAS_BD_STASHING ; + priv->bd_stash_en =1 ; + } + + stash_len =of_get_property (np,"rx-stash-len" ,NULL ); + +if (stash_len) + priv->rx_stash_size = *stash_len; + + stash_idx =of_get_property (np,"rx-stash-idx" ,NULL ); + +if (stash_idx) + priv->rx_stash_index = *stash_idx; + +if (stash_len || stash_idx) + priv->device_flags |=FSL_GIANFAR_DEV_HAS_BUF_STASHING ; + mac_addr =of_get_mac_address (np);if (mac_addr)memcpy (dev->dev_addr, mac_addr,MAC_ADDR_LEN );
drivers/net/gianfar_sysfs.c +9 -3
@@ -53,6 +53,9 @@ static ssize_t gfar_set_bd_stash(struct device *dev,u32 temp;unsigned long flags; +if (!(priv->device_flags &FSL_GIANFAR_DEV_HAS_BD_STASHING )) +return count; +/* Find out the new setting */ if (!strncmp ("on" , buf, count -1 ) || !strncmp ("1" , buf, count -1 )) new_setting =1 ;
@@ -100,6 +103,9 @@ static ssize_t gfar_set_rx_stash_size(struct device *dev,u32 temp;unsigned long flags; +if (!(priv->device_flags &FSL_GIANFAR_DEV_HAS_BUF_STASHING )) +return count; +spin_lock_irqsave (&priv->rxlock, flags);if (length > priv->rx_buffer_size) goto out;
@@ -152,6 +158,9 @@ static ssize_t gfar_set_rx_stash_index(struct device *dev,u32 temp;unsigned long flags; +if (!(priv->device_flags &FSL_GIANFAR_DEV_HAS_BUF_STASHING )) +return count; +spin_lock_irqsave (&priv->rxlock, flags);if (index > priv->rx_stash_size) goto out;
@@ -293,12 +302,9 @@ void gfar_init_sysfs(struct net_device *dev)int rc;/* Initialize the default values */ - priv->rx_stash_size =DEFAULT_STASH_LENGTH ; - priv->rx_stash_index =DEFAULT_STASH_INDEX ; priv->fifo_threshold =DEFAULT_FIFO_TX_THR ; priv->fifo_starve =DEFAULT_FIFO_TX_STARVE ; priv->fifo_starve_off =DEFAULT_FIFO_TX_STARVE_OFF ; - priv->bd_stash_en =DEFAULT_BD_STASH ;/* Create our sysfs files */ rc =device_create_file (&dev->dev, &dev_attr_bd_stash);
Signature · 1 line
1.5.4.GIT
David Miller
maintainerRe: [PATCH v2.6.30 3/3] gianfar: Fix stashing support
From: Andy Fleming <[email protected]>
Date: Tue, 3 Feb 2009 19:17:03 -0600
Quoted 6 lines
Stashing is only supported on the 85xx (e500-based) SoCs. The 83xx and 86xx chips don't have a proper cache for this. U-Boot has been updated to add stashing properties to the device tree nodes of gianfar devices on 85xx. So now we modify Linux to keep stashing off unless those properties are there.
Signed-off-by Andy Fleming <[email protected]>
Also applied, thanks Andy.
Re: [PATCH v2.6.30 2/3] gianfar: Add support for skb recycling
In reply to Andy FlemingFrom: Andy Fleming <[email protected]>
Date: Tue, 3 Feb 2009 19:17:02 -0600
Quoted 1 line
Signed-off-by Andy Fleming <[email protected]>
Applied.
Re: [PATCH v2.6.30 1/3] netdev: Merge UCC and gianfar MDIO bus drivers
In reply to Andy FlemingFrom: Andy Fleming <[email protected]>
Date: Tue, 3 Feb 2009 19:17:01 -0600
Quoted 4 lines
The MDIO bus drivers for the UCC and gianfar ethernet controllers are essentially the same. There's no reason to duplicate that much code.
Signed-off-by Andy Fleming <[email protected]>
Applied.
David Miller
maintainerRe: [PATCH v2.6.29 2/2] gianfar: Fix potential soft reset race
In reply to Andy FlemingFrom: Andy Fleming <[email protected]>
Date: Tue, 3 Feb 2009 19:17:00 -0600
Quoted 5 lines
SOFT_RESETmust be asserted for at least 3 TX clocks in order for it to work properly. The syncs in thegfar_write()commands have been hiding this, but we need to guarantee it.Signed-off-by Andy Fleming <[email protected]>
Also applied.
From: Andy Fleming <[email protected]>
Date: Tue, 3 Feb 2009 19:16:59 -0600
Quoted 5 lines
BD_LENGTH_MASKis supposed to catch the low 16-bits of the status field, not the low byte. The old way, we would never be able to clean up tx packets with sizes divisible by 256.Signed-off-by Andy Fleming <[email protected]>
Applied.