8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature
Subsystems (5)
PATCH v4 1/1 8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature
Removed the shared ei_debug variable. Replaced it by adding u32 msg_enable to the private struct ei_device. Now each 8390 ethernet instance has a per-device logging variable.
Changed older style printk() calls to more canonical forms.
Tested on: ne, ne2k-pci, smc-ultra, and wd hardware.
V4.0
- Substituted pr_info() and pr_debug() for printk() KERN_INFO and KERN_DEBUG
V3.0
- Checked for cases where pr_cont() was most appropriate choice.
- Changed module parameter from 'debug' to 'msg_enable' because debug was no longer the best description.
V2.0
- Changed netif_msg_(drv|probe|ifdown|rx_err|tx_err|tx_queued|intr|rx_status|hw) to netif_(dbg|info|warn|err) where possible.
--- drivers/net/ethernet/8390/8390.h | 7 +-- drivers/net/ethernet/8390/apne.c | 62 ++++++++++------- drivers/net/ethernet/8390/ax88796.c | 22 ++++++- drivers/net/ethernet/8390/axnet_cs.c | 119 ++++++++++++++++----------------- drivers/net/ethernet/8390/etherh.c | 51 +++++++++----- drivers/net/ethernet/8390/hydra.c | 11 ++- drivers/net/ethernet/8390/lib8390.c | 77 +++++++++++---------- drivers/net/ethernet/8390/mac8390.c | 19 ++++-- drivers/net/ethernet/8390/mcf8390.c | 8 ++- drivers/net/ethernet/8390/ne.c | 96 +++++++++++++++------------ drivers/net/ethernet/8390/ne2k-pci.c | 54 ++++++++++----- drivers/net/ethernet/8390/pcnet_cs.c | 62 +++++++++-------- drivers/net/ethernet/8390/smc-ultra.c | 48 ++++++++----- drivers/net/ethernet/8390/stnic.c | 28 +++++--- drivers/net/ethernet/8390/wd.c | 42 +++++++----- drivers/net/ethernet/8390/zorro8390.c | 22 ++++-- 16 files changed, 426 insertions(+), 302 deletions(-)
drivers/net/ethernet/8390/8390.h +1 -6
@@ -21,12 +21,6 @@ struct e8390_pkt_hdr {unsigned short count;/* header + packet length in bytes */ }; -#ifdef notdef -extern int ei_debug; -#else -#define ei_debug 1 -#endif -#ifdef CONFIG_NET_POLL_CONTROLLER void ei_poll (struct net_device *dev);void eip_poll (struct net_device *dev);
@@ -99,6 +93,7 @@ struct ei_device {u32 *reg_offset;/* Register mapping table */ spinlock_t page_lock;/* Page register locks */ unsigned long priv;/* Private field to store bus IDs etc. */ +u32 msg_enable;/* debug message level */ #ifdef AX88796_PLATFORM unsigned char rxcr_base;/* default value for RXCR */ #endif
drivers/net/ethernet/8390/apne.c +36 -26
170 lines not on this page · raw message
drivers/net/ethernet/8390/ax88796.c +20 -2
@@ -78,6 +78,8 @@ static unsigned char version[] = "ax88796.c: Copyright 2005,2007 Simtec Electron#define AX_GPOC_PPDSET BIT(6) +static u32 ax_msg_enable; +/* device private data */ struct ax_device {
@@ -147,8 +149,7 @@ static void ax_reset_8390(struct net_device *dev)unsigned long reset_start_time = jiffies;void __iomem *addr = (void __iomem *)dev->base_addr; -if (ei_debug >1 ) -netdev_dbg (dev,"resetting the 8390 t=%ld\n" , jiffies); +netif_dbg (ei_local, hw, dev,"resetting the 8390 t=%ld...\n" , jiffies);ei_outb (ei_inb (addr +NE_RESET ), addr +NE_RESET );
@@ -496,12 +497,28 @@ static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)return phy_ethtool_sset (phy_dev, cmd); } +static u32 ax_get_msglevel (struct net_device *dev) +{ +struct ei_device *ei_local =netdev_priv (dev); + +return ei_local->msg_enable; +} + +static void ax_set_msglevel (struct net_device *dev,u32 v) +{ +struct ei_device *ei_local =netdev_priv (dev); + + ei_local->msg_enable = v; +} +static const struct ethtool_ops ax_ethtool_ops = { .get_drvinfo = ax_get_drvinfo, .get_settings = ax_get_settings, .set_settings = ax_set_settings, .get_link = ethtool_op_get_link, .get_ts_info = ethtool_op_get_ts_info, + .get_msglevel = ax_get_msglevel, + .set_msglevel = ax_set_msglevel, };#ifdef CONFIG_AX88796_93CX6
@@ -763,6 +780,7 @@ static int ax_init_dev(struct net_device *dev) ei_local->block_output = &ax_block_output; ei_local->get_8390_hdr = &ax_get_8390_hdr; ei_local->priv =0 ; + ei_local->msg_enable = ax_msg_enable; dev->netdev_ops = &ax_netdev_ops; dev->ethtool_ops = &ax_ethtool_ops;
drivers/net/ethernet/8390/axnet_cs.c +57 -62
237 lines not on this page · raw message
drivers/net/ethernet/8390/etherh.c +32 -19
116 lines not on this page · raw message
drivers/net/ethernet/8390/hydra.c +8 -3
@@ -66,6 +66,7 @@ static void hydra_block_input(struct net_device *dev, int count,static void hydra_block_output (struct net_device *dev,int count,const unsigned char *buf,int start_page);static void hydra_remove_one (struct zorro_dev *z); +static u32 hydra_msg_enable;static struct zorro_device_id hydra_zorro_tbl[] = { {ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET },
@@ -119,6 +120,7 @@ static int hydra_init(struct zorro_dev *z)int start_page, stop_page;int j;int err; +struct ei_device *ei_local;static u32 hydra_offsets[16 ] = {0x00 ,0x02 ,0x04 ,0x06 ,0x08 ,0x0a ,0x0c ,0x0e ,
@@ -137,6 +139,8 @@ static int hydra_init(struct zorro_dev *z) start_page =NESM_START_PG ; stop_page =NESM_STOP_PG ; + ei_local =netdev_priv (dev); + ei_local->msg_enable = hydra_msg_enable; dev->base_addr = ioaddr; dev->irq =IRQ_AMIGA_PORTS ;
@@ -187,15 +191,16 @@ static int hydra_open(struct net_device *dev)static int hydra_close (struct net_device *dev) { -if (ei_debug >1 ) -printk (KERN_DEBUG "%s: Shutting down ethercard.\n" , dev->name); +struct ei_device *ei_local =netdev_priv (dev); + +netif_dbg (ei_local, ifdown, dev,"Shutting down ethercard.\n" );__ei_close (dev);return 0 ; }static void hydra_reset_8390 (struct net_device *dev) { -printk (KERN_INFO "Hydra hw reset not there\n" ); +netdev_info (dev,"Hydra hw reset not there\n" ); } static void hydra_get_8390_hdr(struct net_device *dev,
drivers/net/ethernet/8390/lib8390.c +41 -36
164 lines not on this page · raw message
drivers/net/ethernet/8390/mac8390.c +14 -5
@@ -167,6 +167,7 @@ static void slow_sane_block_output(struct net_device *dev, int count, const unsigned char *buf, int start_page);static void word_memcpy_tocard (unsigned long tp,const void *fp,int count);static void word_memcpy_fromcard (void *tp,unsigned long fp,int count); +static u32 mac8390_msg_enable;static enum mac8390_type __init mac8390_ident (struct nubus_dev *dev) {
@@ -402,6 +403,7 @@ struct net_device * __init mac8390_probe(int unit)struct net_device *dev;struct nubus_dev *ndev =NULL ;int err = -ENODEV ; +struct ei_device *ei_local;static unsigned int slots;
@@ -440,6 +442,10 @@ struct net_device * __init mac8390_probe(int unit)if (!ndev) goto out; + + ei_local =netdev_priv (dev); + ei_local->msg_enable = mac8390_msg_enable; + err =register_netdev (dev);if (err) goto out;
@@ -660,19 +666,22 @@ static int mac8390_close(struct net_device *dev)static void mac8390_no_reset (struct net_device *dev) { +struct ei_device *ei_local =netdev_priv (dev); + ei_status.txing =0 ; -if (ei_debug >1 ) -pr_info ("reset not supported\n" ); +netif_info (ei_local, hw, dev,"reset not supported\n" ); }static void interlan_reset (struct net_device *dev) {unsigned char *target =nubus_slot_addr (IRQ2SLOT (dev->irq)); -if (ei_debug >1 ) -pr_info ("Need to reset the NS8390 t=%lu..." , jiffies); +struct ei_device *ei_local =netdev_priv (dev); + +netif_info (ei_local, hw, dev,"Need to reset the NS8390 t=%lu..." , + jiffies); ei_status.txing =0 ; target[0xC0000 ] =0 ; -if (ei_debug >1 ) +if (netif_msg_hw (ei_local))pr_cont ("reset complete\n" ); }
drivers/net/ethernet/8390/mcf8390.c +5 -3
@@ -39,6 +39,7 @@ static const char version[] =#define NESM_START_PG 0x40/* First page of TX buffer */ #define NESM_STOP_PG 0x80/* Last page +1 of RX ring */ +static u32 mcf8390_msg_enable;#ifdef NE2000_ODDOFFSET /*
@@ -153,9 +154,9 @@ static void mcf8390_reset_8390(struct net_device *dev) {unsigned long reset_start_time = jiffies;u32 addr = dev->base_addr; +struct ei_device *ei_local =netdev_priv (dev); -if (ei_debug >1 ) -netdev_dbg (dev,"resetting the 8390 t=%ld...\n" , jiffies); +netif_dbg (ei_local, hw, dev,"resetting the 8390 t=%ld...\n" , jiffies);ei_outb (ei_inb (addr +NE_RESET ), addr +NE_RESET );
@@ -288,7 +289,7 @@ static void mcf8390_block_output(struct net_device *dev, int count, dma_start = jiffies;while ((ei_inb (addr +NE_EN0_ISR ) &ENISR_RDC ) ==0 ) {if (time_after (jiffies, dma_start +2 *HZ /100 )) {/* 20ms */ -netdev_err (dev,"timeout waiting for Tx RDC\n" ); +netdev_warn (dev,"timeout waiting for Tx RDC\n" );mcf8390_reset_8390 (dev);__NS8390_init (dev,1 );break ;
@@ -437,6 +438,7 @@ static int mcf8390_probe(struct platform_device *pdev)SET_NETDEV_DEV (dev, &pdev->dev);platform_set_drvdata (pdev, dev); ei_local =netdev_priv (dev); + ei_local->msg_enable = mcf8390_msg_enable; dev->irq = irq->start; dev->base_addr = mem->start;
drivers/net/ethernet/8390/ne.c +53 -43
267 lines not on this page · raw message
drivers/net/ethernet/8390/ne2k-pci.c +37 -17
140 lines not on this page · raw message
drivers/net/ethernet/8390/pcnet_cs.c +34 -28
159 lines not on this page · raw message
drivers/net/ethernet/8390/smc-ultra.c +29 -19
138 lines not on this page · raw message
drivers/net/ethernet/8390/stnic.c +19 -9
@@ -69,6 +69,11 @@ static void stnic_block_output (struct net_device *dev, int count,static void stnic_init (struct net_device *dev); +static u32 stnic_msg_enable; + +module_param_named (msg_enable, stnic_msg_enable, uint, (S_IRUSR |S_IRGRP |S_IROTH )); +MODULE_PARM_DESC (msg_enable,"Debug message level (see linux/netdevice.h for bitmap)" ); +/* SH7750 specific read/write io. */ static inline void STNIC_DELAY (void )
@@ -100,6 +105,7 @@ static int __init stnic_probe(void) {struct net_device *dev;int i, err; +struct ei_device *ei_local;/* If we are not running on a SolutionEngine, give up now */ if (!MACH_SE )
@@ -125,10 +131,10 @@ static int __init stnic_probe(void)share and the board will usually be enabled. */ err =request_irq (dev->irq, ei_interrupt,0 ,DRV_NAME , dev);if (err) { -printk (KERN_EMERG " unable to get IRQ %d.\n" , dev->irq); -free_netdev (dev); -return err; - } +netdev_emerg (dev," unable to get IRQ %d.\n" , dev->irq); +free_netdev (dev); +return err; + } ei_status.name = dev->name; ei_status.word16 =1 ;
@@ -147,6 +153,8 @@ static int __init stnic_probe(void) ei_status.block_output = &stnic_block_output;stnic_init (dev); + ei_local =netdev_priv (dev); + ei_local->msg_enable = stnic_msg_enable; err =register_netdev (dev);if (err) {
@@ -156,7 +164,7 @@ static int __init stnic_probe(void) } stnic_dev = dev; -printk (KERN_INFO "NS ST-NIC 83902A\n" ); +netdev_info (dev,"NS ST-NIC 83902A\n" );return 0 ; }
@@ -164,10 +172,11 @@ static int __init stnic_probe(void)static void stnic_reset (struct net_device *dev) { +struct ei_device *ei_local =netdev_priv (dev); + *(vhalf *)PA_83902_RST =0 ;udelay (5 ); -if (ei_debug >1 ) -printk (KERN_WARNING "8390 reset done (%ld).\n" , jiffies); +netif_warn (ei_local, hw, dev,"8390 reset done (%ld).\n" , jiffies); *(vhalf *)PA_83902_RST = ~0 ;udelay (5 ); }
@@ -176,6 +185,8 @@ static void stnic_get_hdr (struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page) { + struct ei_device *ei_local = netdev_priv(dev); +half buf[2 ];STNIC_WRITE (PG0_RSAR0 ,0 );
@@ -196,8 +207,7 @@ stnic_get_hdr (struct net_device *dev, struct e8390_pkt_hdr *hdr, hdr->count = ((buf[1 ] >>8 ) &0xff ) | (buf[1 ] <<8 );#endif -if (ei_debug >1 ) -printk (KERN_DEBUG "ring %x status %02x next %02x count %04x.\n" , +netif_dbg (ei_local, probe, dev,"ring %x status %02x next %02x count %04x.\n" , ring_page, hdr->status, hdr->next, hdr->count);STNIC_WRITE (STNIC_CR ,CR_RDMA |CR_PG0 |CR_STA );
drivers/net/ethernet/8390/wd.c +25 -17
135 lines not on this page · raw message
drivers/net/ethernet/8390/zorro8390.c +15 -7
@@ -44,6 +44,8 @@static const char version[] ="8390.c:v1.10cvs 9/23/94 Donald Becker ([email protected])\n" ; +static u32 zorro8390_msg_enable; +#include "lib8390.c" #define DRV_NAME "zorro8390"
@@ -86,9 +88,9 @@ static struct card_info {static void zorro8390_reset_8390 (struct net_device *dev) {unsigned long reset_start_time = jiffies; +struct ei_device *ei_local =netdev_priv (dev); -if (ei_debug >1 ) -netdev_dbg (dev,"resetting - t=%ld...\n" , jiffies); +netif_dbg (ei_local, hw, dev,"resetting - t=%ld...\n" , jiffies);z_writeb (z_readb (NE_BASE +NE_RESET ),NE_BASE +NE_RESET );
@@ -119,8 +121,9 @@ static void zorro8390_get_8390_hdr(struct net_device *dev,* If it does, it's the last thing you'll see */ if (ei_status.dmaing) { -netdev_err (dev,"%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n" , - __func__, ei_status.dmaing, ei_status.irqlock); +netdev_warn (dev, +"%s: DMAing conflict [DMAstat:%d][irqlock:%d]\n" , + __func__, ei_status.dmaing, ei_status.irqlock);return ; }
@@ -230,7 +233,7 @@ static void zorro8390_block_output(struct net_device *dev, int count,while ((z_readb (NE_BASE +NE_EN0_ISR ) &ENISR_RDC ) ==0 )if (time_after (jiffies, dma_start +2 *HZ /100 )) {/* 20ms */ -netdev_err (dev,"timeout waiting for Tx RDC\n" ); +netdev_warn (dev,"timeout waiting for Tx RDC\n" );zorro8390_reset_8390 (dev);__NS8390_init (dev,1 );break ;
@@ -248,8 +251,9 @@ static int zorro8390_open(struct net_device *dev)static int zorro8390_close (struct net_device *dev) { -if (ei_debug >1 ) -netdev_dbg (dev,"Shutting down ethercard\n" ); +struct ei_device *ei_local =netdev_priv (dev); + +netif_dbg (ei_local, ifdown, dev,"Shutting down ethercard\n" );__ei_close (dev);return 0 ; }
@@ -293,6 +297,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,int err;unsigned char SA_prom[32 ];int start_page, stop_page; +struct ei_device *ei_local =netdev_priv (dev);static u32 zorro8390_offsets[16 ] = {0x00 ,0x02 ,0x04 ,0x06 ,0x08 ,0x0a ,0x0c ,0x0e ,0x10 ,0x12 ,0x14 ,0x16 ,0x18 ,0x1a ,0x1c ,0x1e ,
@@ -383,6 +388,9 @@ static int zorro8390_init(struct net_device *dev, unsigned long board, dev->netdev_ops = &zorro8390_netdev_ops;__NS8390_init (dev,0 ); + + ei_local->msg_enable = zorro8390_msg_enable; + err =register_netdev (dev);if (err) {free_irq (IRQ_AMIGA_PORTS , dev);
Signature · 1 line
1.7.1
From: Matthew Whitehead <[email protected]>
Date: Wed, 11 Dec 2013 17:00:59 -0500
Quoted 16 lines
Removed the shared
ei_debugvariable. Replaced it by adding u32msg_enableto the private structei_device. Now each 8390 ethernet instance has a per-device logging variable.Changed older style
printk()calls to more canonical forms.Tested on: ne, ne2k-pci, smc-ultra, and wd hardware.
V4.0
- Substitutedpr_info()andpr_debug()forprintk()KERN_INFOandKERN_DEBUGV3.0
- Checked for cases wherepr_cont()was most appropriate choice.
- Changed module parameter from 'debug' to 'msg_enable' because debug was no longer the best description.
Quoted 5 lines
V2.0
- Changednetif_msg_(drv|probe|ifdown|rx_err|tx_err|tx_queued|intr|rx_status|hw)tonetif_(dbg|info|warn|err)where possible.Signed-off-by Matthew Whitehead <[email protected]>
Applied, but there was some trailing whitespace I had to edit out while applying this, thanks.