Skip to content

Fixes, cleanup and modernization for some legacy ethernet NIC drivers

Finn Thain linux-arm-kernel linux-m68k lkml netdev 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest13 patches 10 repliesIn review
  2. v312 patches 1 replySuperseded
  3. v29 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v19 patches2 repliesSuperseded

Changes in v4 from the cover letter

- Rebased on current nubus code.
- Renamed some more struct nubus_rsrc pointers that were misleadingly called 'dev' and 'ndev'.
- Removed an unused struct member from the mac89x0 driver.
- Dropped gratuitous log message changes (capitalization, punctuation etc.) so that the old messages can still be grep'd.
- Improved patch descriptions.
- Revised code style to reduce checkpatch.pl noise.
- Addressed two more 8390 logging issues.
- Added a new patch to remove redundant 8390.o dependencies.
- Re-ordered some patches for easier cherry picking.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13net/8390: Remove redundant make dependenciesdrivers/net/ethernet/8390/Makefile+3 -31 reply
2/13net/8390: Fix msg_enable patch snafudrivers/net/ethernet/8390/ax88796.c drivers/net/ethernet/8390/axnet_cs.c drivers/net/ethernet/8390/etherh.c +8 more+4 -496 replies
3/13net/smc9194: Remove bogus CONFIG_MAC referencedrivers/net/ethernet/smsc/Kconfig+1 -10 replies
4/13net/macmace: Fix and clean up log messagesdrivers/net/ethernet/apple/macmace.c+3 -60 replies
5/13net/mac89x0: Remove dead or unreachable codedrivers/net/ethernet/cirrus/mac89x0.c+0 -320 replies
6/13net/mac89x0: Convert to platform_driverarch/m68k/mac/config.c drivers/net/Space.c drivers/net/ethernet/cirrus/mac89x0.c +1 more+35 -421 reply
7/13net/mac89x0: Fix and modernize log messagesdrivers/net/ethernet/cirrus/mac89x0.c+9 -100 replies
8/13net/mac89x0: Replace custom debug logging with netif_* callsdrivers/net/ethernet/cirrus/mac89x0.c+15 -320 replies
9/13net/mac8390: Convert to nubus_driverdrivers/net/Space.c drivers/net/ethernet/8390/mac8390.c include/net/Space.h+68 -742 replies
10/13net/mac8390: Fix log messagesdrivers/net/ethernet/8390/mac8390.c+17 -190 replies
11/13net/macsonic: Convert to nubus_driverdrivers/net/ethernet/natsemi/macsonic.c+118 -540 replies
12/13net/sonic: Clean up and modernize log messagesdrivers/net/ethernet/natsemi/jazzsonic.c drivers/net/ethernet/natsemi/macsonic.c drivers/net/ethernet/natsemi/xtsonic.c+36 -420 replies
13/13net/sonic: Replace custom debug logging with netif_* callsdrivers/net/ethernet/natsemi/jazzsonic.c drivers/net/ethernet/natsemi/macsonic.c drivers/net/ethernet/natsemi/sonic.c +2 more+54 -1030 replies

Reviews trailers per patch

2 of 13 patches have a Reviewed-by or Acked-by.

PatchStan JohnsonGeert Uytterhoeven
1/13A-b
2/13T-b
3/13
4/13T-b
5/13
6/13A-b
7/13
8/13
9/13T-b
10/13T-b
11/13T-b
12/13T-b
13/13T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH net v4 00/13] Fixes, cleanup and modernization for some legacy ethernet NIC drivers

This patch series adds Driver Model support to Mac NIC drivers, fixes some bugs, removes some dead code and adopts netif_* calls to reduce code duplication.

This series results in a reduction of about 100 lines of code.

It has been tested on a variety of Macs, with coverage for the changes to lib8390.c, mac8390.c, macsonic.c, sonic.c and macmace.c.

Much of this patch series depends on the NuBus modernization series which has been merged for 4.16-rc.

Changes since v3:
- Rebased on current nubus code.
- Renamed some more struct nubus_rsrc pointers that were misleadingly called 'dev' and 'ndev'.
- Removed an unused struct member from the mac89x0 driver.
- Dropped gratuitous log message changes (capitalization, punctuation etc.) so that the old messages can still be grep'd.
- Improved patch descriptions.
- Revised code style to reduce checkpatch.pl noise.
- Addressed two more 8390 logging issues.
- Added a new patch to remove redundant 8390.o dependencies.
- Re-ordered some patches for easier cherry picking.

Changes since v2:
- Modernized the Mac NIC drivers by adopting the Linux Driver Model.
- Used dev_foo() in NuBus drivers.
- Removed device probe messages logged after register_netdev().

Changes since v1:
- Retained the once_is_enough test in mac89x0.c.
- Added tested-by tags.
- Moved netdev_info() call to correct branch in macmace.c.

Finn Thain (13):
net/8390: Remove redundant make dependencies net/8390: Fix msg_enable patch snafu
net/smc9194: Remove bogus CONFIG_MAC reference net/macmace: Fix and clean up log messages net/mac89x0: Remove dead or unreachable code net/mac89x0: Convert to platform_driver net/mac89x0: Fix and modernize log messages net/mac89x0: Replace custom debug logging with netif_* calls net/mac8390: Convert to nubus_driver
net/mac8390: Fix log messages
net/macsonic: Convert to nubus_driver
net/sonic: Clean up and modernize log messages net/sonic: Replace custom debug logging with netif_* calls

 arch/m68k/mac/config.c                   |   4 +
 drivers/net/Space.c                      |   6 -
 drivers/net/ethernet/8390/Makefile       |   6 +-
 drivers/net/ethernet/8390/ax88796.c      |   3 -
 drivers/net/ethernet/8390/axnet_cs.c     |   2 -
 drivers/net/ethernet/8390/etherh.c       |  17 ---
 drivers/net/ethernet/8390/hydra.c        |   4 -
 drivers/net/ethernet/8390/lib8390.c      |   2 +
 drivers/net/ethernet/8390/mac8390.c      | 170 ++++++++++------------
 drivers/net/ethernet/8390/mcf8390.c      |   4 -
 drivers/net/ethernet/8390/ne.c           |   2 +-
 drivers/net/ethernet/8390/pcnet_cs.c     |   4 -
 drivers/net/ethernet/8390/wd.c           |   2 +-
 drivers/net/ethernet/8390/zorro8390.c    |   5 -
 drivers/net/ethernet/apple/macmace.c     |   9 +-
 drivers/net/ethernet/cirrus/mac89x0.c    | 157 +++++++-------------
 drivers/net/ethernet/natsemi/jazzsonic.c |  32 +---
 drivers/net/ethernet/natsemi/macsonic.c  | 241 ++++++++++++++++++-------------
 drivers/net/ethernet/natsemi/sonic.c     |  92 ++++++------
 drivers/net/ethernet/natsemi/sonic.h     |   2 +
 drivers/net/ethernet/natsemi/xtsonic.c   |  30 +---
 drivers/net/ethernet/smsc/Kconfig        |   2 +-
 include/net/Space.h                      |   2 -
 23 files changed, 347 insertions(+), 451 deletions(-)
Signature · 1 line
2.13.6