2012-06-05 03:42:12 +00:00
|
|
|
/* drivers/net/ethernet/freescale/gianfar.c
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* Gianfar Ethernet Driver
|
2005-11-11 18:38:59 +00:00
|
|
|
* This driver is designed for the non-CPM ethernet controllers
|
|
|
|
* on the 85xx and 83xx family of integrated processors
|
2005-04-16 22:20:36 +00:00
|
|
|
* Based on 8260_io/fcc_enet.c
|
|
|
|
*
|
|
|
|
* Author: Andy Fleming
|
2005-11-14 00:06:30 +00:00
|
|
|
* Maintainer: Kumar Gala
|
2009-11-02 07:03:00 +00:00
|
|
|
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
2014-02-17 10:53:14 +00:00
|
|
|
* Copyright 2002-2009, 2011-2013 Freescale Semiconductor, Inc.
|
2009-11-02 07:03:00 +00:00
|
|
|
* Copyright 2007 MontaVista Software, Inc.
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
|
|
* option) any later version.
|
|
|
|
*
|
|
|
|
* Gianfar: AKA Lambda Draconis, "Dragon"
|
|
|
|
* RA 11 31 24.2
|
|
|
|
* Dec +69 19 52
|
|
|
|
* V 3.84
|
|
|
|
* B-V +1.62
|
|
|
|
*
|
|
|
|
* Theory of operation
|
2005-06-20 15:54:21 +00:00
|
|
|
*
|
2008-12-16 23:29:15 +00:00
|
|
|
* The driver is initialized through of_device. Configuration information
|
|
|
|
* is therefore conveyed through an OF-style device tree.
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* The Gianfar Ethernet Controller uses a ring of buffer
|
|
|
|
* descriptors. The beginning is indicated by a register
|
2005-06-20 15:54:21 +00:00
|
|
|
* pointing to the physical address of the start of the ring.
|
|
|
|
* The end is determined by a "wrap" bit being set in the
|
2005-04-16 22:20:36 +00:00
|
|
|
* last descriptor of the ring.
|
|
|
|
*
|
|
|
|
* When a packet is received, the RXF bit in the
|
2005-06-20 15:54:21 +00:00
|
|
|
* IEVENT register is set, triggering an interrupt when the
|
2005-04-16 22:20:36 +00:00
|
|
|
* corresponding bit in the IMASK register is also set (if
|
|
|
|
* interrupt coalescing is active, then the interrupt may not
|
|
|
|
* happen immediately, but will wait until either a set number
|
2005-09-24 02:54:21 +00:00
|
|
|
* of frames or amount of time have passed). In NAPI, the
|
2005-04-16 22:20:36 +00:00
|
|
|
* interrupt handler will signal there is work to be done, and
|
2008-07-10 22:33:52 +00:00
|
|
|
* exit. This method will start at the last known empty
|
2005-06-20 15:54:21 +00:00
|
|
|
* descriptor, and process every subsequent descriptor until there
|
2005-04-16 22:20:36 +00:00
|
|
|
* are none left with data (NAPI will stop after a set number of
|
|
|
|
* packets to give time to other tasks, but will eventually
|
|
|
|
* process all the packets). The data arrives inside a
|
|
|
|
* pre-allocated skb, and so after the skb is passed up to the
|
|
|
|
* stack, a new skb must be allocated, and the address field in
|
|
|
|
* the buffer descriptor must be updated to indicate this new
|
|
|
|
* skb.
|
|
|
|
*
|
|
|
|
* When the kernel requests that a packet be transmitted, the
|
|
|
|
* driver starts where it left off last time, and points the
|
|
|
|
* descriptor at the buffer which was passed in. The driver
|
|
|
|
* then informs the DMA engine that there are packets ready to
|
|
|
|
* be transmitted. Once the controller is finished transmitting
|
|
|
|
* the packet, an interrupt may be triggered (under the same
|
|
|
|
* conditions as for reception, but depending on the TXF bit).
|
|
|
|
* The driver then cleans up the buffer.
|
|
|
|
*/
|
|
|
|
|
2011-06-14 08:57:47 +00:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#define DEBUG
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/errno.h>
|
2005-09-24 02:54:21 +00:00
|
|
|
#include <linux/unistd.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/skbuff.h>
|
2005-06-20 15:54:21 +00:00
|
|
|
#include <linux/if_vlan.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/mm.h>
|
2013-09-17 19:28:33 +00:00
|
|
|
#include <linux/of_address.h>
|
|
|
|
#include <linux/of_irq.h>
|
2009-04-25 12:53:12 +00:00
|
|
|
#include <linux/of_mdio.h>
|
2008-12-16 23:29:15 +00:00
|
|
|
#include <linux/of_platform.h>
|
2005-06-20 15:54:21 +00:00
|
|
|
#include <linux/ip.h>
|
|
|
|
#include <linux/tcp.h>
|
|
|
|
#include <linux/udp.h>
|
2006-01-11 19:26:25 +00:00
|
|
|
#include <linux/in.h>
|
2010-04-08 23:10:03 +00:00
|
|
|
#include <linux/net_tstamp.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#include <asm/io.h>
|
2010-06-30 06:39:12 +00:00
|
|
|
#include <asm/reg.h>
|
2013-10-09 17:20:41 +00:00
|
|
|
#include <asm/mpc85xx.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <asm/irq.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/dma-mapping.h>
|
|
|
|
#include <linux/crc32.h>
|
2005-09-24 02:54:21 +00:00
|
|
|
#include <linux/mii.h>
|
|
|
|
#include <linux/phy.h>
|
2008-12-16 23:29:15 +00:00
|
|
|
#include <linux/phy_fixed.h>
|
|
|
|
#include <linux/of.h>
|
2010-10-26 22:07:13 +00:00
|
|
|
#include <linux/of_net.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#include "gianfar.h"
|
|
|
|
|
|
|
|
#define TX_TIMEOUT (1*HZ)
|
|
|
|
|
2005-11-11 18:38:59 +00:00
|
|
|
const char gfar_driver_version[] = "1.3";
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
static int gfar_enet_open(struct net_device *dev);
|
|
|
|
static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
2008-08-19 19:12:45 +00:00
|
|
|
static void gfar_reset_task(struct work_struct *work);
|
2005-04-16 22:20:36 +00:00
|
|
|
static void gfar_timeout(struct net_device *dev);
|
|
|
|
static int gfar_close(struct net_device *dev);
|
2008-04-22 22:18:29 +00:00
|
|
|
struct sk_buff *gfar_new_skb(struct net_device *dev);
|
2009-11-02 07:03:00 +00:00
|
|
|
static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
|
2012-06-05 03:42:13 +00:00
|
|
|
struct sk_buff *skb);
|
2005-04-16 22:20:36 +00:00
|
|
|
static int gfar_set_mac_address(struct net_device *dev);
|
|
|
|
static int gfar_change_mtu(struct net_device *dev, int new_mtu);
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
static irqreturn_t gfar_error(int irq, void *dev_id);
|
|
|
|
static irqreturn_t gfar_transmit(int irq, void *dev_id);
|
|
|
|
static irqreturn_t gfar_interrupt(int irq, void *dev_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
static void adjust_link(struct net_device *dev);
|
2014-04-30 11:27:21 +00:00
|
|
|
static noinline void gfar_update_link_state(struct gfar_private *priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
static int init_phy(struct net_device *dev);
|
2011-02-23 04:05:51 +00:00
|
|
|
static int gfar_probe(struct platform_device *ofdev);
|
2010-08-06 15:25:50 +00:00
|
|
|
static int gfar_remove(struct platform_device *ofdev);
|
2005-09-24 02:54:21 +00:00
|
|
|
static void free_skb_resources(struct gfar_private *priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
static void gfar_set_multi(struct net_device *dev);
|
|
|
|
static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr);
|
2007-05-11 23:25:11 +00:00
|
|
|
static void gfar_configure_serdes(struct net_device *dev);
|
2014-03-07 12:42:45 +00:00
|
|
|
static int gfar_poll_rx(struct napi_struct *napi, int budget);
|
|
|
|
static int gfar_poll_tx(struct napi_struct *napi, int budget);
|
|
|
|
static int gfar_poll_rx_sq(struct napi_struct *napi, int budget);
|
|
|
|
static int gfar_poll_tx_sq(struct napi_struct *napi, int budget);
|
2006-11-07 10:27:02 +00:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
static void gfar_netpoll(struct net_device *dev);
|
|
|
|
#endif
|
2009-11-02 07:03:00 +00:00
|
|
|
int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit);
|
2013-03-19 07:40:02 +00:00
|
|
|
static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue);
|
2013-02-14 05:00:05 +00:00
|
|
|
static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
|
|
|
|
int amount_pull, struct napi_struct *napi);
|
2014-02-17 10:53:18 +00:00
|
|
|
static void gfar_halt_nodisable(struct gfar_private *priv);
|
2005-11-11 18:38:59 +00:00
|
|
|
static void gfar_clear_exact_match(struct net_device *dev);
|
2010-12-21 10:16:08 +00:00
|
|
|
static void gfar_set_mac_for_addr(struct net_device *dev, int num,
|
|
|
|
const u8 *addr);
|
2009-03-10 12:58:28 +00:00
|
|
|
static int gfar_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
MODULE_AUTHOR("Freescale Semiconductor, Inc");
|
|
|
|
MODULE_DESCRIPTION("Gianfar Ethernet Driver");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
static void gfar_init_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
|
2009-10-12 06:00:37 +00:00
|
|
|
dma_addr_t buf)
|
|
|
|
{
|
|
|
|
u32 lstatus;
|
|
|
|
|
|
|
|
bdp->bufPtr = buf;
|
|
|
|
|
|
|
|
lstatus = BD_LFLAG(RXBD_EMPTY | RXBD_INTERRUPT);
|
2009-11-02 07:03:00 +00:00
|
|
|
if (bdp == rx_queue->rx_bd_base + rx_queue->rx_ring_size - 1)
|
2009-10-12 06:00:37 +00:00
|
|
|
lstatus |= BD_LFLAG(RXBD_WRAP);
|
|
|
|
|
|
|
|
eieio();
|
|
|
|
|
|
|
|
bdp->lstatus = lstatus;
|
|
|
|
}
|
|
|
|
|
2009-10-12 06:00:39 +00:00
|
|
|
static int gfar_init_bds(struct net_device *ndev)
|
2009-10-12 06:00:34 +00:00
|
|
|
{
|
2009-10-12 06:00:39 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(ndev);
|
2009-11-02 07:03:00 +00:00
|
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|
|
|
|
struct gfar_priv_rx_q *rx_queue = NULL;
|
2009-10-12 06:00:34 +00:00
|
|
|
struct txbd8 *txbdp;
|
|
|
|
struct rxbd8 *rxbdp;
|
2009-11-02 07:03:15 +00:00
|
|
|
int i, j;
|
2009-11-02 07:03:00 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
|
|
|
tx_queue = priv->tx_queue[i];
|
|
|
|
/* Initialize some variables in our dev structure */
|
|
|
|
tx_queue->num_txbdfree = tx_queue->tx_ring_size;
|
|
|
|
tx_queue->dirty_tx = tx_queue->tx_bd_base;
|
|
|
|
tx_queue->cur_tx = tx_queue->tx_bd_base;
|
|
|
|
tx_queue->skb_curtx = 0;
|
|
|
|
tx_queue->skb_dirtytx = 0;
|
|
|
|
|
|
|
|
/* Initialize Transmit Descriptor Ring */
|
|
|
|
txbdp = tx_queue->tx_bd_base;
|
|
|
|
for (j = 0; j < tx_queue->tx_ring_size; j++) {
|
|
|
|
txbdp->lstatus = 0;
|
|
|
|
txbdp->bufPtr = 0;
|
|
|
|
txbdp++;
|
|
|
|
}
|
2009-10-12 06:00:39 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
/* Set the last descriptor in the ring to indicate wrap */
|
|
|
|
txbdp--;
|
|
|
|
txbdp->status |= TXBD_WRAP;
|
2009-10-12 06:00:39 +00:00
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
rx_queue = priv->rx_queue[i];
|
|
|
|
rx_queue->cur_rx = rx_queue->rx_bd_base;
|
|
|
|
rx_queue->skb_currx = 0;
|
|
|
|
rxbdp = rx_queue->rx_bd_base;
|
2009-10-12 06:00:39 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (j = 0; j < rx_queue->rx_ring_size; j++) {
|
|
|
|
struct sk_buff *skb = rx_queue->rx_skbuff[j];
|
2009-10-12 06:00:39 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
if (skb) {
|
|
|
|
gfar_init_rxbdp(rx_queue, rxbdp,
|
|
|
|
rxbdp->bufPtr);
|
|
|
|
} else {
|
|
|
|
skb = gfar_new_skb(ndev);
|
|
|
|
if (!skb) {
|
2011-06-14 08:57:47 +00:00
|
|
|
netdev_err(ndev, "Can't allocate RX buffers\n");
|
2012-11-08 22:11:41 +00:00
|
|
|
return -ENOMEM;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
|
|
|
rx_queue->rx_skbuff[j] = skb;
|
|
|
|
|
|
|
|
gfar_new_rxbdp(rx_queue, rxbdp, skb);
|
2009-10-12 06:00:39 +00:00
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
rxbdp++;
|
2009-10-12 06:00:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_alloc_skb_resources(struct net_device *ndev)
|
|
|
|
{
|
2009-10-12 06:00:34 +00:00
|
|
|
void *vaddr;
|
2009-11-02 07:03:15 +00:00
|
|
|
dma_addr_t addr;
|
|
|
|
int i, j, k;
|
2009-10-12 06:00:34 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(ndev);
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
struct device *dev = priv->dev;
|
2009-11-02 07:03:00 +00:00
|
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|
|
|
|
struct gfar_priv_rx_q *rx_queue = NULL;
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
priv->total_tx_ring_size = 0;
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++)
|
|
|
|
priv->total_tx_ring_size += priv->tx_queue[i]->tx_ring_size;
|
|
|
|
|
|
|
|
priv->total_rx_ring_size = 0;
|
|
|
|
for (i = 0; i < priv->num_rx_queues; i++)
|
|
|
|
priv->total_rx_ring_size += priv->rx_queue[i]->rx_ring_size;
|
2009-10-12 06:00:34 +00:00
|
|
|
|
|
|
|
/* Allocate memory for the buffer descriptors */
|
2009-10-12 06:00:39 +00:00
|
|
|
vaddr = dma_alloc_coherent(dev,
|
2013-03-14 13:07:21 +00:00
|
|
|
(priv->total_tx_ring_size *
|
|
|
|
sizeof(struct txbd8)) +
|
|
|
|
(priv->total_rx_ring_size *
|
|
|
|
sizeof(struct rxbd8)),
|
|
|
|
&addr, GFP_KERNEL);
|
|
|
|
if (!vaddr)
|
2009-10-12 06:00:34 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
|
|
|
tx_queue = priv->tx_queue[i];
|
2011-06-16 19:08:06 +00:00
|
|
|
tx_queue->tx_bd_base = vaddr;
|
2009-11-02 07:03:15 +00:00
|
|
|
tx_queue->tx_bd_dma_base = addr;
|
|
|
|
tx_queue->dev = ndev;
|
|
|
|
/* enet DMA only understands physical addresses */
|
2012-06-05 03:42:13 +00:00
|
|
|
addr += sizeof(struct txbd8) * tx_queue->tx_ring_size;
|
|
|
|
vaddr += sizeof(struct txbd8) * tx_queue->tx_ring_size;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
2009-10-12 06:00:34 +00:00
|
|
|
|
|
|
|
/* Start the rx descriptor ring where the tx ring leaves off */
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
rx_queue = priv->rx_queue[i];
|
2011-06-16 19:08:06 +00:00
|
|
|
rx_queue->rx_bd_base = vaddr;
|
2009-11-02 07:03:15 +00:00
|
|
|
rx_queue->rx_bd_dma_base = addr;
|
|
|
|
rx_queue->dev = ndev;
|
2012-06-05 03:42:13 +00:00
|
|
|
addr += sizeof(struct rxbd8) * rx_queue->rx_ring_size;
|
|
|
|
vaddr += sizeof(struct rxbd8) * rx_queue->rx_ring_size;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
2009-10-12 06:00:34 +00:00
|
|
|
|
|
|
|
/* Setup the skbuff rings */
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
|
|
|
tx_queue = priv->tx_queue[i];
|
2013-02-07 11:46:27 +00:00
|
|
|
tx_queue->tx_skbuff =
|
|
|
|
kmalloc_array(tx_queue->tx_ring_size,
|
|
|
|
sizeof(*tx_queue->tx_skbuff),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!tx_queue->tx_skbuff)
|
2009-11-02 07:03:15 +00:00
|
|
|
goto cleanup;
|
2009-10-12 06:00:34 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (k = 0; k < tx_queue->tx_ring_size; k++)
|
|
|
|
tx_queue->tx_skbuff[k] = NULL;
|
|
|
|
}
|
2009-10-12 06:00:34 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
rx_queue = priv->rx_queue[i];
|
2013-02-07 11:46:27 +00:00
|
|
|
rx_queue->rx_skbuff =
|
|
|
|
kmalloc_array(rx_queue->rx_ring_size,
|
|
|
|
sizeof(*rx_queue->rx_skbuff),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!rx_queue->rx_skbuff)
|
2009-11-02 07:03:15 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
for (j = 0; j < rx_queue->rx_ring_size; j++)
|
|
|
|
rx_queue->rx_skbuff[j] = NULL;
|
|
|
|
}
|
2009-10-12 06:00:34 +00:00
|
|
|
|
2009-10-12 06:00:39 +00:00
|
|
|
if (gfar_init_bds(ndev))
|
|
|
|
goto cleanup;
|
2009-10-12 06:00:34 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
free_skb_resources(priv);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
static void gfar_init_tx_rx_base(struct gfar_private *priv)
|
|
|
|
{
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2009-11-04 12:53:00 +00:00
|
|
|
u32 __iomem *baddr;
|
2009-11-02 07:03:15 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
baddr = ®s->tbase0;
|
2012-06-05 03:42:13 +00:00
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
2009-11-02 07:03:15 +00:00
|
|
|
gfar_write(baddr, priv->tx_queue[i]->tx_bd_dma_base);
|
2012-06-05 03:42:13 +00:00
|
|
|
baddr += 2;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
baddr = ®s->rbase0;
|
2012-06-05 03:42:13 +00:00
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
2009-11-02 07:03:15 +00:00
|
|
|
gfar_write(baddr, priv->rx_queue[i]->rx_bd_dma_base);
|
2012-06-05 03:42:13 +00:00
|
|
|
baddr += 2;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
static void gfar_rx_buff_size_config(struct gfar_private *priv)
|
2009-10-12 06:00:34 +00:00
|
|
|
{
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
int frame_size = priv->ndev->mtu + ETH_HLEN;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
gianfar: Fix and cleanup Rx FCB indication
This fixes a less obvious error on one hand, and prevents futher
similar errors by disambiguating and optimizing RxFCB indication,
on the other hand.
The error consists in NETIF_F_HW_VLAN_TX flag being used as an
indication of Rx FCB insertion. This happened as soon gfar_uses_fcb(),
which despite its name indicates Rx FCB insertion, started
incorporating is_vlan_on().
is_vlan_on(), on the other hand, is also a misleading construct because
we need to differentiate b/w hw VLAN extraction/VLEX (marked by VLAN_RX
flag) and hw VLAN insertion/VLINS (VLAN_TX flag), which are different
mechanisms using different types of FCBs.
The hw spec for the RxFCB feature is as follows:
In the case of RxBD rings, FCBs (Frame Control Block) are inserted by
the eTSEC whenever RCTRL[PRSDEP] is set to a non-zero value. Only one
FCB is inserted per frame (in the buffer pointed to by the RxBD with
bit F set). TOE acceleration for receive is enabled for all rx frames
in this case.
This patch introduces priv->uses_rxfcb field to quickly signal RxFCB
insertion in accordance with the specification above.
The dependency on FSL_GIANFAR_DEV_HAS_TIMER was also eliminated as
another source of confusion. The actual dependency is to priv->hwts_rx_en.
Upon changing priv->hwts_rx_en via IOCTL, the gfar device is being
restarted and on init_mac() the priv->hwts_rx_en flag determines RxFCB
insertion, and rctrl is programmed accordingly. The patch takes care
of this case too.
Though maybe not as self documenting as the inlining version uses_fcb(),
priv->uses_rxfcb has the main purpose to quickly signal, on the hot path,
that the incoming frame has a *Rx* FCB block inserted which needs to be
pulled out before passing the skb to the stack. This is a performance
critical operation, it needs to happen fast, that's why uses_rxfcb is
placed in the first cacheline of gfar_private.
This is also why a cached rctrl cannot be used instead: 1) because
we don't have 32 bits available in the first cacheline of gfar_priv
(but only 16); 2) bit operations are expensive on the hot path.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:07 +00:00
|
|
|
/* set this when rx hw offload (TOE) functions are being used */
|
|
|
|
priv->uses_rxfcb = 0;
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (priv->ndev->features & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX))
|
|
|
|
priv->uses_rxfcb = 1;
|
|
|
|
|
|
|
|
if (priv->hwts_rx_en)
|
|
|
|
priv->uses_rxfcb = 1;
|
|
|
|
|
|
|
|
if (priv->uses_rxfcb)
|
|
|
|
frame_size += GMAC_FCB_LEN;
|
|
|
|
|
|
|
|
frame_size += priv->padding;
|
|
|
|
|
|
|
|
frame_size = (frame_size & ~(INCREMENTAL_BUFFER_SIZE - 1)) +
|
|
|
|
INCREMENTAL_BUFFER_SIZE;
|
|
|
|
|
|
|
|
priv->rx_buffer_size = frame_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gfar_mac_rx_config(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
|
|
u32 rctrl = 0;
|
|
|
|
|
2009-12-16 01:14:58 +00:00
|
|
|
if (priv->rx_filer_enable) {
|
2009-11-02 07:03:15 +00:00
|
|
|
rctrl |= RCTRL_FILREN;
|
2009-12-16 01:14:58 +00:00
|
|
|
/* Program the RIR0 reg with the required distribution */
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
if (priv->poll_mode == GFAR_SQ_POLLING)
|
|
|
|
gfar_write(®s->rir0, DEFAULT_2RXQ_RIR0);
|
|
|
|
else /* GFAR_MQ_POLLING */
|
|
|
|
gfar_write(®s->rir0, DEFAULT_8RXQ_RIR0);
|
2009-12-16 01:14:58 +00:00
|
|
|
}
|
2009-10-12 06:00:34 +00:00
|
|
|
|
2013-01-23 00:18:36 +00:00
|
|
|
/* Restore PROMISC mode */
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
if (priv->ndev->flags & IFF_PROMISC)
|
2013-01-23 00:18:36 +00:00
|
|
|
rctrl |= RCTRL_PROM;
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (priv->ndev->features & NETIF_F_RXCSUM)
|
2009-10-12 06:00:34 +00:00
|
|
|
rctrl |= RCTRL_CHECKSUMMING;
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (priv->extended_hash)
|
|
|
|
rctrl |= RCTRL_EXTHASH | RCTRL_EMEN;
|
2009-10-12 06:00:34 +00:00
|
|
|
|
|
|
|
if (priv->padding) {
|
|
|
|
rctrl &= ~RCTRL_PAL_MASK;
|
|
|
|
rctrl |= RCTRL_PADDING(priv->padding);
|
|
|
|
}
|
|
|
|
|
2010-06-11 01:49:05 +00:00
|
|
|
/* Enable HW time stamping if requested from user space */
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (priv->hwts_rx_en)
|
2010-06-11 01:49:05 +00:00
|
|
|
rctrl |= RCTRL_PRSDEP_INIT | RCTRL_TS_ENABLE;
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (priv->ndev->features & NETIF_F_HW_VLAN_CTAG_RX)
|
2011-07-26 00:03:13 +00:00
|
|
|
rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT;
|
2009-10-12 06:00:34 +00:00
|
|
|
|
|
|
|
/* Init rctrl based on our settings */
|
|
|
|
gfar_write(®s->rctrl, rctrl);
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
}
|
2009-10-12 06:00:34 +00:00
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
static void gfar_mac_tx_config(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
|
|
u32 tctrl = 0;
|
|
|
|
|
|
|
|
if (priv->ndev->features & NETIF_F_IP_CSUM)
|
2009-10-12 06:00:34 +00:00
|
|
|
tctrl |= TCTRL_INIT_CSUM;
|
|
|
|
|
2012-09-23 22:39:08 +00:00
|
|
|
if (priv->prio_sched_en)
|
|
|
|
tctrl |= TCTRL_TXSCHED_PRIO;
|
|
|
|
else {
|
|
|
|
tctrl |= TCTRL_TXSCHED_WRRS;
|
|
|
|
gfar_write(®s->tr03wt, DEFAULT_WRRS_WEIGHT);
|
|
|
|
gfar_write(®s->tr47wt, DEFAULT_WRRS_WEIGHT);
|
|
|
|
}
|
2009-11-02 07:03:15 +00:00
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (priv->ndev->features & NETIF_F_HW_VLAN_CTAG_TX)
|
|
|
|
tctrl |= TCTRL_VLINS;
|
|
|
|
|
2009-10-12 06:00:34 +00:00
|
|
|
gfar_write(®s->tctrl, tctrl);
|
|
|
|
}
|
|
|
|
|
gianfar: Fix Tx int miss, dont write IC on-the-fly
Programming the interrupt coalescing (IC) registers while
the controller/DMA is on may incur the loss of one Tx
confirmation interrupt, under certain conditions. This is
a subtle hw race because it does not occur during a burst
of Tx packets. It has been observed on p2020 devices that,
if just one packet is being xmit'ed, the Tx confirmation
doesn't trigger and BQL evetually blocks the Tx queues,
followed by Tx timeout and an un-responsive device.
This issue was not apparent prior to introducing BQL
support, as a late Tx confirmation was not an issue back then
and the next burst of Tx frames would have triggered the
Tx confirmation/ Tx ring cleanup anyway.
Bottom line, the hw specifications state that the IC registers
should not be programmed while the Rx/Tx blocks (the DMA) are
enabled. Further more, these registers are currently re-written
with the same values on the processing path, over and over again.
To fix this, rewriting the IC registers has been removed from
the processing path (napi poll). A complete MAC reset procedure
has been implemented for the ethtool -c option instead, to
reliably update these registers while the controller is stopped.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:46 +00:00
|
|
|
static void gfar_configure_coalescing(struct gfar_private *priv,
|
|
|
|
unsigned long tx_mask, unsigned long rx_mask)
|
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
|
|
u32 __iomem *baddr;
|
|
|
|
|
|
|
|
if (priv->mode == MQ_MG_MODE) {
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
baddr = ®s->txic0;
|
|
|
|
for_each_set_bit(i, &tx_mask, priv->num_tx_queues) {
|
|
|
|
gfar_write(baddr + i, 0);
|
|
|
|
if (likely(priv->tx_queue[i]->txcoalescing))
|
|
|
|
gfar_write(baddr + i, priv->tx_queue[i]->txic);
|
|
|
|
}
|
|
|
|
|
|
|
|
baddr = ®s->rxic0;
|
|
|
|
for_each_set_bit(i, &rx_mask, priv->num_rx_queues) {
|
|
|
|
gfar_write(baddr + i, 0);
|
|
|
|
if (likely(priv->rx_queue[i]->rxcoalescing))
|
|
|
|
gfar_write(baddr + i, priv->rx_queue[i]->rxic);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Backward compatible case -- even if we enable
|
|
|
|
* multiple queues, there's only single reg to program
|
|
|
|
*/
|
|
|
|
gfar_write(®s->txic, 0);
|
|
|
|
if (likely(priv->tx_queue[0]->txcoalescing))
|
|
|
|
gfar_write(®s->txic, priv->tx_queue[0]->txic);
|
|
|
|
|
|
|
|
gfar_write(®s->rxic, 0);
|
|
|
|
if (unlikely(priv->rx_queue[0]->rxcoalescing))
|
|
|
|
gfar_write(®s->rxic, priv->rx_queue[0]->rxic);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void gfar_configure_coalescing_all(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
gfar_configure_coalescing(priv, 0xFF, 0xFF);
|
|
|
|
}
|
|
|
|
|
2009-12-16 01:15:07 +00:00
|
|
|
static struct net_device_stats *gfar_get_stats(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
|
|
unsigned long rx_packets = 0, rx_bytes = 0, rx_dropped = 0;
|
|
|
|
unsigned long tx_packets = 0, tx_bytes = 0;
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-12-16 01:15:07 +00:00
|
|
|
|
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
rx_packets += priv->rx_queue[i]->stats.rx_packets;
|
2012-06-05 03:42:13 +00:00
|
|
|
rx_bytes += priv->rx_queue[i]->stats.rx_bytes;
|
2009-12-16 01:15:07 +00:00
|
|
|
rx_dropped += priv->rx_queue[i]->stats.rx_dropped;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev->stats.rx_packets = rx_packets;
|
2012-06-05 03:42:13 +00:00
|
|
|
dev->stats.rx_bytes = rx_bytes;
|
2009-12-16 01:15:07 +00:00
|
|
|
dev->stats.rx_dropped = rx_dropped;
|
|
|
|
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
2011-01-12 12:13:14 +00:00
|
|
|
tx_bytes += priv->tx_queue[i]->stats.tx_bytes;
|
|
|
|
tx_packets += priv->tx_queue[i]->stats.tx_packets;
|
2009-12-16 01:15:07 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 03:42:13 +00:00
|
|
|
dev->stats.tx_bytes = tx_bytes;
|
2009-12-16 01:15:07 +00:00
|
|
|
dev->stats.tx_packets = tx_packets;
|
|
|
|
|
|
|
|
return &dev->stats;
|
|
|
|
}
|
|
|
|
|
2009-03-10 12:58:28 +00:00
|
|
|
static const struct net_device_ops gfar_netdev_ops = {
|
|
|
|
.ndo_open = gfar_enet_open,
|
|
|
|
.ndo_start_xmit = gfar_start_xmit,
|
|
|
|
.ndo_stop = gfar_close,
|
|
|
|
.ndo_change_mtu = gfar_change_mtu,
|
2011-04-15 04:50:50 +00:00
|
|
|
.ndo_set_features = gfar_set_features,
|
2011-08-16 06:29:01 +00:00
|
|
|
.ndo_set_rx_mode = gfar_set_multi,
|
2009-03-10 12:58:28 +00:00
|
|
|
.ndo_tx_timeout = gfar_timeout,
|
|
|
|
.ndo_do_ioctl = gfar_ioctl,
|
2009-12-16 01:15:07 +00:00
|
|
|
.ndo_get_stats = gfar_get_stats,
|
2009-07-09 17:54:35 +00:00
|
|
|
.ndo_set_mac_address = eth_mac_addr,
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
2009-03-10 12:58:28 +00:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
.ndo_poll_controller = gfar_netpoll,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2014-02-17 10:53:17 +00:00
|
|
|
static void gfar_ints_disable(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[i].regs;
|
|
|
|
/* Clear IEVENT */
|
|
|
|
gfar_write(®s->ievent, IEVENT_INIT_CLEAR);
|
|
|
|
|
|
|
|
/* Initialize IMASK */
|
|
|
|
gfar_write(®s->imask, IMASK_INIT_CLEAR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gfar_ints_enable(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[i].regs;
|
|
|
|
/* Unmask the interrupts we look for */
|
|
|
|
gfar_write(®s->imask, IMASK_DEFAULT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
void lock_tx_qs(struct gfar_private *priv)
|
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++)
|
|
|
|
spin_lock(&priv->tx_queue[i]->txlock);
|
|
|
|
}
|
|
|
|
|
|
|
|
void unlock_tx_qs(struct gfar_private *priv)
|
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++)
|
|
|
|
spin_unlock(&priv->tx_queue[i]->txlock);
|
|
|
|
}
|
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
static int gfar_alloc_tx_queues(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
|
|
|
priv->tx_queue[i] = kzalloc(sizeof(struct gfar_priv_tx_q),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!priv->tx_queue[i])
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
priv->tx_queue[i]->tx_skbuff = NULL;
|
|
|
|
priv->tx_queue[i]->qindex = i;
|
|
|
|
priv->tx_queue[i]->dev = priv->ndev;
|
|
|
|
spin_lock_init(&(priv->tx_queue[i]->txlock));
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_alloc_rx_queues(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
priv->rx_queue[i] = kzalloc(sizeof(struct gfar_priv_rx_q),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!priv->rx_queue[i])
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
priv->rx_queue[i]->rx_skbuff = NULL;
|
|
|
|
priv->rx_queue[i]->qindex = i;
|
|
|
|
priv->rx_queue[i]->dev = priv->ndev;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gfar_free_tx_queues(struct gfar_private *priv)
|
2009-11-02 07:03:15 +00:00
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++)
|
|
|
|
kfree(priv->tx_queue[i]);
|
|
|
|
}
|
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
static void gfar_free_rx_queues(struct gfar_private *priv)
|
2009-11-02 07:03:15 +00:00
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
for (i = 0; i < priv->num_rx_queues; i++)
|
|
|
|
kfree(priv->rx_queue[i]);
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
static void unmap_group_regs(struct gfar_private *priv)
|
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:34 +00:00
|
|
|
|
|
|
|
for (i = 0; i < MAXGROUPS; i++)
|
|
|
|
if (priv->gfargrp[i].regs)
|
|
|
|
iounmap(priv->gfargrp[i].regs);
|
|
|
|
}
|
|
|
|
|
2013-01-29 03:55:12 +00:00
|
|
|
static void free_gfar_dev(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < priv->num_grps; i++)
|
|
|
|
for (j = 0; j < GFAR_NUM_IRQS; j++) {
|
|
|
|
kfree(priv->gfargrp[i].irqinfo[j]);
|
|
|
|
priv->gfargrp[i].irqinfo[j] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
free_netdev(priv->ndev);
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
static void disable_napi(struct gfar_private *priv)
|
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:34 +00:00
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
napi_disable(&priv->gfargrp[i].napi_rx);
|
|
|
|
napi_disable(&priv->gfargrp[i].napi_tx);
|
|
|
|
}
|
2009-11-02 07:03:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void enable_napi(struct gfar_private *priv)
|
|
|
|
{
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2009-11-02 07:03:34 +00:00
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
napi_enable(&priv->gfargrp[i].napi_rx);
|
|
|
|
napi_enable(&priv->gfargrp[i].napi_tx);
|
|
|
|
}
|
2009-11-02 07:03:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_parse_group(struct device_node *np,
|
2012-06-05 03:42:13 +00:00
|
|
|
struct gfar_private *priv, const char *model)
|
2009-11-02 07:03:34 +00:00
|
|
|
{
|
2013-01-29 03:55:11 +00:00
|
|
|
struct gfar_priv_grp *grp = &priv->gfargrp[priv->num_grps];
|
2013-01-29 03:55:12 +00:00
|
|
|
int i;
|
|
|
|
|
2013-02-04 09:49:42 +00:00
|
|
|
for (i = 0; i < GFAR_NUM_IRQS; i++) {
|
|
|
|
grp->irqinfo[i] = kzalloc(sizeof(struct gfar_irqinfo),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!grp->irqinfo[i])
|
2013-01-29 03:55:12 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2009-11-02 07:03:34 +00:00
|
|
|
|
2013-01-29 03:55:11 +00:00
|
|
|
grp->regs = of_iomap(np, 0);
|
|
|
|
if (!grp->regs)
|
2009-11-02 07:03:34 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-01-29 03:55:12 +00:00
|
|
|
gfar_irq(grp, TX)->irq = irq_of_parse_and_map(np, 0);
|
2009-11-02 07:03:34 +00:00
|
|
|
|
|
|
|
/* If we aren't the FEC we have multiple interrupts */
|
|
|
|
if (model && strcasecmp(model, "FEC")) {
|
2013-01-29 03:55:12 +00:00
|
|
|
gfar_irq(grp, RX)->irq = irq_of_parse_and_map(np, 1);
|
|
|
|
gfar_irq(grp, ER)->irq = irq_of_parse_and_map(np, 2);
|
|
|
|
if (gfar_irq(grp, TX)->irq == NO_IRQ ||
|
|
|
|
gfar_irq(grp, RX)->irq == NO_IRQ ||
|
|
|
|
gfar_irq(grp, ER)->irq == NO_IRQ)
|
2009-11-02 07:03:34 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2013-01-29 03:55:11 +00:00
|
|
|
grp->priv = priv;
|
|
|
|
spin_lock_init(&grp->grplock);
|
2012-06-05 03:42:13 +00:00
|
|
|
if (priv->mode == MQ_MG_MODE) {
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
u32 *rxq_mask, *txq_mask;
|
|
|
|
rxq_mask = (u32 *)of_get_property(np, "fsl,rx-bit-map", NULL);
|
|
|
|
txq_mask = (u32 *)of_get_property(np, "fsl,tx-bit-map", NULL);
|
|
|
|
|
|
|
|
if (priv->poll_mode == GFAR_SQ_POLLING) {
|
|
|
|
/* One Q per interrupt group: Q0 to G0, Q1 to G1 */
|
|
|
|
grp->rx_bit_map = (DEFAULT_MAPPING >> priv->num_grps);
|
|
|
|
grp->tx_bit_map = (DEFAULT_MAPPING >> priv->num_grps);
|
|
|
|
} else { /* GFAR_MQ_POLLING */
|
|
|
|
grp->rx_bit_map = rxq_mask ?
|
|
|
|
*rxq_mask : (DEFAULT_MAPPING >> priv->num_grps);
|
|
|
|
grp->tx_bit_map = txq_mask ?
|
|
|
|
*txq_mask : (DEFAULT_MAPPING >> priv->num_grps);
|
|
|
|
}
|
2009-11-02 07:03:34 +00:00
|
|
|
} else {
|
2013-01-29 03:55:11 +00:00
|
|
|
grp->rx_bit_map = 0xFF;
|
|
|
|
grp->tx_bit_map = 0xFF;
|
2009-11-02 07:03:34 +00:00
|
|
|
}
|
2014-02-17 10:53:14 +00:00
|
|
|
|
|
|
|
/* bit_map's MSB is q0 (from q0 to q7) but, for_each_set_bit parses
|
|
|
|
* right to left, so we need to revert the 8 bits to get the q index
|
|
|
|
*/
|
|
|
|
grp->rx_bit_map = bitrev8(grp->rx_bit_map);
|
|
|
|
grp->tx_bit_map = bitrev8(grp->tx_bit_map);
|
|
|
|
|
|
|
|
/* Calculate RSTAT, TSTAT, RQUEUE and TQUEUE values,
|
|
|
|
* also assign queues to groups
|
|
|
|
*/
|
|
|
|
for_each_set_bit(i, &grp->rx_bit_map, priv->num_rx_queues) {
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
if (!grp->rx_queue)
|
|
|
|
grp->rx_queue = priv->rx_queue[i];
|
2014-02-17 10:53:14 +00:00
|
|
|
grp->num_rx_queues++;
|
|
|
|
grp->rstat |= (RSTAT_CLEAR_RHALT >> i);
|
|
|
|
priv->rqueue |= ((RQUEUE_EN0 | RQUEUE_EX0) >> i);
|
|
|
|
priv->rx_queue[i]->grp = grp;
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_set_bit(i, &grp->tx_bit_map, priv->num_tx_queues) {
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
if (!grp->tx_queue)
|
|
|
|
grp->tx_queue = priv->tx_queue[i];
|
2014-02-17 10:53:14 +00:00
|
|
|
grp->num_tx_queues++;
|
|
|
|
grp->tstat |= (TSTAT_CLEAR_THALT >> i);
|
|
|
|
priv->tqueue |= (TQUEUE_EN0 >> i);
|
|
|
|
priv->tx_queue[i]->grp = grp;
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
priv->num_grps++;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-08-06 15:25:50 +00:00
|
|
|
static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
|
2008-12-16 23:29:15 +00:00
|
|
|
{
|
|
|
|
const char *model;
|
|
|
|
const char *ctype;
|
|
|
|
const void *mac_addr;
|
2009-11-02 07:03:15 +00:00
|
|
|
int err = 0, i;
|
|
|
|
struct net_device *dev = NULL;
|
|
|
|
struct gfar_private *priv = NULL;
|
2010-04-13 23:12:29 +00:00
|
|
|
struct device_node *np = ofdev->dev.of_node;
|
2009-11-02 07:03:34 +00:00
|
|
|
struct device_node *child = NULL;
|
2009-02-05 00:43:44 +00:00
|
|
|
const u32 *stash;
|
|
|
|
const u32 *stash_len;
|
|
|
|
const u32 *stash_idx;
|
2009-11-02 07:03:15 +00:00
|
|
|
unsigned int num_tx_qs, num_rx_qs;
|
|
|
|
u32 *tx_queues, *rx_queues;
|
2014-03-11 16:01:24 +00:00
|
|
|
unsigned short mode, poll_mode;
|
2008-12-16 23:29:15 +00:00
|
|
|
|
|
|
|
if (!np || !of_device_is_available(np))
|
|
|
|
return -ENODEV;
|
|
|
|
|
2014-03-11 16:01:24 +00:00
|
|
|
if (of_device_is_compatible(np, "fsl,etsec2")) {
|
|
|
|
mode = MQ_MG_MODE;
|
|
|
|
poll_mode = GFAR_SQ_POLLING;
|
|
|
|
} else {
|
|
|
|
mode = SQ_SG_MODE;
|
|
|
|
poll_mode = GFAR_SQ_POLLING;
|
|
|
|
}
|
|
|
|
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
/* parse the num of HW tx and rx queues */
|
2009-11-02 07:03:15 +00:00
|
|
|
tx_queues = (u32 *)of_get_property(np, "fsl,num_tx_queues", NULL);
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
rx_queues = (u32 *)of_get_property(np, "fsl,num_rx_queues", NULL);
|
|
|
|
|
2014-03-11 16:01:24 +00:00
|
|
|
if (mode == SQ_SG_MODE) {
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
num_tx_qs = 1;
|
|
|
|
num_rx_qs = 1;
|
|
|
|
} else { /* MQ_MG_MODE */
|
2014-03-21 07:33:17 +00:00
|
|
|
/* get the actual number of supported groups */
|
|
|
|
unsigned int num_grps = of_get_available_child_count(np);
|
|
|
|
|
|
|
|
if (num_grps == 0 || num_grps > MAXGROUPS) {
|
|
|
|
dev_err(&ofdev->dev, "Invalid # of int groups(%d)\n",
|
|
|
|
num_grps);
|
|
|
|
pr_err("Cannot do alloc_etherdev, aborting\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2014-03-11 16:01:24 +00:00
|
|
|
if (poll_mode == GFAR_SQ_POLLING) {
|
2014-03-21 07:33:17 +00:00
|
|
|
num_tx_qs = num_grps; /* one txq per int group */
|
|
|
|
num_rx_qs = num_grps; /* one rxq per int group */
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
} else { /* GFAR_MQ_POLLING */
|
|
|
|
num_tx_qs = tx_queues ? *tx_queues : 1;
|
|
|
|
num_rx_qs = rx_queues ? *rx_queues : 1;
|
|
|
|
}
|
|
|
|
}
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
if (num_tx_qs > MAX_TX_QS) {
|
2011-06-14 08:57:47 +00:00
|
|
|
pr_err("num_tx_qs(=%d) greater than MAX_TX_QS(=%d)\n",
|
|
|
|
num_tx_qs, MAX_TX_QS);
|
|
|
|
pr_err("Cannot do alloc_etherdev, aborting\n");
|
2009-11-02 07:03:15 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (num_rx_qs > MAX_RX_QS) {
|
2011-06-14 08:57:47 +00:00
|
|
|
pr_err("num_rx_qs(=%d) greater than MAX_RX_QS(=%d)\n",
|
|
|
|
num_rx_qs, MAX_RX_QS);
|
|
|
|
pr_err("Cannot do alloc_etherdev, aborting\n");
|
2009-11-02 07:03:15 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
*pdev = alloc_etherdev_mq(sizeof(*priv), num_tx_qs);
|
|
|
|
dev = *pdev;
|
|
|
|
if (NULL == dev)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
priv = netdev_priv(dev);
|
|
|
|
priv->ndev = dev;
|
|
|
|
|
2014-03-11 16:01:24 +00:00
|
|
|
priv->mode = mode;
|
|
|
|
priv->poll_mode = poll_mode;
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
priv->num_tx_queues = num_tx_qs;
|
2010-09-27 08:27:37 +00:00
|
|
|
netif_set_real_num_rx_queues(dev, num_rx_qs);
|
2009-11-02 07:03:15 +00:00
|
|
|
priv->num_rx_queues = num_rx_qs;
|
2014-02-17 10:53:14 +00:00
|
|
|
|
|
|
|
err = gfar_alloc_tx_queues(priv);
|
|
|
|
if (err)
|
|
|
|
goto tx_alloc_failed;
|
|
|
|
|
|
|
|
err = gfar_alloc_rx_queues(priv);
|
|
|
|
if (err)
|
|
|
|
goto rx_alloc_failed;
|
2008-12-16 23:29:15 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Init Rx queue filer rule set linked list */
|
2011-06-20 20:57:59 +00:00
|
|
|
INIT_LIST_HEAD(&priv->rx_list.list);
|
|
|
|
priv->rx_list.count = 0;
|
|
|
|
mutex_init(&priv->rx_queue_access);
|
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
model = of_get_property(np, "model", NULL);
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
for (i = 0; i < MAXGROUPS; i++)
|
|
|
|
priv->gfargrp[i].regs = NULL;
|
2008-12-16 23:29:15 +00:00
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
/* Parse and initialize group specific information */
|
2014-03-11 16:01:24 +00:00
|
|
|
if (priv->mode == MQ_MG_MODE) {
|
2009-11-02 07:03:34 +00:00
|
|
|
for_each_child_of_node(np, child) {
|
|
|
|
err = gfar_parse_group(child, priv, model);
|
|
|
|
if (err)
|
|
|
|
goto err_grp_init;
|
2008-12-16 23:29:15 +00:00
|
|
|
}
|
2014-03-11 16:01:24 +00:00
|
|
|
} else { /* SQ_SG_MODE */
|
2009-11-02 07:03:34 +00:00
|
|
|
err = gfar_parse_group(np, priv, model);
|
2012-06-05 03:42:13 +00:00
|
|
|
if (err)
|
2009-11-02 07:03:34 +00:00
|
|
|
goto err_grp_init;
|
2008-12-16 23:29:15 +00:00
|
|
|
}
|
|
|
|
|
2009-02-05 00:43:44 +00:00
|
|
|
stash = of_get_property(np, "bd-stash", NULL);
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
if (stash) {
|
2009-02-05 00:43:44 +00:00
|
|
|
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;
|
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
mac_addr = of_get_mac_address(np);
|
2012-06-05 03:42:13 +00:00
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
if (mac_addr)
|
2011-11-16 09:38:02 +00:00
|
|
|
memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
|
2008-12-16 23:29:15 +00:00
|
|
|
|
|
|
|
if (model && !strcasecmp(model, "TSEC"))
|
2014-02-17 10:53:15 +00:00
|
|
|
priv->device_flags |= FSL_GIANFAR_DEV_HAS_GIGABIT |
|
2012-06-05 03:42:13 +00:00
|
|
|
FSL_GIANFAR_DEV_HAS_COALESCE |
|
|
|
|
FSL_GIANFAR_DEV_HAS_RMON |
|
|
|
|
FSL_GIANFAR_DEV_HAS_MULTI_INTR;
|
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
if (model && !strcasecmp(model, "eTSEC"))
|
2014-02-17 10:53:15 +00:00
|
|
|
priv->device_flags |= FSL_GIANFAR_DEV_HAS_GIGABIT |
|
2012-06-05 03:42:13 +00:00
|
|
|
FSL_GIANFAR_DEV_HAS_COALESCE |
|
|
|
|
FSL_GIANFAR_DEV_HAS_RMON |
|
|
|
|
FSL_GIANFAR_DEV_HAS_MULTI_INTR |
|
|
|
|
FSL_GIANFAR_DEV_HAS_CSUM |
|
|
|
|
FSL_GIANFAR_DEV_HAS_VLAN |
|
|
|
|
FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
|
|
|
|
FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
|
|
|
|
FSL_GIANFAR_DEV_HAS_TIMER;
|
2008-12-16 23:29:15 +00:00
|
|
|
|
|
|
|
ctype = of_get_property(np, "phy-connection-type", NULL);
|
|
|
|
|
|
|
|
/* We only care about rgmii-id. The rest are autodetected */
|
|
|
|
if (ctype && !strcmp(ctype, "rgmii-id"))
|
|
|
|
priv->interface = PHY_INTERFACE_MODE_RGMII_ID;
|
|
|
|
else
|
|
|
|
priv->interface = PHY_INTERFACE_MODE_MII;
|
|
|
|
|
|
|
|
if (of_get_property(np, "fsl,magic-packet", NULL))
|
|
|
|
priv->device_flags |= FSL_GIANFAR_DEV_HAS_MAGIC_PACKET;
|
|
|
|
|
2009-04-25 12:53:12 +00:00
|
|
|
priv->phy_node = of_parse_phandle(np, "phy-handle", 0);
|
2008-12-16 23:29:15 +00:00
|
|
|
|
2014-05-22 16:47:48 +00:00
|
|
|
/* In the case of a fixed PHY, the DT node associated
|
|
|
|
* to the PHY is the Ethernet MAC DT node.
|
|
|
|
*/
|
|
|
|
if (of_phy_is_fixed_link(np)) {
|
|
|
|
err = of_phy_register_fixed_link(np);
|
|
|
|
if (err)
|
|
|
|
goto err_grp_init;
|
|
|
|
|
|
|
|
priv->phy_node = np;
|
|
|
|
}
|
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
/* Find the TBI PHY. If it's not there, we don't support SGMII */
|
2009-04-25 12:53:12 +00:00
|
|
|
priv->tbi_node = of_parse_phandle(np, "tbi-handle", 0);
|
2008-12-16 23:29:15 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
err_grp_init:
|
|
|
|
unmap_group_regs(priv);
|
2014-02-17 10:53:14 +00:00
|
|
|
rx_alloc_failed:
|
|
|
|
gfar_free_rx_queues(priv);
|
|
|
|
tx_alloc_failed:
|
|
|
|
gfar_free_tx_queues(priv);
|
2013-01-29 03:55:12 +00:00
|
|
|
free_gfar_dev(priv);
|
2008-12-16 23:29:15 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-11-18 23:05:27 +00:00
|
|
|
static int gfar_hwtstamp_set(struct net_device *netdev, struct ifreq *ifr)
|
2010-04-08 23:10:03 +00:00
|
|
|
{
|
|
|
|
struct hwtstamp_config config;
|
|
|
|
struct gfar_private *priv = netdev_priv(netdev);
|
|
|
|
|
|
|
|
if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
/* reserved for future extensions */
|
|
|
|
if (config.flags)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2010-04-08 23:10:35 +00:00
|
|
|
switch (config.tx_type) {
|
|
|
|
case HWTSTAMP_TX_OFF:
|
|
|
|
priv->hwts_tx_en = 0;
|
|
|
|
break;
|
|
|
|
case HWTSTAMP_TX_ON:
|
|
|
|
if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER))
|
|
|
|
return -ERANGE;
|
|
|
|
priv->hwts_tx_en = 1;
|
|
|
|
break;
|
|
|
|
default:
|
2010-04-08 23:10:03 +00:00
|
|
|
return -ERANGE;
|
2010-04-08 23:10:35 +00:00
|
|
|
}
|
2010-04-08 23:10:03 +00:00
|
|
|
|
|
|
|
switch (config.rx_filter) {
|
|
|
|
case HWTSTAMP_FILTER_NONE:
|
2010-06-11 01:49:05 +00:00
|
|
|
if (priv->hwts_rx_en) {
|
|
|
|
priv->hwts_rx_en = 0;
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
reset_gfar(netdev);
|
2010-06-11 01:49:05 +00:00
|
|
|
}
|
2010-04-08 23:10:03 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER))
|
|
|
|
return -ERANGE;
|
2010-06-11 01:49:05 +00:00
|
|
|
if (!priv->hwts_rx_en) {
|
|
|
|
priv->hwts_rx_en = 1;
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
reset_gfar(netdev);
|
2010-06-11 01:49:05 +00:00
|
|
|
}
|
2010-04-08 23:10:03 +00:00
|
|
|
config.rx_filter = HWTSTAMP_FILTER_ALL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
|
|
|
|
-EFAULT : 0;
|
|
|
|
}
|
|
|
|
|
2013-11-18 23:05:27 +00:00
|
|
|
static int gfar_hwtstamp_get(struct net_device *netdev, struct ifreq *ifr)
|
|
|
|
{
|
|
|
|
struct hwtstamp_config config;
|
|
|
|
struct gfar_private *priv = netdev_priv(netdev);
|
|
|
|
|
|
|
|
config.flags = 0;
|
|
|
|
config.tx_type = priv->hwts_tx_en ? HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;
|
|
|
|
config.rx_filter = (priv->hwts_rx_en ?
|
|
|
|
HWTSTAMP_FILTER_ALL : HWTSTAMP_FILTER_NONE);
|
|
|
|
|
|
|
|
return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
|
|
|
|
-EFAULT : 0;
|
|
|
|
}
|
|
|
|
|
2009-01-09 10:23:11 +00:00
|
|
|
static int gfar_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
|
|
|
|
|
|
if (!netif_running(dev))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2010-04-08 23:10:03 +00:00
|
|
|
if (cmd == SIOCSHWTSTAMP)
|
2013-11-18 23:05:27 +00:00
|
|
|
return gfar_hwtstamp_set(dev, rq);
|
|
|
|
if (cmd == SIOCGHWTSTAMP)
|
|
|
|
return gfar_hwtstamp_get(dev, rq);
|
2010-04-08 23:10:03 +00:00
|
|
|
|
2009-01-09 10:23:11 +00:00
|
|
|
if (!priv->phydev)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2010-07-17 08:48:55 +00:00
|
|
|
return phy_mii_ioctl(priv->phydev, rq, cmd);
|
2009-01-09 10:23:11 +00:00
|
|
|
}
|
|
|
|
|
2009-11-04 12:53:00 +00:00
|
|
|
static u32 cluster_entry_per_class(struct gfar_private *priv, u32 rqfar,
|
|
|
|
u32 class)
|
2009-11-02 07:03:40 +00:00
|
|
|
{
|
|
|
|
u32 rqfpr = FPR_FILER_MASK;
|
|
|
|
u32 rqfcr = 0x0;
|
|
|
|
|
|
|
|
rqfar--;
|
|
|
|
rqfcr = RQFCR_CLE | RQFCR_PID_MASK | RQFCR_CMP_EXACT;
|
2011-06-07 21:46:51 +00:00
|
|
|
priv->ftp_rqfpr[rqfar] = rqfpr;
|
|
|
|
priv->ftp_rqfcr[rqfar] = rqfcr;
|
2009-11-02 07:03:40 +00:00
|
|
|
gfar_write_filer(priv, rqfar, rqfcr, rqfpr);
|
|
|
|
|
|
|
|
rqfar--;
|
|
|
|
rqfcr = RQFCR_CMP_NOMATCH;
|
2011-06-07 21:46:51 +00:00
|
|
|
priv->ftp_rqfpr[rqfar] = rqfpr;
|
|
|
|
priv->ftp_rqfcr[rqfar] = rqfcr;
|
2009-11-02 07:03:40 +00:00
|
|
|
gfar_write_filer(priv, rqfar, rqfcr, rqfpr);
|
|
|
|
|
|
|
|
rqfar--;
|
|
|
|
rqfcr = RQFCR_CMP_EXACT | RQFCR_PID_PARSE | RQFCR_CLE | RQFCR_AND;
|
|
|
|
rqfpr = class;
|
2011-06-07 21:46:51 +00:00
|
|
|
priv->ftp_rqfcr[rqfar] = rqfcr;
|
|
|
|
priv->ftp_rqfpr[rqfar] = rqfpr;
|
2009-11-02 07:03:40 +00:00
|
|
|
gfar_write_filer(priv, rqfar, rqfcr, rqfpr);
|
|
|
|
|
|
|
|
rqfar--;
|
|
|
|
rqfcr = RQFCR_CMP_EXACT | RQFCR_PID_MASK | RQFCR_AND;
|
|
|
|
rqfpr = class;
|
2011-06-07 21:46:51 +00:00
|
|
|
priv->ftp_rqfcr[rqfar] = rqfcr;
|
|
|
|
priv->ftp_rqfpr[rqfar] = rqfpr;
|
2009-11-02 07:03:40 +00:00
|
|
|
gfar_write_filer(priv, rqfar, rqfcr, rqfpr);
|
|
|
|
|
|
|
|
return rqfar;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gfar_init_filer_table(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i = 0x0;
|
|
|
|
u32 rqfar = MAX_FILER_IDX;
|
|
|
|
u32 rqfcr = 0x0;
|
|
|
|
u32 rqfpr = FPR_FILER_MASK;
|
|
|
|
|
|
|
|
/* Default rule */
|
|
|
|
rqfcr = RQFCR_CMP_MATCH;
|
2011-06-07 21:46:51 +00:00
|
|
|
priv->ftp_rqfcr[rqfar] = rqfcr;
|
|
|
|
priv->ftp_rqfpr[rqfar] = rqfpr;
|
2009-11-02 07:03:40 +00:00
|
|
|
gfar_write_filer(priv, rqfar, rqfcr, rqfpr);
|
|
|
|
|
|
|
|
rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV6);
|
|
|
|
rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV6 | RQFPR_UDP);
|
|
|
|
rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV6 | RQFPR_TCP);
|
|
|
|
rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4);
|
|
|
|
rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_UDP);
|
|
|
|
rqfar = cluster_entry_per_class(priv, rqfar, RQFPR_IPV4 | RQFPR_TCP);
|
|
|
|
|
2010-06-11 10:16:55 +00:00
|
|
|
/* cur_filer_idx indicated the first non-masked rule */
|
2009-11-02 07:03:40 +00:00
|
|
|
priv->cur_filer_idx = rqfar;
|
|
|
|
|
|
|
|
/* Rest are masked rules */
|
|
|
|
rqfcr = RQFCR_CMP_NOMATCH;
|
|
|
|
for (i = 0; i < rqfar; i++) {
|
2011-06-07 21:46:51 +00:00
|
|
|
priv->ftp_rqfcr[i] = rqfcr;
|
|
|
|
priv->ftp_rqfpr[i] = rqfpr;
|
2009-11-02 07:03:40 +00:00
|
|
|
gfar_write_filer(priv, i, rqfcr, rqfpr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-09 17:20:41 +00:00
|
|
|
static void __gfar_detect_errata_83xx(struct gfar_private *priv)
|
2010-06-30 06:39:12 +00:00
|
|
|
{
|
|
|
|
unsigned int pvr = mfspr(SPRN_PVR);
|
|
|
|
unsigned int svr = mfspr(SPRN_SVR);
|
|
|
|
unsigned int mod = (svr >> 16) & 0xfff6; /* w/o E suffix */
|
|
|
|
unsigned int rev = svr & 0xffff;
|
|
|
|
|
|
|
|
/* MPC8313 Rev 2.0 and higher; All MPC837x */
|
|
|
|
if ((pvr == 0x80850010 && mod == 0x80b0 && rev >= 0x0020) ||
|
2012-06-05 03:42:13 +00:00
|
|
|
(pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
|
2010-06-30 06:39:12 +00:00
|
|
|
priv->errata |= GFAR_ERRATA_74;
|
|
|
|
|
2010-06-30 06:39:13 +00:00
|
|
|
/* MPC8313 and MPC837x all rev */
|
|
|
|
if ((pvr == 0x80850010 && mod == 0x80b0) ||
|
2012-06-05 03:42:13 +00:00
|
|
|
(pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
|
2010-06-30 06:39:13 +00:00
|
|
|
priv->errata |= GFAR_ERRATA_76;
|
|
|
|
|
2013-10-09 17:20:41 +00:00
|
|
|
/* MPC8313 Rev < 2.0 */
|
|
|
|
if (pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020)
|
|
|
|
priv->errata |= GFAR_ERRATA_12;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __gfar_detect_errata_85xx(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
unsigned int svr = mfspr(SPRN_SVR);
|
|
|
|
|
|
|
|
if ((SVR_SOC_VER(svr) == SVR_8548) && (SVR_REV(svr) == 0x20))
|
2011-03-16 17:57:13 +00:00
|
|
|
priv->errata |= GFAR_ERRATA_12;
|
2013-10-09 17:20:42 +00:00
|
|
|
if (((SVR_SOC_VER(svr) == SVR_P2020) && (SVR_REV(svr) < 0x20)) ||
|
|
|
|
((SVR_SOC_VER(svr) == SVR_P2010) && (SVR_REV(svr) < 0x20)))
|
|
|
|
priv->errata |= GFAR_ERRATA_76; /* aka eTSEC 20 */
|
2013-10-09 17:20:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void gfar_detect_errata(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct device *dev = &priv->ofdev->dev;
|
|
|
|
|
|
|
|
/* no plans to fix */
|
|
|
|
priv->errata |= GFAR_ERRATA_A002;
|
|
|
|
|
|
|
|
if (pvr_version_is(PVR_VER_E500V1) || pvr_version_is(PVR_VER_E500V2))
|
|
|
|
__gfar_detect_errata_85xx(priv);
|
|
|
|
else /* non-mpc85xx parts, i.e. e300 core based */
|
|
|
|
__gfar_detect_errata_83xx(priv);
|
2011-03-16 17:57:13 +00:00
|
|
|
|
2010-06-30 06:39:12 +00:00
|
|
|
if (priv->errata)
|
|
|
|
dev_info(dev, "enabled errata workarounds, flags: 0x%x\n",
|
|
|
|
priv->errata);
|
|
|
|
}
|
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
void gfar_mac_reset(struct gfar_private *priv)
|
2014-02-17 10:53:14 +00:00
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
u32 tempval;
|
2014-02-17 10:53:14 +00:00
|
|
|
|
|
|
|
/* Reset MAC layer */
|
|
|
|
gfar_write(®s->maccfg1, MACCFG1_SOFT_RESET);
|
|
|
|
|
|
|
|
/* We need to delay at least 3 TX clocks */
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
udelay(3);
|
2014-02-17 10:53:14 +00:00
|
|
|
|
|
|
|
/* the soft reset bit is not self-resetting, so we need to
|
|
|
|
* clear it before resuming normal operation
|
|
|
|
*/
|
|
|
|
gfar_write(®s->maccfg1, 0);
|
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
udelay(3);
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
/* Compute rx_buff_size based on config flags */
|
|
|
|
gfar_rx_buff_size_config(priv);
|
|
|
|
|
|
|
|
/* Initialize the max receive frame/buffer lengths */
|
|
|
|
gfar_write(®s->maxfrm, priv->rx_buffer_size);
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
gfar_write(®s->mrblr, priv->rx_buffer_size);
|
|
|
|
|
|
|
|
/* Initialize the Minimum Frame Length Register */
|
|
|
|
gfar_write(®s->minflr, MINFLR_INIT_SETTINGS);
|
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
/* Initialize MACCFG2. */
|
|
|
|
tempval = MACCFG2_INIT_SETTINGS;
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
|
|
|
|
/* If the mtu is larger than the max size for standard
|
|
|
|
* ethernet frames (ie, a jumbo frame), then set maccfg2
|
|
|
|
* to allow huge frames, and to check the length
|
|
|
|
*/
|
|
|
|
if (priv->rx_buffer_size > DEFAULT_RX_BUFFER_SIZE ||
|
|
|
|
gfar_has_errata(priv, GFAR_ERRATA_74))
|
2014-02-17 10:53:14 +00:00
|
|
|
tempval |= MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK;
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
gfar_write(®s->maccfg2, tempval);
|
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
/* Clear mac addr hash registers */
|
|
|
|
gfar_write(®s->igaddr0, 0);
|
|
|
|
gfar_write(®s->igaddr1, 0);
|
|
|
|
gfar_write(®s->igaddr2, 0);
|
|
|
|
gfar_write(®s->igaddr3, 0);
|
|
|
|
gfar_write(®s->igaddr4, 0);
|
|
|
|
gfar_write(®s->igaddr5, 0);
|
|
|
|
gfar_write(®s->igaddr6, 0);
|
|
|
|
gfar_write(®s->igaddr7, 0);
|
|
|
|
|
|
|
|
gfar_write(®s->gaddr0, 0);
|
|
|
|
gfar_write(®s->gaddr1, 0);
|
|
|
|
gfar_write(®s->gaddr2, 0);
|
|
|
|
gfar_write(®s->gaddr3, 0);
|
|
|
|
gfar_write(®s->gaddr4, 0);
|
|
|
|
gfar_write(®s->gaddr5, 0);
|
|
|
|
gfar_write(®s->gaddr6, 0);
|
|
|
|
gfar_write(®s->gaddr7, 0);
|
|
|
|
|
|
|
|
if (priv->extended_hash)
|
|
|
|
gfar_clear_exact_match(priv->ndev);
|
|
|
|
|
|
|
|
gfar_mac_rx_config(priv);
|
|
|
|
|
|
|
|
gfar_mac_tx_config(priv);
|
|
|
|
|
|
|
|
gfar_set_mac_address(priv->ndev);
|
|
|
|
|
|
|
|
gfar_set_multi(priv->ndev);
|
|
|
|
|
|
|
|
/* clear ievent and imask before configuring coalescing */
|
|
|
|
gfar_ints_disable(priv);
|
|
|
|
|
|
|
|
/* Configure the coalescing support */
|
|
|
|
gfar_configure_coalescing_all(priv);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gfar_hw_init(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
|
|
u32 attrs;
|
|
|
|
|
|
|
|
/* Stop the DMA engine now, in case it was running before
|
|
|
|
* (The firmware could have used it, and left it running).
|
|
|
|
*/
|
|
|
|
gfar_halt(priv);
|
|
|
|
|
|
|
|
gfar_mac_reset(priv);
|
|
|
|
|
|
|
|
/* Zero out the rmon mib registers if it has them */
|
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_RMON) {
|
|
|
|
memset_io(&(regs->rmon), 0, sizeof(struct rmon_mib));
|
|
|
|
|
|
|
|
/* Mask off the CAM interrupts */
|
|
|
|
gfar_write(®s->rmon.cam1, 0xffffffff);
|
|
|
|
gfar_write(®s->rmon.cam2, 0xffffffff);
|
|
|
|
}
|
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
/* Initialize ECNTRL */
|
|
|
|
gfar_write(®s->ecntrl, ECNTRL_INIT_SETTINGS);
|
|
|
|
|
2014-02-17 10:53:15 +00:00
|
|
|
/* Set the extraction length and index */
|
|
|
|
attrs = ATTRELI_EL(priv->rx_stash_size) |
|
|
|
|
ATTRELI_EI(priv->rx_stash_index);
|
|
|
|
|
|
|
|
gfar_write(®s->attreli, attrs);
|
|
|
|
|
|
|
|
/* Start with defaults, and add stashing
|
|
|
|
* depending on driver parameters
|
|
|
|
*/
|
|
|
|
attrs = ATTR_INIT_SETTINGS;
|
|
|
|
|
|
|
|
if (priv->bd_stash_en)
|
|
|
|
attrs |= ATTR_BDSTASH;
|
|
|
|
|
|
|
|
if (priv->rx_stash_size != 0)
|
|
|
|
attrs |= ATTR_BUFSTASH;
|
|
|
|
|
|
|
|
gfar_write(®s->attr, attrs);
|
|
|
|
|
|
|
|
/* FIFO configs */
|
|
|
|
gfar_write(®s->fifo_tx_thr, DEFAULT_FIFO_TX_THR);
|
|
|
|
gfar_write(®s->fifo_tx_starve, DEFAULT_FIFO_TX_STARVE);
|
|
|
|
gfar_write(®s->fifo_tx_starve_shutoff, DEFAULT_FIFO_TX_STARVE_OFF);
|
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
/* Program the interrupt steering regs, only for MG devices */
|
|
|
|
if (priv->num_grps > 1)
|
|
|
|
gfar_write_isrg(priv);
|
|
|
|
}
|
|
|
|
|
2014-06-04 08:49:16 +00:00
|
|
|
static void gfar_init_addr_hash_table(struct gfar_private *priv)
|
2014-02-17 10:53:14 +00:00
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
|
|
|
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_EXTENDED_HASH) {
|
|
|
|
priv->extended_hash = 1;
|
|
|
|
priv->hash_width = 9;
|
|
|
|
|
|
|
|
priv->hash_regs[0] = ®s->igaddr0;
|
|
|
|
priv->hash_regs[1] = ®s->igaddr1;
|
|
|
|
priv->hash_regs[2] = ®s->igaddr2;
|
|
|
|
priv->hash_regs[3] = ®s->igaddr3;
|
|
|
|
priv->hash_regs[4] = ®s->igaddr4;
|
|
|
|
priv->hash_regs[5] = ®s->igaddr5;
|
|
|
|
priv->hash_regs[6] = ®s->igaddr6;
|
|
|
|
priv->hash_regs[7] = ®s->igaddr7;
|
|
|
|
priv->hash_regs[8] = ®s->gaddr0;
|
|
|
|
priv->hash_regs[9] = ®s->gaddr1;
|
|
|
|
priv->hash_regs[10] = ®s->gaddr2;
|
|
|
|
priv->hash_regs[11] = ®s->gaddr3;
|
|
|
|
priv->hash_regs[12] = ®s->gaddr4;
|
|
|
|
priv->hash_regs[13] = ®s->gaddr5;
|
|
|
|
priv->hash_regs[14] = ®s->gaddr6;
|
|
|
|
priv->hash_regs[15] = ®s->gaddr7;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
priv->extended_hash = 0;
|
|
|
|
priv->hash_width = 8;
|
|
|
|
|
|
|
|
priv->hash_regs[0] = ®s->gaddr0;
|
|
|
|
priv->hash_regs[1] = ®s->gaddr1;
|
|
|
|
priv->hash_regs[2] = ®s->gaddr2;
|
|
|
|
priv->hash_regs[3] = ®s->gaddr3;
|
|
|
|
priv->hash_regs[4] = ®s->gaddr4;
|
|
|
|
priv->hash_regs[5] = ®s->gaddr5;
|
|
|
|
priv->hash_regs[6] = ®s->gaddr6;
|
|
|
|
priv->hash_regs[7] = ®s->gaddr7;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-24 02:54:21 +00:00
|
|
|
/* Set up the ethernet device structure, private data,
|
2012-06-05 03:42:12 +00:00
|
|
|
* and anything else we need before we start
|
|
|
|
*/
|
2011-02-23 04:05:51 +00:00
|
|
|
static int gfar_probe(struct platform_device *ofdev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct net_device *dev = NULL;
|
|
|
|
struct gfar_private *priv = NULL;
|
2014-02-17 10:53:14 +00:00
|
|
|
int err = 0, i;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
err = gfar_of_init(ofdev, &dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
priv = netdev_priv(dev);
|
2009-03-19 06:28:22 +00:00
|
|
|
priv->ndev = dev;
|
|
|
|
priv->ofdev = ofdev;
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
priv->dev = &ofdev->dev;
|
2009-03-19 06:28:22 +00:00
|
|
|
SET_NETDEV_DEV(dev, &ofdev->dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-07-11 23:04:45 +00:00
|
|
|
spin_lock_init(&priv->bflock);
|
2008-08-19 19:12:45 +00:00
|
|
|
INIT_WORK(&priv->reset_task, gfar_reset_task);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-05-23 00:52:31 +00:00
|
|
|
platform_set_drvdata(ofdev, priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2010-06-30 06:39:12 +00:00
|
|
|
gfar_detect_errata(priv);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Set the dev->base_addr to the gfar reg region */
|
2014-02-17 10:53:14 +00:00
|
|
|
dev->base_addr = (unsigned long) priv->gfargrp[0].regs;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Fill in the dev structure */
|
|
|
|
dev->watchdog_timeo = TX_TIMEOUT;
|
|
|
|
dev->mtu = 1500;
|
2009-03-10 12:58:28 +00:00
|
|
|
dev->netdev_ops = &gfar_netdev_ops;
|
2005-06-20 15:54:21 +00:00
|
|
|
dev->ethtool_ops = &gfar_ethtool_ops;
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
/* Register for napi ...We are registering NAPI for each grp */
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
if (priv->poll_mode == GFAR_SQ_POLLING) {
|
|
|
|
netif_napi_add(dev, &priv->gfargrp[i].napi_rx,
|
|
|
|
gfar_poll_rx_sq, GFAR_DEV_WEIGHT);
|
|
|
|
netif_napi_add(dev, &priv->gfargrp[i].napi_tx,
|
|
|
|
gfar_poll_tx_sq, 2);
|
|
|
|
} else {
|
2014-03-07 12:42:45 +00:00
|
|
|
netif_napi_add(dev, &priv->gfargrp[i].napi_rx,
|
|
|
|
gfar_poll_rx, GFAR_DEV_WEIGHT);
|
|
|
|
netif_napi_add(dev, &priv->gfargrp[i].napi_tx,
|
|
|
|
gfar_poll_tx, 2);
|
|
|
|
}
|
|
|
|
}
|
2009-11-02 07:03:00 +00:00
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_CSUM) {
|
2011-04-15 04:50:50 +00:00
|
|
|
dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
|
2012-06-05 03:42:13 +00:00
|
|
|
NETIF_F_RXCSUM;
|
2011-04-15 04:50:50 +00:00
|
|
|
dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG |
|
2012-06-05 03:42:13 +00:00
|
|
|
NETIF_F_RXCSUM | NETIF_F_HIGHDMA;
|
2011-04-15 04:50:50 +00:00
|
|
|
}
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2011-07-20 04:54:19 +00:00
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) {
|
2013-04-19 02:04:27 +00:00
|
|
|
dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX |
|
|
|
|
NETIF_F_HW_VLAN_CTAG_RX;
|
|
|
|
dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
|
2011-07-20 04:54:19 +00:00
|
|
|
}
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2014-02-17 10:53:14 +00:00
|
|
|
gfar_init_addr_hash_table(priv);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2014-02-17 10:53:16 +00:00
|
|
|
/* Insert receive time stamps into padding alignment bytes */
|
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
|
|
|
|
priv->padding = 8;
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2010-04-08 23:10:03 +00:00
|
|
|
if (dev->features & NETIF_F_IP_CSUM ||
|
2012-06-05 03:42:13 +00:00
|
|
|
priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
|
2012-05-21 23:00:48 +00:00
|
|
|
dev->needed_headroom = GMAC_FCB_LEN;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
priv->rx_buffer_size = DEFAULT_RX_BUFFER_SIZE;
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
/* Initializing some of the rx/tx queue level parameters */
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
|
|
|
priv->tx_queue[i]->tx_ring_size = DEFAULT_TX_RING_SIZE;
|
|
|
|
priv->tx_queue[i]->num_txbdfree = DEFAULT_TX_RING_SIZE;
|
|
|
|
priv->tx_queue[i]->txcoalescing = DEFAULT_TX_COALESCE;
|
|
|
|
priv->tx_queue[i]->txic = DEFAULT_TXIC;
|
|
|
|
}
|
2009-11-02 07:03:00 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
priv->rx_queue[i]->rx_ring_size = DEFAULT_RX_RING_SIZE;
|
|
|
|
priv->rx_queue[i]->rxcoalescing = DEFAULT_RX_COALESCE;
|
|
|
|
priv->rx_queue[i]->rxic = DEFAULT_RXIC;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* always enable rx filer */
|
2011-06-20 20:57:59 +00:00
|
|
|
priv->rx_filer_enable = 1;
|
2005-06-20 15:54:21 +00:00
|
|
|
/* Enable most messages by default */
|
|
|
|
priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
|
2012-09-23 22:39:08 +00:00
|
|
|
/* use pritority h/w tx queue scheduling for single queue devices */
|
|
|
|
if (priv->num_tx_queues == 1)
|
|
|
|
priv->prio_sched_en = 1;
|
2005-06-20 15:54:21 +00:00
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
set_bit(GFAR_DOWN, &priv->state);
|
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
gfar_hw_init(priv);
|
2008-10-02 11:12:24 +00:00
|
|
|
|
2014-06-03 22:55:38 +00:00
|
|
|
/* Carrier starts down, phylib will bring it up */
|
|
|
|
netif_carrier_off(dev);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
err = register_netdev(dev);
|
|
|
|
|
|
|
|
if (err) {
|
2011-06-14 08:57:47 +00:00
|
|
|
pr_err("%s: Cannot register net device, aborting\n", dev->name);
|
2005-04-16 22:20:36 +00:00
|
|
|
goto register_fail;
|
|
|
|
}
|
|
|
|
|
2009-02-01 08:52:34 +00:00
|
|
|
device_init_wakeup(&dev->dev,
|
2012-06-05 03:42:13 +00:00
|
|
|
priv->device_flags &
|
|
|
|
FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
|
2009-02-01 08:52:34 +00:00
|
|
|
|
2008-12-18 00:51:32 +00:00
|
|
|
/* fill out IRQ number and name fields */
|
2009-11-02 07:03:34 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
2013-01-29 03:55:12 +00:00
|
|
|
struct gfar_priv_grp *grp = &priv->gfargrp[i];
|
2009-11-02 07:03:34 +00:00
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
|
2013-01-29 03:55:12 +00:00
|
|
|
sprintf(gfar_irq(grp, TX)->name, "%s%s%c%s",
|
2012-03-25 07:10:07 +00:00
|
|
|
dev->name, "_g", '0' + i, "_tx");
|
2013-01-29 03:55:12 +00:00
|
|
|
sprintf(gfar_irq(grp, RX)->name, "%s%s%c%s",
|
2012-03-25 07:10:07 +00:00
|
|
|
dev->name, "_g", '0' + i, "_rx");
|
2013-01-29 03:55:12 +00:00
|
|
|
sprintf(gfar_irq(grp, ER)->name, "%s%s%c%s",
|
2012-03-25 07:10:07 +00:00
|
|
|
dev->name, "_g", '0' + i, "_er");
|
2009-11-02 07:03:34 +00:00
|
|
|
} else
|
2013-01-29 03:55:12 +00:00
|
|
|
strcpy(gfar_irq(grp, TX)->name, dev->name);
|
2009-11-02 07:03:34 +00:00
|
|
|
}
|
2008-12-18 00:51:32 +00:00
|
|
|
|
2009-11-02 07:03:40 +00:00
|
|
|
/* Initialize the filer table */
|
|
|
|
gfar_init_filer_table(priv);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Print out the device info */
|
2011-06-14 08:57:47 +00:00
|
|
|
netdev_info(dev, "mac: %pM\n", dev->dev_addr);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Even more device info helps when determining which kernel
|
|
|
|
* provided which set of benchmarks.
|
|
|
|
*/
|
2011-06-14 08:57:47 +00:00
|
|
|
netdev_info(dev, "Running with NAPI enabled\n");
|
2009-11-02 07:03:15 +00:00
|
|
|
for (i = 0; i < priv->num_rx_queues; i++)
|
2011-06-14 08:57:47 +00:00
|
|
|
netdev_info(dev, "RX BD ring size for Q[%d]: %d\n",
|
|
|
|
i, priv->rx_queue[i]->rx_ring_size);
|
2012-06-05 03:42:13 +00:00
|
|
|
for (i = 0; i < priv->num_tx_queues; i++)
|
2011-06-14 08:57:47 +00:00
|
|
|
netdev_info(dev, "TX BD ring size for Q[%d]: %d\n",
|
|
|
|
i, priv->tx_queue[i]->tx_ring_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
register_fail:
|
2009-11-02 07:03:34 +00:00
|
|
|
unmap_group_regs(priv);
|
2014-02-17 10:53:14 +00:00
|
|
|
gfar_free_rx_queues(priv);
|
|
|
|
gfar_free_tx_queues(priv);
|
2014-08-07 19:20:12 +00:00
|
|
|
of_node_put(priv->phy_node);
|
|
|
|
of_node_put(priv->tbi_node);
|
2013-01-29 03:55:12 +00:00
|
|
|
free_gfar_dev(priv);
|
2005-09-24 02:54:21 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2010-08-06 15:25:50 +00:00
|
|
|
static int gfar_remove(struct platform_device *ofdev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2013-05-23 00:52:31 +00:00
|
|
|
struct gfar_private *priv = platform_get_drvdata(ofdev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-08-07 19:20:12 +00:00
|
|
|
of_node_put(priv->phy_node);
|
|
|
|
of_node_put(priv->tbi_node);
|
2009-04-25 12:53:12 +00:00
|
|
|
|
2009-09-06 08:41:02 +00:00
|
|
|
unregister_netdev(priv->ndev);
|
2009-11-02 07:03:34 +00:00
|
|
|
unmap_group_regs(priv);
|
2014-02-17 10:53:14 +00:00
|
|
|
gfar_free_rx_queues(priv);
|
|
|
|
gfar_free_tx_queues(priv);
|
2013-01-29 03:55:12 +00:00
|
|
|
free_gfar_dev(priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-11 23:04:45 +00:00
|
|
|
#ifdef CONFIG_PM
|
2009-10-12 06:00:42 +00:00
|
|
|
|
|
|
|
static int gfar_suspend(struct device *dev)
|
2008-07-11 23:04:45 +00:00
|
|
|
{
|
2009-10-12 06:00:42 +00:00
|
|
|
struct gfar_private *priv = dev_get_drvdata(dev);
|
|
|
|
struct net_device *ndev = priv->ndev;
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2008-07-11 23:04:45 +00:00
|
|
|
unsigned long flags;
|
|
|
|
u32 tempval;
|
|
|
|
|
|
|
|
int magic_packet = priv->wol_en &&
|
2012-06-05 03:42:13 +00:00
|
|
|
(priv->device_flags &
|
|
|
|
FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
netif_device_detach(ndev);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
if (netif_running(ndev)) {
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
local_irq_save(flags);
|
|
|
|
lock_tx_qs(priv);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
gfar_halt_nodisable(priv);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
|
|
|
/* Disable Tx, and Rx if wake-on-LAN is disabled. */
|
2009-11-02 07:03:09 +00:00
|
|
|
tempval = gfar_read(®s->maccfg1);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
|
|
|
tempval &= ~MACCFG1_TX_EN;
|
|
|
|
|
|
|
|
if (!magic_packet)
|
|
|
|
tempval &= ~MACCFG1_RX_EN;
|
|
|
|
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->maccfg1, tempval);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
unlock_tx_qs(priv);
|
|
|
|
local_irq_restore(flags);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
disable_napi(priv);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
|
|
|
if (magic_packet) {
|
|
|
|
/* Enable interrupt on Magic Packet */
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->imask, IMASK_MAG);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
|
|
|
/* Enable Magic Packet mode */
|
2009-11-02 07:03:09 +00:00
|
|
|
tempval = gfar_read(®s->maccfg2);
|
2008-07-11 23:04:45 +00:00
|
|
|
tempval |= MACCFG2_MPEN;
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->maccfg2, tempval);
|
2008-07-11 23:04:45 +00:00
|
|
|
} else {
|
|
|
|
phy_stop(priv->phydev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
static int gfar_resume(struct device *dev)
|
2008-07-11 23:04:45 +00:00
|
|
|
{
|
2009-10-12 06:00:42 +00:00
|
|
|
struct gfar_private *priv = dev_get_drvdata(dev);
|
|
|
|
struct net_device *ndev = priv->ndev;
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2008-07-11 23:04:45 +00:00
|
|
|
unsigned long flags;
|
|
|
|
u32 tempval;
|
|
|
|
int magic_packet = priv->wol_en &&
|
2012-06-05 03:42:13 +00:00
|
|
|
(priv->device_flags &
|
|
|
|
FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
if (!netif_running(ndev)) {
|
|
|
|
netif_device_attach(ndev);
|
2008-07-11 23:04:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!magic_packet && priv->phydev)
|
|
|
|
phy_start(priv->phydev);
|
|
|
|
|
|
|
|
/* Disable Magic Packet mode, in case something
|
|
|
|
* else woke us up.
|
|
|
|
*/
|
2009-11-02 07:03:15 +00:00
|
|
|
local_irq_save(flags);
|
|
|
|
lock_tx_qs(priv);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-11-02 07:03:09 +00:00
|
|
|
tempval = gfar_read(®s->maccfg2);
|
2008-07-11 23:04:45 +00:00
|
|
|
tempval &= ~MACCFG2_MPEN;
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->maccfg2, tempval);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
gfar_start(priv);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
unlock_tx_qs(priv);
|
|
|
|
local_irq_restore(flags);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
netif_device_attach(ndev);
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
enable_napi(priv);
|
2009-10-12 06:00:42 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_restore(struct device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = dev_get_drvdata(dev);
|
|
|
|
struct net_device *ndev = priv->ndev;
|
|
|
|
|
2012-11-09 04:43:51 +00:00
|
|
|
if (!netif_running(ndev)) {
|
|
|
|
netif_device_attach(ndev);
|
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
return 0;
|
2012-11-09 04:43:51 +00:00
|
|
|
}
|
2009-10-12 06:00:42 +00:00
|
|
|
|
2012-11-08 22:11:41 +00:00
|
|
|
if (gfar_init_bds(ndev)) {
|
|
|
|
free_skb_resources(priv);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
gfar_mac_reset(priv);
|
|
|
|
|
|
|
|
gfar_init_tx_rx_base(priv);
|
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
gfar_start(priv);
|
2009-10-12 06:00:42 +00:00
|
|
|
|
|
|
|
priv->oldlink = 0;
|
|
|
|
priv->oldspeed = 0;
|
|
|
|
priv->oldduplex = -1;
|
|
|
|
|
|
|
|
if (priv->phydev)
|
|
|
|
phy_start(priv->phydev);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
2009-10-12 06:00:42 +00:00
|
|
|
netif_device_attach(ndev);
|
2009-11-10 14:11:05 +00:00
|
|
|
enable_napi(priv);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2009-10-12 06:00:42 +00:00
|
|
|
|
|
|
|
static struct dev_pm_ops gfar_pm_ops = {
|
|
|
|
.suspend = gfar_suspend,
|
|
|
|
.resume = gfar_resume,
|
|
|
|
.freeze = gfar_suspend,
|
|
|
|
.thaw = gfar_resume,
|
|
|
|
.restore = gfar_restore,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define GFAR_PM_OPS (&gfar_pm_ops)
|
|
|
|
|
2008-07-11 23:04:45 +00:00
|
|
|
#else
|
2009-10-12 06:00:42 +00:00
|
|
|
|
|
|
|
#define GFAR_PM_OPS NULL
|
|
|
|
|
2008-07-11 23:04:45 +00:00
|
|
|
#endif
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-12-01 18:01:06 +00:00
|
|
|
/* Reads the controller's registers to determine what interface
|
|
|
|
* connects it to the PHY.
|
|
|
|
*/
|
|
|
|
static phy_interface_t gfar_get_interface(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2009-11-02 07:03:09 +00:00
|
|
|
u32 ecntrl;
|
|
|
|
|
|
|
|
ecntrl = gfar_read(®s->ecntrl);
|
2006-12-01 18:01:06 +00:00
|
|
|
|
|
|
|
if (ecntrl & ECNTRL_SGMII_MODE)
|
|
|
|
return PHY_INTERFACE_MODE_SGMII;
|
|
|
|
|
|
|
|
if (ecntrl & ECNTRL_TBI_MODE) {
|
|
|
|
if (ecntrl & ECNTRL_REDUCED_MODE)
|
|
|
|
return PHY_INTERFACE_MODE_RTBI;
|
|
|
|
else
|
|
|
|
return PHY_INTERFACE_MODE_TBI;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ecntrl & ECNTRL_REDUCED_MODE) {
|
2012-06-05 03:42:13 +00:00
|
|
|
if (ecntrl & ECNTRL_REDUCED_MII_MODE) {
|
2006-12-01 18:01:06 +00:00
|
|
|
return PHY_INTERFACE_MODE_RMII;
|
2012-06-05 03:42:13 +00:00
|
|
|
}
|
2007-07-11 16:43:07 +00:00
|
|
|
else {
|
2008-12-16 23:29:15 +00:00
|
|
|
phy_interface_t interface = priv->interface;
|
2007-07-11 16:43:07 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* This isn't autodetected right now, so it must
|
2007-07-11 16:43:07 +00:00
|
|
|
* be set by the device tree or platform code.
|
|
|
|
*/
|
|
|
|
if (interface == PHY_INTERFACE_MODE_RGMII_ID)
|
|
|
|
return PHY_INTERFACE_MODE_RGMII_ID;
|
|
|
|
|
2006-12-01 18:01:06 +00:00
|
|
|
return PHY_INTERFACE_MODE_RGMII;
|
2007-07-11 16:43:07 +00:00
|
|
|
}
|
2006-12-01 18:01:06 +00:00
|
|
|
}
|
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT)
|
2006-12-01 18:01:06 +00:00
|
|
|
return PHY_INTERFACE_MODE_GMII;
|
|
|
|
|
|
|
|
return PHY_INTERFACE_MODE_MII;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-09-24 02:54:21 +00:00
|
|
|
/* Initializes driver's PHY state, and attaches to the PHY.
|
|
|
|
* Returns 0 on success.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
static int init_phy(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2005-09-24 02:54:21 +00:00
|
|
|
uint gigabit_support =
|
2008-12-16 23:29:15 +00:00
|
|
|
priv->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT ?
|
2013-08-12 10:53:26 +00:00
|
|
|
GFAR_SUPPORTED_GBIT : 0;
|
2006-12-01 18:01:06 +00:00
|
|
|
phy_interface_t interface;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
priv->oldlink = 0;
|
|
|
|
priv->oldspeed = 0;
|
|
|
|
priv->oldduplex = -1;
|
|
|
|
|
2006-12-01 18:01:06 +00:00
|
|
|
interface = gfar_get_interface(dev);
|
|
|
|
|
2009-07-16 21:31:42 +00:00
|
|
|
priv->phydev = of_phy_connect(dev, priv->phy_node, &adjust_link, 0,
|
|
|
|
interface);
|
|
|
|
if (!priv->phydev) {
|
|
|
|
dev_err(&dev->dev, "could not attach to PHY\n");
|
|
|
|
return -ENODEV;
|
2009-04-25 12:53:12 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-05-11 23:25:11 +00:00
|
|
|
if (interface == PHY_INTERFACE_MODE_SGMII)
|
|
|
|
gfar_configure_serdes(dev);
|
|
|
|
|
2005-09-24 02:54:21 +00:00
|
|
|
/* Remove any features not supported by the controller */
|
2009-04-25 12:53:12 +00:00
|
|
|
priv->phydev->supported &= (GFAR_SUPPORTED | gigabit_support);
|
|
|
|
priv->phydev->advertising = priv->phydev->supported;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Initialize TBI PHY interface for communicating with the
|
2008-04-17 04:08:10 +00:00
|
|
|
* SERDES lynx PHY on the chip. We communicate with this PHY
|
|
|
|
* through the MDIO bus on each controller, treating it as a
|
|
|
|
* "normal" PHY at the address found in the TBIPA register. We assume
|
|
|
|
* that the TBIPA register is valid. Either the MDIO bus code will set
|
|
|
|
* it to a value that doesn't conflict with other PHYs on the bus, or the
|
|
|
|
* value doesn't matter, as there are no other PHYs on the bus.
|
|
|
|
*/
|
2007-05-11 23:25:11 +00:00
|
|
|
static void gfar_configure_serdes(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2009-04-25 12:53:12 +00:00
|
|
|
struct phy_device *tbiphy;
|
|
|
|
|
|
|
|
if (!priv->tbi_node) {
|
|
|
|
dev_warn(&dev->dev, "error: SGMII mode requires that the "
|
|
|
|
"device tree specify a tbi-handle\n");
|
|
|
|
return;
|
|
|
|
}
|
gianfar: Fix race in TBI/SerDes configuration
The init_phy() function attaches to the PHY, then configures the
SerDes<->TBI link (in SGMII mode). The TBI is on the MDIO bus with the PHY
(sort of) and is accessed via the gianfar's MDIO registers, using the
functions gfar_local_mdio_read/write(), which don't do any locking.
The previously attached PHY will start a work-queue on a timer, and
probably an irq handler as well, which will talk to the PHY and thus use
the MDIO bus. This uses phy_read/write(), which have locking, but not
against the gfar_local_mdio versions.
The result is that PHY code will try to use the MDIO bus at the same time
as the SerDes setup code, corrupting the transfers.
Setting up the SerDes before attaching to the PHY will insure that there is
no race between the SerDes code and *our* PHY, but doesn't fix everything.
Typically the PHYs for all gianfar devices are on the same MDIO bus, which
is associated with the first gianfar device. This means that the first
gianfar's SerDes code could corrupt the MDIO transfers for a different
gianfar's PHY.
The lock used by phy_read/write() is contained in the mii_bus structure,
which is pointed to by the PHY. This is difficult to access from the
gianfar drivers, as there is no link between a gianfar device and the
mii_bus which shares the same MDIO registers. As far as the device layer
and drivers are concerned they are two unrelated devices (which happen to
share registers).
Generally all gianfar devices' PHYs will be on the bus associated with the
first gianfar. But this might not be the case, so simply locking the
gianfar's PHY's mii bus might not lock the mii bus that the SerDes setup
code is going to use.
We solve this by having the code that creates the gianfar platform device
look in the device tree for an mdio device that shares the gianfar's
registers. If one is found the ID of its platform device is saved in the
gianfar's platform data.
A new function in the gianfar mii code, gfar_get_miibus(), can use the bus
ID to search through the platform devices for a gianfar_mdio device with
the right ID. The platform device's driver data is the mii_bus structure,
which the SerDes setup code can use to lock the current bus.
Signed-off-by: Trent Piepho <tpiepho@freescale.com>
CC: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
2008-10-31 01:17:06 +00:00
|
|
|
|
2009-04-25 12:53:12 +00:00
|
|
|
tbiphy = of_phy_find_device(priv->tbi_node);
|
|
|
|
if (!tbiphy) {
|
|
|
|
dev_err(&dev->dev, "error: Could not get TBI device\n");
|
2008-12-16 23:29:15 +00:00
|
|
|
return;
|
|
|
|
}
|
2007-05-11 23:25:11 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* If the link is already up, we must already be ok, and don't need to
|
2008-10-31 01:17:07 +00:00
|
|
|
* configure and reset the TBI<->SerDes link. Maybe U-Boot configured
|
|
|
|
* everything for us? Resetting it takes the link down and requires
|
|
|
|
* several seconds for it to come back.
|
|
|
|
*/
|
2009-04-25 12:53:12 +00:00
|
|
|
if (phy_read(tbiphy, MII_BMSR) & BMSR_LSTATUS)
|
2008-12-16 23:29:15 +00:00
|
|
|
return;
|
2007-05-11 23:25:11 +00:00
|
|
|
|
2008-04-17 04:08:10 +00:00
|
|
|
/* Single clk mode, mii mode off(for serdes communication) */
|
2009-04-25 12:53:12 +00:00
|
|
|
phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);
|
2007-05-11 23:25:11 +00:00
|
|
|
|
2009-04-25 12:53:12 +00:00
|
|
|
phy_write(tbiphy, MII_ADVERTISE,
|
2012-06-05 03:42:13 +00:00
|
|
|
ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
|
|
|
|
ADVERTISE_1000XPSE_ASYM);
|
2007-05-11 23:25:11 +00:00
|
|
|
|
2012-06-05 03:42:13 +00:00
|
|
|
phy_write(tbiphy, MII_BMCR,
|
|
|
|
BMCR_ANENABLE | BMCR_ANRESTART | BMCR_FULLDPLX |
|
|
|
|
BMCR_SPEED1000);
|
2007-05-11 23:25:11 +00:00
|
|
|
}
|
|
|
|
|
2010-06-30 06:39:15 +00:00
|
|
|
static int __gfar_is_rx_idle(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
u32 res;
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Normaly TSEC should not hang on GRS commands, so we should
|
2010-06-30 06:39:15 +00:00
|
|
|
* actually wait for IEVENT_GRSC flag.
|
|
|
|
*/
|
2013-10-09 17:20:40 +00:00
|
|
|
if (!gfar_has_errata(priv, GFAR_ERRATA_A002))
|
2010-06-30 06:39:15 +00:00
|
|
|
return 0;
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Read the eTSEC register at offset 0xD1C. If bits 7-14 are
|
2010-06-30 06:39:15 +00:00
|
|
|
* the same as bits 23-30, the eTSEC Rx is assumed to be idle
|
|
|
|
* and the Rx can be safely reset.
|
|
|
|
*/
|
|
|
|
res = gfar_read((void __iomem *)priv->gfargrp[0].regs + 0xd1c);
|
|
|
|
res &= 0x7f807f80;
|
|
|
|
if ((res & 0xffff) == (res >> 16))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-06-20 15:54:21 +00:00
|
|
|
|
|
|
|
/* Halt the receive and transmit queues */
|
2014-02-17 10:53:18 +00:00
|
|
|
static void gfar_halt_nodisable(struct gfar_private *priv)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2014-02-17 10:53:17 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2005-04-16 22:20:36 +00:00
|
|
|
u32 tempval;
|
|
|
|
|
2014-02-17 10:53:17 +00:00
|
|
|
gfar_ints_disable(priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Stop the DMA, and wait for it to stop */
|
2009-11-02 07:03:09 +00:00
|
|
|
tempval = gfar_read(®s->dmactrl);
|
2012-06-05 03:42:13 +00:00
|
|
|
if ((tempval & (DMACTRL_GRS | DMACTRL_GTS)) !=
|
|
|
|
(DMACTRL_GRS | DMACTRL_GTS)) {
|
2010-06-30 06:39:15 +00:00
|
|
|
int ret;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
tempval |= (DMACTRL_GRS | DMACTRL_GTS);
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->dmactrl, tempval);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2010-06-30 06:39:15 +00:00
|
|
|
do {
|
|
|
|
ret = spin_event_timeout(((gfar_read(®s->ievent) &
|
|
|
|
(IEVENT_GRSC | IEVENT_GTSC)) ==
|
|
|
|
(IEVENT_GRSC | IEVENT_GTSC)), 1000000, 0);
|
|
|
|
if (!ret && !(gfar_read(®s->ievent) & IEVENT_GRSC))
|
|
|
|
ret = __gfar_is_rx_idle(priv);
|
|
|
|
} while (!ret);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-07-11 23:04:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Halt the receive and transmit queues */
|
2014-02-17 10:53:18 +00:00
|
|
|
void gfar_halt(struct gfar_private *priv)
|
2008-07-11 23:04:45 +00:00
|
|
|
{
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2008-07-11 23:04:45 +00:00
|
|
|
u32 tempval;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
/* Dissable the Rx/Tx hw queues */
|
|
|
|
gfar_write(®s->rqueue, 0);
|
|
|
|
gfar_write(®s->tqueue, 0);
|
2008-08-12 20:10:46 +00:00
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
mdelay(10);
|
|
|
|
|
|
|
|
gfar_halt_nodisable(priv);
|
|
|
|
|
|
|
|
/* Disable Rx/Tx DMA */
|
2005-04-16 22:20:36 +00:00
|
|
|
tempval = gfar_read(®s->maccfg1);
|
|
|
|
tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);
|
|
|
|
gfar_write(®s->maccfg1, tempval);
|
2005-06-20 15:54:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void stop_gfar(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
netif_tx_stop_all_queues(dev);
|
2005-09-24 02:54:21 +00:00
|
|
|
|
2014-03-17 17:06:10 +00:00
|
|
|
smp_mb__before_atomic();
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
set_bit(GFAR_DOWN, &priv->state);
|
2014-03-17 17:06:10 +00:00
|
|
|
smp_mb__after_atomic();
|
2009-11-02 07:03:00 +00:00
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
disable_napi(priv);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
/* disable ints and gracefully shut down Rx/Tx DMA */
|
2014-02-17 10:53:18 +00:00
|
|
|
gfar_halt(priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
phy_stop(priv->phydev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
free_skb_resources(priv);
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
static void free_skb_tx_queue(struct gfar_priv_tx_q *tx_queue)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct txbd8 *txbdp;
|
2009-11-02 07:03:15 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(tx_queue->dev);
|
2008-12-18 00:51:04 +00:00
|
|
|
int i, j;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
txbdp = tx_queue->tx_bd_base;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
for (i = 0; i < tx_queue->tx_ring_size; i++) {
|
|
|
|
if (!tx_queue->tx_skbuff[i])
|
2008-12-18 00:51:04 +00:00
|
|
|
continue;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_unmap_single(priv->dev, txbdp->bufPtr,
|
2012-06-05 03:42:13 +00:00
|
|
|
txbdp->length, DMA_TO_DEVICE);
|
2008-12-18 00:51:04 +00:00
|
|
|
txbdp->lstatus = 0;
|
2009-11-02 07:03:15 +00:00
|
|
|
for (j = 0; j < skb_shinfo(tx_queue->tx_skbuff[i])->nr_frags;
|
2012-06-05 03:42:13 +00:00
|
|
|
j++) {
|
2008-12-18 00:51:04 +00:00
|
|
|
txbdp++;
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_unmap_page(priv->dev, txbdp->bufPtr,
|
2012-06-05 03:42:13 +00:00
|
|
|
txbdp->length, DMA_TO_DEVICE);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2008-05-07 18:20:55 +00:00
|
|
|
txbdp++;
|
2009-11-02 07:03:00 +00:00
|
|
|
dev_kfree_skb_any(tx_queue->tx_skbuff[i]);
|
|
|
|
tx_queue->tx_skbuff[i] = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2009-11-02 07:03:00 +00:00
|
|
|
kfree(tx_queue->tx_skbuff);
|
2012-11-08 22:11:41 +00:00
|
|
|
tx_queue->tx_skbuff = NULL;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
|
|
|
|
{
|
|
|
|
struct rxbd8 *rxbdp;
|
|
|
|
struct gfar_private *priv = netdev_priv(rx_queue->dev);
|
|
|
|
int i;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
rxbdp = rx_queue->rx_bd_base;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
for (i = 0; i < rx_queue->rx_ring_size; i++) {
|
|
|
|
if (rx_queue->rx_skbuff[i]) {
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_unmap_single(priv->dev, rxbdp->bufPtr,
|
|
|
|
priv->rx_buffer_size,
|
2012-06-05 03:42:13 +00:00
|
|
|
DMA_FROM_DEVICE);
|
2009-11-02 07:03:00 +00:00
|
|
|
dev_kfree_skb_any(rx_queue->rx_skbuff[i]);
|
|
|
|
rx_queue->rx_skbuff[i] = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2009-10-12 06:00:30 +00:00
|
|
|
rxbdp->lstatus = 0;
|
|
|
|
rxbdp->bufPtr = 0;
|
|
|
|
rxbdp++;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2009-11-02 07:03:00 +00:00
|
|
|
kfree(rx_queue->rx_skbuff);
|
2012-11-08 22:11:41 +00:00
|
|
|
rx_queue->rx_skbuff = NULL;
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
2009-10-12 06:00:30 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
/* If there are any tx skbs or rx skbs still around, free them.
|
2012-06-05 03:42:12 +00:00
|
|
|
* Then free tx_skbuff and rx_skbuff
|
|
|
|
*/
|
2009-11-02 07:03:15 +00:00
|
|
|
static void free_skb_resources(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|
|
|
|
struct gfar_priv_rx_q *rx_queue = NULL;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Go through all the buffer descriptors and free their data buffers */
|
|
|
|
for (i = 0; i < priv->num_tx_queues; i++) {
|
2012-01-06 18:51:03 +00:00
|
|
|
struct netdev_queue *txq;
|
2012-06-05 03:42:13 +00:00
|
|
|
|
2009-11-02 07:03:15 +00:00
|
|
|
tx_queue = priv->tx_queue[i];
|
2012-01-06 18:51:03 +00:00
|
|
|
txq = netdev_get_tx_queue(tx_queue->dev, tx_queue->qindex);
|
2012-06-05 03:42:13 +00:00
|
|
|
if (tx_queue->tx_skbuff)
|
2009-11-02 07:03:15 +00:00
|
|
|
free_skb_tx_queue(tx_queue);
|
2012-01-06 18:51:03 +00:00
|
|
|
netdev_tx_reset_queue(txq);
|
2009-11-02 07:03:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < priv->num_rx_queues; i++) {
|
|
|
|
rx_queue = priv->rx_queue[i];
|
2012-06-05 03:42:13 +00:00
|
|
|
if (rx_queue->rx_skbuff)
|
2009-11-02 07:03:15 +00:00
|
|
|
free_skb_rx_queue(rx_queue);
|
|
|
|
}
|
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_free_coherent(priv->dev,
|
2012-06-05 03:42:13 +00:00
|
|
|
sizeof(struct txbd8) * priv->total_tx_ring_size +
|
|
|
|
sizeof(struct rxbd8) * priv->total_rx_ring_size,
|
|
|
|
priv->tx_queue[0]->tx_bd_base,
|
|
|
|
priv->tx_queue[0]->tx_bd_dma_base);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
void gfar_start(struct gfar_private *priv)
|
2005-06-20 15:54:21 +00:00
|
|
|
{
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2005-06-20 15:54:21 +00:00
|
|
|
u32 tempval;
|
2009-11-02 07:03:34 +00:00
|
|
|
int i = 0;
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
/* Enable Rx/Tx hw queues */
|
|
|
|
gfar_write(®s->rqueue, priv->rqueue);
|
|
|
|
gfar_write(®s->tqueue, priv->tqueue);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
|
|
|
/* Initialize DMACTRL to have WWR and WOP */
|
2009-11-02 07:03:09 +00:00
|
|
|
tempval = gfar_read(®s->dmactrl);
|
2005-06-20 15:54:21 +00:00
|
|
|
tempval |= DMACTRL_INIT_SETTINGS;
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->dmactrl, tempval);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
|
|
|
/* Make sure we aren't stopped */
|
2009-11-02 07:03:09 +00:00
|
|
|
tempval = gfar_read(®s->dmactrl);
|
2005-06-20 15:54:21 +00:00
|
|
|
tempval &= ~(DMACTRL_GRS | DMACTRL_GTS);
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->dmactrl, tempval);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
regs = priv->gfargrp[i].regs;
|
|
|
|
/* Clear THLT/RHLT, so that the DMA starts polling now */
|
|
|
|
gfar_write(®s->tstat, priv->gfargrp[i].tstat);
|
|
|
|
gfar_write(®s->rstat, priv->gfargrp[i].rstat);
|
|
|
|
}
|
2008-12-16 23:30:20 +00:00
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
/* Enable Rx/Tx DMA */
|
|
|
|
tempval = gfar_read(®s->maccfg1);
|
|
|
|
tempval |= (MACCFG1_RX_EN | MACCFG1_TX_EN);
|
|
|
|
gfar_write(®s->maccfg1, tempval);
|
|
|
|
|
2014-02-17 10:53:17 +00:00
|
|
|
gfar_ints_enable(priv);
|
|
|
|
|
2014-02-17 10:53:18 +00:00
|
|
|
priv->ndev->trans_start = jiffies; /* prevent tx timeout */
|
2005-06-20 15:54:21 +00:00
|
|
|
}
|
|
|
|
|
2014-02-24 10:13:44 +00:00
|
|
|
static void free_grp_irqs(struct gfar_priv_grp *grp)
|
|
|
|
{
|
|
|
|
free_irq(gfar_irq(grp, TX)->irq, grp);
|
|
|
|
free_irq(gfar_irq(grp, RX)->irq, grp);
|
|
|
|
free_irq(gfar_irq(grp, ER)->irq, grp);
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
static int register_grp_irqs(struct gfar_priv_grp *grp)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = grp->priv;
|
|
|
|
struct net_device *dev = priv->ndev;
|
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* If the device has multiple interrupts, register for
|
2012-06-05 03:42:12 +00:00
|
|
|
* them. Otherwise, only register for the one
|
|
|
|
*/
|
2008-12-16 23:29:15 +00:00
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
|
2005-06-20 15:54:21 +00:00
|
|
|
/* Install our interrupt handlers for Error,
|
2012-06-05 03:42:12 +00:00
|
|
|
* Transmit, and Receive
|
|
|
|
*/
|
2013-01-29 03:55:12 +00:00
|
|
|
err = request_irq(gfar_irq(grp, ER)->irq, gfar_error, 0,
|
|
|
|
gfar_irq(grp, ER)->name, grp);
|
|
|
|
if (err < 0) {
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_err(priv, intr, dev, "Can't get IRQ %d\n",
|
2013-01-29 03:55:12 +00:00
|
|
|
gfar_irq(grp, ER)->irq);
|
2009-11-02 07:03:34 +00:00
|
|
|
|
2010-08-05 10:26:20 +00:00
|
|
|
goto err_irq_fail;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2013-01-29 03:55:12 +00:00
|
|
|
err = request_irq(gfar_irq(grp, TX)->irq, gfar_transmit, 0,
|
|
|
|
gfar_irq(grp, TX)->name, grp);
|
|
|
|
if (err < 0) {
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_err(priv, intr, dev, "Can't get IRQ %d\n",
|
2013-01-29 03:55:12 +00:00
|
|
|
gfar_irq(grp, TX)->irq);
|
2005-04-16 22:20:36 +00:00
|
|
|
goto tx_irq_fail;
|
|
|
|
}
|
2013-01-29 03:55:12 +00:00
|
|
|
err = request_irq(gfar_irq(grp, RX)->irq, gfar_receive, 0,
|
|
|
|
gfar_irq(grp, RX)->name, grp);
|
|
|
|
if (err < 0) {
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_err(priv, intr, dev, "Can't get IRQ %d\n",
|
2013-01-29 03:55:12 +00:00
|
|
|
gfar_irq(grp, RX)->irq);
|
2005-04-16 22:20:36 +00:00
|
|
|
goto rx_irq_fail;
|
|
|
|
}
|
|
|
|
} else {
|
2013-01-29 03:55:12 +00:00
|
|
|
err = request_irq(gfar_irq(grp, TX)->irq, gfar_interrupt, 0,
|
|
|
|
gfar_irq(grp, TX)->name, grp);
|
|
|
|
if (err < 0) {
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_err(priv, intr, dev, "Can't get IRQ %d\n",
|
2013-01-29 03:55:12 +00:00
|
|
|
gfar_irq(grp, TX)->irq);
|
2005-04-16 22:20:36 +00:00
|
|
|
goto err_irq_fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
rx_irq_fail:
|
2013-01-29 03:55:12 +00:00
|
|
|
free_irq(gfar_irq(grp, TX)->irq, grp);
|
2009-11-02 07:03:34 +00:00
|
|
|
tx_irq_fail:
|
2013-01-29 03:55:12 +00:00
|
|
|
free_irq(gfar_irq(grp, ER)->irq, grp);
|
2009-11-02 07:03:34 +00:00
|
|
|
err_irq_fail:
|
|
|
|
return err;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-02-24 10:13:44 +00:00
|
|
|
static void gfar_free_irq(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Free the IRQs */
|
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
|
|
|
|
for (i = 0; i < priv->num_grps; i++)
|
|
|
|
free_grp_irqs(&priv->gfargrp[i]);
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < priv->num_grps; i++)
|
|
|
|
free_irq(gfar_irq(&priv->gfargrp[i], TX)->irq,
|
|
|
|
&priv->gfargrp[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_request_irq(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
int err, i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
|
|
|
err = register_grp_irqs(&priv->gfargrp[i]);
|
|
|
|
if (err) {
|
|
|
|
for (j = 0; j < i; j++)
|
|
|
|
free_grp_irqs(&priv->gfargrp[j]);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:34 +00:00
|
|
|
/* Bring the controller up and running */
|
|
|
|
int startup_gfar(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(ndev);
|
2014-02-24 10:13:44 +00:00
|
|
|
int err;
|
2009-11-02 07:03:34 +00:00
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
gfar_mac_reset(priv);
|
2009-11-02 07:03:34 +00:00
|
|
|
|
|
|
|
err = gfar_alloc_skb_resources(ndev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
gianfar: Implement MAC reset and reconfig procedure
The main MAC config registers like: RCTRL/TCTRL, MRBLR,
MAXFRM, RXIC/TXIC, most fields of MACCFG1/2, should not
be changed on-the-fly, but at least after stopping the
DMA and disabling the Rx/Tx blocks and, for increased
reliability, after a MAC soft reset.
Impelement a complete MAC soft reset and reconfig procedure
following the latest HW advisories - gfar_mac_reset() - to
replace gfar_mac_init() and (the confusing) init_registers()
functions.
Factor out separate config functions for RCTRL and TCTRL,
insure programming order of the relevant config regs after
MAC soft reset.
Split gfar_hw_init() into gfar_mac_reset() and the remaining
global regs that don't need to be reconfigured after MAC soft
reset (FIFOCFG, ATTRELI, HW counters a.s.o).
As gfar_hw_init() now makes all the register writes @probe()
time, based on all the device flags and config options, it
must be moved further down, just before register_netdev(),
as the last config step when the config values are comitted
to HW. Also, move netif_carrier_off() after register_netdev(),
because it has no effect if called before.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:42 +00:00
|
|
|
gfar_init_tx_rx_base(priv);
|
2009-11-02 07:03:34 +00:00
|
|
|
|
2014-03-17 17:06:10 +00:00
|
|
|
smp_mb__before_atomic();
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
clear_bit(GFAR_DOWN, &priv->state);
|
2014-03-17 17:06:10 +00:00
|
|
|
smp_mb__after_atomic();
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
|
|
|
|
/* Start Rx/Tx DMA and enable the interrupts */
|
2014-02-17 10:53:18 +00:00
|
|
|
gfar_start(priv);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-10-12 06:00:34 +00:00
|
|
|
phy_start(priv->phydev);
|
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
enable_napi(priv);
|
|
|
|
|
|
|
|
netif_tx_wake_all_queues(ndev);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Called when something needs to use the ethernet device
|
|
|
|
* Returns 0 for success.
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static int gfar_enet_open(struct net_device *dev)
|
|
|
|
{
|
2007-10-12 13:53:51 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
int err;
|
|
|
|
|
|
|
|
err = init_phy(dev);
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
if (err)
|
2005-04-16 22:20:36 +00:00
|
|
|
return err;
|
|
|
|
|
2014-02-24 10:13:44 +00:00
|
|
|
err = gfar_request_irq(priv);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
err = startup_gfar(dev);
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
if (err)
|
2007-10-17 19:57:46 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-02-01 08:52:34 +00:00
|
|
|
device_set_wakeup_enable(&dev->dev, priv->wol_en);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-03-27 07:38:45 +00:00
|
|
|
static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb)
|
2005-06-20 15:54:21 +00:00
|
|
|
{
|
2009-03-27 07:38:45 +00:00
|
|
|
struct txfcb *fcb = (struct txfcb *)skb_push(skb, GMAC_FCB_LEN);
|
2009-04-28 15:04:10 +00:00
|
|
|
|
|
|
|
memset(fcb, 0, GMAC_FCB_LEN);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
|
|
|
return fcb;
|
|
|
|
}
|
|
|
|
|
2012-01-09 23:26:51 +00:00
|
|
|
static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,
|
2012-06-05 03:42:13 +00:00
|
|
|
int fcb_length)
|
2005-06-20 15:54:21 +00:00
|
|
|
{
|
|
|
|
/* If we're here, it's a IP packet with a TCP or UDP
|
|
|
|
* payload. We set it to checksum, using a pseudo-header
|
|
|
|
* we provide
|
|
|
|
*/
|
2012-06-05 03:42:14 +00:00
|
|
|
u8 flags = TXFCB_DEFAULT;
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Tell the controller what the protocol is
|
|
|
|
* And provide the already calculated phcs
|
|
|
|
*/
|
2007-04-21 05:47:35 +00:00
|
|
|
if (ip_hdr(skb)->protocol == IPPROTO_UDP) {
|
2005-11-11 18:38:59 +00:00
|
|
|
flags |= TXFCB_UDP;
|
2007-03-13 17:28:48 +00:00
|
|
|
fcb->phcs = udp_hdr(skb)->check;
|
2005-11-11 18:38:59 +00:00
|
|
|
} else
|
2007-06-29 05:12:04 +00:00
|
|
|
fcb->phcs = tcp_hdr(skb)->check;
|
2005-06-20 15:54:21 +00:00
|
|
|
|
|
|
|
/* l3os is the distance between the start of the
|
|
|
|
* frame (skb->data) and the start of the IP hdr.
|
|
|
|
* l4os is the distance between the start of the
|
2012-06-05 03:42:12 +00:00
|
|
|
* l3 hdr and the l4 hdr
|
|
|
|
*/
|
2012-01-09 23:26:51 +00:00
|
|
|
fcb->l3os = (u16)(skb_network_offset(skb) - fcb_length);
|
2007-03-16 20:26:39 +00:00
|
|
|
fcb->l4os = skb_network_header_len(skb);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2005-11-11 18:38:59 +00:00
|
|
|
fcb->flags = flags;
|
2005-06-20 15:54:21 +00:00
|
|
|
}
|
|
|
|
|
2005-11-11 18:38:59 +00:00
|
|
|
void inline gfar_tx_vlan(struct sk_buff *skb, struct txfcb *fcb)
|
2005-06-20 15:54:21 +00:00
|
|
|
{
|
2005-11-11 18:38:59 +00:00
|
|
|
fcb->flags |= TXFCB_VLN;
|
2005-06-20 15:54:21 +00:00
|
|
|
fcb->vlctl = vlan_tx_tag_get(skb);
|
|
|
|
}
|
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
static inline struct txbd8 *skip_txbd(struct txbd8 *bdp, int stride,
|
2012-06-05 03:42:13 +00:00
|
|
|
struct txbd8 *base, int ring_size)
|
2008-12-18 00:51:04 +00:00
|
|
|
{
|
|
|
|
struct txbd8 *new_bd = bdp + stride;
|
|
|
|
|
|
|
|
return (new_bd >= (base + ring_size)) ? (new_bd - ring_size) : new_bd;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct txbd8 *next_txbd(struct txbd8 *bdp, struct txbd8 *base,
|
2012-06-05 03:42:13 +00:00
|
|
|
int ring_size)
|
2008-12-18 00:51:04 +00:00
|
|
|
{
|
|
|
|
return skip_txbd(bdp, 1, base, ring_size);
|
|
|
|
}
|
|
|
|
|
2013-08-05 14:20:09 +00:00
|
|
|
/* eTSEC12: csum generation not supported for some fcb offsets */
|
|
|
|
static inline bool gfar_csum_errata_12(struct gfar_private *priv,
|
|
|
|
unsigned long fcb_addr)
|
|
|
|
{
|
|
|
|
return (gfar_has_errata(priv, GFAR_ERRATA_12) &&
|
|
|
|
(fcb_addr % 0x20) > 0x18);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* eTSEC76: csum generation for frames larger than 2500 may
|
|
|
|
* cause excess delays before start of transmission
|
|
|
|
*/
|
|
|
|
static inline bool gfar_csum_errata_76(struct gfar_private *priv,
|
|
|
|
unsigned int len)
|
|
|
|
{
|
|
|
|
return (gfar_has_errata(priv, GFAR_ERRATA_76) &&
|
|
|
|
(len > 2500));
|
|
|
|
}
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* This is called by the kernel when a frame is ready for transmission.
|
|
|
|
* It is pointed to by the dev->hard_start_xmit function pointer
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2009-11-02 07:03:00 +00:00
|
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|
2009-11-02 07:03:15 +00:00
|
|
|
struct netdev_queue *txq;
|
2009-11-02 07:03:09 +00:00
|
|
|
struct gfar __iomem *regs = NULL;
|
2005-06-20 15:54:21 +00:00
|
|
|
struct txfcb *fcb = NULL;
|
2010-04-08 23:10:35 +00:00
|
|
|
struct txbd8 *txbdp, *txbdp_start, *base, *txbdp_tstamp = NULL;
|
2008-12-16 23:34:50 +00:00
|
|
|
u32 lstatus;
|
2013-08-05 14:20:10 +00:00
|
|
|
int i, rq = 0;
|
|
|
|
int do_tstamp, do_csum, do_vlan;
|
2008-12-18 00:51:04 +00:00
|
|
|
u32 bufaddr;
|
2006-04-20 21:44:29 +00:00
|
|
|
unsigned long flags;
|
2013-08-30 12:01:15 +00:00
|
|
|
unsigned int nr_frags, nr_txbds, bytes_sent, fcb_len = 0;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
|
|
|
rq = skb->queue_mapping;
|
|
|
|
tx_queue = priv->tx_queue[rq];
|
|
|
|
txq = netdev_get_tx_queue(dev, rq);
|
2009-11-02 07:03:00 +00:00
|
|
|
base = tx_queue->tx_bd_base;
|
2009-11-02 07:03:34 +00:00
|
|
|
regs = tx_queue->grp->regs;
|
2010-04-08 23:10:35 +00:00
|
|
|
|
2013-08-05 14:20:10 +00:00
|
|
|
do_csum = (CHECKSUM_PARTIAL == skb->ip_summed);
|
|
|
|
do_vlan = vlan_tx_tag_present(skb);
|
|
|
|
do_tstamp = (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
|
|
|
|
priv->hwts_tx_en;
|
|
|
|
|
|
|
|
if (do_csum || do_vlan)
|
|
|
|
fcb_len = GMAC_FCB_LEN;
|
|
|
|
|
2010-04-08 23:10:35 +00:00
|
|
|
/* check if time stamp should be generated */
|
2013-08-05 14:20:10 +00:00
|
|
|
if (unlikely(do_tstamp))
|
|
|
|
fcb_len = GMAC_FCB_LEN + GMAC_TXPAL_LEN;
|
2008-12-18 00:51:04 +00:00
|
|
|
|
2009-03-27 22:54:30 +00:00
|
|
|
/* make space for additional header when fcb is needed */
|
2013-08-05 14:20:10 +00:00
|
|
|
if (fcb_len && unlikely(skb_headroom(skb) < fcb_len)) {
|
2009-03-27 07:38:45 +00:00
|
|
|
struct sk_buff *skb_new;
|
|
|
|
|
2013-08-05 14:20:10 +00:00
|
|
|
skb_new = skb_realloc_headroom(skb, fcb_len);
|
2009-03-27 07:38:45 +00:00
|
|
|
if (!skb_new) {
|
|
|
|
dev->stats.tx_errors++;
|
2014-03-11 21:20:26 +00:00
|
|
|
dev_kfree_skb_any(skb);
|
2009-03-27 07:38:45 +00:00
|
|
|
return NETDEV_TX_OK;
|
|
|
|
}
|
2012-01-09 23:26:50 +00:00
|
|
|
|
2012-07-05 11:45:13 +00:00
|
|
|
if (skb->sk)
|
|
|
|
skb_set_owner_w(skb_new, skb->sk);
|
2014-03-11 21:20:26 +00:00
|
|
|
dev_consume_skb_any(skb);
|
2009-03-27 07:38:45 +00:00
|
|
|
skb = skb_new;
|
|
|
|
}
|
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
/* total number of fragments in the SKB */
|
|
|
|
nr_frags = skb_shinfo(skb)->nr_frags;
|
|
|
|
|
2010-04-08 23:10:35 +00:00
|
|
|
/* calculate the required number of TxBDs for this skb */
|
|
|
|
if (unlikely(do_tstamp))
|
|
|
|
nr_txbds = nr_frags + 2;
|
|
|
|
else
|
|
|
|
nr_txbds = nr_frags + 1;
|
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
/* check if there is space to queue this packet */
|
2010-04-08 23:10:35 +00:00
|
|
|
if (nr_txbds > tx_queue->num_txbdfree) {
|
2008-12-18 00:51:04 +00:00
|
|
|
/* no space, stop the queue */
|
2009-11-02 07:03:15 +00:00
|
|
|
netif_tx_stop_queue(txq);
|
2008-12-18 00:51:04 +00:00
|
|
|
dev->stats.tx_fifo_errors++;
|
|
|
|
return NETDEV_TX_BUSY;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Update transmit stats */
|
2013-08-30 12:01:15 +00:00
|
|
|
bytes_sent = skb->len;
|
|
|
|
tx_queue->stats.tx_bytes += bytes_sent;
|
|
|
|
/* keep Tx bytes on wire for BQL accounting */
|
|
|
|
GFAR_CB(skb)->bytes_sent = bytes_sent;
|
2011-01-12 12:13:14 +00:00
|
|
|
tx_queue->stats.tx_packets++;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
txbdp = txbdp_start = tx_queue->cur_tx;
|
2010-04-08 23:10:35 +00:00
|
|
|
lstatus = txbdp->lstatus;
|
|
|
|
|
|
|
|
/* Time stamp insertion requires one additional TxBD */
|
|
|
|
if (unlikely(do_tstamp))
|
|
|
|
txbdp_tstamp = txbdp = next_txbd(txbdp, base,
|
2012-06-05 03:42:13 +00:00
|
|
|
tx_queue->tx_ring_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
if (nr_frags == 0) {
|
2010-04-08 23:10:35 +00:00
|
|
|
if (unlikely(do_tstamp))
|
|
|
|
txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_LAST |
|
2012-06-05 03:42:13 +00:00
|
|
|
TXBD_INTERRUPT);
|
2010-04-08 23:10:35 +00:00
|
|
|
else
|
|
|
|
lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
|
2008-12-18 00:51:04 +00:00
|
|
|
} else {
|
|
|
|
/* Place the fragment addresses and lengths into the TxBDs */
|
|
|
|
for (i = 0; i < nr_frags; i++) {
|
2013-08-30 12:01:15 +00:00
|
|
|
unsigned int frag_len;
|
2008-12-18 00:51:04 +00:00
|
|
|
/* Point at the next BD, wrapping as needed */
|
2009-11-02 07:03:00 +00:00
|
|
|
txbdp = next_txbd(txbdp, base, tx_queue->tx_ring_size);
|
2008-12-18 00:51:04 +00:00
|
|
|
|
2013-08-30 12:01:15 +00:00
|
|
|
frag_len = skb_shinfo(skb)->frags[i].size;
|
2008-12-18 00:51:04 +00:00
|
|
|
|
2013-08-30 12:01:15 +00:00
|
|
|
lstatus = txbdp->lstatus | frag_len |
|
2012-06-05 03:42:13 +00:00
|
|
|
BD_LFLAG(TXBD_READY);
|
2008-12-18 00:51:04 +00:00
|
|
|
|
|
|
|
/* Handle the last BD specially */
|
|
|
|
if (i == nr_frags - 1)
|
|
|
|
lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
bufaddr = skb_frag_dma_map(priv->dev,
|
2011-08-29 23:18:29 +00:00
|
|
|
&skb_shinfo(skb)->frags[i],
|
|
|
|
0,
|
2013-08-30 12:01:15 +00:00
|
|
|
frag_len,
|
2011-08-29 23:18:29 +00:00
|
|
|
DMA_TO_DEVICE);
|
2008-12-18 00:51:04 +00:00
|
|
|
|
|
|
|
/* set the TxBD length and buffer pointer */
|
|
|
|
txbdp->bufPtr = bufaddr;
|
|
|
|
txbdp->lstatus = lstatus;
|
|
|
|
}
|
|
|
|
|
|
|
|
lstatus = txbdp_start->lstatus;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-01-09 23:26:51 +00:00
|
|
|
/* Add TxPAL between FCB and frame if required */
|
|
|
|
if (unlikely(do_tstamp)) {
|
|
|
|
skb_push(skb, GMAC_TXPAL_LEN);
|
|
|
|
memset(skb->data, 0, GMAC_TXPAL_LEN);
|
|
|
|
}
|
|
|
|
|
2013-08-05 14:20:10 +00:00
|
|
|
/* Add TxFCB if required */
|
|
|
|
if (fcb_len) {
|
2009-03-27 07:38:45 +00:00
|
|
|
fcb = gfar_add_fcb(skb);
|
2013-08-05 14:20:09 +00:00
|
|
|
lstatus |= BD_LFLAG(TXBD_TOE);
|
2013-08-05 14:20:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set up checksumming */
|
|
|
|
if (do_csum) {
|
|
|
|
gfar_tx_checksum(skb, fcb, fcb_len);
|
2013-08-05 14:20:09 +00:00
|
|
|
|
|
|
|
if (unlikely(gfar_csum_errata_12(priv, (unsigned long)fcb)) ||
|
|
|
|
unlikely(gfar_csum_errata_76(priv, skb->len))) {
|
2011-03-16 17:57:13 +00:00
|
|
|
__skb_pull(skb, GMAC_FCB_LEN);
|
|
|
|
skb_checksum_help(skb);
|
2013-08-05 14:20:10 +00:00
|
|
|
if (do_vlan || do_tstamp) {
|
|
|
|
/* put back a new fcb for vlan/tstamp TOE */
|
|
|
|
fcb = gfar_add_fcb(skb);
|
|
|
|
} else {
|
|
|
|
/* Tx TOE not used */
|
|
|
|
lstatus &= ~(BD_LFLAG(TXBD_TOE));
|
|
|
|
fcb = NULL;
|
|
|
|
}
|
2011-03-16 17:57:13 +00:00
|
|
|
}
|
2005-06-20 15:54:21 +00:00
|
|
|
}
|
|
|
|
|
2013-08-05 14:20:10 +00:00
|
|
|
if (do_vlan)
|
2009-03-27 07:38:45 +00:00
|
|
|
gfar_tx_vlan(skb, fcb);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2010-04-08 23:10:35 +00:00
|
|
|
/* Setup tx hardware time stamping if requested */
|
|
|
|
if (unlikely(do_tstamp)) {
|
2010-08-17 08:59:14 +00:00
|
|
|
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
|
2010-04-08 23:10:35 +00:00
|
|
|
fcb->ptp = 1;
|
|
|
|
}
|
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
txbdp_start->bufPtr = dma_map_single(priv->dev, skb->data,
|
2012-06-05 03:42:13 +00:00
|
|
|
skb_headlen(skb), DMA_TO_DEVICE);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* If time stamping is requested one additional TxBD must be set up. The
|
2010-04-08 23:10:35 +00:00
|
|
|
* first TxBD points to the FCB and must have a data length of
|
|
|
|
* GMAC_FCB_LEN. The second TxBD points to the actual frame data with
|
|
|
|
* the full frame length.
|
|
|
|
*/
|
|
|
|
if (unlikely(do_tstamp)) {
|
2013-08-05 14:20:10 +00:00
|
|
|
txbdp_tstamp->bufPtr = txbdp_start->bufPtr + fcb_len;
|
2010-04-08 23:10:35 +00:00
|
|
|
txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_READY) |
|
2013-08-05 14:20:10 +00:00
|
|
|
(skb_headlen(skb) - fcb_len);
|
2010-04-08 23:10:35 +00:00
|
|
|
lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | GMAC_FCB_LEN;
|
|
|
|
} else {
|
|
|
|
lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | skb_headlen(skb);
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-08-30 12:01:15 +00:00
|
|
|
netdev_tx_sent_queue(txq, bytes_sent);
|
2012-01-06 18:51:03 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* We can work in parallel with gfar_clean_tx_ring(), except
|
2009-11-10 14:11:10 +00:00
|
|
|
* when modifying num_txbdfree. Note that we didn't grab the lock
|
|
|
|
* when we were reading the num_txbdfree and checking for available
|
|
|
|
* space, that's because outside of this function it can only grow,
|
|
|
|
* and once we've got needed space, it cannot suddenly disappear.
|
|
|
|
*
|
|
|
|
* The lock also protects us from gfar_error(), which can modify
|
|
|
|
* regs->tstat and thus retrigger the transfers, which is why we
|
|
|
|
* also must grab the lock before setting ready bit for the first
|
|
|
|
* to be transmitted BD.
|
|
|
|
*/
|
|
|
|
spin_lock_irqsave(&tx_queue->txlock, flags);
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* The powerpc-specific eieio() is used, as wmb() has too strong
|
2007-05-16 20:06:59 +00:00
|
|
|
* semantics (it requires synchronization between cacheable and
|
|
|
|
* uncacheable mappings, which eieio doesn't provide and which we
|
|
|
|
* don't need), thus requiring a more expensive sync instruction. At
|
|
|
|
* some point, the set of architecture-independent barrier functions
|
|
|
|
* should be expanded to include weaker barriers.
|
|
|
|
*/
|
|
|
|
eieio();
|
2005-11-11 18:38:59 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
txbdp_start->lstatus = lstatus;
|
|
|
|
|
gianfar: Fix TX ring processing on SMP machines
Starting with commit a3bc1f11e9b867a4f49505 ("gianfar: Revive SKB
recycling") gianfar driver sooner or later stops transmitting any
packets on SMP machines.
start_xmit() prepares new skb for transmitting, generally it does
three things:
1. sets up all BDs (marks them ready to send), except the first one.
2. stores skb into tx_queue->tx_skbuff so that clean_tx_ring()
would cleanup it later.
3. sets up the first BD, i.e. marks it ready.
Here is what clean_tx_ring() does:
1. reads skbs from tx_queue->tx_skbuff
2. checks if the *last* BD is ready. If it's still ready [to send]
then it it isn't transmitted, so clean_tx_ring() returns.
Otherwise it actually cleanups BDs. All is OK.
Now, if there is just one BD, code flow:
- start_xmit(): stores skb into tx_skbuff. Note that the first BD
(which is also the last one) isn't marked as ready, yet.
- clean_tx_ring(): sees that skb is not null, *and* its lstatus
says that it is NOT ready (like if BD was sent), so it cleans
it up (bad!)
- start_xmit(): marks BD as ready [to send], but it's too late.
We can fix this simply by reordering lstatus/tx_skbuff writes.
Reported-by: Martyn Welch <martyn.welch@ge.com>
Bisected-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Tested-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Tested-by: Martyn Welch <martyn.welch@ge.com>
Cc: Sandeep Gopalpet <Sandeep.Kumar@freescale.com>
Cc: Stable <stable@vger.kernel.org> [2.6.33]
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-03-03 08:18:58 +00:00
|
|
|
eieio(); /* force lstatus write before tx_skbuff */
|
|
|
|
|
|
|
|
tx_queue->tx_skbuff[tx_queue->skb_curtx] = skb;
|
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
/* Update the current skb pointer to the next entry we will use
|
2012-06-05 03:42:12 +00:00
|
|
|
* (wrapping if necessary)
|
|
|
|
*/
|
2009-11-02 07:03:00 +00:00
|
|
|
tx_queue->skb_curtx = (tx_queue->skb_curtx + 1) &
|
2012-06-05 03:42:13 +00:00
|
|
|
TX_RING_MOD_MASK(tx_queue->tx_ring_size);
|
2008-12-18 00:51:04 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
tx_queue->cur_tx = next_txbd(txbdp, base, tx_queue->tx_ring_size);
|
2008-12-18 00:51:04 +00:00
|
|
|
|
|
|
|
/* reduce TxBD free count */
|
2010-04-08 23:10:35 +00:00
|
|
|
tx_queue->num_txbdfree -= (nr_txbds);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* If the next BD still needs to be cleaned up, then the bds
|
2012-06-05 03:42:12 +00:00
|
|
|
* are full. We need to tell the kernel to stop sending us stuff.
|
|
|
|
*/
|
2009-11-02 07:03:00 +00:00
|
|
|
if (!tx_queue->num_txbdfree) {
|
2009-11-02 07:03:15 +00:00
|
|
|
netif_tx_stop_queue(txq);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.tx_fifo_errors++;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Tell the DMA to go go go */
|
2009-11-02 07:03:15 +00:00
|
|
|
gfar_write(®s->tstat, TSTAT_CLEAR_THALT >> tx_queue->qindex);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Unlock priv */
|
2009-11-02 07:03:00 +00:00
|
|
|
spin_unlock_irqrestore(&tx_queue->txlock, flags);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-03-27 07:38:45 +00:00
|
|
|
return NETDEV_TX_OK;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Stops the kernel queue, and halts the controller */
|
|
|
|
static int gfar_close(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
[NET]: Make NAPI polling independent of struct net_device objects.
Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.
In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.
The signature of the ->poll() call back goes from:
int foo_poll(struct net_device *dev, int *budget)
to
int foo_poll(struct napi_struct *napi, int budget)
The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract). The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.
The napi_struct is to be embedded in the device driver private data
structures.
Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler. Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.
With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.
Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.
[ Ported to current tree and all drivers converted. Integrated
Stephen's follow-on kerneldoc additions, and restored poll_list
handling to the old style to fix mutual exclusion issues. -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-10-03 23:41:36 +00:00
|
|
|
|
2008-08-19 19:12:45 +00:00
|
|
|
cancel_work_sync(&priv->reset_task);
|
2005-04-16 22:20:36 +00:00
|
|
|
stop_gfar(dev);
|
|
|
|
|
2005-09-24 02:54:21 +00:00
|
|
|
/* Disconnect from the PHY */
|
|
|
|
phy_disconnect(priv->phydev);
|
|
|
|
priv->phydev = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-02-24 10:13:44 +00:00
|
|
|
gfar_free_irq(priv);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Changes the mac address if the controller is not running. */
|
2008-05-02 18:00:30 +00:00
|
|
|
static int gfar_set_mac_address(struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-11-11 18:38:59 +00:00
|
|
|
gfar_set_mac_for_addr(dev, 0, dev->dev_addr);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_change_mtu(struct net_device *dev, int new_mtu)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2005-06-20 15:54:21 +00:00
|
|
|
int frame_size = new_mtu + ETH_HLEN;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
if ((frame_size < 64) || (frame_size > JUMBO_FRAME_SIZE)) {
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_err(priv, drv, dev, "Invalid MTU setting\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
while (test_and_set_bit_lock(GFAR_RESETTING, &priv->state))
|
|
|
|
cpu_relax();
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (dev->flags & IFF_UP)
|
2005-04-16 22:20:36 +00:00
|
|
|
stop_gfar(dev);
|
|
|
|
|
|
|
|
dev->mtu = new_mtu;
|
|
|
|
|
gianfar: Fix on-the-fly vlan and mtu updates
The RCTRL and TCTRL registers should not be changed
on-the-fly, while the controller is running, otherwise
unexpected behaviour occurs. But that's exactly what
gfar_vlan_mode() does, updating the VLAN acceleration
bits inside RCTRL/TCTRL. The attempt to lock these
operations doesn't help, but only adds to the confusion.
There's also a dependency for Rx FCB insertion (activating
/de-activating the TOE offload block on Rx) which might
change the required rx buffer size. This makes matters
worse as gfar_vlan_mode() ends up calling gfar_change_mtu(),
though the MTU size remains the same. Note that there are
other situations that may affect the required rx buffer size,
like changing RXCSUM or rx hw timestamping, but errorneously
the rx buffer size is not recomputed/ updated in the process.
To fix this, do the vlan updates properly inside the MAC
reset and reconfiguration procedure, which takes care of
the rx buffer size dependecy and the rx TOE block (PRSDEP)
activation/deactivation as well (in the correct order).
As a consequence, MTU/ rx buff size updates are done now
by the same MAC reset and reconfig procedure, so that out
of context updates to MAXFRM, MRBLR, and MACCFG inside
change_mtu() are no longer needed. The rx buffer size
dependecy to Rx FCB is now handled for the other cases too
(RXCSUM and rx hw timestamping).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:43 +00:00
|
|
|
if (dev->flags & IFF_UP)
|
2005-04-16 22:20:36 +00:00
|
|
|
startup_gfar(dev);
|
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
clear_bit_unlock(GFAR_RESETTING, &priv->state);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
void reset_gfar(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(ndev);
|
|
|
|
|
|
|
|
while (test_and_set_bit_lock(GFAR_RESETTING, &priv->state))
|
|
|
|
cpu_relax();
|
|
|
|
|
|
|
|
stop_gfar(ndev);
|
|
|
|
startup_gfar(ndev);
|
|
|
|
|
|
|
|
clear_bit_unlock(GFAR_RESETTING, &priv->state);
|
|
|
|
}
|
|
|
|
|
2008-08-19 19:12:45 +00:00
|
|
|
/* gfar_reset_task gets scheduled when a packet has not been
|
2005-04-16 22:20:36 +00:00
|
|
|
* transmitted after a set amount of time.
|
|
|
|
* For now, assume that clearing out all the structures, and
|
2008-08-19 19:12:45 +00:00
|
|
|
* starting over will fix the problem.
|
|
|
|
*/
|
|
|
|
static void gfar_reset_task(struct work_struct *work)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2008-08-19 19:12:45 +00:00
|
|
|
struct gfar_private *priv = container_of(work, struct gfar_private,
|
2012-06-05 03:42:13 +00:00
|
|
|
reset_task);
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
reset_gfar(priv->ndev);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2008-08-19 19:12:45 +00:00
|
|
|
static void gfar_timeout(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
|
|
|
|
|
|
dev->stats.tx_errors++;
|
|
|
|
schedule_work(&priv->reset_task);
|
|
|
|
}
|
|
|
|
|
2010-07-07 22:54:54 +00:00
|
|
|
static void gfar_align_skb(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
/* We need the data buffer to be aligned properly. We will reserve
|
|
|
|
* as many bytes as needed to align the data properly
|
|
|
|
*/
|
|
|
|
skb_reserve(skb, RXBUF_ALIGNMENT -
|
2012-06-05 03:42:13 +00:00
|
|
|
(((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1)));
|
2010-07-07 22:54:54 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Interrupt Handler for Transmit complete */
|
2013-03-19 07:40:02 +00:00
|
|
|
static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2009-11-02 07:03:00 +00:00
|
|
|
struct net_device *dev = tx_queue->dev;
|
2012-01-06 18:51:03 +00:00
|
|
|
struct netdev_queue *txq;
|
2008-04-10 00:37:51 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2010-04-08 23:10:35 +00:00
|
|
|
struct txbd8 *bdp, *next = NULL;
|
2008-12-18 00:51:04 +00:00
|
|
|
struct txbd8 *lbdp = NULL;
|
2009-11-02 07:03:00 +00:00
|
|
|
struct txbd8 *base = tx_queue->tx_bd_base;
|
2008-12-18 00:51:04 +00:00
|
|
|
struct sk_buff *skb;
|
|
|
|
int skb_dirtytx;
|
2009-11-02 07:03:00 +00:00
|
|
|
int tx_ring_size = tx_queue->tx_ring_size;
|
2010-04-08 23:10:35 +00:00
|
|
|
int frags = 0, nr_txbds = 0;
|
2008-12-18 00:51:04 +00:00
|
|
|
int i;
|
2008-04-10 00:37:51 +00:00
|
|
|
int howmany = 0;
|
2012-01-06 18:51:03 +00:00
|
|
|
int tqi = tx_queue->qindex;
|
|
|
|
unsigned int bytes_sent = 0;
|
2008-12-18 00:51:04 +00:00
|
|
|
u32 lstatus;
|
2010-04-08 23:10:35 +00:00
|
|
|
size_t buflen;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-01-06 18:51:03 +00:00
|
|
|
txq = netdev_get_tx_queue(dev, tqi);
|
2009-11-02 07:03:00 +00:00
|
|
|
bdp = tx_queue->dirty_tx;
|
|
|
|
skb_dirtytx = tx_queue->skb_dirtytx;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
while ((skb = tx_queue->tx_skbuff[skb_dirtytx])) {
|
2009-11-10 14:11:10 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
frags = skb_shinfo(skb)->nr_frags;
|
2010-04-08 23:10:35 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* When time stamping, one additional TxBD must be freed.
|
2010-04-08 23:10:35 +00:00
|
|
|
* Also, we need to dma_unmap_single() the TxPAL.
|
|
|
|
*/
|
2010-08-17 08:59:14 +00:00
|
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS))
|
2010-04-08 23:10:35 +00:00
|
|
|
nr_txbds = frags + 2;
|
|
|
|
else
|
|
|
|
nr_txbds = frags + 1;
|
|
|
|
|
|
|
|
lbdp = skip_txbd(bdp, nr_txbds - 1, base, tx_ring_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
lstatus = lbdp->lstatus;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
/* Only clean completed frames */
|
|
|
|
if ((lstatus & BD_LFLAG(TXBD_READY)) &&
|
2012-06-05 03:42:13 +00:00
|
|
|
(lstatus & BD_LENGTH_MASK))
|
2008-12-18 00:51:04 +00:00
|
|
|
break;
|
|
|
|
|
2010-08-17 08:59:14 +00:00
|
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
|
2010-04-08 23:10:35 +00:00
|
|
|
next = next_txbd(bdp, base, tx_ring_size);
|
2012-01-09 23:26:51 +00:00
|
|
|
buflen = next->length + GMAC_FCB_LEN + GMAC_TXPAL_LEN;
|
2010-04-08 23:10:35 +00:00
|
|
|
} else
|
|
|
|
buflen = bdp->length;
|
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_unmap_single(priv->dev, bdp->bufPtr,
|
2012-06-05 03:42:13 +00:00
|
|
|
buflen, DMA_TO_DEVICE);
|
2010-04-08 23:10:35 +00:00
|
|
|
|
2010-08-17 08:59:14 +00:00
|
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
|
2010-04-08 23:10:35 +00:00
|
|
|
struct skb_shared_hwtstamps shhwtstamps;
|
|
|
|
u64 *ns = (u64*) (((u32)skb->data + 0x10) & ~0x7);
|
2012-06-05 03:42:13 +00:00
|
|
|
|
2010-04-08 23:10:35 +00:00
|
|
|
memset(&shhwtstamps, 0, sizeof(shhwtstamps));
|
|
|
|
shhwtstamps.hwtstamp = ns_to_ktime(*ns);
|
2012-01-09 23:26:51 +00:00
|
|
|
skb_pull(skb, GMAC_FCB_LEN + GMAC_TXPAL_LEN);
|
2010-04-08 23:10:35 +00:00
|
|
|
skb_tstamp_tx(skb, &shhwtstamps);
|
|
|
|
bdp->lstatus &= BD_LFLAG(TXBD_WRAP);
|
|
|
|
bdp = next;
|
|
|
|
}
|
2008-11-12 16:07:11 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
bdp->lstatus &= BD_LFLAG(TXBD_WRAP);
|
|
|
|
bdp = next_txbd(bdp, base, tx_ring_size);
|
2008-04-10 00:37:51 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
for (i = 0; i < frags; i++) {
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_unmap_page(priv->dev, bdp->bufPtr,
|
2012-06-05 03:42:13 +00:00
|
|
|
bdp->length, DMA_TO_DEVICE);
|
2008-12-18 00:51:04 +00:00
|
|
|
bdp->lstatus &= BD_LFLAG(TXBD_WRAP);
|
|
|
|
bdp = next_txbd(bdp, base, tx_ring_size);
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-08-30 12:01:15 +00:00
|
|
|
bytes_sent += GFAR_CB(skb)->bytes_sent;
|
2012-01-06 18:51:03 +00:00
|
|
|
|
2012-10-05 06:23:55 +00:00
|
|
|
dev_kfree_skb_any(skb);
|
2009-02-05 00:43:16 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
tx_queue->tx_skbuff[skb_dirtytx] = NULL;
|
2008-04-10 00:37:51 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
skb_dirtytx = (skb_dirtytx + 1) &
|
2012-06-05 03:42:13 +00:00
|
|
|
TX_RING_MOD_MASK(tx_ring_size);
|
2008-12-18 00:51:04 +00:00
|
|
|
|
|
|
|
howmany++;
|
2009-11-10 14:11:10 +00:00
|
|
|
spin_lock_irqsave(&tx_queue->txlock, flags);
|
2010-04-08 23:10:35 +00:00
|
|
|
tx_queue->num_txbdfree += nr_txbds;
|
2009-11-10 14:11:10 +00:00
|
|
|
spin_unlock_irqrestore(&tx_queue->txlock, flags);
|
2008-12-18 00:51:04 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
/* If we freed a buffer, we can restart transmission, if necessary */
|
gianfar: Fix device reset races (oops) for Tx
The device reset procedure, stop_gfar()/startup_gfar(), has
concurrency issues.
"Kernel access of bad area" oopses show up during Tx timeout
device reset or other reset cases (like changing MTU) that
happen while the interface still has traffic. The oopses
happen in start_xmit and clean_tx_ring when accessing tx_queue->
tx_skbuff which is NULL. The race comes from de-allocating the
tx_skbuff while transmission and napi processing are still
active. Though the Tx queues get temoprarily stopped when Tx
timeout occurs, they get re-enabled as a result of Tx congestion
handling inside the napi context (see clean_tx_ring()). Not
disabling the napi during reset is also a bug, because
clean_tx_ring() will try to access tx_skbuff while it is being
de-alloc'ed and re-alloc'ed.
To fix this, stop_gfar() needs to disable napi processing
after stopping the Tx queues. However, in order to prevent
clean_tx_ring() to re-enable the Tx queue before the napi
gets disabled, the device state DOWN has been introduced.
It prevents the Tx congestion management from re-enabling the
de-congested Tx queue while the device is brought down.
An additional locking state, RESETTING, has been introduced
to prevent simultaneous resets or to prevent configuring the
device while it is resetting.
The bogus 'rxlock's (for each Rx queue) have been removed since
their purpose is not justified, as they don't prevent nor are
suited to prevent device reset/reconfig races (such as this one).
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 10:13:45 +00:00
|
|
|
if (tx_queue->num_txbdfree &&
|
|
|
|
netif_tx_queue_stopped(txq) &&
|
|
|
|
!(test_bit(GFAR_DOWN, &priv->state)))
|
|
|
|
netif_wake_subqueue(priv->ndev, tqi);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-18 00:51:04 +00:00
|
|
|
/* Update dirty indicators */
|
2009-11-02 07:03:00 +00:00
|
|
|
tx_queue->skb_dirtytx = skb_dirtytx;
|
|
|
|
tx_queue->dirty_tx = bdp;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-01-06 18:51:03 +00:00
|
|
|
netdev_tx_completed_queue(txq, howmany, bytes_sent);
|
2008-04-10 00:37:51 +00:00
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
|
2012-06-05 03:42:13 +00:00
|
|
|
struct sk_buff *skb)
|
2008-04-22 22:18:29 +00:00
|
|
|
{
|
2009-11-02 07:03:00 +00:00
|
|
|
struct net_device *dev = rx_queue->dev;
|
2008-04-22 22:18:29 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2009-10-12 06:00:37 +00:00
|
|
|
dma_addr_t buf;
|
2008-04-22 22:18:29 +00:00
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
buf = dma_map_single(priv->dev, skb->data,
|
2009-10-12 06:00:37 +00:00
|
|
|
priv->rx_buffer_size, DMA_FROM_DEVICE);
|
2009-11-02 07:03:00 +00:00
|
|
|
gfar_init_rxbdp(rx_queue, bdp, buf);
|
2008-04-22 22:18:29 +00:00
|
|
|
}
|
|
|
|
|
2012-06-05 03:42:11 +00:00
|
|
|
static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2012-10-05 06:23:55 +00:00
|
|
|
struct sk_buff *skb;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2010-07-07 22:54:54 +00:00
|
|
|
skb = netdev_alloc_skb(dev, priv->rx_buffer_size + RXBUF_ALIGNMENT);
|
2008-04-22 22:18:29 +00:00
|
|
|
if (!skb)
|
2005-04-16 22:20:36 +00:00
|
|
|
return NULL;
|
|
|
|
|
2010-07-07 22:54:54 +00:00
|
|
|
gfar_align_skb(skb);
|
2005-11-11 18:38:59 +00:00
|
|
|
|
2010-07-07 22:54:54 +00:00
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
2012-06-05 03:42:11 +00:00
|
|
|
struct sk_buff *gfar_new_skb(struct net_device *dev)
|
2010-07-07 22:54:54 +00:00
|
|
|
{
|
2012-10-05 06:23:55 +00:00
|
|
|
return gfar_alloc_skb(dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-10-16 06:18:13 +00:00
|
|
|
static inline void count_errors(unsigned short status, struct net_device *dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-10-16 06:18:13 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2007-10-04 00:41:50 +00:00
|
|
|
struct net_device_stats *stats = &dev->stats;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct gfar_extra_stats *estats = &priv->extra_stats;
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* If the packet was truncated, none of the other errors matter */
|
2005-04-16 22:20:36 +00:00
|
|
|
if (status & RXBD_TRUNCATED) {
|
|
|
|
stats->rx_length_errors++;
|
|
|
|
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&estats->rx_trunc);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* Count the errors, if there were any */
|
|
|
|
if (status & (RXBD_LARGE | RXBD_SHORT)) {
|
|
|
|
stats->rx_length_errors++;
|
|
|
|
|
|
|
|
if (status & RXBD_LARGE)
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&estats->rx_large);
|
2005-04-16 22:20:36 +00:00
|
|
|
else
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&estats->rx_short);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
if (status & RXBD_NONOCTET) {
|
|
|
|
stats->rx_frame_errors++;
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&estats->rx_nonoctet);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
if (status & RXBD_CRCERR) {
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&estats->rx_crcerr);
|
2005-04-16 22:20:36 +00:00
|
|
|
stats->rx_crc_errors++;
|
|
|
|
}
|
|
|
|
if (status & RXBD_OVERRUN) {
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&estats->rx_overrun);
|
2005-04-16 22:20:36 +00:00
|
|
|
stats->rx_crc_errors++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:09 +00:00
|
|
|
irqreturn_t gfar_receive(int irq, void *grp_id)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2014-03-07 12:42:45 +00:00
|
|
|
struct gfar_priv_grp *grp = (struct gfar_priv_grp *)grp_id;
|
|
|
|
unsigned long flags;
|
|
|
|
u32 imask;
|
|
|
|
|
|
|
|
if (likely(napi_schedule_prep(&grp->napi_rx))) {
|
|
|
|
spin_lock_irqsave(&grp->grplock, flags);
|
|
|
|
imask = gfar_read(&grp->regs->imask);
|
|
|
|
imask &= IMASK_RX_DISABLED;
|
|
|
|
gfar_write(&grp->regs->imask, imask);
|
|
|
|
spin_unlock_irqrestore(&grp->grplock, flags);
|
|
|
|
__napi_schedule(&grp->napi_rx);
|
|
|
|
} else {
|
|
|
|
/* Clear IEVENT, so interrupts aren't called again
|
|
|
|
* because of the packets that have already arrived.
|
|
|
|
*/
|
|
|
|
gfar_write(&grp->regs->ievent, IEVENT_RX_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Interrupt Handler for Transmit complete */
|
|
|
|
static irqreturn_t gfar_transmit(int irq, void *grp_id)
|
|
|
|
{
|
|
|
|
struct gfar_priv_grp *grp = (struct gfar_priv_grp *)grp_id;
|
|
|
|
unsigned long flags;
|
|
|
|
u32 imask;
|
|
|
|
|
|
|
|
if (likely(napi_schedule_prep(&grp->napi_tx))) {
|
|
|
|
spin_lock_irqsave(&grp->grplock, flags);
|
|
|
|
imask = gfar_read(&grp->regs->imask);
|
|
|
|
imask &= IMASK_TX_DISABLED;
|
|
|
|
gfar_write(&grp->regs->imask, imask);
|
|
|
|
spin_unlock_irqrestore(&grp->grplock, flags);
|
|
|
|
__napi_schedule(&grp->napi_tx);
|
|
|
|
} else {
|
|
|
|
/* Clear IEVENT, so interrupts aren't called again
|
|
|
|
* because of the packets that have already arrived.
|
|
|
|
*/
|
|
|
|
gfar_write(&grp->regs->ievent, IEVENT_TX_MASK);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
2005-06-20 15:54:21 +00:00
|
|
|
static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
|
|
|
|
{
|
|
|
|
/* If valid headers were found, and valid sums
|
|
|
|
* were verified, then we tell the kernel that no
|
2012-06-05 03:42:12 +00:00
|
|
|
* checksumming is necessary. Otherwise, it is [FIXME]
|
|
|
|
*/
|
2005-11-11 18:38:59 +00:00
|
|
|
if ((fcb->flags & RXFCB_CSUM_MASK) == (RXFCB_CIP | RXFCB_CTU))
|
2005-06-20 15:54:21 +00:00
|
|
|
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
|
|
|
else
|
2010-09-02 20:07:41 +00:00
|
|
|
skb_checksum_none_assert(skb);
|
2005-06-20 15:54:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */
|
2013-02-14 05:00:05 +00:00
|
|
|
static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
|
|
|
|
int amount_pull, struct napi_struct *napi)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2005-06-20 15:54:21 +00:00
|
|
|
struct rxfcb *fcb = NULL;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-12-16 23:31:15 +00:00
|
|
|
/* fcb is at the beginning if exists */
|
|
|
|
fcb = (struct rxfcb *)skb->data;
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Remove the FCB from the skb
|
|
|
|
* Remove the padded bytes, if there are any
|
|
|
|
*/
|
2009-12-24 03:13:06 +00:00
|
|
|
if (amount_pull) {
|
|
|
|
skb_record_rx_queue(skb, fcb->rq);
|
2008-12-16 23:31:15 +00:00
|
|
|
skb_pull(skb, amount_pull);
|
2009-12-24 03:13:06 +00:00
|
|
|
}
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2010-04-08 23:10:03 +00:00
|
|
|
/* Get receive timestamp from the skb */
|
|
|
|
if (priv->hwts_rx_en) {
|
|
|
|
struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
|
|
|
|
u64 *ns = (u64 *) skb->data;
|
2012-06-05 03:42:13 +00:00
|
|
|
|
2010-04-08 23:10:03 +00:00
|
|
|
memset(shhwtstamps, 0, sizeof(*shhwtstamps));
|
|
|
|
shhwtstamps->hwtstamp = ns_to_ktime(*ns);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (priv->padding)
|
|
|
|
skb_pull(skb, priv->padding);
|
|
|
|
|
2011-04-15 04:50:50 +00:00
|
|
|
if (dev->features & NETIF_F_RXCSUM)
|
2008-12-16 23:31:15 +00:00
|
|
|
gfar_rx_checksum(skb, fcb);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2008-12-16 23:31:15 +00:00
|
|
|
/* Tell the skb what kind of packet this is */
|
|
|
|
skb->protocol = eth_type_trans(skb, dev);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-04-19 02:04:27 +00:00
|
|
|
/* There's need to check for NETIF_F_HW_VLAN_CTAG_RX here.
|
2011-08-10 01:19:48 +00:00
|
|
|
* Even if vlan rx accel is disabled, on some chips
|
|
|
|
* RXFCB_VLN is pseudo randomly set.
|
|
|
|
*/
|
2013-04-19 02:04:27 +00:00
|
|
|
if (dev->features & NETIF_F_HW_VLAN_CTAG_RX &&
|
2011-08-10 01:19:48 +00:00
|
|
|
fcb->flags & RXFCB_VLN)
|
2013-04-22 23:24:19 +00:00
|
|
|
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), fcb->vlctl);
|
2011-07-20 04:54:19 +00:00
|
|
|
|
2008-12-16 23:31:15 +00:00
|
|
|
/* Send the packet up the stack */
|
2013-03-21 03:12:15 +00:00
|
|
|
napi_gro_receive(napi, skb);
|
2005-06-20 15:54:21 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* gfar_clean_rx_ring() -- Processes each frame in the rx ring
|
2012-06-05 03:42:11 +00:00
|
|
|
* until the budget/quota has been reached. Returns the number
|
|
|
|
* of frames handled
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2009-11-02 07:03:00 +00:00
|
|
|
int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2009-11-02 07:03:00 +00:00
|
|
|
struct net_device *dev = rx_queue->dev;
|
2008-12-16 23:33:40 +00:00
|
|
|
struct rxbd8 *bdp, *base;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct sk_buff *skb;
|
2008-12-16 23:31:15 +00:00
|
|
|
int pkt_len;
|
|
|
|
int amount_pull;
|
2005-04-16 22:20:36 +00:00
|
|
|
int howmany = 0;
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
|
|
|
|
|
|
/* Get the first full descriptor */
|
2009-11-02 07:03:00 +00:00
|
|
|
bdp = rx_queue->cur_rx;
|
|
|
|
base = rx_queue->rx_bd_base;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
gianfar: Fix and cleanup Rx FCB indication
This fixes a less obvious error on one hand, and prevents futher
similar errors by disambiguating and optimizing RxFCB indication,
on the other hand.
The error consists in NETIF_F_HW_VLAN_TX flag being used as an
indication of Rx FCB insertion. This happened as soon gfar_uses_fcb(),
which despite its name indicates Rx FCB insertion, started
incorporating is_vlan_on().
is_vlan_on(), on the other hand, is also a misleading construct because
we need to differentiate b/w hw VLAN extraction/VLEX (marked by VLAN_RX
flag) and hw VLAN insertion/VLINS (VLAN_TX flag), which are different
mechanisms using different types of FCBs.
The hw spec for the RxFCB feature is as follows:
In the case of RxBD rings, FCBs (Frame Control Block) are inserted by
the eTSEC whenever RCTRL[PRSDEP] is set to a non-zero value. Only one
FCB is inserted per frame (in the buffer pointed to by the RxBD with
bit F set). TOE acceleration for receive is enabled for all rx frames
in this case.
This patch introduces priv->uses_rxfcb field to quickly signal RxFCB
insertion in accordance with the specification above.
The dependency on FSL_GIANFAR_DEV_HAS_TIMER was also eliminated as
another source of confusion. The actual dependency is to priv->hwts_rx_en.
Upon changing priv->hwts_rx_en via IOCTL, the gfar device is being
restarted and on init_mac() the priv->hwts_rx_en flag determines RxFCB
insertion, and rctrl is programmed accordingly. The patch takes care
of this case too.
Though maybe not as self documenting as the inlining version uses_fcb(),
priv->uses_rxfcb has the main purpose to quickly signal, on the hot path,
that the incoming frame has a *Rx* FCB block inserted which needs to be
pulled out before passing the skb to the stack. This is a performance
critical operation, it needs to happen fast, that's why uses_rxfcb is
placed in the first cacheline of gfar_private.
This is also why a cached rctrl cannot be used instead: 1) because
we don't have 32 bits available in the first cacheline of gfar_priv
(but only 16); 2) bit operations are expensive on the hot path.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:07 +00:00
|
|
|
amount_pull = priv->uses_rxfcb ? GMAC_FCB_LEN : 0;
|
2008-12-16 23:31:15 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
while (!((bdp->status & RXBD_EMPTY) || (--rx_work_limit < 0))) {
|
2008-04-22 22:18:29 +00:00
|
|
|
struct sk_buff *newskb;
|
2012-06-05 03:42:13 +00:00
|
|
|
|
2007-05-16 20:06:59 +00:00
|
|
|
rmb();
|
2008-04-22 22:18:29 +00:00
|
|
|
|
|
|
|
/* Add another skb for the future */
|
|
|
|
newskb = gfar_new_skb(dev);
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
skb = rx_queue->rx_skbuff[rx_queue->skb_currx];
|
2005-04-16 22:20:36 +00:00
|
|
|
|
gianfar: Add device ref (dev) in gfar_private
Use device pointer (dev) to simplify the code and to
avoid double indirections, especially on the hot path.
Basically, instead of accessing priv to get the ofdev
reference and then accessing the ofdev structure to
dereference the needed dev pointer, we will get the
dev pointer directly from priv.
The dev pointer is required on the hot path, see gfar_new_rxbdp
or gfar_clean_rx_ring (or xmit), and this patch makes
it available directly from priv's 1st cacheline.
This change is reflected at asm level too, taking (the hot)
gfar_new_rxbdp():
initial version -
18c0: 7c 7e 1b 78 mr r30,r3
18d0: 81 69 04 3c lwz r11,1084(r9)
18d8: 34 6b 00 10 addic. r3,r11,16
18dc: 41 82 00 08 beq- 18e4
patched version -
18d0: 80 69 04 38 lwz r3,1080(r9)
18d8: 2f 83 00 00 cmpwi cr7,r3,0
18dc: 41 9e 00 08 beq- cr7,18e4
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-14 05:00:02 +00:00
|
|
|
dma_unmap_single(priv->dev, bdp->bufPtr,
|
2012-06-05 03:42:13 +00:00
|
|
|
priv->rx_buffer_size, DMA_FROM_DEVICE);
|
2008-11-12 16:07:11 +00:00
|
|
|
|
2010-06-11 10:51:03 +00:00
|
|
|
if (unlikely(!(bdp->status & RXBD_ERR) &&
|
2012-06-05 03:42:13 +00:00
|
|
|
bdp->length > priv->rx_buffer_size))
|
2010-06-11 10:51:03 +00:00
|
|
|
bdp->status = RXBD_LARGE;
|
|
|
|
|
2008-04-22 22:18:29 +00:00
|
|
|
/* We drop the frame if we failed to allocate a new buffer */
|
|
|
|
if (unlikely(!newskb || !(bdp->status & RXBD_LAST) ||
|
2012-06-05 03:42:13 +00:00
|
|
|
bdp->status & RXBD_ERR)) {
|
2008-04-22 22:18:29 +00:00
|
|
|
count_errors(bdp->status, dev);
|
|
|
|
|
|
|
|
if (unlikely(!newskb))
|
|
|
|
newskb = skb;
|
2010-07-07 22:54:54 +00:00
|
|
|
else if (skb)
|
2012-10-05 06:23:55 +00:00
|
|
|
dev_kfree_skb(skb);
|
2008-04-22 22:18:29 +00:00
|
|
|
} else {
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Increment the number of packets */
|
2009-12-16 01:15:07 +00:00
|
|
|
rx_queue->stats.rx_packets++;
|
2005-04-16 22:20:36 +00:00
|
|
|
howmany++;
|
|
|
|
|
2008-12-16 23:31:15 +00:00
|
|
|
if (likely(skb)) {
|
|
|
|
pkt_len = bdp->length - ETH_FCS_LEN;
|
|
|
|
/* Remove the FCS from the packet length */
|
|
|
|
skb_put(skb, pkt_len);
|
2009-12-16 01:15:07 +00:00
|
|
|
rx_queue->stats.rx_bytes += pkt_len;
|
2009-12-24 03:13:06 +00:00
|
|
|
skb_record_rx_queue(skb, rx_queue->qindex);
|
2012-04-19 22:54:35 +00:00
|
|
|
gfar_process_frame(dev, skb, amount_pull,
|
2014-03-07 12:42:45 +00:00
|
|
|
&rx_queue->grp->napi_rx);
|
2008-12-16 23:31:15 +00:00
|
|
|
|
|
|
|
} else {
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_warn(priv, rx_err, dev, "Missing skb!\n");
|
2009-12-16 01:15:07 +00:00
|
|
|
rx_queue->stats.rx_dropped++;
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&priv->extra_stats.rx_skbmissing);
|
2008-12-16 23:31:15 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
rx_queue->rx_skbuff[rx_queue->skb_currx] = newskb;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-04-22 22:18:29 +00:00
|
|
|
/* Setup the new bdp */
|
2009-11-02 07:03:00 +00:00
|
|
|
gfar_new_rxbdp(rx_queue, bdp, newskb);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Update to the next pointer */
|
2009-11-02 07:03:00 +00:00
|
|
|
bdp = next_bd(bdp, base, rx_queue->rx_ring_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* update to point at the next skb */
|
2012-06-05 03:42:13 +00:00
|
|
|
rx_queue->skb_currx = (rx_queue->skb_currx + 1) &
|
|
|
|
RX_RING_MOD_MASK(rx_queue->rx_ring_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the current rxbd pointer to be the next one */
|
2009-11-02 07:03:00 +00:00
|
|
|
rx_queue->cur_rx = bdp;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return howmany;
|
|
|
|
}
|
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
static int gfar_poll_rx_sq(struct napi_struct *napi, int budget)
|
2013-06-10 17:19:48 +00:00
|
|
|
{
|
|
|
|
struct gfar_priv_grp *gfargrp =
|
2014-03-07 12:42:45 +00:00
|
|
|
container_of(napi, struct gfar_priv_grp, napi_rx);
|
2013-06-10 17:19:48 +00:00
|
|
|
struct gfar __iomem *regs = gfargrp->regs;
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
struct gfar_priv_rx_q *rx_queue = gfargrp->rx_queue;
|
2013-06-10 17:19:48 +00:00
|
|
|
int work_done = 0;
|
|
|
|
|
|
|
|
/* Clear IEVENT, so interrupts aren't called again
|
|
|
|
* because of the packets that have already arrived
|
|
|
|
*/
|
2014-03-07 12:42:45 +00:00
|
|
|
gfar_write(®s->ievent, IEVENT_RX_MASK);
|
2013-06-10 17:19:48 +00:00
|
|
|
|
|
|
|
work_done = gfar_clean_rx_ring(rx_queue, budget);
|
|
|
|
|
|
|
|
if (work_done < budget) {
|
2014-03-07 12:42:45 +00:00
|
|
|
u32 imask;
|
2013-06-10 17:19:48 +00:00
|
|
|
napi_complete(napi);
|
|
|
|
/* Clear the halt bit in RSTAT */
|
|
|
|
gfar_write(®s->rstat, gfargrp->rstat);
|
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
spin_lock_irq(&gfargrp->grplock);
|
|
|
|
imask = gfar_read(®s->imask);
|
|
|
|
imask |= IMASK_RX_DEFAULT;
|
|
|
|
gfar_write(®s->imask, imask);
|
|
|
|
spin_unlock_irq(&gfargrp->grplock);
|
2013-06-10 17:19:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return work_done;
|
|
|
|
}
|
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
static int gfar_poll_tx_sq(struct napi_struct *napi, int budget)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2012-06-05 03:42:13 +00:00
|
|
|
struct gfar_priv_grp *gfargrp =
|
2014-03-07 12:42:45 +00:00
|
|
|
container_of(napi, struct gfar_priv_grp, napi_tx);
|
|
|
|
struct gfar __iomem *regs = gfargrp->regs;
|
gianfar: Use Single-Queue polling for "fsl,etsec2"
For the "fsl,etsec2" compatible models the driver currently
supports 8 Tx and Rx DMA rings (aka HW queues). However, there
are only 2 pairs of Rx/Tx interrupt lines, as these controllers
are integrated in low power SoCs with 2 CPUs at most. As a result,
there are at most 2 NAPI instances that have to service multiple
Tx and Rx queues for these devices. This complicates the NAPI
polling routine having to iterate over the mutiple Rx/Tx queues
hooked to the same interrupt lines. And there's also an overhead
at HW level, as the controller needs to service all the 8 Tx rings
in a round robin manner. The combined overhead shows up for multi
parallel Tx flows transmitted by the kernel stack, when the driver
usually starts returning NETDEV_TX_BUSY leading to NETDEV WATCHDOG
Tx timeout triggering if the Tx path is congested for too long.
As an alternative, this patch makes the driver support only one
Tx/Rx DMA ring per NAPI instance (per interrupt group or pair
of Tx/Rx interrupt lines) by default. The simplified single queue
polling routine (gfar_poll_sq) will be the default napi poll routine
for the etsec2 devices too. Some adjustments needed to be made to
link the Tx/Rx HW queues with each NAPI instance (2 in this case).
The gfar_poll_sq() is already successfully used by older SQ_SG_MODE
(single interrupt group) controllers.
This patch fixes Tx timeout triggering under heavy Tx traffic load
(i.e. iperf -c -P 8) for the "fsl,etsec2" (currently the only
MQ_MG_MODE devices). There's also a significant memory footprint
reduction by supporting 2 Rx/Tx DMA rings (at most), instead of 8,
for these devices.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-07 12:42:46 +00:00
|
|
|
struct gfar_priv_tx_q *tx_queue = gfargrp->tx_queue;
|
2014-03-07 12:42:45 +00:00
|
|
|
u32 imask;
|
|
|
|
|
|
|
|
/* Clear IEVENT, so interrupts aren't called again
|
|
|
|
* because of the packets that have already arrived
|
|
|
|
*/
|
|
|
|
gfar_write(®s->ievent, IEVENT_TX_MASK);
|
|
|
|
|
|
|
|
/* run Tx cleanup to completion */
|
|
|
|
if (tx_queue->tx_skbuff[tx_queue->skb_dirtytx])
|
|
|
|
gfar_clean_tx_ring(tx_queue);
|
|
|
|
|
|
|
|
napi_complete(napi);
|
|
|
|
|
|
|
|
spin_lock_irq(&gfargrp->grplock);
|
|
|
|
imask = gfar_read(®s->imask);
|
|
|
|
imask |= IMASK_TX_DEFAULT;
|
|
|
|
gfar_write(®s->imask, imask);
|
|
|
|
spin_unlock_irq(&gfargrp->grplock);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gfar_poll_rx(struct napi_struct *napi, int budget)
|
|
|
|
{
|
|
|
|
struct gfar_priv_grp *gfargrp =
|
|
|
|
container_of(napi, struct gfar_priv_grp, napi_rx);
|
2009-11-02 07:03:15 +00:00
|
|
|
struct gfar_private *priv = gfargrp->priv;
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = gfargrp->regs;
|
2009-11-02 07:03:15 +00:00
|
|
|
struct gfar_priv_rx_q *rx_queue = NULL;
|
2013-03-19 07:40:02 +00:00
|
|
|
int work_done = 0, work_done_per_q = 0;
|
2013-03-21 03:12:13 +00:00
|
|
|
int i, budget_per_q = 0;
|
2013-03-19 07:40:03 +00:00
|
|
|
unsigned long rstat_rxf;
|
|
|
|
int num_act_queues;
|
2009-11-02 07:03:15 +00:00
|
|
|
|
2008-12-18 00:52:00 +00:00
|
|
|
/* Clear IEVENT, so interrupts aren't called again
|
2012-06-05 03:42:12 +00:00
|
|
|
* because of the packets that have already arrived
|
|
|
|
*/
|
2014-03-07 12:42:45 +00:00
|
|
|
gfar_write(®s->ievent, IEVENT_RX_MASK);
|
2008-12-18 00:52:00 +00:00
|
|
|
|
2013-03-19 07:40:03 +00:00
|
|
|
rstat_rxf = gfar_read(®s->rstat) & RSTAT_RXF_MASK;
|
|
|
|
|
|
|
|
num_act_queues = bitmap_weight(&rstat_rxf, MAX_RX_QS);
|
|
|
|
if (num_act_queues)
|
|
|
|
budget_per_q = budget/num_act_queues;
|
|
|
|
|
2013-10-14 14:05:09 +00:00
|
|
|
for_each_set_bit(i, &gfargrp->rx_bit_map, priv->num_rx_queues) {
|
|
|
|
/* skip queue if not active */
|
|
|
|
if (!(rstat_rxf & (RSTAT_CLEAR_RXF0 >> i)))
|
|
|
|
continue;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-10-14 14:05:09 +00:00
|
|
|
rx_queue = priv->rx_queue[i];
|
|
|
|
work_done_per_q =
|
|
|
|
gfar_clean_rx_ring(rx_queue, budget_per_q);
|
|
|
|
work_done += work_done_per_q;
|
|
|
|
|
|
|
|
/* finished processing this queue */
|
|
|
|
if (work_done_per_q < budget_per_q) {
|
|
|
|
/* clear active queue hw indication */
|
|
|
|
gfar_write(®s->rstat,
|
|
|
|
RSTAT_CLEAR_RXF0 >> i);
|
|
|
|
num_act_queues--;
|
|
|
|
|
|
|
|
if (!num_act_queues)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-12-18 00:52:30 +00:00
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
if (!num_act_queues) {
|
|
|
|
u32 imask;
|
2013-10-14 14:05:09 +00:00
|
|
|
napi_complete(napi);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2013-10-14 14:05:09 +00:00
|
|
|
/* Clear the halt bit in RSTAT */
|
|
|
|
gfar_write(®s->rstat, gfargrp->rstat);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
spin_lock_irq(&gfargrp->grplock);
|
|
|
|
imask = gfar_read(®s->imask);
|
|
|
|
imask |= IMASK_RX_DEFAULT;
|
|
|
|
gfar_write(®s->imask, imask);
|
|
|
|
spin_unlock_irq(&gfargrp->grplock);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2013-03-19 07:40:02 +00:00
|
|
|
return work_done;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2014-03-07 12:42:45 +00:00
|
|
|
static int gfar_poll_tx(struct napi_struct *napi, int budget)
|
|
|
|
{
|
|
|
|
struct gfar_priv_grp *gfargrp =
|
|
|
|
container_of(napi, struct gfar_priv_grp, napi_tx);
|
|
|
|
struct gfar_private *priv = gfargrp->priv;
|
|
|
|
struct gfar __iomem *regs = gfargrp->regs;
|
|
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|
|
|
|
int has_tx_work = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Clear IEVENT, so interrupts aren't called again
|
|
|
|
* because of the packets that have already arrived
|
|
|
|
*/
|
|
|
|
gfar_write(®s->ievent, IEVENT_TX_MASK);
|
|
|
|
|
|
|
|
for_each_set_bit(i, &gfargrp->tx_bit_map, priv->num_tx_queues) {
|
|
|
|
tx_queue = priv->tx_queue[i];
|
|
|
|
/* run Tx cleanup to completion */
|
|
|
|
if (tx_queue->tx_skbuff[tx_queue->skb_dirtytx]) {
|
|
|
|
gfar_clean_tx_ring(tx_queue);
|
|
|
|
has_tx_work = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!has_tx_work) {
|
|
|
|
u32 imask;
|
|
|
|
napi_complete(napi);
|
|
|
|
|
|
|
|
spin_lock_irq(&gfargrp->grplock);
|
|
|
|
imask = gfar_read(®s->imask);
|
|
|
|
imask |= IMASK_TX_DEFAULT;
|
|
|
|
gfar_write(®s->imask, imask);
|
|
|
|
spin_unlock_irq(&gfargrp->grplock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-11-07 10:27:02 +00:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Polling 'interrupt' - used by things like netconsole to send skbs
|
2006-11-07 10:27:02 +00:00
|
|
|
* without having to re-enable interrupts. It's not called while
|
|
|
|
* the interrupt routine is executing.
|
|
|
|
*/
|
|
|
|
static void gfar_netpoll(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2012-06-05 03:42:14 +00:00
|
|
|
int i;
|
2006-11-07 10:27:02 +00:00
|
|
|
|
|
|
|
/* If the device has multiple interrupts, run tx/rx */
|
2008-12-16 23:29:15 +00:00
|
|
|
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
|
2009-11-02 07:03:34 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
2013-02-24 05:38:31 +00:00
|
|
|
struct gfar_priv_grp *grp = &priv->gfargrp[i];
|
|
|
|
|
|
|
|
disable_irq(gfar_irq(grp, TX)->irq);
|
|
|
|
disable_irq(gfar_irq(grp, RX)->irq);
|
|
|
|
disable_irq(gfar_irq(grp, ER)->irq);
|
|
|
|
gfar_interrupt(gfar_irq(grp, TX)->irq, grp);
|
|
|
|
enable_irq(gfar_irq(grp, ER)->irq);
|
|
|
|
enable_irq(gfar_irq(grp, RX)->irq);
|
|
|
|
enable_irq(gfar_irq(grp, TX)->irq);
|
2009-11-02 07:03:34 +00:00
|
|
|
}
|
2006-11-07 10:27:02 +00:00
|
|
|
} else {
|
2009-11-02 07:03:34 +00:00
|
|
|
for (i = 0; i < priv->num_grps; i++) {
|
2013-02-24 05:38:31 +00:00
|
|
|
struct gfar_priv_grp *grp = &priv->gfargrp[i];
|
|
|
|
|
|
|
|
disable_irq(gfar_irq(grp, TX)->irq);
|
|
|
|
gfar_interrupt(gfar_irq(grp, TX)->irq, grp);
|
|
|
|
enable_irq(gfar_irq(grp, TX)->irq);
|
2009-12-09 10:52:19 +00:00
|
|
|
}
|
2006-11-07 10:27:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* The interrupt handler for devices with one interrupt */
|
2009-11-02 07:03:09 +00:00
|
|
|
static irqreturn_t gfar_interrupt(int irq, void *grp_id)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2009-11-02 07:03:09 +00:00
|
|
|
struct gfar_priv_grp *gfargrp = grp_id;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Save ievent for future reference */
|
2009-11-02 07:03:09 +00:00
|
|
|
u32 events = gfar_read(&gfargrp->regs->ievent);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Check for reception */
|
2007-02-15 13:56:01 +00:00
|
|
|
if (events & IEVENT_RX_MASK)
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_receive(irq, grp_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Check for transmit completion */
|
2007-02-15 13:56:01 +00:00
|
|
|
if (events & IEVENT_TX_MASK)
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_transmit(irq, grp_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-02-15 13:56:01 +00:00
|
|
|
/* Check for errors */
|
|
|
|
if (events & IEVENT_ERR_MASK)
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_error(irq, grp_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called every time the controller might need to be made
|
|
|
|
* aware of new link state. The PHY code conveys this
|
2005-09-24 02:54:21 +00:00
|
|
|
* information through variables in the phydev structure, and this
|
2005-04-16 22:20:36 +00:00
|
|
|
* function converts those variables into the appropriate
|
|
|
|
* register values, and can bring down the device if needed.
|
|
|
|
*/
|
|
|
|
static void adjust_link(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2005-09-24 02:54:21 +00:00
|
|
|
struct phy_device *phydev = priv->phydev;
|
|
|
|
|
2014-04-30 11:27:21 +00:00
|
|
|
if (unlikely(phydev->link != priv->oldlink ||
|
|
|
|
phydev->duplex != priv->oldduplex ||
|
|
|
|
phydev->speed != priv->oldspeed))
|
|
|
|
gfar_update_link_state(priv);
|
2005-09-24 02:54:21 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Update the hash table based on the current list of multicast
|
|
|
|
* addresses we subscribe to. Also, change the promiscuity of
|
|
|
|
* the device based on the flags (this function is called
|
2012-06-05 03:42:12 +00:00
|
|
|
* whenever dev->flags is changed
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static void gfar_set_multi(struct net_device *dev)
|
|
|
|
{
|
2010-04-01 21:22:57 +00:00
|
|
|
struct netdev_hw_addr *ha;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2005-04-16 22:20:36 +00:00
|
|
|
u32 tempval;
|
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
if (dev->flags & IFF_PROMISC) {
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Set RCTRL to PROM */
|
|
|
|
tempval = gfar_read(®s->rctrl);
|
|
|
|
tempval |= RCTRL_PROM;
|
|
|
|
gfar_write(®s->rctrl, tempval);
|
|
|
|
} else {
|
|
|
|
/* Set RCTRL to not PROM */
|
|
|
|
tempval = gfar_read(®s->rctrl);
|
|
|
|
tempval &= ~(RCTRL_PROM);
|
|
|
|
gfar_write(®s->rctrl, tempval);
|
|
|
|
}
|
2006-09-13 17:24:59 +00:00
|
|
|
|
2009-11-02 07:03:00 +00:00
|
|
|
if (dev->flags & IFF_ALLMULTI) {
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Set the hash to rx all multicast frames */
|
2005-06-20 15:54:21 +00:00
|
|
|
gfar_write(®s->igaddr0, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr1, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr2, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr3, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr4, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr5, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr6, 0xffffffff);
|
|
|
|
gfar_write(®s->igaddr7, 0xffffffff);
|
2005-04-16 22:20:36 +00:00
|
|
|
gfar_write(®s->gaddr0, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr1, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr2, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr3, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr4, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr5, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr6, 0xffffffff);
|
|
|
|
gfar_write(®s->gaddr7, 0xffffffff);
|
|
|
|
} else {
|
2005-11-11 18:38:59 +00:00
|
|
|
int em_num;
|
|
|
|
int idx;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* zero out the hash */
|
2005-06-20 15:54:21 +00:00
|
|
|
gfar_write(®s->igaddr0, 0x0);
|
|
|
|
gfar_write(®s->igaddr1, 0x0);
|
|
|
|
gfar_write(®s->igaddr2, 0x0);
|
|
|
|
gfar_write(®s->igaddr3, 0x0);
|
|
|
|
gfar_write(®s->igaddr4, 0x0);
|
|
|
|
gfar_write(®s->igaddr5, 0x0);
|
|
|
|
gfar_write(®s->igaddr6, 0x0);
|
|
|
|
gfar_write(®s->igaddr7, 0x0);
|
2005-04-16 22:20:36 +00:00
|
|
|
gfar_write(®s->gaddr0, 0x0);
|
|
|
|
gfar_write(®s->gaddr1, 0x0);
|
|
|
|
gfar_write(®s->gaddr2, 0x0);
|
|
|
|
gfar_write(®s->gaddr3, 0x0);
|
|
|
|
gfar_write(®s->gaddr4, 0x0);
|
|
|
|
gfar_write(®s->gaddr5, 0x0);
|
|
|
|
gfar_write(®s->gaddr6, 0x0);
|
|
|
|
gfar_write(®s->gaddr7, 0x0);
|
|
|
|
|
2005-11-11 18:38:59 +00:00
|
|
|
/* If we have extended hash tables, we need to
|
|
|
|
* clear the exact match registers to prepare for
|
2012-06-05 03:42:12 +00:00
|
|
|
* setting them
|
|
|
|
*/
|
2005-11-11 18:38:59 +00:00
|
|
|
if (priv->extended_hash) {
|
|
|
|
em_num = GFAR_EM_NUM + 1;
|
|
|
|
gfar_clear_exact_match(dev);
|
|
|
|
idx = 1;
|
|
|
|
} else {
|
|
|
|
idx = 0;
|
|
|
|
em_num = 0;
|
|
|
|
}
|
|
|
|
|
2010-02-08 04:30:35 +00:00
|
|
|
if (netdev_mc_empty(dev))
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Parse the list, and set the appropriate bits */
|
2010-04-01 21:22:57 +00:00
|
|
|
netdev_for_each_mc_addr(ha, dev) {
|
2005-11-11 18:38:59 +00:00
|
|
|
if (idx < em_num) {
|
2010-04-01 21:22:57 +00:00
|
|
|
gfar_set_mac_for_addr(dev, idx, ha->addr);
|
2005-11-11 18:38:59 +00:00
|
|
|
idx++;
|
|
|
|
} else
|
2010-04-01 21:22:57 +00:00
|
|
|
gfar_set_hash_for_addr(dev, ha->addr);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-11 18:38:59 +00:00
|
|
|
|
|
|
|
/* Clears each of the exact match registers to zero, so they
|
2012-06-05 03:42:12 +00:00
|
|
|
* don't interfere with normal reception
|
|
|
|
*/
|
2005-11-11 18:38:59 +00:00
|
|
|
static void gfar_clear_exact_match(struct net_device *dev)
|
|
|
|
{
|
|
|
|
int idx;
|
2011-11-16 09:38:02 +00:00
|
|
|
static const u8 zero_arr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
|
2005-11-11 18:38:59 +00:00
|
|
|
|
2012-06-05 03:42:13 +00:00
|
|
|
for (idx = 1; idx < GFAR_EM_NUM + 1; idx++)
|
2010-12-21 10:16:08 +00:00
|
|
|
gfar_set_mac_for_addr(dev, idx, zero_arr);
|
2005-11-11 18:38:59 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Set the appropriate hash bit for the given addr */
|
|
|
|
/* The algorithm works like so:
|
|
|
|
* 1) Take the Destination Address (ie the multicast address), and
|
|
|
|
* do a CRC on it (little endian), and reverse the bits of the
|
|
|
|
* result.
|
|
|
|
* 2) Use the 8 most significant bits as a hash into a 256-entry
|
|
|
|
* table. The table is controlled through 8 32-bit registers:
|
|
|
|
* gaddr0-7. gaddr0's MSB is entry 0, and gaddr7's LSB is
|
|
|
|
* gaddr7. This means that the 3 most significant bits in the
|
|
|
|
* hash index which gaddr register to use, and the 5 other bits
|
|
|
|
* indicate which bit (assuming an IBM numbering scheme, which
|
|
|
|
* for PowerPC (tm) is usually the case) in the register holds
|
2012-06-05 03:42:12 +00:00
|
|
|
* the entry.
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
|
|
|
|
{
|
|
|
|
u32 tempval;
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2011-11-16 09:38:02 +00:00
|
|
|
u32 result = ether_crc(ETH_ALEN, addr);
|
2005-06-20 15:54:21 +00:00
|
|
|
int width = priv->hash_width;
|
|
|
|
u8 whichbit = (result >> (32 - width)) & 0x1f;
|
|
|
|
u8 whichreg = result >> (32 - width + 5);
|
2005-04-16 22:20:36 +00:00
|
|
|
u32 value = (1 << (31-whichbit));
|
|
|
|
|
2005-06-20 15:54:21 +00:00
|
|
|
tempval = gfar_read(priv->hash_regs[whichreg]);
|
2005-04-16 22:20:36 +00:00
|
|
|
tempval |= value;
|
2005-06-20 15:54:21 +00:00
|
|
|
gfar_write(priv->hash_regs[whichreg], tempval);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-11-11 18:38:59 +00:00
|
|
|
|
|
|
|
/* There are multiple MAC Address register pairs on some controllers
|
|
|
|
* This function sets the numth pair to a given address
|
|
|
|
*/
|
2010-12-21 10:16:08 +00:00
|
|
|
static void gfar_set_mac_for_addr(struct net_device *dev, int num,
|
|
|
|
const u8 *addr)
|
2005-11-11 18:38:59 +00:00
|
|
|
{
|
|
|
|
struct gfar_private *priv = netdev_priv(dev);
|
2009-11-02 07:03:34 +00:00
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
2005-11-11 18:38:59 +00:00
|
|
|
int idx;
|
2011-11-16 09:38:02 +00:00
|
|
|
char tmpbuf[ETH_ALEN];
|
2005-11-11 18:38:59 +00:00
|
|
|
u32 tempval;
|
2009-11-02 07:03:09 +00:00
|
|
|
u32 __iomem *macptr = ®s->macstnaddr1;
|
2005-11-11 18:38:59 +00:00
|
|
|
|
|
|
|
macptr += num*2;
|
|
|
|
|
2012-06-05 03:42:12 +00:00
|
|
|
/* Now copy it into the mac registers backwards, cuz
|
|
|
|
* little endian is silly
|
|
|
|
*/
|
2011-11-16 09:38:02 +00:00
|
|
|
for (idx = 0; idx < ETH_ALEN; idx++)
|
|
|
|
tmpbuf[ETH_ALEN - 1 - idx] = addr[idx];
|
2005-11-11 18:38:59 +00:00
|
|
|
|
|
|
|
gfar_write(macptr, *((u32 *) (tmpbuf)));
|
|
|
|
|
|
|
|
tempval = *((u32 *) (tmpbuf + 4));
|
|
|
|
|
|
|
|
gfar_write(macptr+1, tempval);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* GFAR error interrupt handler */
|
2009-11-02 07:03:09 +00:00
|
|
|
static irqreturn_t gfar_error(int irq, void *grp_id)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2009-11-02 07:03:09 +00:00
|
|
|
struct gfar_priv_grp *gfargrp = grp_id;
|
|
|
|
struct gfar __iomem *regs = gfargrp->regs;
|
|
|
|
struct gfar_private *priv= gfargrp->priv;
|
|
|
|
struct net_device *dev = priv->ndev;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Save ievent for future reference */
|
2009-11-02 07:03:09 +00:00
|
|
|
u32 events = gfar_read(®s->ievent);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Clear IEVENT */
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_write(®s->ievent, events & IEVENT_ERR_MASK);
|
2008-07-11 23:04:45 +00:00
|
|
|
|
|
|
|
/* Magic Packet is not an error. */
|
2008-12-16 23:29:15 +00:00
|
|
|
if ((priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET) &&
|
2008-07-11 23:04:45 +00:00
|
|
|
(events & IEVENT_MAG))
|
|
|
|
events &= ~IEVENT_MAG;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Hmm... */
|
2005-06-20 15:54:21 +00:00
|
|
|
if (netif_msg_rx_err(priv) || netif_msg_tx_err(priv))
|
2012-06-05 03:42:13 +00:00
|
|
|
netdev_dbg(dev,
|
|
|
|
"error interrupt (ievent=0x%08x imask=0x%08x)\n",
|
2011-06-14 08:57:47 +00:00
|
|
|
events, gfar_read(®s->imask));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Update the error counters */
|
|
|
|
if (events & IEVENT_TXE) {
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.tx_errors++;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (events & IEVENT_LC)
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.tx_window_errors++;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (events & IEVENT_CRL)
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.tx_aborted_errors++;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (events & IEVENT_XFUN) {
|
2009-11-10 14:11:08 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_dbg(priv, tx_err, dev,
|
|
|
|
"TX FIFO underrun, packet dropped\n");
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.tx_dropped++;
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&priv->extra_stats.tx_underrun);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-10 14:11:08 +00:00
|
|
|
local_irq_save(flags);
|
|
|
|
lock_tx_qs(priv);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Reactivate the Tx Queues */
|
2009-11-02 07:03:15 +00:00
|
|
|
gfar_write(®s->tstat, gfargrp->tstat);
|
2009-11-10 14:11:08 +00:00
|
|
|
|
|
|
|
unlock_tx_qs(priv);
|
|
|
|
local_irq_restore(flags);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_dbg(priv, tx_err, dev, "Transmit Error\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
if (events & IEVENT_BSY) {
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.rx_errors++;
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&priv->extra_stats.rx_bsy);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2009-11-02 07:03:09 +00:00
|
|
|
gfar_receive(irq, grp_id);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_dbg(priv, rx_err, dev, "busy error (rstat: %x)\n",
|
|
|
|
gfar_read(®s->rstat));
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
if (events & IEVENT_BABR) {
|
2007-10-04 00:41:50 +00:00
|
|
|
dev->stats.rx_errors++;
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&priv->extra_stats.rx_babr);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_dbg(priv, rx_err, dev, "babbling RX error\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
if (events & IEVENT_EBERR) {
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&priv->extra_stats.eberr);
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_dbg(priv, rx_err, dev, "bus error\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2011-06-14 08:57:47 +00:00
|
|
|
if (events & IEVENT_RXC)
|
|
|
|
netif_dbg(priv, rx_status, dev, "control frame\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (events & IEVENT_BABT) {
|
2013-02-12 20:38:19 +00:00
|
|
|
atomic64_inc(&priv->extra_stats.tx_babt);
|
2011-06-14 08:57:47 +00:00
|
|
|
netif_dbg(priv, tx_err, dev, "babbling TX error\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
2014-04-30 11:27:21 +00:00
|
|
|
static u32 gfar_get_flowctrl_cfg(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct phy_device *phydev = priv->phydev;
|
|
|
|
u32 val = 0;
|
|
|
|
|
|
|
|
if (!phydev->duplex)
|
|
|
|
return val;
|
|
|
|
|
|
|
|
if (!priv->pause_aneg_en) {
|
|
|
|
if (priv->tx_pause_en)
|
|
|
|
val |= MACCFG1_TX_FLOW;
|
|
|
|
if (priv->rx_pause_en)
|
|
|
|
val |= MACCFG1_RX_FLOW;
|
|
|
|
} else {
|
|
|
|
u16 lcl_adv, rmt_adv;
|
|
|
|
u8 flowctrl;
|
|
|
|
/* get link partner capabilities */
|
|
|
|
rmt_adv = 0;
|
|
|
|
if (phydev->pause)
|
|
|
|
rmt_adv = LPA_PAUSE_CAP;
|
|
|
|
if (phydev->asym_pause)
|
|
|
|
rmt_adv |= LPA_PAUSE_ASYM;
|
|
|
|
|
|
|
|
lcl_adv = mii_advertise_flowctrl(phydev->advertising);
|
|
|
|
|
|
|
|
flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
|
|
|
|
if (flowctrl & FLOW_CTRL_TX)
|
|
|
|
val |= MACCFG1_TX_FLOW;
|
|
|
|
if (flowctrl & FLOW_CTRL_RX)
|
|
|
|
val |= MACCFG1_RX_FLOW;
|
|
|
|
}
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static noinline void gfar_update_link_state(struct gfar_private *priv)
|
|
|
|
{
|
|
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
|
|
struct phy_device *phydev = priv->phydev;
|
|
|
|
|
|
|
|
if (unlikely(test_bit(GFAR_RESETTING, &priv->state)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (phydev->link) {
|
|
|
|
u32 tempval1 = gfar_read(®s->maccfg1);
|
|
|
|
u32 tempval = gfar_read(®s->maccfg2);
|
|
|
|
u32 ecntrl = gfar_read(®s->ecntrl);
|
|
|
|
|
|
|
|
if (phydev->duplex != priv->oldduplex) {
|
|
|
|
if (!(phydev->duplex))
|
|
|
|
tempval &= ~(MACCFG2_FULL_DUPLEX);
|
|
|
|
else
|
|
|
|
tempval |= MACCFG2_FULL_DUPLEX;
|
|
|
|
|
|
|
|
priv->oldduplex = phydev->duplex;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (phydev->speed != priv->oldspeed) {
|
|
|
|
switch (phydev->speed) {
|
|
|
|
case 1000:
|
|
|
|
tempval =
|
|
|
|
((tempval & ~(MACCFG2_IF)) | MACCFG2_GMII);
|
|
|
|
|
|
|
|
ecntrl &= ~(ECNTRL_R100);
|
|
|
|
break;
|
|
|
|
case 100:
|
|
|
|
case 10:
|
|
|
|
tempval =
|
|
|
|
((tempval & ~(MACCFG2_IF)) | MACCFG2_MII);
|
|
|
|
|
|
|
|
/* Reduced mode distinguishes
|
|
|
|
* between 10 and 100
|
|
|
|
*/
|
|
|
|
if (phydev->speed == SPEED_100)
|
|
|
|
ecntrl |= ECNTRL_R100;
|
|
|
|
else
|
|
|
|
ecntrl &= ~(ECNTRL_R100);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
netif_warn(priv, link, priv->ndev,
|
|
|
|
"Ack! Speed (%d) is not 10/100/1000!\n",
|
|
|
|
phydev->speed);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
priv->oldspeed = phydev->speed;
|
|
|
|
}
|
|
|
|
|
|
|
|
tempval1 &= ~(MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
|
|
|
|
tempval1 |= gfar_get_flowctrl_cfg(priv);
|
|
|
|
|
|
|
|
gfar_write(®s->maccfg1, tempval1);
|
|
|
|
gfar_write(®s->maccfg2, tempval);
|
|
|
|
gfar_write(®s->ecntrl, ecntrl);
|
|
|
|
|
|
|
|
if (!priv->oldlink)
|
|
|
|
priv->oldlink = 1;
|
|
|
|
|
|
|
|
} else if (priv->oldlink) {
|
|
|
|
priv->oldlink = 0;
|
|
|
|
priv->oldspeed = 0;
|
|
|
|
priv->oldduplex = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (netif_msg_link(priv))
|
|
|
|
phy_print_status(phydev);
|
|
|
|
}
|
|
|
|
|
2008-12-16 23:29:15 +00:00
|
|
|
static struct of_device_id gfar_match[] =
|
|
|
|
{
|
|
|
|
{
|
|
|
|
.type = "network",
|
|
|
|
.compatible = "gianfar",
|
|
|
|
},
|
2009-11-02 07:03:34 +00:00
|
|
|
{
|
|
|
|
.compatible = "fsl,etsec2",
|
|
|
|
},
|
2008-12-16 23:29:15 +00:00
|
|
|
{},
|
|
|
|
};
|
2009-10-14 21:54:52 +00:00
|
|
|
MODULE_DEVICE_TABLE(of, gfar_match);
|
2008-12-16 23:29:15 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Structure for a device driver */
|
2011-02-23 04:05:51 +00:00
|
|
|
static struct platform_driver gfar_driver = {
|
2010-04-13 23:13:02 +00:00
|
|
|
.driver = {
|
|
|
|
.name = "fsl-gianfar",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.pm = GFAR_PM_OPS,
|
|
|
|
.of_match_table = gfar_match,
|
|
|
|
},
|
2005-04-16 22:20:36 +00:00
|
|
|
.probe = gfar_probe,
|
|
|
|
.remove = gfar_remove,
|
|
|
|
};
|
|
|
|
|
2011-11-27 16:44:17 +00:00
|
|
|
module_platform_driver(gfar_driver);
|