bk://gkernel.bkbits.net/netdev-2.6
jgarzik@redhat.com|ChangeSet|20040603000509|29729 jgarzik
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/06/02 23:45:50-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-netdev
#
# drivers/net/Kconfig
# 2004/06/02 23:45:47-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 20:05:09-04:00 jgarzik@redhat.com
# Merge redhat.com:/spare/repo/netdev-2.6/r8169
# into redhat.com:/spare/repo/netdev-2.6/ALL
#
# drivers/net/r8169.c
# 2004/06/02 20:05:05-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 20:03:26-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: tx lock removal
#
# spinlock removal crusade.
#
# The patch rephrases the spinlock_irq() in rtl8169_start_xmit() and its
# companion in the Tx irq handling patch in terms of ordered operations.
#
# drivers/net/r8169.c
# 2004/06/02 18:15:37-04:00 romieu@fr.zoreil.com +10 -9
# r8169: tx lock removal
#
# ChangeSet
# 2004/06/02 20:03:18-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: gcc bug workaround
#
# Add a temporary variable to workaround gcc 2.95.3 bug.
#
# drivers/net/r8169.c
# 2004/06/02 18:15:34-04:00 romieu@fr.zoreil.com +5 -2
# r8169: gcc bug workaround
#
# ChangeSet
# 2004/06/02 20:03:10-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: initial link setup rework
#
# Use rtl8169_set_speed() for link setup in rtl8169_init_one():
# - the code which handles the option checking is isolated;
# - display (once) a notice message about the deprecated interface;
# - rtl8169_open() enables the phy timer if the link is not up;
# - rtl8169_set_speed() checks that the netdevice is actually ready
# in order to activate the timer.
#
# drivers/net/r8169.c
# 2004/06/02 17:18:02-04:00 romieu@fr.zoreil.com +43 -93
# r8169: initial link setup rework
#
# ChangeSet
# 2004/06/02 20:03:02-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: link handling and phy reset rework
#
# Link handling changes (Andy Lutomirski <luto@myrealbox.com>):
# - removed rtl8169_hw_phy_reset() and its busy loop;
# - RTL8169_PHY_TIMEOUT is x10 to account for the removal of the
# phy_link_down_cnt loop in rtl8169_phy_timer();
# - added spinlocking in timer context for rtl8169_phy_timer to avoid
# messing with the {set/get}_settings commands issued via ethtool;
# - more TBI stuff.
#
# This patch differs from the former version on the following points:
# - the LinkChg irq does not enable the phy timer when the link goes
# down any more;
# - the phy timer is not enabled in rtl8169_set_speed();
# - removal of the initial renegotiation hack.
#
# drivers/net/r8169.c
# 2004/06/02 17:17:50-04:00 romieu@fr.zoreil.com +94 -50
# r8169: link handling and phy reset rework
#
# ChangeSet
# 2004/06/02 15:37:59-04:00 rl@hellgate.ch
# [PATCH] Add rhine_power_init(): get power regs into sane state
#
# Add rhine_power_init(): get power regs into sane state.
# Move the respective code out of rhine_init_one. Add code for
# two additional patterns (Rhine III).
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +35 -20
# Add rhine_power_init(): get power regs into sane state
#
# ChangeSet
# 2004/06/02 15:37:51-04:00 rl@hellgate.ch
# [PATCH] Rewrite special-casing
#
# Use PCI revision to determine special cases. One bit field replaces a
# bunch of data structures holding special case information.
#
# Replace chip_id, drv_flags in rhine_private with quirks
#
# Remove enum rhine_chips, struct rhine_chip_info (and array),
# enum chip_capability_flags
#
# Add enum rhine_revs, enum rhine_quirks (some values in preparation for
# subsequent changes)
#
# wait_for_reset() and enable_mmio() now use quirks instead of chip_id
#
# Remove model names from ident strings for now.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +76 -58
# Rewrite special-casing
#
# ChangeSet
# 2004/06/02 15:37:42-04:00 rl@hellgate.ch
# [PATCH] Return codes for rhine_init_one
#
# Use return codes in rhine_init_one instead of -ENODEV for all errors.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +15 -7
# Return codes for rhine_init_one
#
# ChangeSet
# 2004/06/02 15:37:34-04:00 rl@hellgate.ch
# [PATCH] Nuke all pci_flags
#
# All this code together can be replaced with a single #ifdef USE_MMIO.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +11 -20
# Nuke all pci_flags
#
# ChangeSet
# 2004/06/02 15:37:26-04:00 rl@hellgate.ch
# [PATCH] Nuke default_port, references to if_port, medialock
#
# As is, code doesn't do anything useful.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +0 -10
# Nuke default_port, references to if_port, medialock
#
# ChangeSet
# 2004/06/02 15:37:18-04:00 rl@hellgate.ch
# [PATCH] Nuke HasESIPhy and related code
#
# This has been dead code forever.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +2 -3
# Nuke HasESIPhy and related code
#
# ChangeSet
# 2004/06/02 15:37:09-04:00 rl@hellgate.ch
# [PATCH] Nuke CanHaveMII and related code
#
# All Rhines can have a MII.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +26 -40
# Nuke CanHaveMII and related code
#
# ChangeSet
# 2004/06/02 15:37:01-04:00 rl@hellgate.ch
# [PATCH] Nuke HAS_IP_COPYSUM
#
# HAS_IP_COPYSUM has been utterly meaningless for a long time.
#
# Signed-off-by: Roger Luethi <rl@hellgate.ch>
#
# drivers/net/via-rhine.c
# 2004/06/01 20:00:00-04:00 rl@hellgate.ch +0 -5
# Nuke HAS_IP_COPYSUM
#
# ChangeSet
# 2004/06/02 09:39:39-04:00 jgarzik@redhat.com
# Merge redhat.com:/spare/repo/netdev-2.6/r8169
# into redhat.com:/spare/repo/netdev-2.6/ALL
#
# drivers/net/r8169.c
# 2004/06/02 09:39:36-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# drivers/net/Kconfig
# 2004/06/02 09:39:36-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 09:38:31-04:00 jgarzik@redhat.com
# Merge redhat.com:/spare/repo/netdev-2.6/misc-herbert
# into redhat.com:/spare/repo/netdev-2.6/ALL
#
# drivers/net/yellowfin.c
# 2004/06/02 09:38:27-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# drivers/net/natsemi.c
# 2004/06/02 09:38:27-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# drivers/net/ibmlana.c
# 2004/06/02 09:38:27-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# drivers/net/acenic.c
# 2004/06/02 09:38:27-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/06/02 09:37:12-04:00 jgarzik@redhat.com
# Merge redhat.com:/spare/repo/netdev-2.6/ip-copysum
# into redhat.com:/spare/repo/netdev-2.6/ALL
#
# drivers/net/tulip/winbond-840.c
# 2004/06/02 09:37:08-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# drivers/net/epic100.c
# 2004/06/02 09:37:08-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/27 15:21:03-04:00 herbert@gondor.apana.org.au
# [NETDRV #2] Use driver-specific name for resources
#
# Here is the next part which uses a driver-specific name instead of
# dev->name for resource allocations prior to netdev registration.
# It also changes printks that are in direct response to errors in
# resource allocations.
#
# drivers/net/zorro8390.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/yellowfin.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/wd.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/sunhme.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/sungem.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/sun3_82586.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/stnic.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/starfire.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/smc9194.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +5 -3
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/smc-ultra32.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/smc-ultra.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/smc-mca.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/r8169.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/oaknet.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ns83820.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ni52.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ne3210.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +6 -4
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ne2k_cbus.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ne2.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ne.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ne-h8300.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/natsemi.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/lp486e.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/lne390.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +5 -3
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/jazzsonic.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ibmlana.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/hp.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +5 -3
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/hp-plus.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/forcedeth.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +2 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/fmv18x.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ewrk3.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +2 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/eth16i.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -4
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/eepro.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/e2100.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/defxx.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/cs89x0.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/at1700.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +5 -3
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/apne.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/acenic.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/ac3200.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +4 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/82596.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +3 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/3c527.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +2 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/3c523.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/3c507.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +2 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/3c503.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +2 -2
# 2/x: [NETDRV] Use driver-specific name for resources
#
# drivers/net/3c501.c
# 2004/05/22 13:40:55-04:00 herbert@gondor.apana.org.au +1 -1
# 2/x: [NETDRV] Use driver-specific name for resources
#
# ChangeSet
# 2004/05/27 15:20:53-04:00 herbert@gondor.apana.org.au
# [NETDRV #1] Ifdef builtin-only probe in ISA/MCA drivers
#
# Here is the bit which conditionalises the
# builtin-only probe functions.
#
# drivers/net/wd.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/smc-ultra.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/ne2k_cbus.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/ne2.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/ne.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/ne-h8300.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/lne390.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/lance.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/isa-skeleton.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/hp100.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/hp.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/hp-plus.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/ewrk3.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/eth16i.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/es3210.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/eexpress.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/eepro.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/e2100.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/cs89x0.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +1 -1
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/ac3200.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/3c523.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/3c505.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -1
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# drivers/net/3c503.c
# 2004/05/20 17:16:23-04:00 herbert@gondor.apana.org.au +2 -0
# 1/x: [NETDRV] Ifdef builtin-only probe in ISA/MCA drivers
#
# ChangeSet
# 2004/05/27 13:58:44-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: ethtool .get_{settings/link}
#
# - ethtool get_settings() for r8169 (Andy Lutomirski <luto@myrealbox.com>);
# - rtl8169_ethtool_ops.get_drvinfo() is set as well;
# - added some bits to handle the TBI status.
#
# The locking does not need to be specially clever.
#
# drivers/net/r8169.c
# 2004/05/20 07:15:59-04:00 romieu@fr.zoreil.com +87 -0
# r8169: ethtool .get_{settings/link}
#
# ChangeSet
# 2004/05/27 13:58:35-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: ethtool .set_settings
#
# ethtool set_settings support (Andy Lutomirski <luto@myrealbox.com>).
# The initial code has been modified so that the settings of parameters
# for TBI and normal mode do not step on each others shoes.
#
# drivers/net/r8169.c
# 2004/05/20 07:03:25-04:00 romieu@fr.zoreil.com +97 -0
# r8169: ethtool .set_settings
#
# ChangeSet
# 2004/05/27 13:38:57-04:00 rl@hellgate.ch
# [PATCH] Nuke HAS_IP_COPYSUM for net drivers
#
# Entirely untested, but Obviously Correct(TM). HAS_IP_COPYSUM has been
# utterly meaningless for a long time.
#
# drivers/net/yellowfin.c
# 2004/05/25 14:46:47-04:00 rl@hellgate.ch +0 -5
# Nuke HAS_IP_COPYSUM for net drivers
#
# drivers/net/tulip/winbond-840.c
# 2004/05/25 14:46:26-04:00 rl@hellgate.ch +0 -6
# Nuke HAS_IP_COPYSUM for net drivers
#
# drivers/net/natsemi.c
# 2004/05/25 14:51:58-04:00 rl@hellgate.ch +0 -5
# Nuke HAS_IP_COPYSUM for net drivers
#
# drivers/net/epic100.c
# 2004/05/25 14:45:55-04:00 rl@hellgate.ch +0 -5
# Nuke HAS_IP_COPYSUM for net drivers
#
# ChangeSet
# 2004/05/17 14:07:14-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: janitoring
#
# Spring cleanup
# - unsigned int (u32) should be slightly faster on ppc64 (Jon D Mason);
# - misc minor de-uglyfication.
#
# drivers/net/r8169.c
# 2004/05/14 17:08:45-04:00 romieu@fr.zoreil.com +47 -47
# 2.6.6-mm2 - r8169 janitoring
#
# ChangeSet
# 2004/05/17 14:07:06-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: cosmetic renaming of a register
#
# RxUnderrun status bit renamed to LinkChg (identical to the 8139cp driver).
#
# drivers/net/r8169.c
# 2004/05/14 17:08:47-04:00 romieu@fr.zoreil.com +5 -5
# 2.6.6-mm2 - r8169 register rename
#
# ChangeSet
# 2004/05/17 14:06:58-04:00 romieu@fr.zoreil.com
# [PATCH] r8169: napi support
#
# Napi for r8169 (Jon D Mason <jonmason@us.ibm.com>).
# Both Tx and Rx processing are moved to the ->poll() function.
#
# drivers/net/r8169.c
# 2004/05/14 17:07:18-04:00 romieu@fr.zoreil.com +78 -11
# 2.6.6-mm2 - r8169 napi
#
# drivers/net/Kconfig
# 2004/05/14 17:07:18-04:00 romieu@fr.zoreil.com +5 -0
# 2.6.6-mm2 - r8169 napi
#
# ChangeSet
# 2004/04/21 23:30:47-04:00 romieu@fr.zoreil.com
# [PATCH] epic100: code removal in irq handler
#
# The loop in the irq handler is not needed any more as the high frequency
# events have been deferred due to napi usage.
#
# drivers/net/epic100.c
# 2004/04/19 18:37:16-04:00 romieu@fr.zoreil.com +52 -64
# 2.6.6-rc1-mm1 - code removal in the epic100 irq handler
#
# ChangeSet
# 2004/04/21 23:30:40-04:00 romieu@fr.zoreil.com
# [PATCH] epic100: spin_unlock_irqrestore avoidance
#
# This patch avoids to duplicate a spin_unlock:
# - it is mostly an artifact due to wild goto;
# - it makes the generated code smaller.
#
# drivers/net/epic100.c
# 2004/04/19 18:37:05-04:00 romieu@fr.zoreil.com +16 -10
# 2.6.6-rc1-mm1 - spin_unlock_irqrestore avoidance in epic100
#
# ChangeSet
# 2004/03/25 23:52:21-05:00 romieu@fr.zoreil.com
# [netdrvr epic100] napi fixes
#
# Multiple invocation of __netif_rx_schedule() in epic_interrupt() while
# epic_poll loops over __netif_rx_complete() leads to serious device
# refcount leak.
#
# drivers/net/epic100.c
# 2004/03/25 23:52:16-05:00 romieu@fr.zoreil.com +18 -15
# [netdrvr epic100] napi fixes
#
# Multiple invocation of __netif_rx_schedule() in epic_interrupt() while
# epic_poll loops over __netif_rx_complete() leads to serious device
# refcount leak.
#
# ChangeSet
# 2004/03/22 19:07:18-05:00 romieu@fr.zoreil.com
# [netdrvr epic100] napi 3/3 - transmit path
#
# drivers/net/epic100.c
# 2004/03/22 18:18:40-05:00 romieu@fr.zoreil.com +9 -11
# 2.6.5-rc2 - epic100 napi
#
# ChangeSet
# 2004/03/22 19:07:11-05:00 romieu@fr.zoreil.com
# [netdrvr epic100] napi 2/3 - receive path
#
# drivers/net/epic100.c
# 2004/03/22 18:18:33-05:00 romieu@fr.zoreil.com +116 -21
# 2.6.5-rc2 - epic100 napi
#
# ChangeSet
# 2004/03/22 19:07:03-05:00 romieu@fr.zoreil.com
# [netdrvr epic100] napi 1/3 - just shuffle some code around
#
# Isolate the classical TX part of epic_interrupt. Innocent code shuffling.
#
# drivers/net/epic100.c
# 2004/03/22 16:53:18-05:00 romieu@fr.zoreil.com +76 -61
# 2.6.5-rc2 - epic100 napi
#
# ChangeSet
# 2004/03/22 19:06:56-05:00 romieu@fr.zoreil.com
# [netdrvr epic100] minor cleanups
#
# - extra pci_disable_device() to balance invocation of pci_enable_device()
# in epic_init_one() (-> error path + epic_remove_one());
# - lazy return status in epic_init_one(), tsss...;
# - memory dedicated to Rx descriptors was not freed after failure of
# register_netdev() in epic_init_one();
# - use of epic_pause() in epic_close() offers a small window for a late
# interruption just before the final free_irq(). Let's close the window to
# avoid two epic_rx() threads racing with each other.
#
# drivers/net/epic100.c
# 2004/03/22 16:53:16-05:00 romieu@fr.zoreil.com +40 -19
# 2.6.5-rc2 - epic100 fixup
#
diff -Nru a/drivers/net/3c501.c b/drivers/net/3c501.c
--- a/drivers/net/3c501.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/3c501.c 2004-06-02 23:47:31 -07:00
@@ -225,7 +225,7 @@
* Reserve I/O resource for exclusive use by this driver
*/
- if (!request_region(ioaddr, EL1_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, EL1_IO_EXTENT, DRV_NAME))
return -ENODEV;
/*
diff -Nru a/drivers/net/3c503.c b/drivers/net/3c503.c
--- a/drivers/net/3c503.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/3c503.c 2004-06-02 23:47:31 -07:00
@@ -147,6 +147,7 @@
release_region(dev->base_addr, EL2_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init el2_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -171,6 +172,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/* Probe for the Etherlink II card at I/O port base IOADDR,
returning non-zero on success. If found, set the station
@@ -182,10 +184,10 @@
static unsigned version_printed;
unsigned long vendor_id;
- if (!request_region(ioaddr, EL2_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME))
return -EBUSY;
- if (!request_region(ioaddr + 0x400, 8, dev->name)) {
+ if (!request_region(ioaddr + 0x400, 8, DRV_NAME)) {
retval = -EBUSY;
goto out;
}
diff -Nru a/drivers/net/3c505.c b/drivers/net/3c505.c
--- a/drivers/net/3c505.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/3c505.c 2004-06-02 23:47:31 -07:00
@@ -1614,6 +1614,7 @@
return err;
}
+#ifndef MODULE
struct net_device * __init elplus_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(elp_device));
@@ -1632,7 +1633,7 @@
return dev;
}
-#ifdef MODULE
+#else
static struct net_device *dev_3c505[ELP_MAX_CARDS];
static int io[ELP_MAX_CARDS];
static int irq[ELP_MAX_CARDS];
diff -Nru a/drivers/net/3c507.c b/drivers/net/3c507.c
--- a/drivers/net/3c507.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/3c507.c 2004-06-02 23:47:31 -07:00
@@ -373,7 +373,7 @@
init_ID_done = 1;
}
- if (!request_region(ioaddr, EL16_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, EL16_IO_EXTENT, DRV_NAME))
return -ENODEV;
if ((inb(ioaddr) != '*') || (inb(ioaddr + 1) != '3') ||
@@ -392,7 +392,7 @@
irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
- irqval = request_irq(irq, &el16_interrupt, 0, dev->name, dev);
+ irqval = request_irq(irq, &el16_interrupt, 0, DRV_NAME, dev);
if (irqval) {
printk ("unable to get IRQ %d (irqval=%d).\n", irq, irqval);
retval = -EAGAIN;
diff -Nru a/drivers/net/3c523.c b/drivers/net/3c523.c
--- a/drivers/net/3c523.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/3c523.c 2004-06-02 23:47:31 -07:00
@@ -445,7 +445,7 @@
slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
continue;
}
- if (!request_region(dev->base_addr, ELMC_IO_EXTENT, dev->name)) {
+ if (!request_region(dev->base_addr, ELMC_IO_EXTENT, DRV_NAME)) {
slot = mca_find_adapter(ELMC_MCA_ID, slot + 1);
continue;
}
@@ -585,6 +585,7 @@
release_region(dev->base_addr, ELMC_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init elmc_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct priv));
@@ -609,6 +610,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/**********************************************
* init the chip (elmc-interrupt should be disabled?!)
diff -Nru a/drivers/net/3c527.c b/drivers/net/3c527.c
--- a/drivers/net/3c527.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/3c527.c 2004-06-02 23:47:31 -07:00
@@ -434,10 +434,10 @@
* Grab the IRQ
*/
- err = request_irq(dev->irq, &mc32_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
+ err = request_irq(dev->irq, &mc32_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM, DRV_NAME, dev);
if (err) {
release_region(dev->base_addr, MC32_IO_EXTENT);
- printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
+ printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
goto err_exit_ports;
}
diff -Nru a/drivers/net/82596.c b/drivers/net/82596.c
--- a/drivers/net/82596.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/82596.c 2004-06-02 23:47:31 -07:00
@@ -63,6 +63,8 @@
static char version[] __initdata =
"82596.c $Revision: 1.5 $\n";
+#define DRV_NAME "82596"
+
/* DEBUG flags
*/
@@ -1191,7 +1193,7 @@
/* this is easy the ethernet interface can only be at 0x300 */
/* first check nothing is already registered here */
- if (!request_region(ioaddr, I596_TOTAL_SIZE, dev->name)) {
+ if (!request_region(ioaddr, I596_TOTAL_SIZE, DRV_NAME)) {
printk(KERN_ERR "82596: IO address 0x%04x in use\n", ioaddr);
err = -EBUSY;
goto out;
diff -Nru a/drivers/net/Kconfig b/drivers/net/Kconfig
--- a/drivers/net/Kconfig 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/Kconfig 2004-06-02 23:47:31 -07:00
@@ -2020,6 +2020,11 @@
To compile this driver as a module, choose M here: the module
will be called r8169. This is recommended.
+config R8169_NAPI
+ bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+ depends on R8169 && EXPERIMENTAL
+
+
config SK98LIN
tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
depends on PCI
diff -Nru a/drivers/net/ac3200.c b/drivers/net/ac3200.c
--- a/drivers/net/ac3200.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ac3200.c 2004-06-02 23:47:31 -07:00
@@ -39,6 +39,8 @@
#include "8390.h"
+#define DRV_NAME "ac3200"
+
/* Offsets from the base address. */
#define AC_NIC_BASE 0x00
#define AC_SA_PROM 0x16 /* The station address PROM. */
@@ -130,6 +132,7 @@
iounmap((void *)dev->mem_start);
}
+#ifndef MODULE
struct net_device * __init ac3200_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -154,12 +157,13 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ac_probe1(int ioaddr, struct net_device *dev)
{
int i, retval;
- if (!request_region(ioaddr, AC_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
return -EBUSY;
if (inb_p(ioaddr + AC_ID_PORT) == 0xff) {
@@ -203,7 +207,7 @@
printk(", assigning");
}
- retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+ retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
if (retval) {
printk (" nothing! Unable to get IRQ %d.\n", dev->irq);
goto out1;
diff -Nru a/drivers/net/acenic.c b/drivers/net/acenic.c
--- a/drivers/net/acenic.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/acenic.c 2004-06-02 23:47:31 -07:00
@@ -85,6 +85,8 @@
#include <asm/uaccess.h>
+#define DRV_NAME "acenic"
+
#undef INDEX_DEBUG
#ifdef CONFIG_ACENIC_OMIT_TIGON_I
@@ -1195,10 +1197,10 @@
}
ecode = request_irq(pdev->irq, ace_interrupt, SA_SHIRQ,
- dev->name, dev);
+ DRV_NAME, dev);
if (ecode) {
printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",
- dev->name, pdev->irq);
+ DRV_NAME, pdev->irq);
goto init_error;
} else
dev->irq = pdev->irq;
diff -Nru a/drivers/net/apne.c b/drivers/net/apne.c
--- a/drivers/net/apne.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/apne.c 2004-06-02 23:47:31 -07:00
@@ -49,6 +49,8 @@
/* ---- No user-serviceable parts below ---- */
+#define DRV_NAME "apne"
+
#define NE_BASE (dev->base_addr)
#define NE_CMD 0x00
#define NE_DATAPORT 0x10 /* NatSemi-defined port window offset. */
@@ -168,7 +170,7 @@
return ERR_PTR(-ENODEV);
}
- if (!request_region(IOBASE, 0x20, dev->name)) {
+ if (!request_region(IOBASE, 0x20, DRV_NAME)) {
free_netdev(dev);
return ERR_PTR(-EBUSY);
}
@@ -310,7 +312,7 @@
dev->base_addr = ioaddr;
/* Install the Interrupt handler */
- i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, dev->name, dev);
+ i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, DRV_NAME, dev);
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {
diff -Nru a/drivers/net/at1700.c b/drivers/net/at1700.c
--- a/drivers/net/at1700.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/at1700.c 2004-06-02 23:47:31 -07:00
@@ -65,6 +65,8 @@
static char version[] __initdata =
"at1700.c:v1.15 4/7/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
+#define DRV_NAME "at1700"
+
/* Tunable parameters. */
/* When to switch from the 64-entry multicast filter to Rx-all-multicast. */
@@ -322,11 +324,11 @@
struct net_local *lp = netdev_priv(dev);
#ifndef CONFIG_X86_PC9800
- if (!request_region(ioaddr, AT1700_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME))
return -EBUSY;
#else
for (i = 0; i < 0x2000; i += 0x0200) {
- if (!request_region(ioaddr + i, 2, dev->name)) {
+ if (!request_region(ioaddr + i, 2, DRV_NAME)) {
while (i > 0) {
i -= 0x0200;
release_region(ioaddr + i, 2);
@@ -542,7 +544,7 @@
lp->jumpered = is_fmv18x;
lp->mca_slot = slot;
/* Snarf the interrupt vector now. */
- ret = request_irq(irq, &net_interrupt, 0, dev->name, dev);
+ ret = request_irq(irq, &net_interrupt, 0, DRV_NAME, dev);
if (ret) {
printk (" AT1700 at %#3x is unusable due to a conflict on"
"IRQ %d.\n", ioaddr, irq);
diff -Nru a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
--- a/drivers/net/cs89x0.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/cs89x0.c 2004-06-02 23:47:31 -07:00
@@ -141,6 +141,8 @@
static char version[] __initdata =
"cs89x0.c: v2.4.3-pre1 Russell Nelson <nelson@crynwr.com>, Andrew Morton <andrewm@uow.edu.au>\n";
+#define DRV_NAME "cs89x0"
+
/* First, a few definitions that the brave might change.
A zero-terminated list of I/O addresses to be probed. Some special flags..
Addr & 1 = Read back the address port, look for signature and reset
@@ -261,7 +263,6 @@
}
__setup("cs89x0_media=", media_fn);
-#endif
/* Check for a network adaptor of this type, and return '0' iff one exists.
@@ -318,6 +319,7 @@
printk(KERN_WARNING "cs89x0: no cs8900 or cs8920 detected. Be sure to disable PnP with SETUP\n");
return ERR_PTR(err);
}
+#endif
static int
readreg(struct net_device *dev, int portno)
@@ -425,9 +427,9 @@
/* Grab the region so we can find another board if autoIRQ fails. */
/* WTF is going on here? */
- if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, dev->name)) {
+ if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) {
printk(KERN_ERR "%s: request_region(0x%x, 0x%x) failed\n",
- dev->name, ioaddr, NETCARD_IO_EXTENT);
+ DRV_NAME, ioaddr, NETCARD_IO_EXTENT);
retval = -EBUSY;
goto out1;
}
diff -Nru a/drivers/net/defxx.c b/drivers/net/defxx.c
--- a/drivers/net/defxx.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/defxx.c 2004-06-02 23:47:31 -07:00
@@ -219,6 +219,8 @@
static char version[] __devinitdata =
"defxx.c:v1.06 2003/08/04 Lawrence V. Stefani and others\n";
+#define DRV_NAME "defxx"
+
#define DYNAMIC_BUFFERS 1
#define SKBUFF_RX_COPYBREAK 200
@@ -435,9 +437,9 @@
bp = dev->priv;
- if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN, dev->name)) {
+ if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN, DRV_NAME)) {
printk (KERN_ERR "%s: Cannot reserve I/O resource 0x%x @ 0x%lx, aborting\n",
- dev->name, PFI_K_CSR_IO_LEN, ioaddr);
+ DRV_NAME, PFI_K_CSR_IO_LEN, ioaddr);
err = -EBUSY;
goto err_out;
}
diff -Nru a/drivers/net/e2100.c b/drivers/net/e2100.c
--- a/drivers/net/e2100.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/e2100.c 2004-06-02 23:47:31 -07:00
@@ -51,6 +51,8 @@
#include "8390.h"
+#define DRV_NAME "e2100"
+
static int e21_probe_list[] = {0x300, 0x280, 0x380, 0x220, 0};
/* Offsets from the base_addr.
@@ -144,6 +146,7 @@
release_region(dev->base_addr, E21_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init e2100_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -168,6 +171,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init e21_probe1(struct net_device *dev, int ioaddr)
{
@@ -175,7 +179,7 @@
unsigned char *station_addr = dev->dev_addr;
static unsigned version_printed;
- if (!request_region(ioaddr, E21_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, E21_IO_EXTENT, DRV_NAME))
return -EBUSY;
/* First check the station address for the Ctron prefix. */
diff -Nru a/drivers/net/eepro.c b/drivers/net/eepro.c
--- a/drivers/net/eepro.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/eepro.c 2004-06-02 23:47:31 -07:00
@@ -151,6 +151,8 @@
#include <asm/io.h>
#include <asm/dma.h>
+#define DRV_NAME "eepro"
+
#define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb) )
/* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */
#define SLOW_DOWN inb(0x80)
@@ -577,6 +579,7 @@
return -ENODEV;
}
+#ifndef MODULE
struct net_device * __init eepro_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct eepro_local));
@@ -603,6 +606,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static void __init printEEPROMInfo(short ioaddr, struct net_device *dev)
{
@@ -745,7 +749,7 @@
int ioaddr = dev->base_addr;
/* Grab the region so we can find another board if autoIRQ fails. */
- if (!request_region(ioaddr, EEPRO_IO_EXTENT, dev->name)) {
+ if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) {
if (!autoprobe)
printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n",
ioaddr);
diff -Nru a/drivers/net/eexpress.c b/drivers/net/eexpress.c
--- a/drivers/net/eexpress.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/eexpress.c 2004-06-02 23:47:31 -07:00
@@ -423,6 +423,7 @@
return -ENODEV;
}
+#ifndef MODULE
struct net_device * __init express_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
@@ -443,6 +444,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/*
* open and initialize the adapter, ready for use
diff -Nru a/drivers/net/epic100.c b/drivers/net/epic100.c
--- a/drivers/net/epic100.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/epic100.c 2004-06-02 23:47:31 -07:00
@@ -77,8 +77,6 @@
These may be modified when a driver module is loaded.*/
static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 32;
/* Used to pass the full-duplex flag, etc. */
#define MAX_UNITS 8 /* More are supported, limit only on options */
@@ -96,9 +94,9 @@
Making the Tx ring too large decreases the effectiveness of channel
bonding and packet priority.
There are no ill effects from too-large receive rings. */
-#define TX_RING_SIZE 16
-#define TX_QUEUE_LEN 10 /* Limit ring entries actually used. */
-#define RX_RING_SIZE 32
+#define TX_RING_SIZE 256
+#define TX_QUEUE_LEN 240 /* Limit ring entries actually used. */
+#define RX_RING_SIZE 256
#define TX_TOTAL_SIZE TX_RING_SIZE*sizeof(struct epic_tx_desc)
#define RX_TOTAL_SIZE RX_RING_SIZE*sizeof(struct epic_rx_desc)
@@ -155,12 +153,10 @@
MODULE_LICENSE("GPL");
MODULE_PARM(debug, "i");
-MODULE_PARM(max_interrupt_work, "i");
MODULE_PARM(rx_copybreak, "i");
MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i");
MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
MODULE_PARM_DESC(debug, "EPIC/100 debug level (0-5)");
-MODULE_PARM_DESC(max_interrupt_work, "EPIC/100 maximum events handled per interrupt");
MODULE_PARM_DESC(options, "EPIC/100: Bits 0-3: media type, bit 4: full duplex");
MODULE_PARM_DESC(rx_copybreak, "EPIC/100 copy breakpoint for copy-only-tiny-frames");
MODULE_PARM_DESC(full_duplex, "EPIC/100 full duplex setting(s) (1)");
@@ -292,6 +288,12 @@
StopTxDMA=0x20, StopRxDMA=0x40, RestartTx=0x80,
};
+#define EpicRemoved 0xffffffff /* Chip failed or removed (CardBus) */
+
+#define EpicNapiEvent (TxEmpty | TxDone | \
+ RxDone | RxStarted | RxEarlyWarn | RxOverflow | RxFull)
+#define EpicNormalEvent (0x0000ffff & ~EpicNapiEvent)
+
static u16 media2miictl[16] = {
0, 0x0C00, 0x0C00, 0x2000, 0x0100, 0x2100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0 };
@@ -330,9 +332,12 @@
/* Ring pointers. */
spinlock_t lock; /* Group with Tx control cache line. */
+ spinlock_t napi_lock;
+ unsigned int reschedule_in_poll;
unsigned int cur_tx, dirty_tx;
unsigned int cur_rx, dirty_rx;
+ u32 irq_mask;
unsigned int rx_buf_sz; /* Based on MTU+slack. */
struct pci_dev *pci_dev; /* PCI bus location. */
@@ -359,7 +364,8 @@
static void epic_tx_timeout(struct net_device *dev);
static void epic_init_ring(struct net_device *dev);
static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static int epic_rx(struct net_device *dev);
+static int epic_rx(struct net_device *dev, int budget);
+static int epic_poll(struct net_device *dev, int *budget);
static irqreturn_t epic_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static struct ethtool_ops netdev_ethtool_ops;
@@ -378,7 +384,7 @@
int irq;
struct net_device *dev;
struct epic_private *ep;
- int i, option = 0, duplex = 0;
+ int i, ret, option = 0, duplex = 0;
void *ring_space;
dma_addr_t ring_dma;
@@ -392,29 +398,33 @@
card_idx++;
- i = pci_enable_device(pdev);
- if (i)
- return i;
+ ret = pci_enable_device(pdev);
+ if (ret)
+ goto out;
irq = pdev->irq;
if (pci_resource_len(pdev, 0) < pci_id_tbl[chip_idx].io_size) {
printk (KERN_ERR "card %d: no PCI region space\n", card_idx);
- return -ENODEV;
+ ret = -ENODEV;
+ goto err_out_disable;
}
pci_set_master(pdev);
+ ret = pci_request_regions(pdev, DRV_NAME);
+ if (ret < 0)
+ goto err_out_disable;
+
+ ret = -ENOMEM;
+
dev = alloc_etherdev(sizeof (*ep));
if (!dev) {
printk (KERN_ERR "card %d: no memory for eth device\n", card_idx);
- return -ENOMEM;
+ goto err_out_free_res;
}
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
- if (pci_request_regions(pdev, DRV_NAME))
- goto err_out_free_netdev;
-
#ifdef USE_IO_OPS
ioaddr = pci_resource_start (pdev, 0);
#else
@@ -422,7 +432,7 @@
ioaddr = (long) ioremap (ioaddr, pci_resource_len (pdev, 1));
if (!ioaddr) {
printk (KERN_ERR DRV_NAME " %d: ioremap failed\n", card_idx);
- goto err_out_free_res;
+ goto err_out_free_netdev;
}
#endif
@@ -459,7 +469,9 @@
dev->base_addr = ioaddr;
dev->irq = irq;
- spin_lock_init (&ep->lock);
+ spin_lock_init(&ep->lock);
+ spin_lock_init(&ep->napi_lock);
+ ep->reschedule_in_poll = 0;
/* Bring the chip out of low-power mode. */
outl(0x4200, ioaddr + GENCTL);
@@ -489,6 +501,9 @@
ep->pci_dev = pdev;
ep->chip_id = chip_idx;
ep->chip_flags = pci_id_tbl[chip_idx].drv_flags;
+ ep->irq_mask =
+ (ep->chip_flags & TYPE2_INTR ? PCIBusErr175 : PCIBusErr170)
+ | CntFull | TxUnderrun | EpicNapiEvent;
/* Find the connected MII xcvrs.
Doing this in open() would allow detecting external xcvrs later, but
@@ -543,10 +558,12 @@
dev->ethtool_ops = &netdev_ethtool_ops;
dev->watchdog_timeo = TX_TIMEOUT;
dev->tx_timeout = &epic_tx_timeout;
+ dev->poll = epic_poll;
+ dev->weight = 64;
- i = register_netdev(dev);
- if (i)
- goto err_out_unmap_tx;
+ ret = register_netdev(dev);
+ if (ret < 0)
+ goto err_out_unmap_rx;
printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ",
dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq);
@@ -554,19 +571,24 @@
printk("%2.2x:", dev->dev_addr[i]);
printk("%2.2x.\n", dev->dev_addr[i]);
- return 0;
+out:
+ return ret;
+err_out_unmap_rx:
+ pci_free_consistent(pdev, RX_TOTAL_SIZE, ep->rx_ring, ep->rx_ring_dma);
err_out_unmap_tx:
pci_free_consistent(pdev, TX_TOTAL_SIZE, ep->tx_ring, ep->tx_ring_dma);
err_out_iounmap:
#ifndef USE_IO_OPS
iounmap(ioaddr);
-err_out_free_res:
-#endif
- pci_release_regions(pdev);
err_out_free_netdev:
+#endif
free_netdev(dev);
- return -ENODEV;
+err_out_free_res:
+ pci_release_regions(pdev);
+err_out_disable:
+ pci_disable_device(pdev);
+ goto out;
}
/* Serial EEPROM section. */
@@ -592,6 +614,38 @@
#define EE_READ256_CMD (6 << 8)
#define EE_ERASE_CMD (7 << 6)
+static void epic_disable_int(struct net_device *dev, struct epic_private *ep)
+{
+ long ioaddr = dev->base_addr;
+
+ outl(0x00000000, ioaddr + INTMASK);
+}
+
+static inline void __epic_pci_commit(long ioaddr)
+{
+#ifndef USE_IO_OPS
+ inl(ioaddr + INTMASK);
+#endif
+}
+
+static inline void epic_napi_irq_off(struct net_device *dev,
+ struct epic_private *ep)
+{
+ long ioaddr = dev->base_addr;
+
+ outl(ep->irq_mask & ~EpicNapiEvent, ioaddr + INTMASK);
+ __epic_pci_commit(ioaddr);
+}
+
+static inline void epic_napi_irq_on(struct net_device *dev,
+ struct epic_private *ep)
+{
+ long ioaddr = dev->base_addr;
+
+ /* No need to commit possible posted write */
+ outl(ep->irq_mask | EpicNapiEvent, ioaddr + INTMASK);
+}
+
static int __devinit read_eeprom(long ioaddr, int location)
{
int i;
@@ -752,9 +806,8 @@
/* Enable interrupts by setting the interrupt mask. */
outl((ep->chip_flags & TYPE2_INTR ? PCIBusErr175 : PCIBusErr170)
- | CntFull | TxUnderrun | TxDone | TxEmpty
- | RxError | RxOverflow | RxFull | RxHeader | RxDone,
- ioaddr + INTMASK);
+ | CntFull | TxUnderrun
+ | RxError | RxHeader | EpicNapiEvent, ioaddr + INTMASK);
if (debug > 1)
printk(KERN_DEBUG "%s: epic_open() ioaddr %lx IRQ %d status %4.4x "
@@ -795,7 +848,7 @@
}
/* Remove the packets on the Rx queue. */
- epic_rx(dev);
+ epic_rx(dev, RX_RING_SIZE);
}
static void epic_restart(struct net_device *dev)
@@ -841,9 +894,9 @@
/* Enable interrupts by setting the interrupt mask. */
outl((ep->chip_flags & TYPE2_INTR ? PCIBusErr175 : PCIBusErr170)
- | CntFull | TxUnderrun | TxDone | TxEmpty
- | RxError | RxOverflow | RxFull | RxHeader | RxDone,
- ioaddr + INTMASK);
+ | CntFull | TxUnderrun
+ | RxError | RxHeader | EpicNapiEvent, ioaddr + INTMASK);
+
printk(KERN_DEBUG "%s: epic_restart() done, cmd status %4.4x, ctl %4.4x"
" interrupt %4.4x.\n",
dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL),
@@ -929,7 +982,6 @@
int i;
ep->tx_full = 0;
- ep->lock = (spinlock_t) SPIN_LOCK_UNLOCKED;
ep->dirty_tx = ep->cur_tx = 0;
ep->cur_rx = ep->dirty_rx = 0;
ep->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
@@ -1029,6 +1081,76 @@
return 0;
}
+static void epic_tx_error(struct net_device *dev, struct epic_private *ep,
+ int status)
+{
+ struct net_device_stats *stats = &ep->stats;
+
+#ifndef final_version
+ /* There was an major error, log it. */
+ if (debug > 1)
+ printk(KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n",
+ dev->name, status);
+#endif
+ stats->tx_errors++;
+ if (status & 0x1050)
+ stats->tx_aborted_errors++;
+ if (status & 0x0008)
+ stats->tx_carrier_errors++;
+ if (status & 0x0040)
+ stats->tx_window_errors++;
+ if (status & 0x0010)
+ stats->tx_fifo_errors++;
+}
+
+static void epic_tx(struct net_device *dev, struct epic_private *ep)
+{
+ unsigned int dirty_tx, cur_tx;
+
+ /*
+ * Note: if this lock becomes a problem we can narrow the locked
+ * region at the cost of occasionally grabbing the lock more times.
+ */
+ cur_tx = ep->cur_tx;
+ for (dirty_tx = ep->dirty_tx; cur_tx - dirty_tx > 0; dirty_tx++) {
+ struct sk_buff *skb;
+ int entry = dirty_tx % TX_RING_SIZE;
+ int txstatus = le32_to_cpu(ep->tx_ring[entry].txstatus);
+
+ if (txstatus & DescOwn)
+ break; /* It still hasn't been Txed */
+
+ if (likely(txstatus & 0x0001)) {
+ ep->stats.collisions += (txstatus >> 8) & 15;
+ ep->stats.tx_packets++;
+ ep->stats.tx_bytes += ep->tx_skbuff[entry]->len;
+ } else
+ epic_tx_error(dev, ep, txstatus);
+
+ /* Free the original skb. */
+ skb = ep->tx_skbuff[entry];
+ pci_unmap_single(ep->pci_dev, ep->tx_ring[entry].bufaddr,
+ skb->len, PCI_DMA_TODEVICE);
+ dev_kfree_skb_irq(skb);
+ ep->tx_skbuff[entry] = 0;
+ }
+
+#ifndef final_version
+ if (cur_tx - dirty_tx > TX_RING_SIZE) {
+ printk(KERN_WARNING
+ "%s: Out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
+ dev->name, dirty_tx, cur_tx, ep->tx_full);
+ dirty_tx += TX_RING_SIZE;
+ }
+#endif
+ ep->dirty_tx = dirty_tx;
+ if (ep->tx_full && cur_tx - dirty_tx < TX_QUEUE_LEN - 4) {
+ /* The ring is no longer full, allow new TX entries. */
+ ep->tx_full = 0;
+ netif_wake_queue(dev);
+ }
+}
+
/* The interrupt handler does all of the Rx thread work and cleans up
after the Tx thread. */
static irqreturn_t epic_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
@@ -1036,135 +1158,71 @@
struct net_device *dev = dev_instance;
struct epic_private *ep = dev->priv;
long ioaddr = dev->base_addr;
- int status, boguscnt = max_interrupt_work;
unsigned int handled = 0;
+ int status;
- do {
- status = inl(ioaddr + INTSTAT);
- /* Acknowledge all of the current interrupt sources ASAP. */
- outl(status & 0x00007fff, ioaddr + INTSTAT);
-
- if (debug > 4)
- printk(KERN_DEBUG "%s: Interrupt, status=%#8.8x new "
- "intstat=%#8.8x.\n",
- dev->name, status, (int)inl(ioaddr + INTSTAT));
-
- if ((status & IntrSummary) == 0)
- break;
- handled = 1;
+ status = inl(ioaddr + INTSTAT);
+ /* Acknowledge all of the current interrupt sources ASAP. */
+ outl(status & EpicNormalEvent, ioaddr + INTSTAT);
- if (status & (RxDone | RxStarted | RxEarlyWarn | RxOverflow))
- epic_rx(dev);
+ if (debug > 4) {
+ printk(KERN_DEBUG "%s: Interrupt, status=%#8.8x new "
+ "intstat=%#8.8x.\n", dev->name, status,
+ (int)inl(ioaddr + INTSTAT));
+ }
- if (status & (TxEmpty | TxDone)) {
- unsigned int dirty_tx, cur_tx;
+ if ((status & IntrSummary) == 0)
+ goto out;
- /* Note: if this lock becomes a problem we can narrow the locked
- region at the cost of occasionally grabbing the lock more
- times. */
- spin_lock(&ep->lock);
- cur_tx = ep->cur_tx;
- dirty_tx = ep->dirty_tx;
- for (; cur_tx - dirty_tx > 0; dirty_tx++) {
- struct sk_buff *skb;
- int entry = dirty_tx % TX_RING_SIZE;
- int txstatus = le32_to_cpu(ep->tx_ring[entry].txstatus);
+ handled = 1;
- if (txstatus & DescOwn)
- break; /* It still hasn't been Txed */
+ if ((status & EpicNapiEvent) && !ep->reschedule_in_poll) {
+ spin_lock(&ep->napi_lock);
+ if (netif_rx_schedule_prep(dev)) {
+ epic_napi_irq_off(dev, ep);
+ __netif_rx_schedule(dev);
+ } else
+ ep->reschedule_in_poll++;
+ spin_unlock(&ep->napi_lock);
+ }
+ status &= ~EpicNapiEvent;
- if ( ! (txstatus & 0x0001)) {
- /* There was an major error, log it. */
-#ifndef final_version
- if (debug > 1)
- printk(KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n",
- dev->name, txstatus);
-#endif
- ep->stats.tx_errors++;
- if (txstatus & 0x1050) ep->stats.tx_aborted_errors++;
- if (txstatus & 0x0008) ep->stats.tx_carrier_errors++;
- if (txstatus & 0x0040) ep->stats.tx_window_errors++;
- if (txstatus & 0x0010) ep->stats.tx_fifo_errors++;
- } else {
- ep->stats.collisions += (txstatus >> 8) & 15;
- ep->stats.tx_packets++;
- ep->stats.tx_bytes += ep->tx_skbuff[entry]->len;
- }
-
- /* Free the original skb. */
- skb = ep->tx_skbuff[entry];
- pci_unmap_single(ep->pci_dev, ep->tx_ring[entry].bufaddr,
- skb->len, PCI_DMA_TODEVICE);
- dev_kfree_skb_irq(skb);
- ep->tx_skbuff[entry] = 0;
- }
+ /* Check uncommon events all at once. */
+ if (status & (CntFull | TxUnderrun | PCIBusErr170 | PCIBusErr175)) {
+ if (status == EpicRemoved)
+ goto out;
-#ifndef final_version
- if (cur_tx - dirty_tx > TX_RING_SIZE) {
- printk(KERN_WARNING "%s: Out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
- dev->name, dirty_tx, cur_tx, ep->tx_full);
- dirty_tx += TX_RING_SIZE;
- }
-#endif
- ep->dirty_tx = dirty_tx;
- if (ep->tx_full
- && cur_tx - dirty_tx < TX_QUEUE_LEN - 4) {
- /* The ring is no longer full, allow new TX entries. */
- ep->tx_full = 0;
- spin_unlock(&ep->lock);
- netif_wake_queue(dev);
- } else
- spin_unlock(&ep->lock);
- }
+ /* Always update the error counts to avoid overhead later. */
+ ep->stats.rx_missed_errors += inb(ioaddr + MPCNT);
+ ep->stats.rx_frame_errors += inb(ioaddr + ALICNT);
+ ep->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
- /* Check uncommon events all at once. */
- if (status & (CntFull | TxUnderrun | RxOverflow | RxFull |
- PCIBusErr170 | PCIBusErr175)) {
- if (status == 0xffffffff) /* Chip failed or removed (CardBus). */
- break;
- /* Always update the error counts to avoid overhead later. */
- ep->stats.rx_missed_errors += inb(ioaddr + MPCNT);
- ep->stats.rx_frame_errors += inb(ioaddr + ALICNT);
- ep->stats.rx_crc_errors += inb(ioaddr + CRCCNT);
-
- if (status & TxUnderrun) { /* Tx FIFO underflow. */
- ep->stats.tx_fifo_errors++;
- outl(ep->tx_threshold += 128, ioaddr + TxThresh);
- /* Restart the transmit process. */
- outl(RestartTx, ioaddr + COMMAND);
- }
- if (status & RxOverflow) { /* Missed a Rx frame. */
- ep->stats.rx_errors++;
- }
- if (status & (RxOverflow | RxFull))
- outw(RxQueued, ioaddr + COMMAND);
- if (status & PCIBusErr170) {
- printk(KERN_ERR "%s: PCI Bus Error! EPIC status %4.4x.\n",
- dev->name, status);
- epic_pause(dev);
- epic_restart(dev);
- }
- /* Clear all error sources. */
- outl(status & 0x7f18, ioaddr + INTSTAT);
+ if (status & TxUnderrun) { /* Tx FIFO underflow. */
+ ep->stats.tx_fifo_errors++;
+ outl(ep->tx_threshold += 128, ioaddr + TxThresh);
+ /* Restart the transmit process. */
+ outl(RestartTx, ioaddr + COMMAND);
}
- if (--boguscnt < 0) {
- printk(KERN_ERR "%s: Too much work at interrupt, "
- "IntrStatus=0x%8.8x.\n",
- dev->name, status);
- /* Clear all interrupt sources. */
- outl(0x0001ffff, ioaddr + INTSTAT);
- break;
+ if (status & PCIBusErr170) {
+ printk(KERN_ERR "%s: PCI Bus Error! status %4.4x.\n",
+ dev->name, status);
+ epic_pause(dev);
+ epic_restart(dev);
}
- } while (1);
+ /* Clear all error sources. */
+ outl(status & 0x7f18, ioaddr + INTSTAT);
+ }
- if (debug > 3)
- printk(KERN_DEBUG "%s: exiting interrupt, intr_status=%#4.4x.\n",
- dev->name, status);
+out:
+ if (debug > 3) {
+ printk(KERN_DEBUG "%s: exit interrupt, intr_status=%#4.4x.\n",
+ dev->name, status);
+ }
return IRQ_RETVAL(handled);
}
-static int epic_rx(struct net_device *dev)
+static int epic_rx(struct net_device *dev, int budget)
{
struct epic_private *ep = dev->priv;
int entry = ep->cur_rx % RX_RING_SIZE;
@@ -1174,6 +1232,10 @@
if (debug > 4)
printk(KERN_DEBUG " In epic_rx(), entry %d %8.8x.\n", entry,
ep->rx_ring[entry].rxstatus);
+
+ if (rx_work_limit > budget)
+ rx_work_limit = budget;
+
/* If we own the next entry, it's a new packet. Send it up. */
while ((ep->rx_ring[entry].rxstatus & cpu_to_le32(DescOwn)) == 0) {
int status = le32_to_cpu(ep->rx_ring[entry].rxstatus);
@@ -1215,13 +1277,8 @@
ep->rx_ring[entry].bufaddr,
ep->rx_buf_sz,
PCI_DMA_FROMDEVICE);
-#if 1 /* HAS_IP_COPYSUM */
eth_copy_and_sum(skb, ep->rx_skbuff[entry]->tail, pkt_len, 0);
skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len), ep->rx_skbuff[entry]->tail,
- pkt_len);
-#endif
pci_dma_sync_single_for_device(ep->pci_dev,
ep->rx_ring[entry].bufaddr,
ep->rx_buf_sz,
@@ -1234,7 +1291,7 @@
ep->rx_skbuff[entry] = NULL;
}
skb->protocol = eth_type_trans(skb, dev);
- netif_rx(skb);
+ netif_receive_skb(skb);
dev->last_rx = jiffies;
ep->stats.rx_packets++;
ep->stats.rx_bytes += pkt_len;
@@ -1262,6 +1319,65 @@
return work_done;
}
+static void epic_rx_err(struct net_device *dev, struct epic_private *ep)
+{
+ long ioaddr = dev->base_addr;
+ int status;
+
+ status = inl(ioaddr + INTSTAT);
+
+ if (status == EpicRemoved)
+ return;
+ if (status & RxOverflow) /* Missed a Rx frame. */
+ ep->stats.rx_errors++;
+ if (status & (RxOverflow | RxFull))
+ outw(RxQueued, ioaddr + COMMAND);
+}
+
+static int epic_poll(struct net_device *dev, int *budget)
+{
+ struct epic_private *ep = dev->priv;
+ int work_done, orig_budget;
+ long ioaddr = dev->base_addr;
+
+ orig_budget = (*budget > dev->quota) ? dev->quota : *budget;
+
+rx_action:
+
+ epic_tx(dev, ep);
+
+ work_done = epic_rx(dev, *budget);
+
+ epic_rx_err(dev, ep);
+
+ *budget -= work_done;
+ dev->quota -= work_done;
+
+ if (netif_running(dev) && (work_done < orig_budget)) {
+ unsigned long flags;
+ int more;
+
+ /* A bit baroque but it avoids a (space hungry) spin_unlock */
+
+ spin_lock_irqsave(&ep->napi_lock, flags);
+
+ more = ep->reschedule_in_poll;
+ if (!more) {
+ __netif_rx_complete(dev);
+ outl(EpicNapiEvent, ioaddr + INTSTAT);
+ epic_napi_irq_on(dev, ep);
+ } else
+ ep->reschedule_in_poll--;
+
+ spin_unlock_irqrestore(&ep->napi_lock, flags);
+
+ if (more)
+ goto rx_action;
+ }
+
+ return (work_done >= orig_budget);
+}
+
static int epic_close(struct net_device *dev)
{
long ioaddr = dev->base_addr;
@@ -1276,9 +1392,13 @@
dev->name, (int)inl(ioaddr + INTSTAT));
del_timer_sync(&ep->timer);
- epic_pause(dev);
+
+ epic_disable_int(dev, ep);
+
free_irq(dev->irq, dev);
+ epic_pause(dev);
+
/* Free all the skbuffs in the Rx queue. */
for (i = 0; i < RX_RING_SIZE; i++) {
skb = ep->rx_skbuff[i];
@@ -1476,6 +1596,7 @@
#endif
pci_release_regions(pdev);
free_netdev(dev);
+ pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
/* pci_power_off(pdev, -1); */
}
diff -Nru a/drivers/net/es3210.c b/drivers/net/es3210.c
--- a/drivers/net/es3210.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/es3210.c 2004-06-02 23:47:31 -07:00
@@ -161,6 +161,7 @@
release_region(dev->base_addr, ES_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init es_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -185,6 +186,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init es_probe1(struct net_device *dev, int ioaddr)
{
diff -Nru a/drivers/net/eth16i.c b/drivers/net/eth16i.c
--- a/drivers/net/eth16i.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/eth16i.c 2004-06-02 23:47:31 -07:00
@@ -458,6 +458,7 @@
return -ENODEV;
}
+#ifndef MODULE
struct net_device * __init eth16i_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct eth16i_local));
@@ -483,6 +484,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init eth16i_probe1(struct net_device *dev, int ioaddr)
{
@@ -491,7 +493,7 @@
int retval;
/* Let's grab the region */
- if (!request_region(ioaddr, ETH16I_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, ETH16I_IO_EXTENT, cardname))
return -EBUSY;
/*
@@ -538,9 +540,9 @@
/* Try to obtain interrupt vector */
- if ((retval = request_irq(dev->irq, (void *)ð16i_interrupt, 0, dev->name, dev))) {
- printk(KERN_WARNING "%s: %s at %#3x, but is unusable due conflicting IRQ %d.\n",
- dev->name, cardname, ioaddr, dev->irq);
+ if ((retval = request_irq(dev->irq, (void *)ð16i_interrupt, 0, cardname, dev))) {
+ printk(KERN_WARNING "%s at %#3x, but is unusable due to conflicting IRQ %d.\n",
+ cardname, ioaddr, dev->irq);
goto out;
}
diff -Nru a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
--- a/drivers/net/ewrk3.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ewrk3.c 2004-06-02 23:47:31 -07:00
@@ -341,6 +341,7 @@
mdelay(1);\
}
+#ifndef MODULE
struct net_device * __init ewrk3_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct ewrk3_private));
@@ -364,6 +365,7 @@
return ERR_PTR(err);
}
+#endif
static int __init ewrk3_probe1(struct net_device *dev, u_long iobase, int irq)
{
@@ -1269,7 +1271,7 @@
for (; (i < maxSlots) && (dev != NULL);
iobase += EWRK3_IOP_INC, i++)
{
- if (request_region(iobase, EWRK3_TOTAL_SIZE, dev->name)) {
+ if (request_region(iobase, EWRK3_TOTAL_SIZE, DRV_NAME)) {
if (DevicePresent(iobase) == 0) {
int irq = dev->irq;
ret = ewrk3_hw_init(dev, iobase);
@@ -1310,7 +1312,7 @@
for (i = 1; (i < maxSlots) && (dev != NULL); i++, iobase += EISA_SLOT_INC) {
if (EISA_signature(name, EISA_ID) == 0) {
- if (request_region(iobase, EWRK3_TOTAL_SIZE, dev->name) &&
+ if (request_region(iobase, EWRK3_TOTAL_SIZE, DRV_NAME) &&
DevicePresent(iobase) == 0) {
int irq = dev->irq;
ret = ewrk3_hw_init(dev, iobase);
diff -Nru a/drivers/net/fmv18x.c b/drivers/net/fmv18x.c
--- a/drivers/net/fmv18x.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/fmv18x.c 2004-06-02 23:47:31 -07:00
@@ -57,6 +57,8 @@
#include <asm/io.h>
#include <asm/dma.h>
+#define DRV_NAME "fmv18x"
+
static unsigned fmv18x_probe_list[] __initdata = {
0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x300, 0x340, 0
};
@@ -192,7 +194,7 @@
That means we have to be careful with the register values we probe for.
*/
- if (!request_region(ioaddr, FMV18X_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, FMV18X_IO_EXTENT, DRV_NAME))
return -EBUSY;
dev->irq = irq;
@@ -224,7 +226,7 @@
}
/* Snarf the interrupt vector now. */
- retval = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev);
+ retval = request_irq(dev->irq, &net_interrupt, 0, DRV_NAME, dev);
if (retval) {
printk ("FMV-18x found at %#3x, but it's unusable due to a conflict on"
"IRQ %d.\n", ioaddr, dev->irq);
diff -Nru a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
--- a/drivers/net/forcedeth.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/forcedeth.c 2004-06-02 23:47:31 -07:00
@@ -81,6 +81,7 @@
* superfluous timer interrupts from the nic.
*/
#define FORCEDETH_VERSION "0.25"
+#define DRV_NAME "forcedeth"
#include <linux/module.h>
#include <linux/types.h>
@@ -1424,7 +1425,7 @@
pci_set_master(pci_dev);
- err = pci_request_regions(pci_dev, dev->name);
+ err = pci_request_regions(pci_dev, DRV_NAME);
if (err < 0)
goto out_disable;
diff -Nru a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
--- a/drivers/net/hp-plus.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/hp-plus.c 2004-06-02 23:47:31 -07:00
@@ -37,6 +37,8 @@
#include "8390.h"
+#define DRV_NAME "hp-plus"
+
/* A zero-terminated list of I/O addresses to be probed. */
static unsigned int hpplus_portlist[] __initdata =
{0x200, 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0};
@@ -142,6 +144,7 @@
release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init hp_plus_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -166,6 +169,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/* Do the interesting part of the probe at a single address. */
static int __init hpp_probe1(struct net_device *dev, int ioaddr)
@@ -176,7 +180,7 @@
int mem_start;
static unsigned version_printed;
- if (!request_region(ioaddr, HP_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
return -EBUSY;
/* Check for the HP+ signature, 50 48 0x 53. */
diff -Nru a/drivers/net/hp.c b/drivers/net/hp.c
--- a/drivers/net/hp.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/hp.c 2004-06-02 23:47:31 -07:00
@@ -37,6 +37,8 @@
#include "8390.h"
+#define DRV_NAME "hp"
+
/* A zero-terminated list of I/O addresses to be probed. */
static unsigned int hppclan_portlist[] __initdata =
{ 0x300, 0x320, 0x340, 0x280, 0x2C0, 0x200, 0x240, 0};
@@ -106,6 +108,7 @@
release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init hp_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -130,6 +133,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init hp_probe1(struct net_device *dev, int ioaddr)
{
@@ -137,7 +141,7 @@
const char *name;
static unsigned version_printed;
- if (!request_region(ioaddr, HP_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
return -EBUSY;
/* Check for the HP physical address, 08 00 09 xx xx xx. */
@@ -182,7 +186,7 @@
outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE);
outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE);
if (irq == probe_irq_off(cookie) /* It's a good IRQ line! */
- && request_irq (irq, ei_interrupt, 0, dev->name, dev) == 0) {
+ && request_irq (irq, ei_interrupt, 0, DRV_NAME, dev) == 0) {
printk(" selecting IRQ %d.\n", irq);
dev->irq = *irqp;
break;
@@ -197,7 +201,7 @@
} else {
if (dev->irq == 2)
dev->irq = 9;
- if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
+ if ((retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev))) {
printk (" unable to get IRQ %d.\n", dev->irq);
goto out;
}
diff -Nru a/drivers/net/hp100.c b/drivers/net/hp100.c
--- a/drivers/net/hp100.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/hp100.c 2004-06-02 23:47:31 -07:00
@@ -386,6 +386,7 @@
}
+#ifndef MODULE
struct net_device * __init hp100_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
@@ -420,6 +421,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init hp100_probe1(struct net_device *dev, int ioaddr,
u_char bus, struct pci_dev *pci_dev)
diff -Nru a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
--- a/drivers/net/ibmlana.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ibmlana.c 2004-06-02 23:47:31 -07:00
@@ -98,6 +98,8 @@
#undef DEBUG
+#define DRV_NAME "ibmlana"
+
/* ------------------------------------------------------------------------
* global static data - not more since we can handle multiple boards and
* have to pack all state info into the device struct!
@@ -952,8 +954,8 @@
printk(KERN_INFO "%s: IBM LAN Adapter/A found in slot %d\n", dev->name, slot + 1);
/* try to obtain I/O range */
- if (!request_region(iobase, IBM_LANA_IORANGE, dev->name)) {
- printk(KERN_ERR "%s: cannot allocate I/O range at %#x!\n", dev->name, iobase);
+ if (!request_region(iobase, IBM_LANA_IORANGE, DRV_NAME)) {
+ printk(KERN_ERR "%s: cannot allocate I/O range at %#x!\n", DRV_NAME, iobase);
startslot = slot + 1;
return -EBUSY;
}
diff -Nru a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
--- a/drivers/net/isa-skeleton.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/isa-skeleton.c 2004-06-02 23:47:31 -07:00
@@ -161,6 +161,7 @@
release_region(dev->base_addr, NETCARD_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init netcard_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
@@ -185,6 +186,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
/*
* This is the real probe routine. Linux has a history of friendly device
diff -Nru a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
--- a/drivers/net/jazzsonic.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/jazzsonic.c 2004-06-02 23:47:31 -07:00
@@ -37,6 +37,8 @@
#include <asm/jazz.h>
#include <asm/jazzdma.h>
+#define DRV_NAME "jazzsonic"
+
#define SREGS_PAD(n) u16 n;
#include "sonic.h"
@@ -151,7 +153,7 @@
int err = -ENODEV;
int i;
- if (!request_region(base_addr, 0x100, dev->name))
+ if (!request_region(base_addr, 0x100, DRV_NAME))
return -EBUSY;
/*
* get the Silicon Revision ID. If this is one of the known
diff -Nru a/drivers/net/lance.c b/drivers/net/lance.c
--- a/drivers/net/lance.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/lance.c 2004-06-02 23:47:31 -07:00
@@ -432,6 +432,7 @@
return -ENODEV;
}
+#ifndef MODULE
struct net_device * __init lance_probe(int unit)
{
struct net_device *dev = alloc_etherdev(0);
@@ -456,6 +457,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int options)
{
diff -Nru a/drivers/net/lne390.c b/drivers/net/lne390.c
--- a/drivers/net/lne390.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/lne390.c 2004-06-02 23:47:31 -07:00
@@ -49,6 +49,8 @@
#include "8390.h"
+#define DRV_NAME "lne390"
+
static int lne390_probe1(struct net_device *dev, int ioaddr);
static int lne390_open(struct net_device *dev);
@@ -112,7 +114,7 @@
SET_MODULE_OWNER(dev);
if (ioaddr > 0x1ff) { /* Check a single specified location. */
- if (!request_region(ioaddr, LNE390_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, LNE390_IO_EXTENT, DRV_NAME))
return -EBUSY;
ret = lne390_probe1(dev, ioaddr);
if (ret)
@@ -131,7 +133,7 @@
/* EISA spec allows for up to 16 slots, but 8 is typical. */
for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
- if (!request_region(ioaddr, LNE390_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, LNE390_IO_EXTENT, DRV_NAME))
continue;
if (lne390_probe1(dev, ioaddr) == 0)
return 0;
@@ -151,6 +153,7 @@
iounmap((void *)dev->mem_start);
}
+#ifndef MODULE
struct net_device * __init lne390_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -175,6 +178,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init lne390_probe1(struct net_device *dev, int ioaddr)
{
@@ -228,7 +232,7 @@
}
printk(" IRQ %d,", dev->irq);
- if ((ret = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
+ if ((ret = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev))) {
printk (" unable to get IRQ %d.\n", dev->irq);
return ret;
}
diff -Nru a/drivers/net/lp486e.c b/drivers/net/lp486e.c
--- a/drivers/net/lp486e.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/lp486e.c 2004-06-02 23:47:31 -07:00
@@ -75,6 +75,8 @@
#include <asm/io.h>
#include <asm/dma.h>
+#define DRV_NAME "lp486e"
+
/* debug print flags */
#define LOG_SRCDST 0x80000000
#define LOG_STATINT 0x40000000
@@ -970,7 +972,7 @@
return -ENODEV;
probed++;
- if (!request_region(IOADDR, LP486E_TOTAL_SIZE, dev->name)) {
+ if (!request_region(IOADDR, LP486E_TOTAL_SIZE, DRV_NAME)) {
printk(KERN_ERR "lp486e: IO address 0x%x in use\n", IOADDR);
return -EBUSY;
}
diff -Nru a/drivers/net/natsemi.c b/drivers/net/natsemi.c
--- a/drivers/net/natsemi.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/natsemi.c 2004-06-02 23:47:31 -07:00
@@ -766,7 +766,7 @@
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
- i = pci_request_regions(pdev, dev->name);
+ i = pci_request_regions(pdev, DRV_NAME);
if (i)
goto err_pci_request_regions;
@@ -1798,14 +1798,9 @@
np->rx_dma[entry],
buflen,
PCI_DMA_FROMDEVICE);
-#if HAS_IP_COPYSUM
eth_copy_and_sum(skb,
np->rx_skbuff[entry]->tail, pkt_len, 0);
skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len),
- np->rx_skbuff[entry]->tail, pkt_len);
-#endif
pci_dma_sync_single_for_device(np->pci_dev,
np->rx_dma[entry],
buflen,
diff -Nru a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
--- a/drivers/net/ne-h8300.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ne-h8300.c 2004-06-02 23:47:31 -07:00
@@ -34,6 +34,8 @@
#include "8390.h"
+#define DRV_NAME "ne-h8300"
+
/* Some defines that people can play with if so inclined. */
/* Do we perform extra sanity checks on stuff ? */
@@ -156,6 +158,7 @@
release_region(dev->base_addr, NE_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -187,6 +190,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ne_probe1(struct net_device *dev, int ioaddr)
{
@@ -200,7 +204,7 @@
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
unsigned char bus_width;
- if (!request_region(ioaddr, NE_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY;
reg0 = inb_p(ioaddr);
diff -Nru a/drivers/net/ne.c b/drivers/net/ne.c
--- a/drivers/net/ne.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ne.c 2004-06-02 23:47:31 -07:00
@@ -55,6 +55,8 @@
#include "8390.h"
+#define DRV_NAME "ne"
+
/* Some defines that people can play with if so inclined. */
/* Do we support clones that don't adhere to 14,15 of the SAprom ? */
@@ -203,6 +205,7 @@
release_region(dev->base_addr, NE_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -227,6 +230,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ne_probe_isapnp(struct net_device *dev)
{
@@ -284,7 +288,7 @@
int reg0, ret;
static unsigned version_printed;
- if (!request_region(ioaddr, NE_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY;
reg0 = inb_p(ioaddr);
diff -Nru a/drivers/net/ne2.c b/drivers/net/ne2.c
--- a/drivers/net/ne2.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ne2.c 2004-06-02 23:47:31 -07:00
@@ -82,6 +82,8 @@
#include "8390.h"
+#define DRV_NAME "ne2"
+
/* Some defines that people can play with if so inclined. */
/* Do we perform extra sanity checks on stuff ? */
@@ -284,6 +286,7 @@
release_region(dev->base_addr, NE_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init ne2_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -308,6 +311,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
{
@@ -368,7 +372,7 @@
irq = irqs[(POS & 0x60)>>5];
}
- if (!request_region(base_addr, NE_IO_EXTENT, dev->name))
+ if (!request_region(base_addr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY;
#ifdef DEBUG
@@ -470,7 +474,7 @@
/* Snarf the interrupt now. There's no point in waiting since we cannot
share and the board will usually be enabled. */
- retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+ retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
if (retval) {
printk (" unable to get IRQ %d (irqval=%d).\n",
dev->irq, retval);
diff -Nru a/drivers/net/ne2k_cbus.c b/drivers/net/ne2k_cbus.c
--- a/drivers/net/ne2k_cbus.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ne2k_cbus.c 2004-06-02 23:47:31 -07:00
@@ -37,6 +37,8 @@
#include "8390.h"
+#define DRV_NAME "ne2k_cbus"
+
/* Some defines that people can play with if so inclined. */
/* Do we support clones that don't adhere to 14,15 of the SAprom ? */
@@ -187,6 +189,7 @@
ne2k_cbus_destroy(dev);
}
+#ifndef MODULE
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -211,6 +214,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr, int irq)
{
@@ -263,7 +267,7 @@
for (rlist = hw->regionlist; rlist->range; rlist++)
if (!request_region(ioaddr + rlist->start,
- rlist->range, dev->name)) {
+ rlist->range, DRV_NAME)) {
ret = -EBUSY;
goto err_out;
}
diff -Nru a/drivers/net/ne3210.c b/drivers/net/ne3210.c
--- a/drivers/net/ne3210.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ne3210.c 2004-06-02 23:47:31 -07:00
@@ -45,6 +45,8 @@
#include "8390.h"
+#define DRV_NAME "ne3210"
+
static int ne3210_open(struct net_device *dev);
static int ne3210_close(struct net_device *dev);
@@ -111,13 +113,13 @@
device->driver_data = dev;
ioaddr = edev->base_addr;
- if (!request_region(ioaddr, NE3210_IO_EXTENT, dev->name)) {
+ if (!request_region(ioaddr, NE3210_IO_EXTENT, DRV_NAME)) {
retval = -EBUSY;
goto out;
}
if (!request_region(ioaddr + NE3210_CFG1,
- NE3210_CFG_EXTENT, dev->name)) {
+ NE3210_CFG_EXTENT, DRV_NAME)) {
retval = -EBUSY;
goto out1;
}
@@ -140,7 +142,7 @@
dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07];
printk(".\nne3210.c: using IRQ %d, ", dev->irq);
- retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+ retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
if (retval) {
printk (" unable to get IRQ %d.\n", dev->irq);
goto out2;
@@ -163,7 +165,7 @@
}
}
- if (!request_mem_region (phys_mem, NE3210_STOP_PG*0x100, dev->name)) {
+ if (!request_mem_region (phys_mem, NE3210_STOP_PG*0x100, DRV_NAME)) {
printk ("ne3210.c: Unable to request shared memory at physical address %#lx\n",
phys_mem);
goto out3;
diff -Nru a/drivers/net/ni52.c b/drivers/net/ni52.c
--- a/drivers/net/ni52.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ni52.c 2004-06-02 23:47:31 -07:00
@@ -124,6 +124,8 @@
#include "ni52.h"
+#define DRV_NAME "ni52"
+
#define DEBUG /* debug on */
#define SYSBUSVAL 1 /* 8 Bit */
@@ -424,7 +426,7 @@
dev->mem_start = memstart;
dev->mem_end = memend;
- if (!request_region(ioaddr, NI52_TOTAL_SIZE, dev->name))
+ if (!request_region(ioaddr, NI52_TOTAL_SIZE, DRV_NAME))
return -EBUSY;
if( !(inb(ioaddr+NI52_MAGIC1) == NI52_MAGICVAL1) ||
diff -Nru a/drivers/net/ns83820.c b/drivers/net/ns83820.c
--- a/drivers/net/ns83820.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/ns83820.c 2004-06-02 23:47:31 -07:00
@@ -113,6 +113,8 @@
#include <asm/uaccess.h>
#include <asm/system.h>
+#define DRV_NAME "ns83820"
+
/* Global parameters. See MODULE_PARM near the bottom. */
static int ihr = 2;
static int reset_phy = 0;
@@ -1851,7 +1853,7 @@
0);
err = request_irq(pci_dev->irq, ns83820_irq, SA_SHIRQ,
- ndev->name, ndev);
+ DRV_NAME, ndev);
if (err) {
printk(KERN_INFO "ns83820: unable to register irq %d\n",
pci_dev->irq);
diff -Nru a/drivers/net/oaknet.c b/drivers/net/oaknet.c
--- a/drivers/net/oaknet.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/oaknet.c 2004-06-02 23:47:31 -07:00
@@ -164,7 +164,7 @@
ret = -EAGAIN;
if (request_irq(dev->irq, ei_interrupt, 0, name, dev)) {
printk("%s: unable to request interrupt %d.\n",
- dev->name, dev->irq);
+ name, dev->irq);
goto out_region;
}
diff -Nru a/drivers/net/r8169.c b/drivers/net/r8169.c
--- a/drivers/net/r8169.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/r8169.c 2004-06-02 23:47:31 -07:00
@@ -7,7 +7,7 @@
Feb 4 2002 - created initially by ShuChen <shuchen@realtek.com.tw>.
May 20 2002 - Add link status force-mode and TBI mode support.
=========================================================================
- 1. The media can be forced in 5 modes.
+ 1. [DEPRECATED: use ethtool instead] The media can be forced in 5 modes.
Command: 'insmod r8169 media = SET_MEDIA'
Ex: 'insmod r8169 media = 0x04' will force PHY to operate in 100Mpbs Half-duplex.
@@ -41,6 +41,7 @@
#include <linux/etherdevice.h>
#include <linux/delay.h>
#include <linux/ethtool.h>
+#include <linux/mii.h>
#include <linux/crc32.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
@@ -64,6 +65,14 @@
#define dprintk(fmt, args...) do {} while (0)
#endif /* RTL8169_DEBUG */
+#ifdef CONFIG_R8169_NAPI
+#define rtl8169_rx_skb netif_receive_skb
+#define rtl8169_rx_quota(count, quota) min(count, quota)
+#else
+#define rtl8169_rx_skb netif_rx
+#define rtl8169_rx_quota(count, quota) count
+#endif
+
/* media options */
#define MAX_UNITS 8
static int media[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 };
@@ -90,15 +99,16 @@
#define RxPacketMaxSize 0x0800 /* Maximum size supported is 16K-1 */
#define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */
+#define R8169_NAPI_WEIGHT 64
#define NUM_TX_DESC 64 /* Number of Tx descriptor registers */
-#define NUM_RX_DESC 64 /* Number of Rx descriptor registers */
+#define NUM_RX_DESC 256 /* Number of Rx descriptor registers */
#define RX_BUF_SIZE 1536 /* Rx Buffer size */
#define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
#define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
#define RTL_MIN_IO_SIZE 0x80
#define RTL8169_TX_TIMEOUT (6*HZ)
-#define RTL8169_PHY_TIMEOUT (HZ)
+#define RTL8169_PHY_TIMEOUT (10*HZ)
/* write/read MMIO register */
#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg))
@@ -194,7 +204,7 @@
SWInt = 0x0100,
TxDescUnavail = 0x80,
RxFIFOOver = 0x40,
- RxUnderrun = 0x20,
+ LinkChg = 0x20,
RxOverflow = 0x10,
TxErr = 0x08,
TxOK = 0x04,
@@ -233,6 +243,14 @@
TxInterFrameGapShift = 24,
TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */
+ /* TBICSR p.28 */
+ TBIReset = 0x80000000,
+ TBILoopback = 0x40000000,
+ TBINwEnable = 0x20000000,
+ TBINwRestart = 0x10000000,
+ TBILinkOk = 0x02000000,
+ TBINwComplete = 0x01000000,
+
/* CPlusCmd p.31 */
RxVlan = (1 << 6),
RxChkSum = (1 << 5),
@@ -306,10 +324,10 @@
};
struct rtl8169_private {
- void *mmio_addr; /* memory map physical address */
+ void *mmio_addr; /* memory map physical address */
struct pci_dev *pci_dev; /* Index of PCI device */
struct net_device_stats stats; /* statistics of net device */
- spinlock_t lock; /* spin lock flag */
+ spinlock_t lock; /* spin lock flag */
int chipset;
int mac_version;
int phy_version;
@@ -317,15 +335,23 @@
u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
u32 dirty_rx;
u32 dirty_tx;
- struct TxDesc *TxDescArray; /* Index of 256-alignment Tx Descriptor buffer */
- struct RxDesc *RxDescArray; /* Index of 256-alignment Rx Descriptor buffer */
+ struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */
+ struct RxDesc *RxDescArray; /* 256-aligned Rx descriptor ring */
dma_addr_t TxPhyAddr;
dma_addr_t RxPhyAddr;
struct sk_buff *Rx_skbuff[NUM_RX_DESC]; /* Rx data buffers */
- struct sk_buff *Tx_skbuff[NUM_TX_DESC]; /* Index of Transmit data buffer */
+ struct sk_buff *Tx_skbuff[NUM_TX_DESC]; /* Tx data buffers */
struct timer_list timer;
- unsigned long phy_link_down_cnt;
u16 cp_cmd;
+ u16 intr_mask;
+ int phy_auto_nego_reg;
+ int phy_1000_ctrl_reg;
+
+ int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex);
+ void (*get_settings)(struct net_device *, struct ethtool_cmd *);
+ void (*phy_reset_enable)(void *);
+ unsigned int (*phy_reset_pending)(void *);
+ unsigned int (*link_ok)(void *);
};
MODULE_AUTHOR("Realtek");
@@ -344,9 +370,14 @@
static void rtl8169_set_rx_mode(struct net_device *dev);
static void rtl8169_tx_timeout(struct net_device *dev);
static struct net_device_stats *rtl8169_get_stats(struct net_device *netdev);
+#ifdef CONFIG_R8169_NAPI
+static int rtl8169_poll(struct net_device *dev, int *budget);
+#endif
static const u16 rtl8169_intr_mask =
- RxUnderrun | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
+ LinkChg | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
+static const u16 rtl8169_napi_event =
+ RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
static const unsigned int rtl8169_rx_config =
(RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift);
@@ -364,11 +395,9 @@
for (i = 2000; i > 0; i--) {
// Check if the RTL8169 has completed writing to the specified MII register
- if (!(RTL_R32(PHYAR) & 0x80000000)) {
+ if (!(RTL_R32(PHYAR) & 0x80000000))
break;
- } else {
- udelay(100);
- }
+ udelay(100);
}
}
@@ -390,18 +419,264 @@
return value;
}
+static unsigned int rtl8169_tbi_reset_pending(void *ioaddr)
+{
+ return RTL_R32(TBICSR) & TBIReset;
+}
+
+static unsigned int rtl8169_xmii_reset_pending(void *ioaddr)
+{
+ return mdio_read(ioaddr, 0) & 0x8000;
+}
+
+static unsigned int rtl8169_tbi_link_ok(void *ioaddr)
+{
+ return RTL_R32(TBICSR) & TBILinkOk;
+}
+
+static unsigned int rtl8169_xmii_link_ok(void *ioaddr)
+{
+ return RTL_R8(PHYstatus) & LinkStatus;
+}
+
+static void rtl8169_tbi_reset_enable(void *ioaddr)
+{
+ RTL_W32(TBICSR, RTL_R32(TBICSR) | TBIReset);
+}
+
+static void rtl8169_xmii_reset_enable(void *ioaddr)
+{
+ unsigned int val;
+
+ val = (mdio_read(ioaddr, PHY_CTRL_REG) | 0x8000) & 0xffff;
+ mdio_write(ioaddr, PHY_CTRL_REG, val);
+}
+
+static void rtl8169_check_link_status(struct net_device *dev,
+ struct rtl8169_private *tp, void *ioaddr)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&tp->lock, flags);
+ if (tp->link_ok(ioaddr)) {
+ netif_carrier_on(dev);
+ printk(KERN_INFO PFX "%s: link up\n", dev->name);
+ } else
+ netif_carrier_off(dev);
+ spin_unlock_irqrestore(&tp->lock, flags);
+}
+
+static void rtl8169_link_option(int idx, u8 *autoneg, u16 *speed, u8 *duplex)
+{
+ struct {
+ u16 speed;
+ u8 duplex;
+ u8 autoneg;
+ u8 media;
+ } link_settings[] = {
+ { SPEED_10, DUPLEX_HALF, AUTONEG_DISABLE, _10_Half },
+ { SPEED_10, DUPLEX_FULL, AUTONEG_DISABLE, _10_Full },
+ { SPEED_100, DUPLEX_HALF, AUTONEG_DISABLE, _100_Half },
+ { SPEED_100, DUPLEX_FULL, AUTONEG_DISABLE, _100_Full },
+ { SPEED_1000, DUPLEX_FULL, AUTONEG_DISABLE, _1000_Full },
+ /* Make TBI happy */
+ { SPEED_1000, DUPLEX_FULL, AUTONEG_ENABLE, 0xff }
+ }, *p;
+ unsigned char option;
+
+ option = ((idx < MAX_UNITS) && (idx >= 0)) ? media[idx] : 0xff;
+
+ if ((option != 0xff) && !idx)
+ printk(KERN_WARNING PFX "media option is deprecated.\n");
+
+ for (p = link_settings; p->media != 0xff; p++) {
+ if (p->media == option)
+ break;
+ }
+ *autoneg = p->autoneg;
+ *speed = p->speed;
+ *duplex = p->duplex;
+}
+
static void rtl8169_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
strcpy(info->driver, RTL8169_DRIVER_NAME);
strcpy(info->version, RTL8169_VERSION );
strcpy(info->bus_info, pci_name(tp->pci_dev));
}
+static int rtl8169_set_speed_tbi(struct net_device *dev,
+ u8 autoneg, u16 speed, u8 duplex)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ void *ioaddr = tp->mmio_addr;
+ int ret = 0;
+ u32 reg;
+
+ reg = RTL_R32(TBICSR);
+ if ((autoneg == AUTONEG_DISABLE) && (speed == SPEED_1000) &&
+ (duplex == DUPLEX_FULL)) {
+ RTL_W32(TBICSR, reg & ~(TBINwEnable | TBINwRestart));
+ } else if (autoneg == AUTONEG_ENABLE)
+ RTL_W32(TBICSR, reg | TBINwEnable | TBINwRestart);
+ else {
+ printk(KERN_WARNING PFX
+ "%s: incorrect speed setting refused in TBI mode\n",
+ dev->name);
+ ret = -EOPNOTSUPP;
+ }
+
+ return ret;
+}
+
+static int rtl8169_set_speed_xmii(struct net_device *dev,
+ u8 autoneg, u16 speed, u8 duplex)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ void *ioaddr = tp->mmio_addr;
+ int auto_nego, giga_ctrl;
+
+ auto_nego = mdio_read(ioaddr, PHY_AUTO_NEGO_REG);
+ auto_nego &= ~(PHY_Cap_10_Half | PHY_Cap_10_Full |
+ PHY_Cap_100_Half | PHY_Cap_100_Full);
+ giga_ctrl = mdio_read(ioaddr, PHY_1000_CTRL_REG);
+ giga_ctrl &= ~(PHY_Cap_1000_Full | PHY_Cap_Null);
+
+ if (autoneg == AUTONEG_ENABLE) {
+ auto_nego |= (PHY_Cap_10_Half | PHY_Cap_10_Full |
+ PHY_Cap_100_Half | PHY_Cap_100_Full);
+ giga_ctrl |= PHY_Cap_1000_Full;
+ } else {
+ if (speed == SPEED_10)
+ auto_nego |= PHY_Cap_10_Half | PHY_Cap_10_Full;
+ else if (speed == SPEED_100)
+ auto_nego |= PHY_Cap_100_Half | PHY_Cap_100_Full;
+ else if (speed == SPEED_1000)
+ giga_ctrl |= PHY_Cap_1000_Full;
+
+ if (duplex == DUPLEX_HALF)
+ auto_nego &= ~(PHY_Cap_10_Full | PHY_Cap_100_Full);
+ }
+
+ tp->phy_auto_nego_reg = auto_nego;
+ tp->phy_1000_ctrl_reg = giga_ctrl;
+
+ mdio_write(ioaddr, PHY_AUTO_NEGO_REG, auto_nego);
+ mdio_write(ioaddr, PHY_1000_CTRL_REG, giga_ctrl);
+ mdio_write(ioaddr, PHY_CTRL_REG, PHY_Enable_Auto_Nego |
+ PHY_Restart_Auto_Nego);
+ return 0;
+}
+
+static int rtl8169_set_speed(struct net_device *dev,
+ u8 autoneg, u16 speed, u8 duplex)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ int ret;
+
+ ret = tp->set_speed(dev, autoneg, speed, duplex);
+
+ if (netif_running(dev) && (tp->phy_1000_ctrl_reg & PHY_Cap_1000_Full))
+ mod_timer(&tp->timer, jiffies + RTL8169_PHY_TIMEOUT);
+
+ return ret;
+}
+
+static int rtl8169_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&tp->lock, flags);
+ ret = rtl8169_set_speed(dev, cmd->autoneg, cmd->speed, cmd->duplex);
+ spin_unlock_irqrestore(&tp->lock, flags);
+
+ return ret;
+}
+
+static void rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ void *ioaddr = tp->mmio_addr;
+ u32 status;
+
+ cmd->supported =
+ SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | SUPPORTED_FIBRE;
+ cmd->port = PORT_FIBRE;
+ cmd->transceiver = XCVR_INTERNAL;
+
+ status = RTL_R32(TBICSR);
+ cmd->advertising = (status & TBINwEnable) ? ADVERTISED_Autoneg : 0;
+ cmd->autoneg = !!(status & TBINwEnable);
+
+ cmd->speed = SPEED_1000;
+ cmd->duplex = DUPLEX_FULL; /* Always set */
+}
+
+static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ void *ioaddr = tp->mmio_addr;
+ u8 status;
+
+ cmd->supported = SUPPORTED_10baseT_Half |
+ SUPPORTED_10baseT_Full |
+ SUPPORTED_100baseT_Half |
+ SUPPORTED_100baseT_Full |
+ SUPPORTED_1000baseT_Full |
+ SUPPORTED_Autoneg |
+ SUPPORTED_TP;
+
+ cmd->autoneg = 1;
+ cmd->advertising = ADVERTISED_TP | ADVERTISED_Autoneg;
+
+ if (tp->phy_auto_nego_reg & PHY_Cap_10_Half)
+ cmd->advertising |= ADVERTISED_10baseT_Half;
+ if (tp->phy_auto_nego_reg & PHY_Cap_10_Full)
+ cmd->advertising |= ADVERTISED_10baseT_Full;
+ if (tp->phy_auto_nego_reg & PHY_Cap_100_Half)
+ cmd->advertising |= ADVERTISED_100baseT_Half;
+ if (tp->phy_auto_nego_reg & PHY_Cap_100_Full)
+ cmd->advertising |= ADVERTISED_100baseT_Full;
+ if (tp->phy_1000_ctrl_reg & PHY_Cap_1000_Full)
+ cmd->advertising |= ADVERTISED_1000baseT_Full;
+
+ status = RTL_R8(PHYstatus);
+
+ if (status & _1000bpsF)
+ cmd->speed = SPEED_1000;
+ else if (status & _100bps)
+ cmd->speed = SPEED_100;
+ else if (status & _10bps)
+ cmd->speed = SPEED_10;
+
+ cmd->duplex = ((status & _1000bpsF) || (status & FullDup)) ?
+ DUPLEX_FULL : DUPLEX_HALF;
+}
+
+static int rtl8169_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct rtl8169_private *tp = netdev_priv(dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&tp->lock, flags);
+
+ tp->get_settings(dev, cmd);
+
+ spin_unlock_irqrestore(&tp->lock, flags);
+ return 0;
+}
+
+
static struct ethtool_ops rtl8169_ethtool_ops = {
.get_drvinfo = rtl8169_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_settings = rtl8169_get_settings,
+ .set_settings = rtl8169_set_settings,
};
static void rtl8169_write_gmii_reg_bit(void *ioaddr, int reg, int bitnum,
@@ -500,7 +775,7 @@
static void rtl8169_hw_phy_config(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
struct {
u16 regs[5]; /* Beware of bit-sign propagation */
@@ -566,61 +841,47 @@
mdio_write(ioaddr, 31, 0x0000); //w 31 2 0 0
}
-static void rtl8169_hw_phy_reset(struct net_device *dev)
-{
- struct rtl8169_private *tp = dev->priv;
- void *ioaddr = tp->mmio_addr;
- int i, val;
-
- printk(KERN_WARNING PFX "%s: Reset RTL8169s PHY\n", dev->name);
-
- val = (mdio_read(ioaddr, 0) | 0x8000) & 0xffff;
- mdio_write(ioaddr, 0, val);
-
- for (i = 50; i >= 0; i--) {
- if (!(mdio_read(ioaddr, 0) & 0x8000))
- break;
- udelay(100); /* Gross */
- }
-
- if (i < 0) {
- printk(KERN_WARNING PFX "%s: no PHY Reset ack. Giving up.\n",
- dev->name);
- }
-}
-
static void rtl8169_phy_timer(unsigned long __opaque)
{
struct net_device *dev = (struct net_device *)__opaque;
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
struct timer_list *timer = &tp->timer;
void *ioaddr = tp->mmio_addr;
+ unsigned long timeout = RTL8169_PHY_TIMEOUT;
assert(tp->mac_version > RTL_GIGA_MAC_VER_B);
assert(tp->phy_version < RTL_GIGA_PHY_VER_G);
- if (RTL_R8(PHYstatus) & LinkStatus)
- tp->phy_link_down_cnt = 0;
- else {
- tp->phy_link_down_cnt++;
- if (tp->phy_link_down_cnt >= 12) {
- int reg;
-
- // If link on 1000, perform phy reset.
- reg = mdio_read(ioaddr, PHY_1000_CTRL_REG);
- if (reg & PHY_Cap_1000_Full)
- rtl8169_hw_phy_reset(dev);
+ if (!(tp->phy_1000_ctrl_reg & PHY_Cap_1000_Full))
+ return;
- tp->phy_link_down_cnt = 0;
- }
+ spin_lock_irq(&tp->lock);
+
+ if (tp->phy_reset_pending(ioaddr)) {
+ /*
+ * A busy loop could burn quite a few cycles on nowadays CPU.
+ * Let's delay the execution of the timer for a few ticks.
+ */
+ timeout = HZ/10;
+ goto out_mod_timer;
}
- mod_timer(timer, jiffies + RTL8169_PHY_TIMEOUT);
+ if (tp->link_ok(ioaddr))
+ goto out_unlock;
+
+ printk(KERN_WARNING PFX "%s: PHY reset until link up\n", dev->name);
+
+ tp->phy_reset_enable(ioaddr);
+
+out_mod_timer:
+ mod_timer(timer, jiffies + timeout);
+out_unlock:
+ spin_unlock_irq(&tp->lock);
}
static inline void rtl8169_delete_timer(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
struct timer_list *timer = &tp->timer;
if ((tp->mac_version <= RTL_GIGA_MAC_VER_B) ||
@@ -628,21 +889,17 @@
return;
del_timer_sync(timer);
-
- tp->phy_link_down_cnt = 0;
}
static inline void rtl8169_request_timer(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
struct timer_list *timer = &tp->timer;
if ((tp->mac_version <= RTL_GIGA_MAC_VER_B) ||
(tp->phy_version >= RTL_GIGA_PHY_VER_G))
return;
- tp->phy_link_down_cnt = 0;
-
init_timer(timer);
timer->expires = jiffies + RTL8169_PHY_TIMEOUT;
timer->data = (unsigned long)(dev);
@@ -681,7 +938,7 @@
// enable device (incl. PCI PM wakeup and hotplug setup)
rc = pci_enable_device(pdev);
if (rc) {
- printk(KERN_ERR PFX "%s: unable to enable device\n", pdev->slot_name);
+ printk(KERN_ERR PFX "%s: enable failure\n", pdev->slot_name);
goto err_out;
}
@@ -693,7 +950,8 @@
pci_read_config_word(pdev, pm_cap + PCI_PM_CTRL, &pwr_command);
acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
} else {
- printk(KERN_ERR PFX "Cannot find PowerManagement capability, aborting.\n");
+ printk(KERN_ERR PFX
+ "Cannot find PowerManagement capability, aborting.\n");
goto err_out_free_res;
}
@@ -716,9 +974,10 @@
goto err_out_disable;
}
- rc = pci_request_regions(pdev, dev->name);
+ rc = pci_request_regions(pdev, MODULENAME);
if (rc) {
- printk(KERN_ERR PFX "%s: Could not request regions.\n", pdev->slot_name);
+ printk(KERN_ERR PFX "%s: could not request regions.\n",
+ pdev->slot_name);
goto err_out_disable;
}
@@ -800,8 +1059,9 @@
void *ioaddr = NULL;
static int board_idx = -1;
static int printed_version = 0;
+ u8 autoneg, duplex;
+ u16 speed;
int i, rc;
- int option = -1, Cap10_100 = 0, Cap1000 = 0;
assert(pdev != NULL);
assert(ent != NULL);
@@ -822,6 +1082,22 @@
assert(dev != NULL);
assert(tp != NULL);
+ if (RTL_R8(PHYstatus) & TBI_Enable) {
+ tp->set_speed = rtl8169_set_speed_tbi;
+ tp->get_settings = rtl8169_gset_tbi;
+ tp->phy_reset_enable = rtl8169_tbi_reset_enable;
+ tp->phy_reset_pending = rtl8169_tbi_reset_pending;
+ tp->link_ok = rtl8169_tbi_link_ok;
+
+ tp->phy_1000_ctrl_reg = PHY_Cap_1000_Full; /* Implied by TBI */
+ } else {
+ tp->set_speed = rtl8169_set_speed_xmii;
+ tp->get_settings = rtl8169_gset_xmii;
+ tp->phy_reset_enable = rtl8169_xmii_reset_enable;
+ tp->phy_reset_pending = rtl8169_xmii_reset_pending;
+ tp->link_ok = rtl8169_xmii_link_ok;
+ }
+
// Get MAC address. FIXME: read EEPROM
for (i = 0; i < MAC_ADDR_LEN; i++)
dev->dev_addr[i] = RTL_R8(MAC0 + i);
@@ -836,9 +1112,12 @@
dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
dev->irq = pdev->irq;
dev->base_addr = (unsigned long) ioaddr;
-// dev->do_ioctl = mii_ioctl;
-
- tp = dev->priv; // private data //
+#ifdef CONFIG_R8169_NAPI
+ dev->poll = rtl8169_poll;
+ dev->weight = R8169_NAPI_WEIGHT;
+ printk(KERN_INFO PFX "NAPI enabled\n");
+#endif
+ tp->intr_mask = 0xffff;
tp->pci_dev = pdev;
tp->mmio_addr = ioaddr;
@@ -885,95 +1164,12 @@
mdio_write(ioaddr, 0x0b, 0x0000); //w 0x0b 15 0 0
}
- // if TBI is not endbled
- if (!(RTL_R8(PHYstatus) & TBI_Enable)) {
- int val = mdio_read(ioaddr, PHY_AUTO_NEGO_REG);
-
- option = (board_idx >= MAX_UNITS) ? 0 : media[board_idx];
- // Force RTL8169 in 10/100/1000 Full/Half mode.
- if (option > 0) {
- printk(KERN_INFO "%s: Force-mode Enabled.\n",
- dev->name);
- Cap10_100 = 0, Cap1000 = 0;
- switch (option) {
- case _10_Half:
- Cap10_100 = PHY_Cap_10_Half_Or_Less;
- Cap1000 = PHY_Cap_Null;
- break;
- case _10_Full:
- Cap10_100 = PHY_Cap_10_Full_Or_Less;
- Cap1000 = PHY_Cap_Null;
- break;
- case _100_Half:
- Cap10_100 = PHY_Cap_100_Half_Or_Less;
- Cap1000 = PHY_Cap_Null;
- break;
- case _100_Full:
- Cap10_100 = PHY_Cap_100_Full_Or_Less;
- Cap1000 = PHY_Cap_Null;
- break;
- case _1000_Full:
- Cap10_100 = PHY_Cap_100_Full_Or_Less;
- Cap1000 = PHY_Cap_1000_Full;
- break;
- default:
- break;
- }
- mdio_write(ioaddr, PHY_AUTO_NEGO_REG, Cap10_100 | (val & 0x1F)); //leave PHY_AUTO_NEGO_REG bit4:0 unchanged
- mdio_write(ioaddr, PHY_1000_CTRL_REG, Cap1000);
- } else {
- printk(KERN_INFO "%s: Auto-negotiation Enabled.\n",
- dev->name);
-
- // enable 10/100 Full/Half Mode, leave PHY_AUTO_NEGO_REG bit4:0 unchanged
- mdio_write(ioaddr, PHY_AUTO_NEGO_REG,
- PHY_Cap_100_Full_Or_Less | (val & 0x1f));
-
- // enable 1000 Full Mode
- mdio_write(ioaddr, PHY_1000_CTRL_REG,
- PHY_Cap_1000_Full);
-
- }
-
- // Enable auto-negotiation and restart auto-nigotiation
- mdio_write(ioaddr, PHY_CTRL_REG,
- PHY_Enable_Auto_Nego | PHY_Restart_Auto_Nego);
- udelay(100);
-
- // wait for auto-negotiation process
- for (i = 10000; i > 0; i--) {
- //check if auto-negotiation complete
- if (mdio_read(ioaddr, PHY_STAT_REG) &
- PHY_Auto_Neco_Comp) {
- udelay(100);
- option = RTL_R8(PHYstatus);
- if (option & _1000bpsF) {
- printk(KERN_INFO
- "%s: 1000Mbps Full-duplex operation.\n",
- dev->name);
- } else {
- printk(KERN_INFO
- "%s: %sMbps %s-duplex operation.\n",
- dev->name,
- (option & _100bps) ? "100" :
- "10",
- (option & FullDup) ? "Full" :
- "Half");
- }
- break;
- } else {
- udelay(100);
- }
- } // end for-loop to wait for auto-negotiation process
-
- } else {
- udelay(100);
- printk(KERN_INFO
- "%s: 1000Mbps Full-duplex operation, TBI Link %s!\n",
- dev->name,
- (RTL_R32(TBICSR) & TBILinkOK) ? "OK" : "Failed");
+ rtl8169_link_option(board_idx, &autoneg, &speed, &duplex);
- }
+ rtl8169_set_speed(dev, autoneg, speed, duplex);
+
+ if (RTL_R8(PHYstatus) & TBI_Enable)
+ printk(KERN_INFO PFX "%s: TBI auto-negotiating\n", dev->name);
return 0;
}
@@ -982,7 +1178,7 @@
rtl8169_remove_one(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
assert(dev != NULL);
assert(tp != NULL);
@@ -1001,7 +1197,7 @@
static int rtl8169_suspend(struct pci_dev *pdev, u32 state)
{
struct net_device *dev = pci_get_drvdata(pdev);
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
unsigned long flags;
@@ -1042,7 +1238,7 @@
static int
rtl8169_open(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
struct pci_dev *pdev = tp->pci_dev;
int retval;
@@ -1074,6 +1270,8 @@
rtl8169_hw_start(dev);
rtl8169_request_timer(dev);
+
+ rtl8169_check_link_status(dev, tp, tp->mmio_addr);
out:
return retval;
@@ -1091,7 +1289,7 @@
static void
rtl8169_hw_start(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
u32 i;
@@ -1102,8 +1300,7 @@
for (i = 1000; i > 0; i--) {
if ((RTL_R8(ChipCmd) & CmdReset) == 0)
break;
- else
- udelay(10);
+ udelay(10);
}
RTL_W8(Cfg9346, Cfg9346_Unlock);
@@ -1114,8 +1311,8 @@
RTL_W16(RxMaxSize, RxPacketMaxSize);
// Set Rx Config register
- i = rtl8169_rx_config | (RTL_R32(RxConfig) & rtl_chip_info[tp->chipset].
- RxConfigMask);
+ i = rtl8169_rx_config |
+ (RTL_R32(RxConfig) & rtl_chip_info[tp->chipset].RxConfigMask);
RTL_W32(RxConfig, i);
/* Set DMA burst size and Interframe Gap Time */
@@ -1126,7 +1323,8 @@
RTL_W16(CPlusCmd, tp->cp_cmd);
if (tp->mac_version == RTL_GIGA_MAC_VER_D) {
- dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14 MUST be 1\n");
+ dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0. "
+ "Bit-3 and bit-14 MUST be 1\n");
tp->cp_cmd |= (1 << 14) | PCIMulRW;
RTL_W16(CPlusCmd, tp->cp_cmd);
}
@@ -1151,7 +1349,6 @@
RTL_W16(IntrMask, rtl8169_intr_mask);
netif_start_queue(dev);
-
}
static inline void rtl8169_make_unusable_by_asic(struct RxDesc *desc)
@@ -1248,7 +1445,7 @@
static int rtl8169_init_ring(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
tp->cur_rx = tp->dirty_rx = 0;
tp->cur_tx = tp->dirty_tx = 0;
@@ -1302,10 +1499,11 @@
static void
rtl8169_tx_timeout(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
u8 tmp8;
+ printk(KERN_INFO "%s: TX Timeout\n", dev->name);
/* disable Tx, if not already */
tmp8 = RTL_R8(ChipCmd);
if (tmp8 & CmdTxEnb)
@@ -1328,9 +1526,9 @@
static int
rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
- int entry = tp->cur_tx % NUM_TX_DESC;
+ unsigned int entry = tp->cur_tx % NUM_TX_DESC;
u32 len = skb->len;
if (unlikely(skb->len < ETH_ZLEN)) {
@@ -1340,10 +1538,9 @@
len = ETH_ZLEN;
}
- spin_lock_irq(&tp->lock);
-
if (!(le32_to_cpu(tp->TxDescArray[entry].status) & OWNbit)) {
dma_addr_t mapping;
+ u32 status;
mapping = pci_map_single(tp->pci_dev, skb->data, len,
PCI_DMA_TODEVICE);
@@ -1351,24 +1548,30 @@
tp->Tx_skbuff[entry] = skb;
tp->TxDescArray[entry].addr = cpu_to_le64(mapping);
- tp->TxDescArray[entry].status = cpu_to_le32(OWNbit | FSbit |
- LSbit | len | (EORbit * !((entry + 1) % NUM_TX_DESC)));
+ /* anti gcc 2.95.3 bugware */
+ status = OWNbit | FSbit | LSbit | len |
+ (EORbit * !((entry + 1) % NUM_TX_DESC));
+ tp->TxDescArray[entry].status = cpu_to_le32(status);
RTL_W8(TxPoll, 0x40); //set polling bit
dev->trans_start = jiffies;
tp->cur_tx++;
+ smp_wmb();
} else
goto err_drop;
-
if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx) {
+ u32 dirty = tp->dirty_tx;
+
netif_stop_queue(dev);
+ smp_rmb();
+ if (dirty != tp->dirty_tx)
+ netif_wake_queue(dev);
}
-out:
- spin_unlock_irq(&tp->lock);
+out:
return 0;
err_drop:
@@ -1382,17 +1585,18 @@
rtl8169_tx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
void *ioaddr)
{
- unsigned long dirty_tx, tx_left;
+ unsigned int dirty_tx, tx_left;
assert(dev != NULL);
assert(tp != NULL);
assert(ioaddr != NULL);
dirty_tx = tp->dirty_tx;
+ smp_rmb();
tx_left = tp->cur_tx - dirty_tx;
while (tx_left > 0) {
- int entry = dirty_tx % NUM_TX_DESC;
+ unsigned int entry = dirty_tx % NUM_TX_DESC;
struct sk_buff *skb = tp->Tx_skbuff[entry];
u32 status;
@@ -1415,6 +1619,7 @@
if (tp->dirty_tx != dirty_tx) {
tp->dirty_tx = dirty_tx;
+ smp_wmb();
if (netif_queue_stopped(dev))
netif_wake_queue(dev);
}
@@ -1442,11 +1647,11 @@
return ret;
}
-static void
+static int
rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
void *ioaddr)
{
- unsigned long cur_rx, rx_left;
+ unsigned int cur_rx, rx_left, count;
int delta;
assert(dev != NULL);
@@ -1455,9 +1660,10 @@
cur_rx = tp->cur_rx;
rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
+ rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota);
while (rx_left > 0) {
- int entry = cur_rx % NUM_RX_DESC;
+ unsigned int entry = cur_rx % NUM_RX_DESC;
u32 status;
rmb();
@@ -1494,7 +1700,7 @@
skb_put(skb, pkt_size);
skb->protocol = eth_type_trans(skb, dev);
- netif_rx(skb);
+ rtl8169_rx_skb(skb);
dev->last_rx = jiffies;
tp->stats.rx_bytes += pkt_size;
@@ -1505,13 +1711,15 @@
rx_left--;
}
+ count = cur_rx - tp->cur_rx;
tp->cur_rx = cur_rx;
delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
- if (delta > 0)
- tp->dirty_rx += delta;
- else if (delta < 0)
+ if (delta < 0) {
printk(KERN_INFO "%s: no Rx buffer allocated\n", dev->name);
+ delta = 0;
+ }
+ tp->dirty_rx += delta;
/*
* FIXME: until there is periodic timer to try and refill the ring,
@@ -1522,6 +1730,8 @@
*/
if (tp->dirty_rx + NUM_RX_DESC == tp->cur_rx)
printk(KERN_EMERG "%s: Rx buffers exhausted\n", dev->name);
+
+ return count;
}
/* The interrupt handler does all of the Rx thread work and cleans up after the Tx thread. */
@@ -1529,7 +1739,7 @@
rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_instance;
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
int boguscnt = max_interrupt_work;
void *ioaddr = tp->mmio_addr;
int status = 0;
@@ -1543,26 +1753,37 @@
break;
handled = 1;
-/*
- if (status & RxUnderrun)
- link_changed = RTL_R16 (CSCR) & CSCR_LinkChangeBit;
-*/
+
+ status &= tp->intr_mask;
RTL_W16(IntrStatus,
(status & RxFIFOOver) ? (status | RxOverflow) : status);
if (!(status & rtl8169_intr_mask))
break;
+ if (status & LinkChg)
+ rtl8169_check_link_status(dev, tp, ioaddr);
+
+#ifdef CONFIG_R8169_NAPI
+ RTL_W16(IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event);
+ tp->intr_mask = ~rtl8169_napi_event;
+
+ if (likely(netif_rx_schedule_prep(dev)))
+ __netif_rx_schedule(dev);
+ else {
+ printk(KERN_INFO "%s: interrupt %x taken in poll\n",
+ dev->name, status);
+ }
+ break;
+#else
// Rx interrupt
- if (status & (RxOK | RxUnderrun | RxOverflow | RxFIFOOver)) {
+ if (status & (RxOK | RxOverflow | RxFIFOOver)) {
rtl8169_rx_interrupt(dev, tp, ioaddr);
}
// Tx interrupt
- if (status & (TxOK | TxErr)) {
- spin_lock(&tp->lock);
+ if (status & (TxOK | TxErr))
rtl8169_tx_interrupt(dev, tp, ioaddr);
- spin_unlock(&tp->lock);
- }
+#endif
boguscnt--;
} while (boguscnt > 0);
@@ -1576,10 +1797,40 @@
return IRQ_RETVAL(handled);
}
+#ifdef CONFIG_R8169_NAPI
+static int rtl8169_poll(struct net_device *dev, int *budget)
+{
+ unsigned int work_done, work_to_do = min(*budget, dev->quota);
+ struct rtl8169_private *tp = netdev_priv(dev);
+ void *ioaddr = tp->mmio_addr;
+
+ work_done = rtl8169_rx_interrupt(dev, tp, ioaddr);
+ rtl8169_tx_interrupt(dev, tp, ioaddr);
+
+ *budget -= work_done;
+ dev->quota -= work_done;
+
+ if ((work_done < work_to_do) || !netif_running(dev)) {
+ netif_rx_complete(dev);
+ tp->intr_mask = 0xffff;
+ /*
+ * 20040426: the barrier is not strictly required but the
+ * behavior of the irq handler could be less predictable
+ * without it. Btw, the lack of flush for the posted pci
+ * write is safe - FR
+ */
+ smp_wmb();
+ RTL_W16(IntrMask, rtl8169_intr_mask);
+ }
+
+ return (work_done >= work_to_do);
+}
+#endif
+
static int
rtl8169_close(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
struct pci_dev *pdev = tp->pci_dev;
void *ioaddr = tp->mmio_addr;
@@ -1621,7 +1872,7 @@
static void
rtl8169_set_rx_mode(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
unsigned long flags;
u32 mc_filter[2]; /* Multicast hash filter */
@@ -1655,10 +1906,8 @@
spin_lock_irqsave(&tp->lock, flags);
- tmp =
- rtl8169_rx_config | rx_mode | (RTL_R32(RxConfig) &
- rtl_chip_info[tp->chipset].
- RxConfigMask);
+ tmp = rtl8169_rx_config | rx_mode |
+ (RTL_R32(RxConfig) & rtl_chip_info[tp->chipset].RxConfigMask);
RTL_W32(RxConfig, tmp);
RTL_W32(MAR0 + 0, mc_filter[0]);
@@ -1675,7 +1924,7 @@
*/
static struct net_device_stats *rtl8169_get_stats(struct net_device *dev)
{
- struct rtl8169_private *tp = dev->priv;
+ struct rtl8169_private *tp = netdev_priv(dev);
void *ioaddr = tp->mmio_addr;
unsigned long flags;
diff -Nru a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
--- a/drivers/net/smc-mca.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/smc-mca.c 2004-06-02 23:47:31 -07:00
@@ -51,6 +51,8 @@
#include "8390.h"
#include "smc-mca.h"
+#define DRV_NAME "smc-mca"
+
static int ultramca_open(struct net_device *dev);
static void ultramca_reset_8390(struct net_device *dev);
static void ultramca_get_8390_hdr(struct net_device *dev,
@@ -265,7 +267,7 @@
goto err_unclaim;
}
- if (!request_region(ioaddr, ULTRA_IO_EXTENT, dev->name)) {
+ if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME)) {
rc = -ENODEV;
goto err_unclaim;
}
diff -Nru a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
--- a/drivers/net/smc-ultra.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/smc-ultra.c 2004-06-02 23:47:31 -07:00
@@ -72,6 +72,8 @@
#include "8390.h"
+#define DRV_NAME "smc-ultra"
+
/* A zero-terminated list of I/O addresses to be probed. */
static unsigned int ultra_portlist[] __initdata =
{0x200, 0x220, 0x240, 0x280, 0x300, 0x340, 0x380, 0};
@@ -178,6 +180,7 @@
release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init ultra_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -202,6 +205,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ultra_probe1(struct net_device *dev, int ioaddr)
{
@@ -215,7 +219,7 @@
unsigned char idreg = inb(ioaddr + 7);
unsigned char reg4 = inb(ioaddr + 4) & 0x7f;
- if (!request_region(ioaddr, ULTRA_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME))
return -EBUSY;
/* Check the ID nibble. */
diff -Nru a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
--- a/drivers/net/smc-ultra32.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/smc-ultra32.c 2004-06-02 23:47:31 -07:00
@@ -61,6 +61,8 @@
#include "8390.h"
+#define DRV_NAME "smc-ultra32"
+
static int ultra32_probe1(struct net_device *dev, int ioaddr);
static int ultra32_open(struct net_device *dev);
static void ultra32_reset_8390(struct net_device *dev);
@@ -163,7 +165,7 @@
unsigned char reg4;
const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
- if (!request_region(ioaddr, ULTRA32_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME))
return -EBUSY;
if (inb(ioaddr + ULTRA32_IDPORT) == 0xff ||
diff -Nru a/drivers/net/smc9194.c b/drivers/net/smc9194.c
--- a/drivers/net/smc9194.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/smc9194.c 2004-06-02 23:47:31 -07:00
@@ -78,6 +78,8 @@
#include "smc9194.h"
+#define DRV_NAME "smc9194"
+
/*------------------------------------------------------------------------
.
. Configuration options, for the experienced user to change.
@@ -843,7 +845,7 @@
word memory_cfg_register;
/* Grab the region so that no one else tries to probe our ioports. */
- if (!request_region(ioaddr, SMC_IO_EXTENT, dev->name))
+ if (!request_region(ioaddr, SMC_IO_EXTENT, DRV_NAME))
return -EBUSY;
dev->irq = irq;
@@ -1001,9 +1003,9 @@
memset(dev->priv, 0, sizeof(struct smc_local));
/* Grab the IRQ */
- retval = request_irq(dev->irq, &smc_interrupt, 0, dev->name, dev);
+ retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev);
if (retval) {
- printk("%s: unable to get IRQ %d (irqval=%d).\n", dev->name,
+ printk("%s: unable to get IRQ %d (irqval=%d).\n", DRV_NAME,
dev->irq, retval);
goto err_out;
}
diff -Nru a/drivers/net/starfire.c b/drivers/net/starfire.c
--- a/drivers/net/starfire.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/starfire.c 2004-06-02 23:47:31 -07:00
@@ -880,7 +880,7 @@
irq = pdev->irq;
- if (pci_request_regions (pdev, dev->name)) {
+ if (pci_request_regions (pdev, DRV_NAME)) {
printk(KERN_ERR DRV_NAME " %d: cannot reserve PCI resources, aborting\n", card_idx);
goto err_out_free_netdev;
}
diff -Nru a/drivers/net/stnic.c b/drivers/net/stnic.c
--- a/drivers/net/stnic.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/stnic.c 2004-06-02 23:47:31 -07:00
@@ -28,6 +28,8 @@
#include "8390.h"
+#define DRV_NAME "stnic"
+
#define byte unsigned char
#define half unsigned short
#define word unsigned int
@@ -130,7 +132,7 @@
/* Snarf the interrupt now. There's no point in waiting since we cannot
share and the board will usually be enabled. */
- err = request_irq (dev->irq, ei_interrupt, 0, dev->name, dev);
+ 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);
diff -Nru a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
--- a/drivers/net/sun3_82586.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/sun3_82586.c 2004-06-02 23:47:31 -07:00
@@ -53,6 +53,8 @@
#include "sun3_82586.h"
+#define DRV_NAME "sun3_82586"
+
#define DEBUG /* debug on */
#define SYSBUSVAL 0 /* 16 Bit */
#define SUN3_82586_TOTAL_SIZE PAGE_SIZE
@@ -336,7 +338,7 @@
{
int i, size, retval;
- if (!request_region(ioaddr, SUN3_82586_TOTAL_SIZE, dev->name))
+ if (!request_region(ioaddr, SUN3_82586_TOTAL_SIZE, DRV_NAME))
return -EBUSY;
/* copy in the ethernet address from the prom */
diff -Nru a/drivers/net/sungem.c b/drivers/net/sungem.c
--- a/drivers/net/sungem.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/sungem.c 2004-06-02 23:47:31 -07:00
@@ -2717,7 +2717,7 @@
gp = dev->priv;
- err = pci_request_regions(pdev, dev->name);
+ err = pci_request_regions(pdev, DRV_NAME);
if (err) {
printk(KERN_ERR PFX "Cannot obtain PCI resources, "
"aborting.\n");
diff -Nru a/drivers/net/sunhme.c b/drivers/net/sunhme.c
--- a/drivers/net/sunhme.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/sunhme.c 2004-06-02 23:47:31 -07:00
@@ -68,6 +68,8 @@
#include "sunhme.h"
+#define DRV_NAME "sunhme"
+
static int macaddr[6];
/* accept MAC address of the form macaddr=0x08,0x00,0x20,0x30,0x40,0x50 */
@@ -3085,7 +3087,7 @@
printk(KERN_ERR "happymeal(PCI): Cannot find proper PCI device base address.\n");
goto err_out_clear_quattro;
}
- if (pci_request_regions(pdev, dev->name)) {
+ if (pci_request_regions(pdev, DRV_NAME)) {
printk(KERN_ERR "happymeal(PCI): Cannot obtain PCI resources, "
"aborting.\n");
goto err_out_clear_quattro;
diff -Nru a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
--- a/drivers/net/tulip/winbond-840.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/tulip/winbond-840.c 2004-06-02 23:47:31 -07:00
@@ -1292,14 +1292,8 @@
pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
np->rx_skbuff[entry]->len,
PCI_DMA_FROMDEVICE);
- /* Call copy + cksum if available. */
-#if HAS_IP_COPYSUM
eth_copy_and_sum(skb, np->rx_skbuff[entry]->tail, pkt_len, 0);
skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len), np->rx_skbuff[entry]->tail,
- pkt_len);
-#endif
pci_dma_sync_single_for_device(np->pci_dev,np->rx_addr[entry],
np->rx_skbuff[entry]->len,
PCI_DMA_FROMDEVICE);
diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
--- a/drivers/net/via-rhine.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/via-rhine.c 2004-06-02 23:47:31 -07:00
@@ -354,59 +354,46 @@
second only the 1234 card.
*/
-enum pci_flags_bit {
- PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,
- PCI_ADDR0=0x10<<0, PCI_ADDR1=0x10<<1, PCI_ADDR2=0x10<<2, PCI_ADDR3=0x10<<3,
+enum rhine_revs {
+ VT86C100A = 0x00,
+ VT6102 = 0x40,
+ VT8231 = 0x50, /* Integrated MAC */
+ VT8233 = 0x60, /* Integrated MAC */
+ VT8235 = 0x74, /* Integrated MAC */
+ VT8237 = 0x78, /* Integrated MAC */
+ VTunknown0 = 0x7C,
+ VT6105 = 0x80,
+ VT6105_B0 = 0x83,
+ VT6105L = 0x8A,
+ VT6107 = 0x8C,
+ VTunknown1 = 0x8E,
+ VT6105M = 0x90,
};
-enum rhine_chips {
- VT86C100A = 0,
- VT6102,
- VT6105,
- VT6105M
-};
-
-struct rhine_chip_info {
- const char *name;
- u16 pci_flags;
- int io_size;
- int drv_flags;
-};
-
-
-enum chip_capability_flags {
- CanHaveMII=1, HasESIPhy=2, HasDavicomPhy=4,
- ReqTxAlign=0x10, HasWOL=0x20,
+enum rhine_quirks {
+ rqWOL = 0x0001, /* Wake-On-LAN support */
+ rqForceReset = 0x0002,
+ rqDavicomPhy = 0x0020,
+ rq6patterns = 0x0040, /* 6 instead of 4 patterns for WOL */
+ rqStatusWBRace = 0x0080, /* Tx Status Writeback Error possible */
+ rqRhineI = 0x0100, /* See comment below */
};
+/*
+ * rqRhineI: VT86C100A (aka Rhine-I) uses different bits to enable
+ * MMIO as well as for the collision counter and the Tx FIFO underflow
+ * indicator. In addition, Tx and Rx buffers need to 4 byte aligned.
+ */
-#ifdef USE_MMIO
-#define RHINE_IOTYPE (PCI_USES_MEM | PCI_USES_MASTER | PCI_ADDR1)
-#else
-#define RHINE_IOTYPE (PCI_USES_IO | PCI_USES_MASTER | PCI_ADDR0)
-#endif
/* Beware of PCI posted writes */
#define IOSYNC do { readb(dev->base_addr + StationAddr); } while (0)
-/* directly indexed by enum rhine_chips, above */
-static struct rhine_chip_info rhine_chip_info[] __devinitdata =
-{
- { "VIA VT86C100A Rhine", RHINE_IOTYPE, 128,
- CanHaveMII | ReqTxAlign | HasDavicomPhy },
- { "VIA VT6102 Rhine-II", RHINE_IOTYPE, 256,
- CanHaveMII | HasWOL },
- { "VIA VT6105 Rhine-III", RHINE_IOTYPE, 256,
- CanHaveMII | HasWOL },
- { "VIA VT6105M Rhine-III", RHINE_IOTYPE, 256,
- CanHaveMII | HasWOL },
-};
-
static struct pci_device_id rhine_pci_tbl[] =
{
- {0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT86C100A},
- {0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6102},
- {0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6105}, /* 6105{,L,LOM} */
- {0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6105M},
- {0,} /* terminate list */
+ {0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT86C100A */
+ {0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6102 */
+ {0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* 6105{,L,LOM} */
+ {0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6105M */
+ { } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);
@@ -421,8 +408,10 @@
MIICmd=0x70, MIIRegAddr=0x71, MIIData=0x72, MACRegEEcsr=0x74,
ConfigA=0x78, ConfigB=0x79, ConfigC=0x7A, ConfigD=0x7B,
RxMissed=0x7C, RxCRCErrs=0x7E, MiscCmd=0x81,
- StickyHW=0x83, IntrStatus2=0x84, WOLcrClr=0xA4, WOLcgClr=0xA7,
- PwrcsrClr=0xAC,
+ StickyHW=0x83, IntrStatus2=0x84,
+ WOLcrSet=0xA0, WOLcrClr=0xA4, WOLcrClr1=0xA6,
+ WOLcgClr=0xA7,
+ PwrcsrSet=0xA8, PwrcsrSet1=0xA9, PwrcsrClr=0xAC, PwrcsrClr1=0xAD,
};
/* Bits in ConfigD */
@@ -514,7 +503,7 @@
spinlock_t lock;
/* Frequently used values: keep some adjacent for cache effect. */
- int chip_id, drv_flags;
+ u32 quirks;
struct rx_desc *rx_head_desc;
unsigned int cur_rx, dirty_rx; /* Producer/consumer ring indices */
unsigned int cur_tx, dirty_tx;
@@ -522,7 +511,6 @@
u16 chip_cmd; /* Current setting for ChipCmd */
/* These values are keep track of the transceiver/media in use. */
- unsigned int default_port:4; /* Last dev->if_port value. */
u8 tx_thresh, rx_thresh;
/* MII transceiver section. */
@@ -557,12 +545,41 @@
intr_status = readw(ioaddr + IntrStatus);
/* On Rhine-II, Bit 3 indicates Tx descriptor write-back race. */
- if (rp->chip_id == VT6102)
+ if (rp->quirks & rqStatusWBRace)
intr_status |= readb(ioaddr + IntrStatus2) << 16;
return intr_status;
}
-static void wait_for_reset(struct net_device *dev, int chip_id, char *name)
+/*
+ * Get power related registers into sane state.
+ * Returns content of power-event (WOL) registers.
+ */
+static void rhine_power_init(struct net_device *dev)
+{
+ long ioaddr = dev->base_addr;
+ struct rhine_private *rp = netdev_priv(dev);
+
+ if (rp->quirks & rqWOL) {
+ /* Make sure chip is in power state D0 */
+ writeb(readb(ioaddr + StickyHW) & 0xFC, ioaddr + StickyHW);
+
+ /* Disable "force PME-enable" */
+ writeb(0x80, ioaddr + WOLcgClr);
+
+ /* Clear power-event config bits (WOL) */
+ writeb(0xFF, ioaddr + WOLcrClr);
+ /* More recent cards can manage two additional patterns */
+ if (rp->quirks & rq6patterns)
+ writeb(0x03, ioaddr + WOLcrClr1);
+
+ /* Clear power-event status bits */
+ writeb(0xFF, ioaddr + PwrcsrClr);
+ if (rp->quirks & rq6patterns)
+ writeb(0x03, ioaddr + PwrcsrClr1);
+ }
+}
+
+static void wait_for_reset(struct net_device *dev, u32 quirks, char *name)
{
long ioaddr = dev->base_addr;
int boguscnt = 20;
@@ -574,7 +591,7 @@
"Trying harder.\n", name);
/* Rhine-II needs to be forced sometimes */
- if (chip_id == VT6102)
+ if (quirks & rqForceReset)
writeb(0x40, ioaddr + MiscCmd);
/* VT86C100A may need long delay after reset (dlink) */
@@ -590,10 +607,10 @@
}
#ifdef USE_MMIO
-static void __devinit enable_mmio(long ioaddr, int chip_id)
+static void __devinit enable_mmio(long ioaddr, u32 quirks)
{
int n;
- if (chip_id == VT86C100A) {
+ if (quirks & rqRhineI) {
/* More recent docs say that this bit is reserved ... */
n = inb(ioaddr + ConfigA) | 0x20;
outb(n, ioaddr + ConfigA);
@@ -628,16 +645,18 @@
{
struct net_device *dev;
struct rhine_private *rp;
- int i, option;
- int chip_id = (int) ent->driver_data;
+ int i, option, rc;
+ u8 pci_rev;
+ u32 quirks;
static int card_idx = -1;
long ioaddr;
long memaddr;
int io_size;
- int pci_flags;
+ int phy, phy_idx = 0;
#ifdef USE_MMIO
long ioaddr0;
#endif
+ const char *name;
/* when built into the kernel, we only print version if device is found */
#ifndef MODULE
@@ -648,14 +667,34 @@
card_idx++;
option = card_idx < MAX_UNITS ? options[card_idx] : 0;
- io_size = rhine_chip_info[chip_id].io_size;
- pci_flags = rhine_chip_info[chip_id].pci_flags;
+ pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev);
+
+ io_size = 256;
+ if (pci_rev < VT6102) {
+ quirks = rqRhineI | rqDavicomPhy;
+ io_size = 128;
+ name = "VT86C100A Rhine";
+ }
+ else {
+ quirks = rqWOL | rqForceReset;
+ if (pci_rev < VT6105) {
+ name = "Rhine II";
+ quirks |= rqStatusWBRace; /* Rhine-II exclusive */
+ }
+ else {
+ name = "Rhine III";
+ if (pci_rev >= VT6105_B0)
+ quirks |= rq6patterns;
+ }
+ }
- if (pci_enable_device(pdev))
+ rc = pci_enable_device(pdev);
+ if (rc)
goto err_out;
/* this should always be supported */
- if (pci_set_dma_mask(pdev, 0xffffffff)) {
+ rc = pci_set_dma_mask(pdev, 0xffffffff);
+ if (rc) {
printk(KERN_ERR "32-bit PCI DMA addresses not supported by "
"the card!?\n");
goto err_out;
@@ -664,6 +703,7 @@
/* sanity check */
if ((pci_resource_len(pdev, 0) < io_size) ||
(pci_resource_len(pdev, 1) < io_size)) {
+ rc = -EIO;
printk(KERN_ERR "Insufficient PCI resources, aborting\n");
goto err_out;
}
@@ -671,11 +711,11 @@
ioaddr = pci_resource_start(pdev, 0);
memaddr = pci_resource_start(pdev, 1);
- if (pci_flags & PCI_USES_MASTER)
- pci_set_master(pdev);
+ pci_set_master(pdev);
dev = alloc_etherdev(sizeof(*rp));
if (dev == NULL) {
+ rc = -ENOMEM;
printk(KERN_ERR "init_ethernet failed for card #%d\n",
card_idx);
goto err_out;
@@ -683,15 +723,17 @@
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
- if (pci_request_regions(pdev, shortname))
+ rc = pci_request_regions(pdev, shortname);
+ if (rc)
goto err_out_free_netdev;
#ifdef USE_MMIO
ioaddr0 = ioaddr;
- enable_mmio(ioaddr0, chip_id);
+ enable_mmio(ioaddr0, quirks);
ioaddr = (long) ioremap(memaddr, io_size);
if (!ioaddr) {
+ rc = -EIO;
printk(KERN_ERR "ioremap failed for device %s, region 0x%X "
"@ 0x%lX\n", pci_name(pdev), io_size, memaddr);
goto err_out_free_res;
@@ -704,36 +746,21 @@
unsigned char a = inb(ioaddr0+reg);
unsigned char b = readb(ioaddr+reg);
if (a != b) {
+ rc = -EIO;
printk(KERN_ERR "MMIO do not match PIO [%02x] "
"(%02x != %02x)\n", reg, a, b);
goto err_out_unmap;
}
}
#endif /* USE_MMIO */
+ dev->base_addr = ioaddr;
- /* D-Link provided reset code (with comment additions) */
- if (rhine_chip_info[chip_id].drv_flags & HasWOL) {
- unsigned char byOrgValue;
-
- /* clear sticky bit before reset & read ethernet address */
- byOrgValue = readb(ioaddr + StickyHW);
- byOrgValue = byOrgValue & 0xFC;
- writeb(byOrgValue, ioaddr + StickyHW);
-
- /* (bits written are cleared?) */
- /* disable force PME-enable */
- writeb(0x80, ioaddr + WOLcgClr);
- /* disable power-event config bit */
- writeb(0xFF, ioaddr + WOLcrClr);
- /* clear power status (undocumented in vt6102 docs?) */
- writeb(0xFF, ioaddr + PwrcsrClr);
- }
+ rhine_power_init(dev);
/* Reset the chip to erase previous misconfiguration. */
writew(CmdReset, ioaddr + ChipCmd);
- dev->base_addr = ioaddr;
- wait_for_reset(dev, chip_id, shortname);
+ wait_for_reset(dev, quirks, shortname);
/* Reload the station address from the EEPROM. */
#ifdef USE_MMIO
@@ -741,7 +768,7 @@
/* Reloading from eeprom overwrites cfgA-D, so we must re-enable MMIO.
If reload_eeprom() was done first this could be avoided, but it is
not known if that still works with the "win98-reboot" problem. */
- enable_mmio(ioaddr0, chip_id);
+ enable_mmio(ioaddr0, quirks);
#else
reload_eeprom(ioaddr);
#endif
@@ -750,11 +777,12 @@
dev->dev_addr[i] = readb(ioaddr + StationAddr + i);
if (!is_valid_ether_addr(dev->dev_addr)) {
+ rc = -EIO;
printk(KERN_ERR "Invalid MAC address for card #%d\n", card_idx);
goto err_out_unmap;
}
- if (chip_id == VT6102) {
+ if (quirks & rqWOL) {
/*
* for 3065D, EEPROM reloaded will cause bit 0 in MAC_REG_CFGA
* turned on. it makes MAC receive magic packet
@@ -772,9 +800,8 @@
rp = netdev_priv(dev);
spin_lock_init(&rp->lock);
- rp->chip_id = chip_id;
- rp->drv_flags = rhine_chip_info[chip_id].drv_flags;
rp->pdev = pdev;
+ rp->quirks = quirks;
rp->mii_if.dev = dev;
rp->mii_if.mdio_read = mdio_read;
rp->mii_if.mdio_write = mdio_write;
@@ -797,19 +824,18 @@
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = rhine_poll;
#endif
- if (rp->drv_flags & ReqTxAlign)
+ if (rp->quirks & rqRhineI)
dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
/* dev->name not defined before register_netdev()! */
- i = register_netdev(dev);
- if (i)
+ rc = register_netdev(dev);
+ if (rc)
goto err_out_unmap;
/* The lower four bits are the media type. */
if (option > 0) {
if (option & 0x220)
rp->mii_if.full_duplex = 1;
- rp->default_port = option & 15;
}
if (card_idx < MAX_UNITS && full_duplex[card_idx] > 0)
rp->mii_if.full_duplex = 1;
@@ -820,9 +846,14 @@
rp->mii_if.force_media = 1;
}
- printk(KERN_INFO "%s: %s at 0x%lx, ",
- dev->name, rhine_chip_info[chip_id].name,
- (pci_flags & PCI_USES_IO) ? ioaddr : memaddr);
+ printk(KERN_INFO "%s: VIA %s at 0x%lx, ",
+ dev->name, name,
+#ifdef USE_MMIO
+ memaddr
+#else
+ ioaddr
+#endif
+ );
for (i = 0; i < 5; i++)
printk("%2.2x:", dev->dev_addr[i]);
@@ -830,41 +861,35 @@
pci_set_drvdata(pdev, dev);
- if (rp->drv_flags & CanHaveMII) {
- int phy, phy_idx = 0;
- rp->phys[0] = 1; /* Standard for this chip. */
- for (phy = 1; phy < 32 && phy_idx < MAX_MII_CNT; phy++) {
- int mii_status = mdio_read(dev, phy, 1);
- if (mii_status != 0xffff && mii_status != 0x0000) {
- rp->phys[phy_idx++] = phy;
- rp->mii_if.advertising = mdio_read(dev, phy, 4);
- printk(KERN_INFO "%s: MII PHY found at address "
- "%d, status 0x%4.4x advertising %4.4x "
- "Link %4.4x.\n", dev->name, phy,
- mii_status, rp->mii_if.advertising,
- mdio_read(dev, phy, 5));
-
- /* set IFF_RUNNING */
- if (mii_status & BMSR_LSTATUS)
- netif_carrier_on(dev);
- else
- netif_carrier_off(dev);
+ rp->phys[0] = 1; /* Standard for this chip. */
+ for (phy = 1; phy < 32 && phy_idx < MAX_MII_CNT; phy++) {
+ int mii_status = mdio_read(dev, phy, 1);
+ if (mii_status != 0xffff && mii_status != 0x0000) {
+ rp->phys[phy_idx++] = phy;
+ rp->mii_if.advertising = mdio_read(dev, phy, 4);
+ printk(KERN_INFO "%s: MII PHY found at address "
+ "%d, status 0x%4.4x advertising %4.4x "
+ "Link %4.4x.\n", dev->name, phy,
+ mii_status, rp->mii_if.advertising,
+ mdio_read(dev, phy, 5));
+
+ /* set IFF_RUNNING */
+ if (mii_status & BMSR_LSTATUS)
+ netif_carrier_on(dev);
+ else
+ netif_carrier_off(dev);
- break;
- }
+ break;
}
- rp->mii_cnt = phy_idx;
- rp->mii_if.phy_id = rp->phys[0];
}
+ rp->mii_cnt = phy_idx;
+ rp->mii_if.phy_id = rp->phys[0];
/* Allow forcing the media type. */
if (option > 0) {
if (option & 0x220)
rp->mii_if.full_duplex = 1;
- rp->default_port = option & 0x3ff;
if (option & 0x330) {
- /* FIXME: shouldn't someone check this variable? */
- /* rp->medialock = 1; */
printk(KERN_INFO " Forcing %dMbs %s-duplex "
"operation.\n",
(option & 0x300 ? 100 : 10),
@@ -887,7 +912,7 @@
err_out_free_netdev:
free_netdev(dev);
err_out:
- return -ENODEV;
+ return rc;
}
static int alloc_ring(struct net_device* dev)
@@ -904,7 +929,7 @@
printk(KERN_ERR "Could not allocate DMA memory.\n");
return -ENOMEM;
}
- if (rp->drv_flags & ReqTxAlign) {
+ if (rp->quirks & rqRhineI) {
rp->tx_bufs = pci_alloc_consistent(rp->pdev,
PKT_BUF_SZ * TX_RING_SIZE,
&rp->tx_bufs_dma);
@@ -1063,9 +1088,6 @@
rp->rx_thresh = 0x60; /* Written in rhine_set_rx_mode(). */
rp->mii_if.full_duplex = 0;
- if (dev->if_port == 0)
- dev->if_port = rp->default_port;
-
writel(rp->rx_ring_dma, ioaddr + RxRingPtr);
writel(rp->tx_ring_dma, ioaddr + TxRingPtr);
@@ -1087,9 +1109,8 @@
/* The LED outputs of various MII xcvrs should be configured. */
/* For NS or Mison phys, turn on bit 1 in register 0x17 */
- /* For ESI phys, turn on bit 7 in register 0x17. */
mdio_write(dev, rp->phys[0], 0x17, mdio_read(dev, rp->phys[0], 0x17) |
- (rp->drv_flags & HasESIPhy) ? 0x0080 : 0x0001);
+ 0x0001);
}
/* Read and write over the MII Management Data I/O (MDIO) interface. */
@@ -1166,7 +1187,7 @@
return i;
alloc_rbufs(dev);
alloc_tbufs(dev);
- wait_for_reset(dev, rp->chip_id, dev->name);
+ wait_for_reset(dev, rp->quirks, dev->name);
init_registers(dev);
if (debug > 2)
printk(KERN_DEBUG "%s: Done rhine_open(), status %4.4x "
@@ -1257,8 +1278,6 @@
dev->name, readw(ioaddr + IntrStatus),
mdio_read(dev, rp->phys[0], MII_BMSR));
- dev->if_port = 0;
-
/* protect against concurrent rx interrupts */
disable_irq(rp->pdev->irq);
@@ -1274,7 +1293,7 @@
alloc_rbufs(dev);
/* Reinitialize the hardware. */
- wait_for_reset(dev, rp->chip_id, dev->name);
+ wait_for_reset(dev, rp->quirks, dev->name);
init_registers(dev);
spin_unlock(&rp->lock);
@@ -1305,7 +1324,7 @@
rp->tx_skbuff[entry] = skb;
- if ((rp->drv_flags & ReqTxAlign) &&
+ if ((rp->quirks & rqRhineI) &&
(((long)skb->data & 3) || skb_shinfo(skb)->nr_frags != 0 || skb->ip_summed == CHECKSUM_HW)) {
/* Must use alignment buffer. */
if (skb->len > PKT_BUF_SZ) {
@@ -1454,7 +1473,7 @@
if (txstatus & 0x0200) rp->stats.tx_window_errors++;
if (txstatus & 0x0100) rp->stats.tx_aborted_errors++;
if (txstatus & 0x0080) rp->stats.tx_heartbeat_errors++;
- if (((rp->chip_id == VT86C100A) && txstatus & 0x0002) ||
+ if (((rp->quirks & rqRhineI) && txstatus & 0x0002) ||
(txstatus & 0x0800) || (txstatus & 0x1000)) {
rp->stats.tx_fifo_errors++;
rp->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
@@ -1462,7 +1481,7 @@
}
/* Transmitter restarted in 'abnormal' handler. */
} else {
- if (rp->chip_id == VT86C100A)
+ if (rp->quirks & rqRhineI)
rp->stats.collisions += (txstatus >> 3) & 0x0F;
else
rp->stats.collisions += txstatus & 0x0F;
@@ -1563,15 +1582,10 @@
eth_copy_and_sum is memcpy for all archs so
this is kind of pointless right now
... or? */
-#if HAS_IP_COPYSUM /* Call copy + cksum if available. */
eth_copy_and_sum(skb,
rp->rx_skbuff[entry]->tail,
pkt_len, 0);
skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len),
- rp->rx_skbuff[entry]->tail, pkt_len);
-#endif
pci_dma_sync_single_for_device(rp->pdev,
rp->rx_skbuff_dma[entry],
rp->rx_buf_sz,
@@ -1679,7 +1693,7 @@
if (intr_status & (IntrLinkChange)) {
if (readb(ioaddr + MIIStatus) & 0x02) {
/* Link failed, restart autonegotiation. */
- if (rp->drv_flags & HasDavicomPhy)
+ if (rp->quirks & rqRhineI)
mdio_write(dev, rp->phys[0], MII_BMCR, 0x3300);
} else
rhine_check_duplex(dev);
@@ -1805,9 +1819,6 @@
struct rhine_private *rp = netdev_priv(dev);
int rc;
- if (!(rp->drv_flags & CanHaveMII))
- return -EINVAL;
-
spin_lock_irq(&rp->lock);
rc = mii_ethtool_gset(&rp->mii_if, cmd);
spin_unlock_irq(&rp->lock);
@@ -1820,9 +1831,6 @@
struct rhine_private *rp = netdev_priv(dev);
int rc;
- if (!(rp->drv_flags & CanHaveMII))
- return -EINVAL;
-
spin_lock_irq(&rp->lock);
rc = mii_ethtool_sset(&rp->mii_if, cmd);
spin_unlock_irq(&rp->lock);
@@ -1834,18 +1842,12 @@
{
struct rhine_private *rp = netdev_priv(dev);
- if (!(rp->drv_flags & CanHaveMII))
- return -EINVAL;
-
return mii_nway_restart(&rp->mii_if);
}
static u32 netdev_get_link(struct net_device *dev)
{
struct rhine_private *rp = netdev_priv(dev);
-
- if (!(rp->drv_flags & CanHaveMII))
- return 0; /* -EINVAL */
return mii_link_ok(&rp->mii_if);
}
diff -Nru a/drivers/net/wd.c b/drivers/net/wd.c
--- a/drivers/net/wd.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/wd.c 2004-06-02 23:47:31 -07:00
@@ -43,6 +43,8 @@
#include "8390.h"
+#define DRV_NAME "wd"
+
/* A zero-terminated list of I/O addresses to be probed. */
static unsigned int wd_portlist[] __initdata =
{0x300, 0x280, 0x380, 0x240, 0};
@@ -131,6 +133,7 @@
release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init wd_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@ -155,6 +158,7 @@
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init wd_probe1(struct net_device *dev, int ioaddr)
{
@@ -300,7 +304,7 @@
/* Snarf the interrupt now. There's no point in waiting since we cannot
share and the board will usually be enabled. */
- i = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+ i = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
if (i) {
printk (" unable to get IRQ %d.\n", dev->irq);
return i;
diff -Nru a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
--- a/drivers/net/yellowfin.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/yellowfin.c 2004-06-02 23:47:31 -07:00
@@ -448,7 +448,7 @@
np = dev->priv;
- if (pci_request_regions(pdev, dev->name))
+ if (pci_request_regions(pdev, DRV_NAME))
goto err_out_free_netdev;
pci_set_master (pdev);
@@ -1201,13 +1201,8 @@
break;
skb->dev = dev;
skb_reserve(skb, 2); /* 16 byte align the IP header */
-#if HAS_IP_COPYSUM
eth_copy_and_sum(skb, rx_skb->tail, pkt_len, 0);
skb_put(skb, pkt_len);
-#else
- memcpy(skb_put(skb, pkt_len),
- rx_skb->tail, pkt_len);
-#endif
pci_dma_sync_single_for_device(yp->pci_dev, desc->addr,
yp->rx_buf_sz,
PCI_DMA_FROMDEVICE);
diff -Nru a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
--- a/drivers/net/zorro8390.c 2004-06-02 23:47:31 -07:00
+++ b/drivers/net/zorro8390.c 2004-06-02 23:47:31 -07:00
@@ -36,6 +36,8 @@
#include "8390.h"
+#define DRV_NAME "zorro8390"
+
#define NE_BASE (dev->base_addr)
#define NE_CMD (0x00*2)
#define NE_DATAPORT (0x10*2) /* NatSemi-defined port window offset. */
@@ -115,7 +117,7 @@
if (!dev)
return -ENOMEM;
SET_MODULE_OWNER(dev);
- if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, dev->name)) {
+ if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {
free_netdev(dev);
return -EBUSY;
}
@@ -198,7 +200,7 @@
dev->irq = IRQ_AMIGA_PORTS;
/* Install the Interrupt handler */
- i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, dev->name, dev);
+ i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, DRV_NAME, dev);
if (i) return i;
for(i = 0; i < ETHER_ADDR_LEN; i++) {