Skip to content

L
linux
Commit 9bd5423f authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'enc28j60-messaging-clean-up-and-ACPI-improvements' 

Andy Shevchenko says:

====================
enc28j60: messaging clean up and ACPI improvements

Most of the patches in the series dedicated to update messaging to use modern
APIs, such as netdev, with a benefit to distinguish devices, if more than one
installed on the system.

Besides that, patch 1 targeting ACPI enabled systems when MAC address provided
there via properties.

And few clean ups are included, such as:
- switching to module_spi_driver()
- converting to use ether_addr_copy() API
- converting to use SPDX

Since v2:
- cover letter is added
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 03f1eccc 75dd98c4
Show whitespace changes
Inline Side-by-side
Showing with 253 additions and 288 deletions
drivers/net/ethernet/microchip/enc28j60.c
View file @ 9bd5423f
// SPDX-License-Identifier: GPL-2.0+
/* /*
* Microchip ENC28J60 ethernet driver (MAC + PHY) * Microchip ENC28J60 ethernet driver (MAC + PHY)
* *
...@@ -5,11 +6,6 @@ ...@@ -5,11 +6,6 @@
* Author: Claudio Lanconelli <lanconelli.claudio@eptar.com> * Author: Claudio Lanconelli <lanconelli.claudio@eptar.com>
* based on enc28j60.c written by David Anders for 2.4 kernel version * based on enc28j60.c written by David Anders for 2.4 kernel version
* *
* 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.
*
* $Id: enc28j60.c,v 1.22 2007/12/20 10:47:01 claudio Exp $ * $Id: enc28j60.c,v 1.22 2007/12/20 10:47:01 claudio Exp $
*/ */
...@@ -18,9 +14,9 @@ ...@@ -18,9 +14,9 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/property.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
...@@ -28,7 +24,6 @@ ...@@ -28,7 +24,6 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/of_net.h>
#include "enc28j60_hw.h" #include "enc28j60_hw.h"
...@@ -41,7 +36,8 @@ ...@@ -41,7 +36,8 @@
(NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN | NETIF_MSG_LINK) (NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN | NETIF_MSG_LINK)
/* Buffer size required for the largest SPI transfer (i.e., reading a /* Buffer size required for the largest SPI transfer (i.e., reading a
* frame). */ * frame).
*/
#define SPI_TRANSFER_BUF_LEN (4 + MAX_FRAMELEN) #define SPI_TRANSFER_BUF_LEN (4 + MAX_FRAMELEN)
#define TX_TIMEOUT (4 * HZ) #define TX_TIMEOUT (4 * HZ)
...@@ -83,11 +79,12 @@ static struct { ...@@ -83,11 +79,12 @@ static struct {
/* /*
* SPI read buffer * SPI read buffer
* wait for the SPI transfer and copy received data to destination * Wait for the SPI transfer and copy received data to destination.
*/ */
static int static int
spi_read_buf(struct enc28j60_net *priv, int len, u8 *data) spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)
{ {
struct device *dev = &priv->spi->dev;
u8 *rx_buf = priv->spi_transfer_buf + 4; u8 *rx_buf = priv->spi_transfer_buf + 4;
u8 *tx_buf = priv->spi_transfer_buf; u8 *tx_buf = priv->spi_transfer_buf;
struct spi_transfer tx = { struct spi_transfer tx = {
...@@ -113,7 +110,7 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data) ...@@ -113,7 +110,7 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)
ret = msg.status; ret = msg.status;
} }
if (ret && netif_msg_drv(priv)) if (ret && netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n", dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",
__func__, ret); __func__, ret);
return ret; return ret;
...@@ -122,9 +119,9 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data) ...@@ -122,9 +119,9 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data)
/* /*
* SPI write buffer * SPI write buffer
*/ */
static int spi_write_buf(struct enc28j60_net *priv, int len, static int spi_write_buf(struct enc28j60_net *priv, int len, const u8 *data)
const u8 *data)
{ {
struct device *dev = &priv->spi->dev;
int ret; int ret;
if (len > SPI_TRANSFER_BUF_LEN - 1 || len <= 0) if (len > SPI_TRANSFER_BUF_LEN - 1 || len <= 0)
...@@ -134,7 +131,7 @@ static int spi_write_buf(struct enc28j60_net *priv, int len, ...@@ -134,7 +131,7 @@ static int spi_write_buf(struct enc28j60_net *priv, int len,
memcpy(&priv->spi_transfer_buf[1], data, len); memcpy(&priv->spi_transfer_buf[1], data, len);
ret = spi_write(priv->spi, priv->spi_transfer_buf, len + 1); ret = spi_write(priv->spi, priv->spi_transfer_buf, len + 1);
if (ret && netif_msg_drv(priv)) if (ret && netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n", dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",
__func__, ret); __func__, ret);
} }
return ret; return ret;
...@@ -143,9 +140,9 @@ static int spi_write_buf(struct enc28j60_net *priv, int len, ...@@ -143,9 +140,9 @@ static int spi_write_buf(struct enc28j60_net *priv, int len,
/* /*
* basic SPI read operation * basic SPI read operation
*/ */
static u8 spi_read_op(struct enc28j60_net *priv, u8 op, static u8 spi_read_op(struct enc28j60_net *priv, u8 op, u8 addr)
u8 addr)
{ {
struct device *dev = &priv->spi->dev;
u8 tx_buf[2]; u8 tx_buf[2];
u8 rx_buf[4]; u8 rx_buf[4];
u8 val = 0; u8 val = 0;
...@@ -159,7 +156,7 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op, ...@@ -159,7 +156,7 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op,
tx_buf[0] = op | (addr & ADDR_MASK); tx_buf[0] = op | (addr & ADDR_MASK);
ret = spi_write_then_read(priv->spi, tx_buf, 1, rx_buf, slen); ret = spi_write_then_read(priv->spi, tx_buf, 1, rx_buf, slen);
if (ret) if (ret)
printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n", dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",
__func__, ret); __func__, ret);
else else
val = rx_buf[slen - 1]; val = rx_buf[slen - 1];
...@@ -170,28 +167,25 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op, ...@@ -170,28 +167,25 @@ static u8 spi_read_op(struct enc28j60_net *priv, u8 op,
/* /*
* basic SPI write operation * basic SPI write operation
*/ */
static int spi_write_op(struct enc28j60_net *priv, u8 op, static int spi_write_op(struct enc28j60_net *priv, u8 op, u8 addr, u8 val)
u8 addr, u8 val)
{ {
struct device *dev = &priv->spi->dev;
int ret; int ret;
priv->spi_transfer_buf[0] = op | (addr & ADDR_MASK); priv->spi_transfer_buf[0] = op | (addr & ADDR_MASK);
priv->spi_transfer_buf[1] = val; priv->spi_transfer_buf[1] = val;
ret = spi_write(priv->spi, priv->spi_transfer_buf, 2); ret = spi_write(priv->spi, priv->spi_transfer_buf, 2);
if (ret && netif_msg_drv(priv)) if (ret && netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() failed: ret = %d\n", dev_printk(KERN_DEBUG, dev, "%s() failed: ret = %d\n",
__func__, ret); __func__, ret);
return ret; return ret;
} }
static void enc28j60_soft_reset(struct enc28j60_net *priv) static void enc28j60_soft_reset(struct enc28j60_net *priv)
{ {
if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
spi_write_op(priv, ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET); spi_write_op(priv, ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);
/* Errata workaround #1, CLKRDY check is unreliable, /* Errata workaround #1, CLKRDY check is unreliable,
* delay at least 1 mS instead */ * delay at least 1 ms instead */
udelay(2000); udelay(2000);
} }
...@@ -203,7 +197,7 @@ static void enc28j60_set_bank(struct enc28j60_net *priv, u8 addr) ...@@ -203,7 +197,7 @@ static void enc28j60_set_bank(struct enc28j60_net *priv, u8 addr)
u8 b = (addr & BANK_MASK) >> 5; u8 b = (addr & BANK_MASK) >> 5;
/* These registers (EIE, EIR, ESTAT, ECON2, ECON1) /* These registers (EIE, EIR, ESTAT, ECON2, ECON1)
* are present in all banks, no need to switch bank * are present in all banks, no need to switch bank.
*/ */
if (addr >= EIE && addr <= ECON1) if (addr >= EIE && addr <= ECON1)
return; return;
...@@ -242,15 +236,13 @@ static void enc28j60_set_bank(struct enc28j60_net *priv, u8 addr) ...@@ -242,15 +236,13 @@ static void enc28j60_set_bank(struct enc28j60_net *priv, u8 addr)
/* /*
* Register bit field Set * Register bit field Set
*/ */
static void nolock_reg_bfset(struct enc28j60_net *priv, static void nolock_reg_bfset(struct enc28j60_net *priv, u8 addr, u8 mask)
u8 addr, u8 mask)
{ {
enc28j60_set_bank(priv, addr); enc28j60_set_bank(priv, addr);
spi_write_op(priv, ENC28J60_BIT_FIELD_SET, addr, mask); spi_write_op(priv, ENC28J60_BIT_FIELD_SET, addr, mask);
} }
static void locked_reg_bfset(struct enc28j60_net *priv, static void locked_reg_bfset(struct enc28j60_net *priv, u8 addr, u8 mask)
u8 addr, u8 mask)
{ {
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
nolock_reg_bfset(priv, addr, mask); nolock_reg_bfset(priv, addr, mask);
...@@ -260,15 +252,13 @@ static void locked_reg_bfset(struct enc28j60_net *priv, ...@@ -260,15 +252,13 @@ static void locked_reg_bfset(struct enc28j60_net *priv,
/* /*
* Register bit field Clear * Register bit field Clear
*/ */
static void nolock_reg_bfclr(struct enc28j60_net *priv, static void nolock_reg_bfclr(struct enc28j60_net *priv, u8 addr, u8 mask)
u8 addr, u8 mask)
{ {
enc28j60_set_bank(priv, addr); enc28j60_set_bank(priv, addr);
spi_write_op(priv, ENC28J60_BIT_FIELD_CLR, addr, mask); spi_write_op(priv, ENC28J60_BIT_FIELD_CLR, addr, mask);
} }
static void locked_reg_bfclr(struct enc28j60_net *priv, static void locked_reg_bfclr(struct enc28j60_net *priv, u8 addr, u8 mask)
u8 addr, u8 mask)
{ {
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
nolock_reg_bfclr(priv, addr, mask); nolock_reg_bfclr(priv, addr, mask);
...@@ -278,15 +268,13 @@ static void locked_reg_bfclr(struct enc28j60_net *priv, ...@@ -278,15 +268,13 @@ static void locked_reg_bfclr(struct enc28j60_net *priv,
/* /*
* Register byte read * Register byte read
*/ */
static int nolock_regb_read(struct enc28j60_net *priv, static int nolock_regb_read(struct enc28j60_net *priv, u8 address)
u8 address)
{ {
enc28j60_set_bank(priv, address); enc28j60_set_bank(priv, address);
return spi_read_op(priv, ENC28J60_READ_CTRL_REG, address); return spi_read_op(priv, ENC28J60_READ_CTRL_REG, address);
} }
static int locked_regb_read(struct enc28j60_net *priv, static int locked_regb_read(struct enc28j60_net *priv, u8 address)
u8 address)
{ {
int ret; int ret;
...@@ -300,8 +288,7 @@ static int locked_regb_read(struct enc28j60_net *priv, ...@@ -300,8 +288,7 @@ static int locked_regb_read(struct enc28j60_net *priv,
/* /*
* Register word read * Register word read
*/ */
static int nolock_regw_read(struct enc28j60_net *priv, static int nolock_regw_read(struct enc28j60_net *priv, u8 address)
u8 address)
{ {
int rl, rh; int rl, rh;
...@@ -312,8 +299,7 @@ static int nolock_regw_read(struct enc28j60_net *priv, ...@@ -312,8 +299,7 @@ static int nolock_regw_read(struct enc28j60_net *priv,
return (rh << 8) | rl; return (rh << 8) | rl;
} }
static int locked_regw_read(struct enc28j60_net *priv, static int locked_regw_read(struct enc28j60_net *priv, u8 address)
u8 address)
{ {
int ret; int ret;
...@@ -327,15 +313,13 @@ static int locked_regw_read(struct enc28j60_net *priv, ...@@ -327,15 +313,13 @@ static int locked_regw_read(struct enc28j60_net *priv,
/* /*
* Register byte write * Register byte write
*/ */
static void nolock_regb_write(struct enc28j60_net *priv, static void nolock_regb_write(struct enc28j60_net *priv, u8 address, u8 data)
u8 address, u8 data)
{ {
enc28j60_set_bank(priv, address); enc28j60_set_bank(priv, address);
spi_write_op(priv, ENC28J60_WRITE_CTRL_REG, address, data); spi_write_op(priv, ENC28J60_WRITE_CTRL_REG, address, data);
} }
static void locked_regb_write(struct enc28j60_net *priv, static void locked_regb_write(struct enc28j60_net *priv, u8 address, u8 data)
u8 address, u8 data)
{ {
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
nolock_regb_write(priv, address, data); nolock_regb_write(priv, address, data);
...@@ -345,8 +329,7 @@ static void locked_regb_write(struct enc28j60_net *priv, ...@@ -345,8 +329,7 @@ static void locked_regb_write(struct enc28j60_net *priv,
/* /*
* Register word write * Register word write
*/ */
static void nolock_regw_write(struct enc28j60_net *priv, static void nolock_regw_write(struct enc28j60_net *priv, u8 address, u16 data)
u8 address, u16 data)
{ {
enc28j60_set_bank(priv, address); enc28j60_set_bank(priv, address);
spi_write_op(priv, ENC28J60_WRITE_CTRL_REG, address, (u8) data); spi_write_op(priv, ENC28J60_WRITE_CTRL_REG, address, (u8) data);
...@@ -354,8 +337,7 @@ static void nolock_regw_write(struct enc28j60_net *priv, ...@@ -354,8 +337,7 @@ static void nolock_regw_write(struct enc28j60_net *priv,
(u8) (data >> 8)); (u8) (data >> 8));
} }
static void locked_regw_write(struct enc28j60_net *priv, static void locked_regw_write(struct enc28j60_net *priv, u8 address, u16 data)
u8 address, u16 data)
{ {
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
nolock_regw_write(priv, address, data); nolock_regw_write(priv, address, data);
...@@ -364,20 +346,23 @@ static void locked_regw_write(struct enc28j60_net *priv, ...@@ -364,20 +346,23 @@ static void locked_regw_write(struct enc28j60_net *priv,
/* /*
* Buffer memory read * Buffer memory read
* Select the starting address and execute a SPI buffer read * Select the starting address and execute a SPI buffer read.
*/ */
static void enc28j60_mem_read(struct enc28j60_net *priv, static void enc28j60_mem_read(struct enc28j60_net *priv, u16 addr, int len,
u16 addr, int len, u8 *data) u8 *data)
{ {
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
nolock_regw_write(priv, ERDPTL, addr); nolock_regw_write(priv, ERDPTL, addr);
#ifdef CONFIG_ENC28J60_WRITEVERIFY #ifdef CONFIG_ENC28J60_WRITEVERIFY
if (netif_msg_drv(priv)) { if (netif_msg_drv(priv)) {
struct device *dev = &priv->spi->dev;
u16 reg; u16 reg;
reg = nolock_regw_read(priv, ERDPTL); reg = nolock_regw_read(priv, ERDPTL);
if (reg != addr) if (reg != addr)
printk(KERN_DEBUG DRV_NAME ": %s() error writing ERDPT " dev_printk(KERN_DEBUG, dev,
"(0x%04x - 0x%04x)\n", __func__, reg, addr); "%s() error writing ERDPT (0x%04x - 0x%04x)\n",
__func__, reg, addr);
} }
#endif #endif
spi_read_buf(priv, len, data); spi_read_buf(priv, len, data);
...@@ -390,6 +375,8 @@ static void enc28j60_mem_read(struct enc28j60_net *priv, ...@@ -390,6 +375,8 @@ static void enc28j60_mem_read(struct enc28j60_net *priv,
static void static void
enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data) enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
{ {
struct device *dev = &priv->spi->dev;
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
/* Set the write pointer to start of transmit buffer area */ /* Set the write pointer to start of transmit buffer area */
nolock_regw_write(priv, EWRPTL, TXSTART_INIT); nolock_regw_write(priv, EWRPTL, TXSTART_INIT);
...@@ -398,8 +385,8 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data) ...@@ -398,8 +385,8 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
u16 reg; u16 reg;
reg = nolock_regw_read(priv, EWRPTL); reg = nolock_regw_read(priv, EWRPTL);
if (reg != TXSTART_INIT) if (reg != TXSTART_INIT)
printk(KERN_DEBUG DRV_NAME dev_printk(KERN_DEBUG, dev,
": %s() ERWPT:0x%04x != 0x%04x\n", "%s() ERWPT:0x%04x != 0x%04x\n",
__func__, reg, TXSTART_INIT); __func__, reg, TXSTART_INIT);
} }
#endif #endif
...@@ -408,30 +395,28 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data) ...@@ -408,30 +395,28 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data)
/* write per-packet control byte */ /* write per-packet control byte */
spi_write_op(priv, ENC28J60_WRITE_BUF_MEM, 0, 0x00); spi_write_op(priv, ENC28J60_WRITE_BUF_MEM, 0, 0x00);
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME dev_printk(KERN_DEBUG, dev,
": %s() after control byte ERWPT:0x%04x\n", "%s() after control byte ERWPT:0x%04x\n",
__func__, nolock_regw_read(priv, EWRPTL)); __func__, nolock_regw_read(priv, EWRPTL));
/* copy the packet into the transmit buffer */ /* copy the packet into the transmit buffer */
spi_write_buf(priv, len, data); spi_write_buf(priv, len, data);
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME dev_printk(KERN_DEBUG, dev,
": %s() after write packet ERWPT:0x%04x, len=%d\n", "%s() after write packet ERWPT:0x%04x, len=%d\n",
__func__, nolock_regw_read(priv, EWRPTL), len); __func__, nolock_regw_read(priv, EWRPTL), len);
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);
} }
static unsigned long msec20_to_jiffies;
static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val) static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val)
{ {
unsigned long timeout = jiffies + msec20_to_jiffies; struct device *dev = &priv->spi->dev;
unsigned long timeout = jiffies + msecs_to_jiffies(20);
/* 20 msec timeout read */ /* 20 msec timeout read */
while ((nolock_regb_read(priv, reg) & mask) != val) { while ((nolock_regb_read(priv, reg) & mask) != val) {
if (time_after(jiffies, timeout)) { if (time_after(jiffies, timeout)) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
dev_dbg(&priv->spi->dev, dev_dbg(dev, "reg %02x ready timeout!\n", reg);
"reg %02x ready timeout!\n", reg);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
cpu_relax(); cpu_relax();
...@@ -449,7 +434,7 @@ static int wait_phy_ready(struct enc28j60_net *priv) ...@@ -449,7 +434,7 @@ static int wait_phy_ready(struct enc28j60_net *priv)
/* /*
* PHY register read * PHY register read
* PHY registers are not accessed directly, but through the MII * PHY registers are not accessed directly, but through the MII.
*/ */
static u16 enc28j60_phy_read(struct enc28j60_net *priv, u8 address) static u16 enc28j60_phy_read(struct enc28j60_net *priv, u8 address)
{ {
...@@ -494,12 +479,12 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev) ...@@ -494,12 +479,12 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)
{ {
int ret; int ret;
struct enc28j60_net *priv = netdev_priv(ndev); struct enc28j60_net *priv = netdev_priv(ndev);
struct device *dev = &priv->spi->dev;
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
if (!priv->hw_enable) { if (!priv->hw_enable) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_INFO DRV_NAME dev_info(dev, "%s: Setting MAC address to %pM\n",
": %s: Setting MAC address to %pM\n",
ndev->name, ndev->dev_addr); ndev->name, ndev->dev_addr);
/* NOTE: MAC address in ENC28J60 is byte-backward */ /* NOTE: MAC address in ENC28J60 is byte-backward */
nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]); nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]);
...@@ -511,9 +496,9 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev) ...@@ -511,9 +496,9 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)
ret = 0; ret = 0;
} else { } else {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME dev_printk(KERN_DEBUG, dev,
": %s() Hardware must be disabled to set " "%s() Hardware must be disabled to set Mac address\n",
"Mac address\n", __func__); __func__);
ret = -EBUSY; ret = -EBUSY;
} }
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);
...@@ -532,7 +517,7 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr) ...@@ -532,7 +517,7 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr)
if (!is_valid_ether_addr(address->sa_data)) if (!is_valid_ether_addr(address->sa_data))
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
memcpy(dev->dev_addr, address->sa_data, dev->addr_len); ether_addr_copy(dev->dev_addr, address->sa_data);
return enc28j60_set_hw_macaddr(dev); return enc28j60_set_hw_macaddr(dev);
} }
...@@ -541,8 +526,11 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr) ...@@ -541,8 +526,11 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr)
*/ */
static void enc28j60_dump_regs(struct enc28j60_net *priv, const char *msg) static void enc28j60_dump_regs(struct enc28j60_net *priv, const char *msg)
{ {
struct device *dev = &priv->spi->dev;
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
printk(KERN_DEBUG DRV_NAME " %s\n" dev_printk(KERN_DEBUG, dev,
" %s\n"
"HwRevID: 0x%02x\n" "HwRevID: 0x%02x\n"
"Cntrl: ECON1 ECON2 ESTAT EIR EIE\n" "Cntrl: ECON1 ECON2 ESTAT EIR EIE\n"
" 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n" " 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n"
...@@ -599,12 +587,13 @@ static u16 rx_packet_start(u16 ptr) ...@@ -599,12 +587,13 @@ static u16 rx_packet_start(u16 ptr)
static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end) static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
{ {
struct device *dev = &priv->spi->dev;
u16 erxrdpt; u16 erxrdpt;
if (start > 0x1FFF || end > 0x1FFF || start > end) { if (start > 0x1FFF || end > 0x1FFF || start > end) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_ERR DRV_NAME ": %s(%d, %d) RXFIFO " dev_err(dev, "%s(%d, %d) RXFIFO bad parameters!\n",
"bad parameters!\n", __func__, start, end); __func__, start, end);
return; return;
} }
/* set receive buffer start + end */ /* set receive buffer start + end */
...@@ -617,10 +606,12 @@ static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end) ...@@ -617,10 +606,12 @@ static void nolock_rxfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end) static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
{ {
struct device *dev = &priv->spi->dev;
if (start > 0x1FFF || end > 0x1FFF || start > end) { if (start > 0x1FFF || end > 0x1FFF || start > end) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_ERR DRV_NAME ": %s(%d, %d) TXFIFO " dev_err(dev, "%s(%d, %d) TXFIFO bad parameters!\n",
"bad parameters!\n", __func__, start, end); __func__, start, end);
return; return;
} }
/* set transmit buffer start + end */ /* set transmit buffer start + end */
...@@ -631,13 +622,14 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end) ...@@ -631,13 +622,14 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
/* /*
* Low power mode shrinks power consumption about 100x, so we'd like * Low power mode shrinks power consumption about 100x, so we'd like
* the chip to be in that mode whenever it's inactive. (However, we * the chip to be in that mode whenever it's inactive. (However, we
* can't stay in lowpower mode during suspend with WOL active.) * can't stay in low power mode during suspend with WOL active.)
*/ */
static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low) static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low)
{ {
struct device *dev = &priv->spi->dev;
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
dev_dbg(&priv->spi->dev, "%s power...\n", dev_dbg(dev, "%s power...\n", is_low ? "low" : "high");
is_low ? "low" : "high");
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
if (is_low) { if (is_low) {
...@@ -656,10 +648,11 @@ static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low) ...@@ -656,10 +648,11 @@ static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low)
static int enc28j60_hw_init(struct enc28j60_net *priv) static int enc28j60_hw_init(struct enc28j60_net *priv)
{ {
struct device *dev = &priv->spi->dev;
u8 reg; u8 reg;
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() - %s\n", __func__, dev_printk(KERN_DEBUG, dev, "%s() - %s\n", __func__,
priv->full_duplex ? "FullDuplex" : "HalfDuplex"); priv->full_duplex ? "FullDuplex" : "HalfDuplex");
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
...@@ -682,14 +675,14 @@ static int enc28j60_hw_init(struct enc28j60_net *priv) ...@@ -682,14 +675,14 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)
/* /*
* Check the RevID. * Check the RevID.
* If it's 0x00 or 0xFF probably the enc28j60 is not mounted or * If it's 0x00 or 0xFF probably the enc28j60 is not mounted or
* damaged * damaged.
*/ */
reg = locked_regb_read(priv, EREVID); reg = locked_regb_read(priv, EREVID);
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_INFO DRV_NAME ": chip RevID: 0x%02x\n", reg); dev_info(dev, "chip RevID: 0x%02x\n", reg);
if (reg == 0x00 || reg == 0xff) { if (reg == 0x00 || reg == 0xff) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() Invalid RevId %d\n", dev_printk(KERN_DEBUG, dev, "%s() Invalid RevId %d\n",
__func__, reg); __func__, reg);
return 0; return 0;
} }
...@@ -723,7 +716,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv) ...@@ -723,7 +716,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)
/* /*
* MACLCON1 (default) * MACLCON1 (default)
* MACLCON2 (default) * MACLCON2 (default)
* Set the maximum packet size which the controller will accept * Set the maximum packet size which the controller will accept.
*/ */
locked_regw_write(priv, MAMXFLL, MAX_FRAMELEN); locked_regw_write(priv, MAMXFLL, MAX_FRAMELEN);
...@@ -750,9 +743,11 @@ static int enc28j60_hw_init(struct enc28j60_net *priv) ...@@ -750,9 +743,11 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)
static void enc28j60_hw_enable(struct enc28j60_net *priv) static void enc28j60_hw_enable(struct enc28j60_net *priv)
{ {
struct device *dev = &priv->spi->dev;
/* enable interrupts */ /* enable interrupts */
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n", dev_printk(KERN_DEBUG, dev, "%s() enabling interrupts.\n",
__func__); __func__);
enc28j60_phy_write(priv, PHIE, PHIE_PGEIE | PHIE_PLNKIE); enc28j60_phy_write(priv, PHIE, PHIE_PGEIE | PHIE_PLNKIE);
...@@ -772,7 +767,7 @@ static void enc28j60_hw_enable(struct enc28j60_net *priv) ...@@ -772,7 +767,7 @@ static void enc28j60_hw_enable(struct enc28j60_net *priv)
static void enc28j60_hw_disable(struct enc28j60_net *priv) static void enc28j60_hw_disable(struct enc28j60_net *priv)
{ {
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
/* disable interrutps and packet reception */ /* disable interrupts and packet reception */
nolock_regb_write(priv, EIE, 0x00); nolock_regb_write(priv, EIE, 0x00);
nolock_reg_bfclr(priv, ECON1, ECON1_RXEN); nolock_reg_bfclr(priv, ECON1, ECON1_RXEN);
priv->hw_enable = false; priv->hw_enable = false;
...@@ -793,14 +788,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex) ...@@ -793,14 +788,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex)
priv->full_duplex = (duplex == DUPLEX_FULL); priv->full_duplex = (duplex == DUPLEX_FULL);
else { else {
if (netif_msg_link(priv)) if (netif_msg_link(priv))
dev_warn(&ndev->dev, netdev_warn(ndev, "unsupported link setting\n");
"unsupported link setting\n");
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
} }
} else { } else {
if (netif_msg_link(priv)) if (netif_msg_link(priv))
dev_warn(&ndev->dev, "Warning: hw must be disabled " netdev_warn(ndev, "Warning: hw must be disabled to set link mode\n");
"to set link mode\n");
ret = -EBUSY; ret = -EBUSY;
} }
return ret; return ret;
...@@ -811,11 +804,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex) ...@@ -811,11 +804,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex)
*/ */
static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE]) static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE])
{ {
struct device *dev = &priv->spi->dev;
int endptr; int endptr;
endptr = locked_regw_read(priv, ETXNDL); endptr = locked_regw_read(priv, ETXNDL);
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME ": reading TSV at addr:0x%04x\n", dev_printk(KERN_DEBUG, dev, "reading TSV at addr:0x%04x\n",
endptr + 1); endptr + 1);
enc28j60_mem_read(priv, endptr + 1, TSV_SIZE, tsv); enc28j60_mem_read(priv, endptr + 1, TSV_SIZE, tsv);
} }
...@@ -823,9 +817,10 @@ static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE]) ...@@ -823,9 +817,10 @@ static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE])
static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg, static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,
u8 tsv[TSV_SIZE]) u8 tsv[TSV_SIZE])
{ {
struct device *dev = &priv->spi->dev;
u16 tmp1, tmp2; u16 tmp1, tmp2;
printk(KERN_DEBUG DRV_NAME ": %s - TSV:\n", msg); dev_printk(KERN_DEBUG, dev, "%s - TSV:\n", msg);
tmp1 = tsv[1]; tmp1 = tsv[1];
tmp1 <<= 8; tmp1 <<= 8;
tmp1 |= tsv[0]; tmp1 |= tsv[0];
...@@ -834,26 +829,28 @@ static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg, ...@@ -834,26 +829,28 @@ static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,
tmp2 <<= 8; tmp2 <<= 8;
tmp2 |= tsv[4]; tmp2 |= tsv[4];
printk(KERN_DEBUG DRV_NAME ": ByteCount: %d, CollisionCount: %d," dev_printk(KERN_DEBUG, dev,
" TotByteOnWire: %d\n", tmp1, tsv[2] & 0x0f, tmp2); "ByteCount: %d, CollisionCount: %d, TotByteOnWire: %d\n",
printk(KERN_DEBUG DRV_NAME ": TxDone: %d, CRCErr:%d, LenChkErr: %d," tmp1, tsv[2] & 0x0f, tmp2);
" LenOutOfRange: %d\n", TSV_GETBIT(tsv, TSV_TXDONE), dev_printk(KERN_DEBUG, dev,
"TxDone: %d, CRCErr:%d, LenChkErr: %d, LenOutOfRange: %d\n",
TSV_GETBIT(tsv, TSV_TXDONE),
TSV_GETBIT(tsv, TSV_TXCRCERROR), TSV_GETBIT(tsv, TSV_TXCRCERROR),
TSV_GETBIT(tsv, TSV_TXLENCHKERROR), TSV_GETBIT(tsv, TSV_TXLENCHKERROR),
TSV_GETBIT(tsv, TSV_TXLENOUTOFRANGE)); TSV_GETBIT(tsv, TSV_TXLENOUTOFRANGE));
printk(KERN_DEBUG DRV_NAME ": Multicast: %d, Broadcast: %d, " dev_printk(KERN_DEBUG, dev,
"PacketDefer: %d, ExDefer: %d\n", "Multicast: %d, Broadcast: %d, PacketDefer: %d, ExDefer: %d\n",
TSV_GETBIT(tsv, TSV_TXMULTICAST), TSV_GETBIT(tsv, TSV_TXMULTICAST),
TSV_GETBIT(tsv, TSV_TXBROADCAST), TSV_GETBIT(tsv, TSV_TXBROADCAST),
TSV_GETBIT(tsv, TSV_TXPACKETDEFER), TSV_GETBIT(tsv, TSV_TXPACKETDEFER),
TSV_GETBIT(tsv, TSV_TXEXDEFER)); TSV_GETBIT(tsv, TSV_TXEXDEFER));
printk(KERN_DEBUG DRV_NAME ": ExCollision: %d, LateCollision: %d, " dev_printk(KERN_DEBUG, dev,
"Giant: %d, Underrun: %d\n", "ExCollision: %d, LateCollision: %d, Giant: %d, Underrun: %d\n",
TSV_GETBIT(tsv, TSV_TXEXCOLLISION), TSV_GETBIT(tsv, TSV_TXEXCOLLISION),
TSV_GETBIT(tsv, TSV_TXLATECOLLISION), TSV_GETBIT(tsv, TSV_TXLATECOLLISION),
TSV_GETBIT(tsv, TSV_TXGIANT), TSV_GETBIT(tsv, TSV_TXUNDERRUN)); TSV_GETBIT(tsv, TSV_TXGIANT), TSV_GETBIT(tsv, TSV_TXUNDERRUN));
printk(KERN_DEBUG DRV_NAME ": ControlFrame: %d, PauseFrame: %d, " dev_printk(KERN_DEBUG, dev,
"BackPressApp: %d, VLanTagFrame: %d\n", "ControlFrame: %d, PauseFrame: %d, BackPressApp: %d, VLanTagFrame: %d\n",
TSV_GETBIT(tsv, TSV_TXCONTROLFRAME), TSV_GETBIT(tsv, TSV_TXCONTROLFRAME),
TSV_GETBIT(tsv, TSV_TXPAUSEFRAME), TSV_GETBIT(tsv, TSV_TXPAUSEFRAME),
TSV_GETBIT(tsv, TSV_BACKPRESSUREAPP), TSV_GETBIT(tsv, TSV_BACKPRESSUREAPP),
...@@ -866,23 +863,25 @@ static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg, ...@@ -866,23 +863,25 @@ static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,
static void enc28j60_dump_rsv(struct enc28j60_net *priv, const char *msg, static void enc28j60_dump_rsv(struct enc28j60_net *priv, const char *msg,
u16 pk_ptr, int len, u16 sts) u16 pk_ptr, int len, u16 sts)
{ {
printk(KERN_DEBUG DRV_NAME ": %s - NextPk: 0x%04x - RSV:\n", struct device *dev = &priv->spi->dev;
msg, pk_ptr);
printk(KERN_DEBUG DRV_NAME ": ByteCount: %d, DribbleNibble: %d\n", len, dev_printk(KERN_DEBUG, dev, "%s - NextPk: 0x%04x - RSV:\n", msg, pk_ptr);
RSV_GETBIT(sts, RSV_DRIBBLENIBBLE)); dev_printk(KERN_DEBUG, dev, "ByteCount: %d, DribbleNibble: %d\n",
printk(KERN_DEBUG DRV_NAME ": RxOK: %d, CRCErr:%d, LenChkErr: %d," len, RSV_GETBIT(sts, RSV_DRIBBLENIBBLE));
" LenOutOfRange: %d\n", RSV_GETBIT(sts, RSV_RXOK), dev_printk(KERN_DEBUG, dev,
"RxOK: %d, CRCErr:%d, LenChkErr: %d, LenOutOfRange: %d\n",
RSV_GETBIT(sts, RSV_RXOK),
RSV_GETBIT(sts, RSV_CRCERROR), RSV_GETBIT(sts, RSV_CRCERROR),
RSV_GETBIT(sts, RSV_LENCHECKERR), RSV_GETBIT(sts, RSV_LENCHECKERR),
RSV_GETBIT(sts, RSV_LENOUTOFRANGE)); RSV_GETBIT(sts, RSV_LENOUTOFRANGE));
printk(KERN_DEBUG DRV_NAME ": Multicast: %d, Broadcast: %d, " dev_printk(KERN_DEBUG, dev,
"LongDropEvent: %d, CarrierEvent: %d\n", "Multicast: %d, Broadcast: %d, LongDropEvent: %d, CarrierEvent: %d\n",
RSV_GETBIT(sts, RSV_RXMULTICAST), RSV_GETBIT(sts, RSV_RXMULTICAST),
RSV_GETBIT(sts, RSV_RXBROADCAST), RSV_GETBIT(sts, RSV_RXBROADCAST),
RSV_GETBIT(sts, RSV_RXLONGEVDROPEV), RSV_GETBIT(sts, RSV_RXLONGEVDROPEV),
RSV_GETBIT(sts, RSV_CARRIEREV)); RSV_GETBIT(sts, RSV_CARRIEREV));
printk(KERN_DEBUG DRV_NAME ": ControlFrame: %d, PauseFrame: %d," dev_printk(KERN_DEBUG, dev,
" UnknownOp: %d, VLanTagFrame: %d\n", "ControlFrame: %d, PauseFrame: %d, UnknownOp: %d, VLanTagFrame: %d\n",
RSV_GETBIT(sts, RSV_RXCONTROLFRAME), RSV_GETBIT(sts, RSV_RXCONTROLFRAME),
RSV_GETBIT(sts, RSV_RXPAUSEFRAME), RSV_GETBIT(sts, RSV_RXPAUSEFRAME),
RSV_GETBIT(sts, RSV_RXUNKNOWNOPCODE), RSV_GETBIT(sts, RSV_RXUNKNOWNOPCODE),
...@@ -904,19 +903,19 @@ static void dump_packet(const char *msg, int len, const char *data) ...@@ -904,19 +903,19 @@ static void dump_packet(const char *msg, int len, const char *data)
static void enc28j60_hw_rx(struct net_device *ndev) static void enc28j60_hw_rx(struct net_device *ndev)
{ {
struct enc28j60_net *priv = netdev_priv(ndev); struct enc28j60_net *priv = netdev_priv(ndev);
struct device *dev = &priv->spi->dev;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
u16 erxrdpt, next_packet, rxstat; u16 erxrdpt, next_packet, rxstat;
u8 rsv[RSV_SIZE]; u8 rsv[RSV_SIZE];
int len; int len;
if (netif_msg_rx_status(priv)) if (netif_msg_rx_status(priv))
printk(KERN_DEBUG DRV_NAME ": RX pk_addr:0x%04x\n", netdev_printk(KERN_DEBUG, ndev, "RX pk_addr:0x%04x\n",
priv->next_pk_ptr); priv->next_pk_ptr);
if (unlikely(priv->next_pk_ptr > RXEND_INIT)) { if (unlikely(priv->next_pk_ptr > RXEND_INIT)) {
if (netif_msg_rx_err(priv)) if (netif_msg_rx_err(priv))
dev_err(&ndev->dev, netdev_err(ndev, "%s() Invalid packet address!! 0x%04x\n",
"%s() Invalid packet address!! 0x%04x\n",
__func__, priv->next_pk_ptr); __func__, priv->next_pk_ptr);
/* packet address corrupted: reset RX logic */ /* packet address corrupted: reset RX logic */
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
...@@ -950,7 +949,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) ...@@ -950,7 +949,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
if (!RSV_GETBIT(rxstat, RSV_RXOK) || len > MAX_FRAMELEN) { if (!RSV_GETBIT(rxstat, RSV_RXOK) || len > MAX_FRAMELEN) {
if (netif_msg_rx_err(priv)) if (netif_msg_rx_err(priv))
dev_err(&ndev->dev, "Rx Error (%04x)\n", rxstat); netdev_err(ndev, "Rx Error (%04x)\n", rxstat);
ndev->stats.rx_errors++; ndev->stats.rx_errors++;
if (RSV_GETBIT(rxstat, RSV_CRCERROR)) if (RSV_GETBIT(rxstat, RSV_CRCERROR))
ndev->stats.rx_crc_errors++; ndev->stats.rx_crc_errors++;
...@@ -962,8 +961,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) ...@@ -962,8 +961,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
skb = netdev_alloc_skb(ndev, len + NET_IP_ALIGN); skb = netdev_alloc_skb(ndev, len + NET_IP_ALIGN);
if (!skb) { if (!skb) {
if (netif_msg_rx_err(priv)) if (netif_msg_rx_err(priv))
dev_err(&ndev->dev, netdev_err(ndev, "out of memory for Rx'd frame\n");
"out of memory for Rx'd frame\n");
ndev->stats.rx_dropped++; ndev->stats.rx_dropped++;
} else { } else {
skb_reserve(skb, NET_IP_ALIGN); skb_reserve(skb, NET_IP_ALIGN);
...@@ -983,11 +981,11 @@ static void enc28j60_hw_rx(struct net_device *ndev) ...@@ -983,11 +981,11 @@ static void enc28j60_hw_rx(struct net_device *ndev)
/* /*
* Move the RX read pointer to the start of the next * Move the RX read pointer to the start of the next
* received packet. * received packet.
* This frees the memory we just read out * This frees the memory we just read out.
*/ */
erxrdpt = erxrdpt_workaround(next_packet, RXSTART_INIT, RXEND_INIT); erxrdpt = erxrdpt_workaround(next_packet, RXSTART_INIT, RXEND_INIT);
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT:0x%04x\n", dev_printk(KERN_DEBUG, dev, "%s() ERXRDPT:0x%04x\n",
__func__, erxrdpt); __func__, erxrdpt);
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
...@@ -997,9 +995,9 @@ static void enc28j60_hw_rx(struct net_device *ndev) ...@@ -997,9 +995,9 @@ static void enc28j60_hw_rx(struct net_device *ndev)
u16 reg; u16 reg;
reg = nolock_regw_read(priv, ERXRDPTL); reg = nolock_regw_read(priv, ERXRDPTL);
if (reg != erxrdpt) if (reg != erxrdpt)
printk(KERN_DEBUG DRV_NAME ": %s() ERXRDPT verify " dev_printk(KERN_DEBUG, dev,
"error (0x%04x - 0x%04x)\n", __func__, "%s() ERXRDPT verify error (0x%04x - 0x%04x)\n",
reg, erxrdpt); __func__, reg, erxrdpt);
} }
#endif #endif
priv->next_pk_ptr = next_packet; priv->next_pk_ptr = next_packet;
...@@ -1013,6 +1011,7 @@ static void enc28j60_hw_rx(struct net_device *ndev) ...@@ -1013,6 +1011,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
*/ */
static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv) static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)
{ {
struct net_device *ndev = priv->netdev;
int epkcnt, erxst, erxnd, erxwr, erxrd; int epkcnt, erxst, erxnd, erxwr, erxrd;
int free_space; int free_space;
...@@ -1035,7 +1034,7 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv) ...@@ -1035,7 +1034,7 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)
} }
mutex_unlock(&priv->lock); mutex_unlock(&priv->lock);
if (netif_msg_rx_status(priv)) if (netif_msg_rx_status(priv))
printk(KERN_DEBUG DRV_NAME ": %s() free_space = %d\n", netdev_printk(KERN_DEBUG, ndev, "%s() free_space = %d\n",
__func__, free_space); __func__, free_space);
return free_space; return free_space;
} }
...@@ -1046,24 +1045,25 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv) ...@@ -1046,24 +1045,25 @@ static int enc28j60_get_free_rxfifo(struct enc28j60_net *priv)
static void enc28j60_check_link_status(struct net_device *ndev) static void enc28j60_check_link_status(struct net_device *ndev)
{ {
struct enc28j60_net *priv = netdev_priv(ndev); struct enc28j60_net *priv = netdev_priv(ndev);
struct device *dev = &priv->spi->dev;
u16 reg; u16 reg;
int duplex; int duplex;
reg = enc28j60_phy_read(priv, PHSTAT2); reg = enc28j60_phy_read(priv, PHSTAT2);
if (netif_msg_hw(priv)) if (netif_msg_hw(priv))
printk(KERN_DEBUG DRV_NAME ": %s() PHSTAT1: %04x, " dev_printk(KERN_DEBUG, dev,
"PHSTAT2: %04x\n", __func__, "%s() PHSTAT1: %04x, PHSTAT2: %04x\n", __func__,
enc28j60_phy_read(priv, PHSTAT1), reg); enc28j60_phy_read(priv, PHSTAT1), reg);
duplex = reg & PHSTAT2_DPXSTAT; duplex = reg & PHSTAT2_DPXSTAT;
if (reg & PHSTAT2_LSTAT) { if (reg & PHSTAT2_LSTAT) {
netif_carrier_on(ndev); netif_carrier_on(ndev);
if (netif_msg_ifup(priv)) if (netif_msg_ifup(priv))
dev_info(&ndev->dev, "link up - %s\n", netdev_info(ndev, "link up - %s\n",
duplex ? "Full duplex" : "Half duplex"); duplex ? "Full duplex" : "Half duplex");
} else { } else {
if (netif_msg_ifdown(priv)) if (netif_msg_ifdown(priv))
dev_info(&ndev->dev, "link down\n"); netdev_info(ndev, "link down\n");
netif_carrier_off(ndev); netif_carrier_off(ndev);
} }
} }
...@@ -1089,8 +1089,8 @@ static void enc28j60_tx_clear(struct net_device *ndev, bool err) ...@@ -1089,8 +1089,8 @@ static void enc28j60_tx_clear(struct net_device *ndev, bool err)
/* /*
* RX handler * RX handler
* ignore PKTIF because is unreliable! (look at the errata datasheet) * Ignore PKTIF because is unreliable! (Look at the errata datasheet)
* check EPKTCNT is the suggested workaround. * Check EPKTCNT is the suggested workaround.
* We don't need to clear interrupt flag, automatically done when * We don't need to clear interrupt flag, automatically done when
* enc28j60_hw_rx() decrements the packet counter. * enc28j60_hw_rx() decrements the packet counter.
* Returns how many packet processed. * Returns how many packet processed.
...@@ -1102,12 +1102,13 @@ static int enc28j60_rx_interrupt(struct net_device *ndev) ...@@ -1102,12 +1102,13 @@ static int enc28j60_rx_interrupt(struct net_device *ndev)
pk_counter = locked_regb_read(priv, EPKTCNT); pk_counter = locked_regb_read(priv, EPKTCNT);
if (pk_counter && netif_msg_intr(priv)) if (pk_counter && netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME ": intRX, pk_cnt: %d\n", pk_counter); netdev_printk(KERN_DEBUG, ndev, "intRX, pk_cnt: %d\n",
pk_counter);
if (pk_counter > priv->max_pk_counter) { if (pk_counter > priv->max_pk_counter) {
/* update statistics */ /* update statistics */
priv->max_pk_counter = pk_counter; priv->max_pk_counter = pk_counter;
if (netif_msg_rx_status(priv) && priv->max_pk_counter > 1) if (netif_msg_rx_status(priv) && priv->max_pk_counter > 1)
printk(KERN_DEBUG DRV_NAME ": RX max_pk_cnt: %d\n", netdev_printk(KERN_DEBUG, ndev, "RX max_pk_cnt: %d\n",
priv->max_pk_counter); priv->max_pk_counter);
} }
ret = pk_counter; ret = pk_counter;
...@@ -1124,8 +1125,6 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1124,8 +1125,6 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
struct net_device *ndev = priv->netdev; struct net_device *ndev = priv->netdev;
int intflags, loop; int intflags, loop;
if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
/* disable further interrupts */ /* disable further interrupts */
locked_reg_bfclr(priv, EIE, EIE_INTIE); locked_reg_bfclr(priv, EIE, EIE_INTIE);
...@@ -1136,16 +1135,16 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1136,16 +1135,16 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
if ((intflags & EIR_DMAIF) != 0) { if ((intflags & EIR_DMAIF) != 0) {
loop++; loop++;
if (netif_msg_intr(priv)) if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "intDMA(%d)\n",
": intDMA(%d)\n", loop); loop);
locked_reg_bfclr(priv, EIR, EIR_DMAIF); locked_reg_bfclr(priv, EIR, EIR_DMAIF);
} }
/* LINK changed handler */ /* LINK changed handler */
if ((intflags & EIR_LINKIF) != 0) { if ((intflags & EIR_LINKIF) != 0) {
loop++; loop++;
if (netif_msg_intr(priv)) if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "intLINK(%d)\n",
": intLINK(%d)\n", loop); loop);
enc28j60_check_link_status(ndev); enc28j60_check_link_status(ndev);
/* read PHIR to clear the flag */ /* read PHIR to clear the flag */
enc28j60_phy_read(priv, PHIR); enc28j60_phy_read(priv, PHIR);
...@@ -1156,13 +1155,12 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1156,13 +1155,12 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
bool err = false; bool err = false;
loop++; loop++;
if (netif_msg_intr(priv)) if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "intTX(%d)\n",
": intTX(%d)\n", loop); loop);
priv->tx_retry_count = 0; priv->tx_retry_count = 0;
if (locked_regb_read(priv, ESTAT) & ESTAT_TXABRT) { if (locked_regb_read(priv, ESTAT) & ESTAT_TXABRT) {
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
dev_err(&ndev->dev, netdev_err(ndev, "Tx Error (aborted)\n");
"Tx Error (aborted)\n");
err = true; err = true;
} }
if (netif_msg_tx_done(priv)) { if (netif_msg_tx_done(priv)) {
...@@ -1179,8 +1177,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1179,8 +1177,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
loop++; loop++;
if (netif_msg_intr(priv)) if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "intTXErr(%d)\n",
": intTXErr(%d)\n", loop); loop);
locked_reg_bfclr(priv, ECON1, ECON1_TXRTS); locked_reg_bfclr(priv, ECON1, ECON1_TXRTS);
enc28j60_read_tsv(priv, tsv); enc28j60_read_tsv(priv, tsv);
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
...@@ -1194,8 +1192,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1194,8 +1192,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
/* Transmit Late collision check for retransmit */ /* Transmit Late collision check for retransmit */
if (TSV_GETBIT(tsv, TSV_TXLATECOLLISION)) { if (TSV_GETBIT(tsv, TSV_TXLATECOLLISION)) {
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev,
": LateCollision TXErr (%d)\n", "LateCollision TXErr (%d)\n",
priv->tx_retry_count); priv->tx_retry_count);
if (priv->tx_retry_count++ < MAX_TX_RETRYCOUNT) if (priv->tx_retry_count++ < MAX_TX_RETRYCOUNT)
locked_reg_bfset(priv, ECON1, locked_reg_bfset(priv, ECON1,
...@@ -1210,13 +1208,12 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1210,13 +1208,12 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
if ((intflags & EIR_RXERIF) != 0) { if ((intflags & EIR_RXERIF) != 0) {
loop++; loop++;
if (netif_msg_intr(priv)) if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "intRXErr(%d)\n",
": intRXErr(%d)\n", loop); loop);
/* Check free FIFO space to flag RX overrun */ /* Check free FIFO space to flag RX overrun */
if (enc28j60_get_free_rxfifo(priv) <= 0) { if (enc28j60_get_free_rxfifo(priv) <= 0) {
if (netif_msg_rx_err(priv)) if (netif_msg_rx_err(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "RX Overrun\n");
": RX Overrun\n");
ndev->stats.rx_dropped++; ndev->stats.rx_dropped++;
} }
locked_reg_bfclr(priv, EIR, EIR_RXERIF); locked_reg_bfclr(priv, EIR, EIR_RXERIF);
...@@ -1228,8 +1225,6 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1228,8 +1225,6 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
/* re-enable interrupts */ /* re-enable interrupts */
locked_reg_bfset(priv, EIE, EIE_INTIE); locked_reg_bfset(priv, EIE, EIE_INTIE);
if (netif_msg_intr(priv))
printk(KERN_DEBUG DRV_NAME ": %s() exit\n", __func__);
} }
/* /*
...@@ -1239,11 +1234,13 @@ static void enc28j60_irq_work_handler(struct work_struct *work) ...@@ -1239,11 +1234,13 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
*/ */
static void enc28j60_hw_tx(struct enc28j60_net *priv) static void enc28j60_hw_tx(struct enc28j60_net *priv)
{ {
struct net_device *ndev = priv->netdev;
BUG_ON(!priv->tx_skb); BUG_ON(!priv->tx_skb);
if (netif_msg_tx_queued(priv)) if (netif_msg_tx_queued(priv))
printk(KERN_DEBUG DRV_NAME netdev_printk(KERN_DEBUG, ndev, "Tx Packet Len:%d\n",
": Tx Packet Len:%d\n", priv->tx_skb->len); priv->tx_skb->len);
if (netif_msg_pktdata(priv)) if (netif_msg_pktdata(priv))
dump_packet(__func__, dump_packet(__func__,
...@@ -1253,6 +1250,7 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv) ...@@ -1253,6 +1250,7 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv)
#ifdef CONFIG_ENC28J60_WRITEVERIFY #ifdef CONFIG_ENC28J60_WRITEVERIFY
/* readback and verify written data */ /* readback and verify written data */
if (netif_msg_drv(priv)) { if (netif_msg_drv(priv)) {
struct device *dev = &priv->spi->dev;
int test_len, k; int test_len, k;
u8 test_buf[64]; /* limit the test to the first 64 bytes */ u8 test_buf[64]; /* limit the test to the first 64 bytes */
int okflag; int okflag;
...@@ -1266,16 +1264,14 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv) ...@@ -1266,16 +1264,14 @@ static void enc28j60_hw_tx(struct enc28j60_net *priv)
okflag = 1; okflag = 1;
for (k = 0; k < test_len; k++) { for (k = 0; k < test_len; k++) {
if (priv->tx_skb->data[k] != test_buf[k]) { if (priv->tx_skb->data[k] != test_buf[k]) {
printk(KERN_DEBUG DRV_NAME dev_printk(KERN_DEBUG, dev,
": Error, %d location differ: " "Error, %d location differ: 0x%02x-0x%02x\n",
"0x%02x-0x%02x\n", k, k, priv->tx_skb->data[k], test_buf[k]);
priv->tx_skb->data[k], test_buf[k]);
okflag = 0; okflag = 0;
} }
} }
if (!okflag) if (!okflag)
printk(KERN_DEBUG DRV_NAME ": Tx write buffer, " dev_printk(KERN_DEBUG, dev, "Tx write buffer, verify ERROR!\n");
"verify ERROR!\n");
} }
#endif #endif
/* set TX request flag */ /* set TX request flag */
...@@ -1287,9 +1283,6 @@ static netdev_tx_t enc28j60_send_packet(struct sk_buff *skb, ...@@ -1287,9 +1283,6 @@ static netdev_tx_t enc28j60_send_packet(struct sk_buff *skb,
{ {
struct enc28j60_net *priv = netdev_priv(dev); struct enc28j60_net *priv = netdev_priv(dev);
if (netif_msg_tx_queued(priv))
printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
/* If some error occurs while trying to transmit this /* If some error occurs while trying to transmit this
* packet, you should return '1' from this function. * packet, you should return '1' from this function.
* In such a case you _may not_ do anything to the * In such a case you _may not_ do anything to the
...@@ -1337,7 +1330,7 @@ static void enc28j60_tx_timeout(struct net_device *ndev) ...@@ -1337,7 +1330,7 @@ static void enc28j60_tx_timeout(struct net_device *ndev)
struct enc28j60_net *priv = netdev_priv(ndev); struct enc28j60_net *priv = netdev_priv(ndev);
if (netif_msg_timer(priv)) if (netif_msg_timer(priv))
dev_err(&ndev->dev, DRV_NAME " tx timeout\n"); netdev_err(ndev, "tx timeout\n");
ndev->stats.tx_errors++; ndev->stats.tx_errors++;
/* can't restart safely under softirq */ /* can't restart safely under softirq */
...@@ -1356,13 +1349,9 @@ static int enc28j60_net_open(struct net_device *dev) ...@@ -1356,13 +1349,9 @@ static int enc28j60_net_open(struct net_device *dev)
{ {
struct enc28j60_net *priv = netdev_priv(dev); struct enc28j60_net *priv = netdev_priv(dev);
if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
if (!is_valid_ether_addr(dev->dev_addr)) { if (!is_valid_ether_addr(dev->dev_addr)) {
if (netif_msg_ifup(priv)) if (netif_msg_ifup(priv))
dev_err(&dev->dev, "invalid MAC address %pM\n", netdev_err(dev, "invalid MAC address %pM\n", dev->dev_addr);
dev->dev_addr);
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
} }
/* Reset the hardware here (and take it out of low power mode) */ /* Reset the hardware here (and take it out of low power mode) */
...@@ -1370,7 +1359,7 @@ static int enc28j60_net_open(struct net_device *dev) ...@@ -1370,7 +1359,7 @@ static int enc28j60_net_open(struct net_device *dev)
enc28j60_hw_disable(priv); enc28j60_hw_disable(priv);
if (!enc28j60_hw_init(priv)) { if (!enc28j60_hw_init(priv)) {
if (netif_msg_ifup(priv)) if (netif_msg_ifup(priv))
dev_err(&dev->dev, "hw_reset() failed\n"); netdev_err(dev, "hw_reset() failed\n");
return -EINVAL; return -EINVAL;
} }
/* Update the MAC address (in case user has changed it) */ /* Update the MAC address (in case user has changed it) */
...@@ -1392,9 +1381,6 @@ static int enc28j60_net_close(struct net_device *dev) ...@@ -1392,9 +1381,6 @@ static int enc28j60_net_close(struct net_device *dev)
{ {
struct enc28j60_net *priv = netdev_priv(dev); struct enc28j60_net *priv = netdev_priv(dev);
if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
enc28j60_hw_disable(priv); enc28j60_hw_disable(priv);
enc28j60_lowpower(priv, true); enc28j60_lowpower(priv, true);
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -1415,16 +1401,16 @@ static void enc28j60_set_multicast_list(struct net_device *dev) ...@@ -1415,16 +1401,16 @@ static void enc28j60_set_multicast_list(struct net_device *dev)
if (dev->flags & IFF_PROMISC) { if (dev->flags & IFF_PROMISC) {
if (netif_msg_link(priv)) if (netif_msg_link(priv))
dev_info(&dev->dev, "promiscuous mode\n"); netdev_info(dev, "promiscuous mode\n");
priv->rxfilter = RXFILTER_PROMISC; priv->rxfilter = RXFILTER_PROMISC;
} else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) { } else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) {
if (netif_msg_link(priv)) if (netif_msg_link(priv))
dev_info(&dev->dev, "%smulticast mode\n", netdev_info(dev, "%smulticast mode\n",
(dev->flags & IFF_ALLMULTI) ? "all-" : ""); (dev->flags & IFF_ALLMULTI) ? "all-" : "");
priv->rxfilter = RXFILTER_MULTI; priv->rxfilter = RXFILTER_MULTI;
} else { } else {
if (netif_msg_link(priv)) if (netif_msg_link(priv))
dev_info(&dev->dev, "normal mode\n"); netdev_info(dev, "normal mode\n");
priv->rxfilter = RXFILTER_NORMAL; priv->rxfilter = RXFILTER_NORMAL;
} }
...@@ -1436,20 +1422,21 @@ static void enc28j60_setrx_work_handler(struct work_struct *work) ...@@ -1436,20 +1422,21 @@ static void enc28j60_setrx_work_handler(struct work_struct *work)
{ {
struct enc28j60_net *priv = struct enc28j60_net *priv =
container_of(work, struct enc28j60_net, setrx_work); container_of(work, struct enc28j60_net, setrx_work);
struct device *dev = &priv->spi->dev;
if (priv->rxfilter == RXFILTER_PROMISC) { if (priv->rxfilter == RXFILTER_PROMISC) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": promiscuous mode\n"); dev_printk(KERN_DEBUG, dev, "promiscuous mode\n");
locked_regb_write(priv, ERXFCON, 0x00); locked_regb_write(priv, ERXFCON, 0x00);
} else if (priv->rxfilter == RXFILTER_MULTI) { } else if (priv->rxfilter == RXFILTER_MULTI) {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": multicast mode\n"); dev_printk(KERN_DEBUG, dev, "multicast mode\n");
locked_regb_write(priv, ERXFCON, locked_regb_write(priv, ERXFCON,
ERXFCON_UCEN | ERXFCON_CRCEN | ERXFCON_UCEN | ERXFCON_CRCEN |
ERXFCON_BCEN | ERXFCON_MCEN); ERXFCON_BCEN | ERXFCON_MCEN);
} else { } else {
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": normal mode\n"); dev_printk(KERN_DEBUG, dev, "normal mode\n");
locked_regb_write(priv, ERXFCON, locked_regb_write(priv, ERXFCON,
ERXFCON_UCEN | ERXFCON_CRCEN | ERXFCON_UCEN | ERXFCON_CRCEN |
ERXFCON_BCEN); ERXFCON_BCEN);
...@@ -1468,7 +1455,7 @@ static void enc28j60_restart_work_handler(struct work_struct *work) ...@@ -1468,7 +1455,7 @@ static void enc28j60_restart_work_handler(struct work_struct *work)
enc28j60_net_close(ndev); enc28j60_net_close(ndev);
ret = enc28j60_net_open(ndev); ret = enc28j60_net_open(ndev);
if (unlikely(ret)) { if (unlikely(ret)) {
dev_info(&ndev->dev, " could not restart %d\n", ret); netdev_info(ndev, "could not restart %d\n", ret);
dev_close(ndev); dev_close(ndev);
} }
} }
...@@ -1552,14 +1539,13 @@ static const struct net_device_ops enc28j60_netdev_ops = { ...@@ -1552,14 +1539,13 @@ static const struct net_device_ops enc28j60_netdev_ops = {
static int enc28j60_probe(struct spi_device *spi) static int enc28j60_probe(struct spi_device *spi)
{ {
unsigned char macaddr[ETH_ALEN];
struct net_device *dev; struct net_device *dev;
struct enc28j60_net *priv; struct enc28j60_net *priv;
const void *macaddr;
int ret = 0; int ret = 0;
if (netif_msg_drv(&debug)) if (netif_msg_drv(&debug))
dev_info(&spi->dev, DRV_NAME " Ethernet driver %s loaded\n", dev_info(&spi->dev, "Ethernet driver %s loaded\n", DRV_VERSION);
DRV_VERSION);
dev = alloc_etherdev(sizeof(struct enc28j60_net)); dev = alloc_etherdev(sizeof(struct enc28j60_net));
if (!dev) { if (!dev) {
...@@ -1570,8 +1556,7 @@ static int enc28j60_probe(struct spi_device *spi) ...@@ -1570,8 +1556,7 @@ static int enc28j60_probe(struct spi_device *spi)
priv->netdev = dev; /* priv to netdev reference */ priv->netdev = dev; /* priv to netdev reference */
priv->spi = spi; /* priv to spi reference */ priv->spi = spi; /* priv to spi reference */
priv->msg_enable = netif_msg_init(debug.msg_enable, priv->msg_enable = netif_msg_init(debug.msg_enable, ENC28J60_MSG_DEFAULT);
ENC28J60_MSG_DEFAULT);
mutex_init(&priv->lock); mutex_init(&priv->lock);
INIT_WORK(&priv->tx_work, enc28j60_tx_work_handler); INIT_WORK(&priv->tx_work, enc28j60_tx_work_handler);
INIT_WORK(&priv->setrx_work, enc28j60_setrx_work_handler); INIT_WORK(&priv->setrx_work, enc28j60_setrx_work_handler);
...@@ -1582,13 +1567,12 @@ static int enc28j60_probe(struct spi_device *spi) ...@@ -1582,13 +1567,12 @@ static int enc28j60_probe(struct spi_device *spi)
if (!enc28j60_chipset_init(dev)) { if (!enc28j60_chipset_init(dev)) {
if (netif_msg_probe(priv)) if (netif_msg_probe(priv))
dev_info(&spi->dev, DRV_NAME " chip not found\n"); dev_info(&spi->dev, "chip not found\n");
ret = -EIO; ret = -EIO;
goto error_irq; goto error_irq;
} }
macaddr = of_get_mac_address(spi->dev.of_node); if (device_get_mac_address(&spi->dev, macaddr, sizeof(macaddr)))
if (macaddr)
ether_addr_copy(dev->dev_addr, macaddr); ether_addr_copy(dev->dev_addr, macaddr);
else else
eth_hw_addr_random(dev); eth_hw_addr_random(dev);
...@@ -1600,8 +1584,8 @@ static int enc28j60_probe(struct spi_device *spi) ...@@ -1600,8 +1584,8 @@ static int enc28j60_probe(struct spi_device *spi)
ret = request_irq(spi->irq, enc28j60_irq, 0, DRV_NAME, priv); ret = request_irq(spi->irq, enc28j60_irq, 0, DRV_NAME, priv);
if (ret < 0) { if (ret < 0) {
if (netif_msg_probe(priv)) if (netif_msg_probe(priv))
dev_err(&spi->dev, DRV_NAME ": request irq %d failed " dev_err(&spi->dev, "request irq %d failed (ret = %d)\n",
"(ret = %d)\n", spi->irq, ret); spi->irq, ret);
goto error_irq; goto error_irq;
} }
...@@ -1616,11 +1600,10 @@ static int enc28j60_probe(struct spi_device *spi) ...@@ -1616,11 +1600,10 @@ static int enc28j60_probe(struct spi_device *spi)
ret = register_netdev(dev); ret = register_netdev(dev);
if (ret) { if (ret) {
if (netif_msg_probe(priv)) if (netif_msg_probe(priv))
dev_err(&spi->dev, "register netdev " DRV_NAME dev_err(&spi->dev, "register netdev failed (ret = %d)\n",
" failed (ret = %d)\n", ret); ret);
goto error_register; goto error_register;
} }
dev_info(&dev->dev, DRV_NAME " driver registered\n");
return 0; return 0;
...@@ -1636,9 +1619,6 @@ static int enc28j60_remove(struct spi_device *spi) ...@@ -1636,9 +1619,6 @@ static int enc28j60_remove(struct spi_device *spi)
{ {
struct enc28j60_net *priv = spi_get_drvdata(spi); struct enc28j60_net *priv = spi_get_drvdata(spi);
if (netif_msg_drv(priv))
printk(KERN_DEBUG DRV_NAME ": remove\n");
unregister_netdev(priv->netdev); unregister_netdev(priv->netdev);
free_irq(spi->irq, priv); free_irq(spi->irq, priv);
free_netdev(priv->netdev); free_netdev(priv->netdev);
...@@ -1660,22 +1640,7 @@ static struct spi_driver enc28j60_driver = { ...@@ -1660,22 +1640,7 @@ static struct spi_driver enc28j60_driver = {
.probe = enc28j60_probe, .probe = enc28j60_probe,
.remove = enc28j60_remove, .remove = enc28j60_remove,
}; };
module_spi_driver(enc28j60_driver);
static int __init enc28j60_init(void)
{
msec20_to_jiffies = msecs_to_jiffies(20);
return spi_register_driver(&enc28j60_driver);
}
module_init(enc28j60_init);
static void __exit enc28j60_exit(void)
{
spi_unregister_driver(&enc28j60_driver);
}
module_exit(enc28j60_exit);
MODULE_DESCRIPTION(DRV_NAME " ethernet driver"); MODULE_DESCRIPTION(DRV_NAME " ethernet driver");
MODULE_AUTHOR("Claudio Lanconelli <lanconelli.claudio@eptar.com>"); MODULE_AUTHOR("Claudio Lanconelli <lanconelli.claudio@eptar.com>");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7