Support for MPC512x FEC
Subsystems (2)
v3 cover Support for MPC512x FEC
These patches attempt to provide support for the Freescale MPC512x FEC in the fs_enet driver. The first cleanup patch replaces printk by dev_xxx. The second and third attemt to support MPC5121 FEC in the FEC driver.
Changes since previous version:
- don't attempt to provide runtime selection of MPC5121 FEC support in the driver since it doesn't make sense. Select MPC5121 FEC support at compile time.
- fix tx buffer alignment workaround patch to align only misaligned buffers.
- address Eric's comments:
ratelimit warning message and use 4-byte aligned skb->len for new properly aligned skb.
The patches are based on net-next-2.6 and has been tested on the:
- Freescale/STX "MPC5121ADS" board (board rev. 4) with
a MPC5121e Rev. 2.
- TQM860L and TQM855 boards.
Anatolij Gustschin (3):
fs_enet: use dev_xxx instead of printk
fs_enet: Add support for MPC512x to fs_enet driver
fs_enet: add FEC TX buffer alignment workaround for MPC5121
drivers/net/fs_enet/Kconfig | 10 +++- drivers/net/fs_enet/fs_enet-main.c | 93 ++++++++++++++++++++++++++--------- drivers/net/fs_enet/fs_enet.h | 49 ++++++++++++++++++- drivers/net/fs_enet/mac-fcc.c | 5 +- drivers/net/fs_enet/mac-fec.c | 58 ++++++++++++++-------- drivers/net/fs_enet/mac-scc.c | 9 ++-- drivers/net/fs_enet/mii-fec.c | 4 +- 7 files changed, 169 insertions(+), 59 deletions(-)
PATCH v3 1/3 fs_enet: use dev_xxx instead of printk
--- drivers/net/fs_enet/fs_enet-main.c | 39 +++++++++++++---------------------- drivers/net/fs_enet/mac-fcc.c | 5 ++- drivers/net/fs_enet/mac-fec.c | 12 ++++------ drivers/net/fs_enet/mac-scc.c | 9 +++---- 4 files changed, 27 insertions(+), 38 deletions(-)
drivers/net/fs_enet/fs_enet-main.c +15 -24
@@ -108,9 +108,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)* the last indicator should be set. */ if ((sc &BD_ENET_RX_LAST ) ==0 ) - printk(KERN_WARNING DRV_MODULE_NAME -": %s rcv is not +last\n" , - dev->name); +dev_warn (fep->dev,"rcv is not +last\n" );/* * Check for errors.
@@ -178,9 +176,8 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget) received++;netif_receive_skb (skb); }else { - printk(KERN_WARNING DRV_MODULE_NAME -": %s Memory squeeze, dropping packet.\n" , - dev->name); +dev_warn (fep->dev, +"Memory squeeze, dropping packet.\n" ); fep->stats.rx_dropped++; skbn = skb; }
@@ -242,9 +239,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev)* the last indicator should be set. */ if ((sc &BD_ENET_RX_LAST ) ==0 ) - printk(KERN_WARNING DRV_MODULE_NAME -": %s rcv is not +last\n" , - dev->name); +dev_warn (fep->dev,"rcv is not +last\n" );/* * Check for errors.
@@ -313,9 +308,8 @@ static int fs_enet_rx_non_napi(struct net_device *dev) received++;netif_rx (skb); }else { - printk(KERN_WARNING DRV_MODULE_NAME -": %s Memory squeeze, dropping packet.\n" , - dev->name); +dev_warn (fep->dev, +"Memory squeeze, dropping packet.\n" ); fep->stats.rx_dropped++; skbn = skb; }
@@ -388,10 +382,10 @@ static void fs_enet_tx(struct net_device *dev) }else fep->stats.tx_packets++; -if (sc &BD_ENET_TX_READY ) - printk(KERN_WARNING DRV_MODULE_NAME -": %s HEY! Enet xmit interrupt and TX_READY.\n" , - dev->name); +if (sc &BD_ENET_TX_READY ) { +dev_warn (fep->dev, +"HEY! Enet xmit interrupt and TX_READY.\n" ); + }/* * Deferred means some collisions occurred during transmit,
@@ -511,9 +505,8 @@ void fs_init_bds(struct net_device *dev)for (i =0 , bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) { skb =dev_alloc_skb (ENET_RX_FRSIZE );if (skb ==NULL ) { - printk(KERN_WARNING DRV_MODULE_NAME -": %s Memory squeeze, unable to allocate skb\n" , - dev->name); +dev_warn (fep->dev, +"Memory squeeze, unable to allocate skb\n" );break ; }skb_align (skb,ENET_RX_ALIGN );
@@ -610,8 +603,7 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)* Ooops. All transmit buffers are full. Bail out. * This should not happen, since the tx queue should be stopped. */ - printk(KERN_WARNING DRV_MODULE_NAME - ": %s tx queue full!.\n", dev->name); +dev_warn (fep->dev,"tx queue full!.\n" );return NETDEV_TX_BUSY ; }
@@ -788,8 +780,7 @@ static int fs_enet_open(struct net_device *dev) r =request_irq (fep->interrupt, fs_enet_interrupt,IRQF_SHARED ,"fs_enet-mac" , dev);if (r !=0 ) { - printk(KERN_ERR DRV_MODULE_NAME - ": %s Could not allocate FS_ENET IRQ!", dev->name); +dev_err (fep->dev,"Could not allocate FS_ENET IRQ!" );if (fep->fpi->use_napi)napi_disable (&fep->napi);return -EINVAL ;
@@ -1053,7 +1044,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,if (ret) goto out_free_bd; -printk (KERN_INFO "%s: fs_enet: %pM\n" , ndev->name, ndev->dev_addr); +pr_info ("%s: fs_enet: %pM\n" , ndev->name, ndev->dev_addr);return 0 ;
drivers/net/fs_enet/mac-fcc.c +3 -2
@@ -476,8 +476,9 @@ static void clear_int_events(struct net_device *dev, u32 int_events)static void ev_error (struct net_device *dev,u32 int_events) { - printk(KERN_WARNING DRV_MODULE_NAME - ": %s FS_ENET ERROR(s) 0x%x\n", dev->name, int_events); +struct fs_enet_private *fep =netdev_priv (dev); + +dev_warn (fep->dev,"FS_ENET ERROR(s) 0x%x\n" , int_events); }static int get_regs (struct net_device *dev,void *p,int *sizep)
drivers/net/fs_enet/mac-fec.c +5 -7
@@ -257,8 +257,7 @@ static void restart(struct net_device *dev) r =whack_reset (fep->fec.fecp);if (r !=0 ) - printk(KERN_ERR DRV_MODULE_NAME -": %s FEC Reset FAILED!\n" , dev->name); +dev_err (fep->dev,"FEC Reset FAILED!\n" );/* * Set station address. */
@@ -355,9 +354,7 @@ static void stop(struct net_device *dev)udelay (1 );if (i ==FEC_RESET_DELAY ) - printk(KERN_WARNING DRV_MODULE_NAME -": %s FEC timeout on graceful transmit stop\n" , - dev->name); +dev_warn (fep->dev,"FEC timeout on graceful transmit stop\n" );/* * Disable FEC. Let only MII interrupts. */
@@ -433,8 +430,9 @@ static void clear_int_events(struct net_device *dev, u32 int_events)static void ev_error (struct net_device *dev,u32 int_events) { - printk(KERN_WARNING DRV_MODULE_NAME - ": %s FEC ERROR(s) 0x%x\n", dev->name, int_events); +struct fs_enet_private *fep =netdev_priv (dev); + +dev_warn (fep->dev,"FEC ERROR(s) 0x%x\n" , int_events); }static int get_regs (struct net_device *dev,void *p,int *sizep)
drivers/net/fs_enet/mac-scc.c +4 -5
@@ -367,9 +367,7 @@ static void stop(struct net_device *dev)udelay (1 );if (i ==SCC_RESET_DELAY ) - printk(KERN_WARNING DRV_MODULE_NAME -": %s SCC timeout on graceful transmit stop\n" , - dev->name); +dev_warn (fep->dev,"SCC timeout on graceful transmit stop\n" );W16 (sccp, scc_sccm,0 );C32 (sccp, scc_gsmrl,SCC_GSMRL_ENR |SCC_GSMRL_ENT );
@@ -429,8 +427,9 @@ static void clear_int_events(struct net_device *dev, u32 int_events)static void ev_error (struct net_device *dev,u32 int_events) { - printk(KERN_WARNING DRV_MODULE_NAME - ": %s SCC ERROR(s) 0x%x\n", dev->name, int_events); +struct fs_enet_private *fep =netdev_priv (dev); + +dev_warn (fep->dev,"SCC ERROR(s) 0x%x\n" , int_events); }static int get_regs (struct net_device *dev,void *p,int *sizep)
Signature · 1 line
1.6.3.3
PATCH v3 2/3 fs_enet: Add support for MPC512x to fs_enet driver
In reply to Anatolij GustschinExtend the fs_enet driver to support MPC512x FEC. Enable it with CONFIG_FS_ENET_MPC5121_FEC option.
--- drivers/net/fs_enet/Kconfig | 10 +++++-- drivers/net/fs_enet/fs_enet-main.c | 7 +++++ drivers/net/fs_enet/fs_enet.h | 49 +++++++++++++++++++++++++++++++++++- drivers/net/fs_enet/mac-fec.c | 46 ++++++++++++++++++++++----------- drivers/net/fs_enet/mii-fec.c | 4 +- 5 files changed, 95 insertions(+), 21 deletions(-)
drivers/net/fs_enet/Kconfig +7 -3
@@ -1,9 +1,13 @@ config FS_ENET tristate "Freescale Ethernet Driver" - depends on CPM1 || CPM2 + depends on CPM1 || CPM2 || PPC_MPC512x select MII select PHYLIB +config FS_ENET_MPC5121_FEC + def_bool y if (FS_ENET && PPC_MPC512x) + select FS_ENET_HAS_FEC + config FS_ENET_HAS_SCC bool "Chip has an SCC usable for ethernet" depends on FS_ENET && (CPM1 || CPM2)
@@ -16,13 +20,13 @@ config FS_ENET_HAS_FCC config FS_ENET_HAS_FEC bool "Chip has an FEC usable for ethernet" - depends on FS_ENET && CPM1 + depends on FS_ENET && (CPM1 || FS_ENET_MPC5121_FEC) select FS_ENET_MDIO_FEC default y config FS_ENET_MDIO_FEC tristate "MDIO driver for FEC" - depends on FS_ENET && CPM1 + depends on FS_ENET && (CPM1 || FS_ENET_MPC5121_FEC) config FS_ENET_MDIO_FCC tristate "MDIO driver for FCC"
drivers/net/fs_enet/fs_enet-main.c +7 -0
@@ -1094,11 +1094,18 @@ static struct of_device_id fs_enet_match[] = { },#endif #ifdef CONFIG_FS_ENET_HAS_FEC +#ifdef CONFIG_FS_ENET_MPC5121_FEC + { + .compatible = "fsl,mpc5121-fec", + .data = (void *)&fs_fec_ops, + }, +#else { .compatible = "fsl,pq1-fec-enet", .data = (void *)&fs_fec_ops, }, #endif +#endif {} }; MODULE_DEVICE_TABLE(of, fs_enet_match);
drivers/net/fs_enet/fs_enet.h +48 -1
57 lines not on this page · raw message
drivers/net/fs_enet/mac-fec.c +31 -15
155 lines not on this page · raw message
drivers/net/fs_enet/mii-fec.c +2 -2
@@ -52,7 +52,7 @@static int fs_enet_fec_mii_read (struct mii_bus *bus ,int phy_id,int location) {struct fec_info * fec = bus->priv; -fec_t __iomem *fecp = fec->fecp; +struct fec __iomem *fecp = fec->fecp;int i, ret =-1 ;BUG_ON ((in_be32 (&fecp->fec_r_cntrl) &FEC_RCNTRL_MII_MODE ) ==0 );
@@ -75,7 +75,7 @@ static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location)static int fs_enet_fec_mii_write (struct mii_bus *bus,int phy_id,int location,u16 val) {struct fec_info * fec = bus->priv; -fec_t __iomem *fecp = fec->fecp; +struct fec __iomem *fecp = fec->fecp;int i;/* this must never happen */
Signature · 1 line
1.6.3.3
PATCH v3 3/3 fs_enet: add FEC TX buffer alignment workaround for MPC5121
In reply to Anatolij GustschinMPC5121 FEC requeries 4-byte alignmnent for TX data buffers. This patch is a work around that copies misaligned tx packets to an aligned skb before sending.
---
Changes since v2:
- ratelimit warning message
- use skb->len + 4 as size for allocation of the new skb with aligned buffer.
drivers/net/fs_enet/fs_enet-main.c | 47 ++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-)
drivers/net/fs_enet/fs_enet-main.c +47 -0
@@ -580,6 +580,40 @@ void fs_cleanup_bds(struct net_device *dev)/**********************************************************************************/ +#ifdef CONFIG_FS_ENET_MPC5121_FEC +/* +* MPC5121 FEC requeries 4-byte alignment for TX data buffer! +*/ +static struct sk_buff *tx_skb_align_workaround (struct net_device *dev, +struct sk_buff *skb) +{ +struct sk_buff *new_skb; +struct fs_enet_private *fep =netdev_priv (dev); + +/* Alloc new skb */ + new_skb =dev_alloc_skb (skb->len +4 ); +if (!new_skb) { +if (net_ratelimit ()) { +dev_warn (fep->dev, +"Memory squeeze, dropping tx packet.\n" ); + } +return NULL ; + } + +/* Make sure new skb is properly aligned */ +skb_align (new_skb,4 ); + +/* Copy data to new skb ... */ +skb_copy_from_linear_data (skb, new_skb->data, skb->len); +skb_put (new_skb, skb->len); + +/* ... and free an old one */ +dev_kfree_skb_any (skb); + +return new_skb; +} +#endif +static int fs_enet_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);
@@ -588,6 +622,19 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)u16 sc;unsigned long flags; +#ifdef CONFIG_FS_ENET_MPC5121_FEC +if (((unsigned long )skb->data) &0x3 ) { + skb =tx_skb_align_workaround (dev, skb); +if (!skb) { +/* +* We have lost packet due to memory allocation error +* in tx_skb_align_workaround(). Hopefully original +* skb is still valid, so try transmit it later. +*/ +return NETDEV_TX_BUSY ; + } + } +#endif spin_lock_irqsave (&fep->tx_lock, flags);/*
Signature · 1 line
1.6.3.3
From: Anatolij Gustschin <[email protected]>
Date: Fri, 26 Feb 2010 23:00:46 +0100
Quoted 4 lines
These patches attempt to provide support for the Freescale MPC512x FEC in the
fs_enetdriver. The first cleanup patch replaces printk bydev_xxx. The second and third attemt to support MPC5121 FEC in the FEC driver.
Applied, for real this time! :-)
Thanks.