a2065: Use pr_fmt, pr_<level> and netdev_<level> (747e252f) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/a2065.c

+162 −174

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,11 @@
	* both 10BASE-2 (thin coax) and AUI (DB-15) connectors		* both 10BASE-2 (thin coax) and AUI (DB-15) connectors
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

			/#define DEBUG/
			/#define TEST_HITS/

	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/netdevice.h>		#include <linux/netdevice.h>
	#include <linux/etherdevice.h>		#include <linux/etherdevice.h>
	@@ -58,10 +63,7 @@

	#include "a2065.h"		#include "a2065.h"

			/* Transmit/Receive Ring Definitions */
	/*
	* Transmit/Receive Ring Definitions
	*/

	#define LANCE_LOG_TX_BUFFERS (2)		#define LANCE_LOG_TX_BUFFERS (2)
	#define LANCE_LOG_RX_BUFFERS (4)		#define LANCE_LOG_RX_BUFFERS (4)
	@@ -76,11 +78,7 @@
	#define RX_BUFF_SIZE PKT_BUF_SIZE		#define RX_BUFF_SIZE PKT_BUF_SIZE
	#define TX_BUFF_SIZE PKT_BUF_SIZE		#define TX_BUFF_SIZE PKT_BUF_SIZE

			/* Layout of the Lance's RAM Buffer */
	/*
	* Layout of the Lance's RAM Buffer
	*/


	struct lance_init_block {		struct lance_init_block {
	unsigned short mode; /* Pre-set mode (reg. 15) */		unsigned short mode; /* Pre-set mode (reg. 15) */
	@@ -101,10 +99,7 @@ struct lance_init_block {
	char tx_buf[TX_RING_SIZE][TX_BUFF_SIZE];		char tx_buf[TX_RING_SIZE][TX_BUFF_SIZE];
	};		};

			/* Private Device Data */
	/*
	* Private Device Data
	*/

	struct lance_private {		struct lance_private {
	char *name;		char *name;
	@@ -129,11 +124,6 @@ struct lance_private {
	struct timer_list multicast_timer;		struct timer_list multicast_timer;
	};		};

	#define TX_BUFFS_AVAIL ((lp->tx_old<=lp->tx_new)?\
	lp->tx_old+lp->tx_ring_mod_mask-lp->tx_new:\
	lp->tx_old - lp->tx_new-1)


	#define LANCE_ADDR(x) ((int)(x) & ~0xff000000)		#define LANCE_ADDR(x) ((int)(x) & ~0xff000000)

	/* Load the CSR registers */		/* Load the CSR registers */
	@@ -141,9 +131,7 @@ static void load_csrs (struct lance_private *lp)
	{		{
	volatile struct lance_regs *ll = lp->ll;		volatile struct lance_regs *ll = lp->ll;
	volatile struct lance_init_block *aib = lp->lance_init_block;		volatile struct lance_init_block *aib = lp->lance_init_block;
	int leptr;		int leptr = LANCE_ADDR(aib);

	leptr = LANCE_ADDR (aib);

	ll->rap = LE_CSR1;		ll->rap = LE_CSR1;
	ll->rdp = (leptr & 0xFFFF);		ll->rdp = (leptr & 0xFFFF);
	@@ -156,19 +144,16 @@ static void load_csrs (struct lance_private *lp)
	ll->rap = LE_CSR0;		ll->rap = LE_CSR0;
	}		}

	#define ZERO 0

	/* Setup the Lance Rx and Tx rings */		/* Setup the Lance Rx and Tx rings */
	static void lance_init_ring(struct net_device *dev)		static void lance_init_ring(struct net_device *dev)
	{		{
	struct lance_private *lp = netdev_priv(dev);		struct lance_private *lp = netdev_priv(dev);
	volatile struct lance_init_block *ib = lp->init_block;		volatile struct lance_init_block *ib = lp->init_block;
	volatile struct lance_init_block aib; / for LANCE_ADDR computations */		volatile struct lance_init_block *aib = lp->lance_init_block;
			/* for LANCE_ADDR computations */
	int leptr;		int leptr;
	int i;		int i;

	aib = lp->lance_init_block;

	/* Lock out other processes while setting up hardware */		/* Lock out other processes while setting up hardware */
	netif_stop_queue(dev);		netif_stop_queue(dev);
	lp->rx_new = lp->tx_new = 0;		lp->rx_new = lp->tx_new = 0;
	@@ -186,25 +171,22 @@ static void lance_init_ring (struct net_device *dev)
	ib->phys_addr[4] = dev->dev_addr[5];		ib->phys_addr[4] = dev->dev_addr[5];
	ib->phys_addr[5] = dev->dev_addr[4];		ib->phys_addr[5] = dev->dev_addr[4];

	if (ZERO)
	printk(KERN_DEBUG "TX rings:\n");

	/* Setup the Tx ring entries */		/* Setup the Tx ring entries */
	for (i = 0; i <= (1<<lp->lance_log_tx_bufs); i++) {		netdev_dbg(dev, "TX rings:\n");
			for (i = 0; i <= 1 << lp->lance_log_tx_bufs; i++) {
	leptr = LANCE_ADDR(&aib->tx_buf[i][0]);		leptr = LANCE_ADDR(&aib->tx_buf[i][0]);
	ib->btx_ring[i].tmd0 = leptr;		ib->btx_ring[i].tmd0 = leptr;
	ib->btx_ring[i].tmd1_hadr = leptr >> 16;		ib->btx_ring[i].tmd1_hadr = leptr >> 16;
	ib->btx_ring[i].tmd1_bits = 0;		ib->btx_ring[i].tmd1_bits = 0;
	ib->btx_ring[i].length = 0xf000; /* The ones required by tmd2 */		ib->btx_ring[i].length = 0xf000; /* The ones required by tmd2 */
	ib->btx_ring[i].misc = 0;		ib->btx_ring[i].misc = 0;
	if (i < 3 && ZERO)		if (i < 3)
	printk(KERN_DEBUG "%d: 0x%8.8x\n", i, leptr);		netdev_dbg(dev, "%d: 0x%08x\n", i, leptr);
	}		}

	/* Setup the Rx ring entries */		/* Setup the Rx ring entries */
	if (ZERO)		netdev_dbg(dev, "RX rings:\n");
	printk(KERN_DEBUG "RX rings:\n");		for (i = 0; i < 1 << lp->lance_log_rx_bufs; i++) {
	for (i = 0; i < (1<<lp->lance_log_rx_bufs); i++) {
	leptr = LANCE_ADDR(&aib->rx_buf[i][0]);		leptr = LANCE_ADDR(&aib->rx_buf[i][0]);

	ib->brx_ring[i].rmd0 = leptr;		ib->brx_ring[i].rmd0 = leptr;
	@@ -212,8 +194,8 @@ static void lance_init_ring (struct net_device *dev)
	ib->brx_ring[i].rmd1_bits = LE_R1_OWN;		ib->brx_ring[i].rmd1_bits = LE_R1_OWN;
	ib->brx_ring[i].length = -RX_BUFF_SIZE \| 0xf000;		ib->brx_ring[i].length = -RX_BUFF_SIZE \| 0xf000;
	ib->brx_ring[i].mblength = 0;		ib->brx_ring[i].mblength = 0;
	if (i < 3 && ZERO)		if (i < 3)
	printk(KERN_DEBUG "%d: 0x%8.8x\n", i, leptr);		netdev_dbg(dev, "%d: 0x%08x\n", i, leptr);
	}		}

	/* Setup the initialization block */		/* Setup the initialization block */
	@@ -222,15 +204,13 @@ static void lance_init_ring (struct net_device *dev)
	leptr = LANCE_ADDR(&aib->brx_ring);		leptr = LANCE_ADDR(&aib->brx_ring);
	ib->rx_len = (lp->lance_log_rx_bufs << 13) \| (leptr >> 16);		ib->rx_len = (lp->lance_log_rx_bufs << 13) \| (leptr >> 16);
	ib->rx_ptr = leptr;		ib->rx_ptr = leptr;
	if (ZERO)		netdev_dbg(dev, "RX ptr: %08x\n", leptr);
	printk(KERN_DEBUG "RX ptr: %8.8x\n", leptr);

	/* Setup tx descriptor pointer */		/* Setup tx descriptor pointer */
	leptr = LANCE_ADDR(&aib->btx_ring);		leptr = LANCE_ADDR(&aib->btx_ring);
	ib->tx_len = (lp->lance_log_tx_bufs << 13) \| (leptr >> 16);		ib->tx_len = (lp->lance_log_tx_bufs << 13) \| (leptr >> 16);
	ib->tx_ptr = leptr;		ib->tx_ptr = leptr;
	if (ZERO)		netdev_dbg(dev, "TX ptr: %08x\n", leptr);
	printk(KERN_DEBUG "TX ptr: %8.8x\n", leptr);

	/* Clear the multicast filter */		/* Clear the multicast filter */
	ib->filter[0] = 0;		ib->filter[0] = 0;
	@@ -249,8 +229,7 @@ static int init_restart_lance (struct lance_private *lp)
	for (i = 0; (i < 100) && !(ll->rdp & (LE_C0_ERR \| LE_C0_IDON)); i++)		for (i = 0; (i < 100) && !(ll->rdp & (LE_C0_ERR \| LE_C0_IDON)); i++)
	barrier();		barrier();
	if ((i == 100) \|\| (ll->rdp & LE_C0_ERR)) {		if ((i == 100) \|\| (ll->rdp & LE_C0_ERR)) {
	printk(KERN_ERR "LANCE unopened after %d ticks, csr0=%4.4x.\n",		pr_err("unopened after %d ticks, csr0=%04x\n", i, ll->rdp);
	i, ll->rdp);
	return -EIO;		return -EIO;
	}		}

	@@ -271,16 +250,18 @@ static int lance_rx (struct net_device *dev)

	#ifdef TEST_HITS		#ifdef TEST_HITS
	int i;		int i;
	printk(KERN_DEBUG "[");		char buf[RX_RING_SIZE + 1];

	for (i = 0; i < RX_RING_SIZE; i++) {		for (i = 0; i < RX_RING_SIZE; i++) {
			char r1_own = ib->brx_ring[i].rmd1_bits & LE_R1_OWN;
	if (i == lp->rx_new)		if (i == lp->rx_new)
	printk ("%s",		buf[i] = r1_own ? '_' : 'X';
	ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "_" : "X");
	else		else
	printk ("%s",		buf[i] = r1_own ? '.' : '1';
	ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "." : "1");
	}		}
	printk ("]\n");		buf[RX_RING_SIZE] = 0;

			pr_debug("RxRing TestHits: [%s]\n", buf);
	#endif		#endif

	ll->rdp = LE_C0_RINT \| LE_C0_INEA;		ll->rdp = LE_C0_RINT \| LE_C0_INEA;
	@@ -297,18 +278,22 @@ static int lance_rx (struct net_device *dev)
	/* Count only the end frame as a rx error,		/* Count only the end frame as a rx error,
	* not the beginning		* not the beginning
	*/		*/
	if (bits & LE_R1_BUF) dev->stats.rx_fifo_errors++;		if (bits & LE_R1_BUF)
	if (bits & LE_R1_CRC) dev->stats.rx_crc_errors++;		dev->stats.rx_fifo_errors++;
	if (bits & LE_R1_OFL) dev->stats.rx_over_errors++;		if (bits & LE_R1_CRC)
	if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++;		dev->stats.rx_crc_errors++;
	if (bits & LE_R1_EOP) dev->stats.rx_errors++;		if (bits & LE_R1_OFL)
			dev->stats.rx_over_errors++;
			if (bits & LE_R1_FRA)
			dev->stats.rx_frame_errors++;
			if (bits & LE_R1_EOP)
			dev->stats.rx_errors++;
	} else {		} else {
	int len = (rd->mblength & 0xfff) - 4;		int len = (rd->mblength & 0xfff) - 4;
	struct sk_buff *skb = dev_alloc_skb(len + 2);		struct sk_buff *skb = dev_alloc_skb(len + 2);

	if (!skb) {		if (!skb) {
	printk(KERN_WARNING "%s: Memory squeeze, "		netdev_warn(dev, "Memory squeeze, deferring packet\n");
	"deferring packet.\n", dev->name);
	dev->stats.rx_dropped++;		dev->stats.rx_dropped++;
	rd->mblength = 0;		rd->mblength = 0;
	rd->rmd1_bits = LE_R1_OWN;		rd->rmd1_bits = LE_R1_OWN;
	@@ -319,7 +304,7 @@ static int lance_rx (struct net_device *dev)
	skb_reserve(skb, 2); /* 16 byte align */		skb_reserve(skb, 2); /* 16 byte align */
	skb_put(skb, len); /* make room */		skb_put(skb, len); /* make room */
	skb_copy_to_linear_data(skb,		skb_copy_to_linear_data(skb,
	(unsigned char *)&(ib->rx_buf [lp->rx_new][0]),		(unsigned char *)&ib->rx_buf[lp->rx_new][0],
	len);		len);
	skb->protocol = eth_type_trans(skb, dev);		skb->protocol = eth_type_trans(skb, dev);
	netif_rx(skb);		netif_rx(skb);
	@@ -360,15 +345,16 @@ static int lance_tx (struct net_device *dev)
	status = td->misc;		status = td->misc;

	dev->stats.tx_errors++;		dev->stats.tx_errors++;
	if (status & LE_T3_RTY) dev->stats.tx_aborted_errors++;		if (status & LE_T3_RTY)
	if (status & LE_T3_LCOL) dev->stats.tx_window_errors++;		dev->stats.tx_aborted_errors++;
			if (status & LE_T3_LCOL)
			dev->stats.tx_window_errors++;

	if (status & LE_T3_CLOS) {		if (status & LE_T3_CLOS) {
	dev->stats.tx_carrier_errors++;		dev->stats.tx_carrier_errors++;
	if (lp->auto_select) {		if (lp->auto_select) {
	lp->tpe = 1 - lp->tpe;		lp->tpe = 1 - lp->tpe;
	printk(KERN_ERR "%s: Carrier Lost, "		netdev_err(dev, "Carrier Lost, trying %s\n",
	"trying %s\n", dev->name,
	lp->tpe ? "TPE" : "AUI");		lp->tpe ? "TPE" : "AUI");
	/* Stop the lance */		/* Stop the lance */
	ll->rap = LE_CSR0;		ll->rap = LE_CSR0;
	@@ -380,13 +366,13 @@ static int lance_tx (struct net_device *dev)
	}		}
	}		}

	/* buffer errors and underflows turn off the transmitter */		/* buffer errors and underflows turn off
	/* Restart the adapter */		* the transmitter, so restart the adapter
			*/
	if (status & (LE_T3_BUF \| LE_T3_UFL)) {		if (status & (LE_T3_BUF \| LE_T3_UFL)) {
	dev->stats.tx_fifo_errors++;		dev->stats.tx_fifo_errors++;

	printk(KERN_ERR "%s: Tx: ERR_BUF\|ERR_UFL, "		netdev_err(dev, "Tx: ERR_BUF\|ERR_UFL, restarting\n");
	"restarting\n", dev->name);
	/* Stop the lance */		/* Stop the lance */
	ll->rap = LE_CSR0;		ll->rap = LE_CSR0;
	ll->rdp = LE_C0_STOP;		ll->rdp = LE_C0_STOP;
	@@ -396,9 +382,7 @@ static int lance_tx (struct net_device *dev)
	return 0;		return 0;
	}		}
	} else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) {		} else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) {
	/*		/* So we don't count the packet more than once. */
	* So we don't count the packet more than once.
	*/
	td->tmd1_bits &= ~(LE_T1_POK);		td->tmd1_bits &= ~(LE_T1_POK);

	/* One collision before packet was sent. */		/* One collision before packet was sent. */
	@@ -419,6 +403,13 @@ static int lance_tx (struct net_device *dev)
	return 0;		return 0;
	}		}

			static int lance_tx_buffs_avail(struct lance_private *lp)
			{
			if (lp->tx_old <= lp->tx_new)
			return lp->tx_old + lp->tx_ring_mod_mask - lp->tx_new;
			return lp->tx_old - lp->tx_new - 1;
			}

	static irqreturn_t lance_interrupt(int irq, void *dev_id)		static irqreturn_t lance_interrupt(int irq, void *dev_id)
	{		{
	struct net_device *dev = dev_id;		struct net_device *dev = dev_id;
	@@ -436,7 +427,7 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id)
	ll->rdp = csr0 & ~(LE_C0_INEA \| LE_C0_TDMD \| LE_C0_STOP \| LE_C0_STRT \|		ll->rdp = csr0 & ~(LE_C0_INEA \| LE_C0_TDMD \| LE_C0_STOP \| LE_C0_STRT \|
	LE_C0_INIT);		LE_C0_INIT);

	if ((csr0 & LE_C0_ERR)) {		if (csr0 & LE_C0_ERR) {
	/* Clear the error condition */		/* Clear the error condition */
	ll->rdp = LE_C0_BABL \| LE_C0_ERR \| LE_C0_MISS \| LE_C0_INEA;		ll->rdp = LE_C0_BABL \| LE_C0_ERR \| LE_C0_MISS \| LE_C0_INEA;
	}		}
	@@ -453,18 +444,18 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id)
	if (csr0 & LE_C0_MISS)		if (csr0 & LE_C0_MISS)
	dev->stats.rx_errors++; /* Missed a Rx frame. */		dev->stats.rx_errors++; /* Missed a Rx frame. */
	if (csr0 & LE_C0_MERR) {		if (csr0 & LE_C0_MERR) {
	printk(KERN_ERR "%s: Bus master arbitration failure, status "		netdev_err(dev, "Bus master arbitration failure, status %04x\n",
	"%4.4x.\n", dev->name, csr0);		csr0);
	/* Restart the chip. */		/* Restart the chip. */
	ll->rdp = LE_C0_STRT;		ll->rdp = LE_C0_STRT;
	}		}

	if (netif_queue_stopped(dev) && TX_BUFFS_AVAIL > 0)		if (netif_queue_stopped(dev) && lance_tx_buffs_avail(lp) > 0)
	netif_wake_queue(dev);		netif_wake_queue(dev);

	ll->rap = LE_CSR0;		ll->rap = LE_CSR0;
	ll->rdp = LE_C0_BABL\|LE_C0_CERR\|LE_C0_MISS\|LE_C0_MERR\|		ll->rdp = (LE_C0_BABL \| LE_C0_CERR \| LE_C0_MISS \| LE_C0_MERR \|
	LE_C0_IDON\|LE_C0_INEA;		LE_C0_IDON \| LE_C0_INEA);
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

	@@ -481,7 +472,8 @@ static int lance_open (struct net_device *dev)
	/* Install the Interrupt handler */		/* Install the Interrupt handler */
	ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, IRQF_SHARED,		ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, IRQF_SHARED,
	dev->name, dev);		dev->name, dev);
	if (ret) return ret;		if (ret)
			return ret;

	load_csrs(lp);		load_csrs(lp);
	lance_init_ring(dev);		lance_init_ring(dev);
	@@ -524,9 +516,8 @@ static inline int lance_reset (struct net_device *dev)
	netif_start_queue(dev);		netif_start_queue(dev);

	status = init_restart_lance(lp);		status = init_restart_lance(lp);
	#ifdef DEBUG_DRIVER		netdev_dbg(dev, "Lance restart=%d\n", status);
	printk(KERN_DEBUG "Lance restart=%d\n", status);
	#endif
	return status;		return status;
	}		}

	@@ -535,8 +526,7 @@ static void lance_tx_timeout(struct net_device *dev)
	struct lance_private *lp = netdev_priv(dev);		struct lance_private *lp = netdev_priv(dev);
	volatile struct lance_regs *ll = lp->ll;		volatile struct lance_regs *ll = lp->ll;

	printk(KERN_ERR "%s: transmit timed out, status %04x, reset\n",		netdev_err(dev, "transmit timed out, status %04x, reset\n", ll->rdp);
	dev->name, ll->rdp);
	lance_reset(dev);		lance_reset(dev);
	netif_wake_queue(dev);		netif_wake_queue(dev);
	}		}
	@@ -557,12 +547,12 @@ static netdev_tx_t lance_start_xmit (struct sk_buff *skb,

	local_irq_save(flags);		local_irq_save(flags);

	if (!TX_BUFFS_AVAIL){		if (!lance_tx_buffs_avail(lp)) {
	local_irq_restore(flags);		local_irq_restore(flags);
	return NETDEV_TX_LOCKED;		return NETDEV_TX_LOCKED;
	}		}

	#ifdef DEBUG_DRIVER		#ifdef DEBUG
	/* dump the packet */		/* dump the packet */
	print_hex_dump(KERN_DEBUG, "skb->data: ", DUMP_PREFIX_NONE,		print_hex_dump(KERN_DEBUG, "skb->data: ", DUMP_PREFIX_NONE,
	16, 1, skb->data, 64, true);		16, 1, skb->data, 64, true);
	@@ -578,7 +568,7 @@ static netdev_tx_t lance_start_xmit (struct sk_buff *skb,
	lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask;		lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask;
	dev->stats.tx_bytes += skblen;		dev->stats.tx_bytes += skblen;

	if (TX_BUFFS_AVAIL <= 0)		if (lance_tx_buffs_avail(lp) <= 0)
	netif_stop_queue(dev);		netif_stop_queue(dev);

	/* Kick the lance: transmit now */		/* Kick the lance: transmit now */
	@@ -692,14 +682,12 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
	{		{
	struct net_device *dev;		struct net_device *dev;
	struct lance_private *priv;		struct lance_private *priv;
	unsigned long board, base_addr, mem_start;		unsigned long board = z->resource.start;
			unsigned long base_addr = board + A2065_LANCE;
			unsigned long mem_start = board + A2065_RAM;
	struct resource r1, r2;		struct resource r1, r2;
	int err;		int err;

	board = z->resource.start;
	base_addr = board+A2065_LANCE;
	mem_start = board+A2065_RAM;

	r1 = request_mem_region(base_addr, sizeof(struct lance_regs),		r1 = request_mem_region(base_addr, sizeof(struct lance_regs),
	"Am7990");		"Am7990");
	if (!r1)		if (!r1)
	@@ -755,7 +743,7 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
	init_timer(&priv->multicast_timer);		init_timer(&priv->multicast_timer);
	priv->multicast_timer.data = (unsigned long) dev;		priv->multicast_timer.data = (unsigned long) dev;
	priv->multicast_timer.function =		priv->multicast_timer.function =
	(void (*)(unsigned long)) &lance_set_multicast;		(void (*)(unsigned long))lance_set_multicast;

	err = register_netdev(dev);		err = register_netdev(dev);
	if (err) {		if (err) {
	@@ -766,8 +754,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
	}		}
	zorro_set_drvdata(z, dev);		zorro_set_drvdata(z, dev);

	printk(KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address "		netdev_info(dev, "A2065 at 0x%08lx, Ethernet Address %pM\n",
	"%pM\n", dev->name, board, dev->dev_addr);		board, dev->dev_addr);

	return 0;		return 0;
	}		}