Skip to content

Commit

Permalink
net/mac8390: Convert to nubus_driver
Browse files Browse the repository at this point in the history 
This resolves an old bug that constrained this driver to no more than
one card.

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Finn Thain authored and David S. Miller committed Feb 21, 2018
1 parent 646fe03 commit 494a973
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 76 deletions.
3 changes: 0 additions & 3 deletions drivers/net/Space.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ static struct devprobe2 m68k_probes[] __initdata = {
#ifdef CONFIG_MVME147_NET /* MVME147 internal Ethernet */
{mvme147lance_probe, 0},
#endif
#ifdef CONFIG_MAC8390 /* NuBus NS8390-based cards */
{mac8390_probe, 0},
#endif
#ifdef CONFIG_MAC89x0
{mac89x0_probe, 0},
#endif
Expand Down
139 changes: 67 additions & 72 deletions drivers/net/ethernet/8390/mac8390.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ enum mac8390_access {
};

extern int mac8390_memtest(struct net_device *dev);
static int mac8390_initdev(struct net_device *dev,
struct nubus_rsrc *ndev,
static int mac8390_initdev(struct net_device *dev, struct nubus_board *board,
enum mac8390_type type);

static int mac8390_open(struct net_device *dev);
Expand Down Expand Up @@ -169,7 +168,7 @@ static void slow_sane_block_output(struct net_device *dev, int count,
static void word_memcpy_tocard(unsigned long tp, const void *fp, int count);
static void word_memcpy_fromcard(void *tp, unsigned long fp, int count);

static enum mac8390_type __init mac8390_ident(struct nubus_rsrc *fres)
static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)
{
switch (fres->dr_sw) {
case NUBUS_DRSW_3COM:
Expand Down Expand Up @@ -235,7 +234,7 @@ static enum mac8390_type __init mac8390_ident(struct nubus_rsrc *fres)
return MAC8390_NONE;
}

static enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
static enum mac8390_access mac8390_testio(unsigned long membase)
{
unsigned long outdata = 0xA5A0B5B0;
unsigned long indata = 0x00000000;
Expand All @@ -253,7 +252,7 @@ static enum mac8390_access __init mac8390_testio(volatile unsigned long membase)
return ACCESS_UNKNOWN;
}

static int __init mac8390_memsize(unsigned long membase)
static int mac8390_memsize(unsigned long membase)
{
unsigned long flags;
int i, j;
Expand Down Expand Up @@ -289,28 +288,28 @@ static int __init mac8390_memsize(unsigned long membase)
return i * 0x1000;
}

static bool __init mac8390_init(struct net_device *dev,
struct nubus_rsrc *ndev,
enum mac8390_type cardtype)
static bool mac8390_rsrc_init(struct net_device *dev,
struct nubus_rsrc *fres,
enum mac8390_type cardtype)
{
struct nubus_board *board = fres->board;
struct nubus_dir dir;
struct nubus_dirent ent;
int offset;
volatile unsigned short *i;

dev->irq = SLOT2IRQ(ndev->board->slot);
dev->irq = SLOT2IRQ(board->slot);
/* This is getting to be a habit */
dev->base_addr = (ndev->board->slot_addr |
((ndev->board->slot & 0xf) << 20));
dev->base_addr = board->slot_addr | ((board->slot & 0xf) << 20);

/*
* Get some Nubus info - we will trust the card's idea
* of where its memory and registers are.
*/

if (nubus_get_func_dir(ndev, &dir) == -1) {
if (nubus_get_func_dir(fres, &dir) == -1) {
pr_err("%s: Unable to get Nubus functional directory for slot %X!\n",
dev->name, ndev->board->slot);
dev->name, board->slot);
return false;
}

Expand All @@ -327,7 +326,7 @@ static bool __init mac8390_init(struct net_device *dev,
if (nubus_find_rsrc(&dir, NUBUS_RESID_MINOR_BASEOS,
&ent) == -1) {
pr_err("%s: Memory offset resource for slot %X not found!\n",
dev->name, ndev->board->slot);
dev->name, board->slot);
return false;
}
nubus_get_rsrc_mem(&offset, &ent, 4);
Expand All @@ -338,7 +337,7 @@ static bool __init mac8390_init(struct net_device *dev,
if (nubus_find_rsrc(&dir, NUBUS_RESID_MINOR_LENGTH,
&ent) == -1) {
pr_info("%s: Memory length resource for slot %X not found, probing\n",
dev->name, ndev->board->slot);
dev->name, board->slot);
offset = mac8390_memsize(dev->mem_start);
} else {
nubus_get_rsrc_mem(&offset, &ent, 4);
Expand All @@ -348,25 +347,25 @@ static bool __init mac8390_init(struct net_device *dev,
switch (cardtype) {
case MAC8390_KINETICS:
case MAC8390_DAYNA: /* it's the same */
dev->base_addr = (int)(ndev->board->slot_addr +
dev->base_addr = (int)(board->slot_addr +
DAYNA_8390_BASE);
dev->mem_start = (int)(ndev->board->slot_addr +
dev->mem_start = (int)(board->slot_addr +
DAYNA_8390_MEM);
dev->mem_end = dev->mem_start +
mac8390_memsize(dev->mem_start);
break;
case MAC8390_INTERLAN:
dev->base_addr = (int)(ndev->board->slot_addr +
dev->base_addr = (int)(board->slot_addr +
INTERLAN_8390_BASE);
dev->mem_start = (int)(ndev->board->slot_addr +
dev->mem_start = (int)(board->slot_addr +
INTERLAN_8390_MEM);
dev->mem_end = dev->mem_start +
mac8390_memsize(dev->mem_start);
break;
case MAC8390_CABLETRON:
dev->base_addr = (int)(ndev->board->slot_addr +
dev->base_addr = (int)(board->slot_addr +
CABLETRON_8390_BASE);
dev->mem_start = (int)(ndev->board->slot_addr +
dev->mem_start = (int)(board->slot_addr +
CABLETRON_8390_MEM);
/* The base address is unreadable if 0x00
* has been written to the command register
Expand All @@ -382,94 +381,91 @@ static bool __init mac8390_init(struct net_device *dev,

default:
pr_err("Card type %s is unsupported, sorry\n",
ndev->board->name);
board->name);
return false;
}
}

return true;
}

struct net_device * __init mac8390_probe(int unit)
static int mac8390_device_probe(struct nubus_board *board)
{
struct net_device *dev;
struct nubus_rsrc *ndev = NULL;
int err = -ENODEV;
static unsigned int slots;

enum mac8390_type cardtype;

/* probably should check for Nubus instead */

if (!MACH_IS_MAC)
return ERR_PTR(-ENODEV);
struct nubus_rsrc *fres;
enum mac8390_type cardtype = MAC8390_NONE;

dev = ____alloc_ei_netdev(0);
if (!dev)
return ERR_PTR(-ENOMEM);
return -ENOMEM;

if (unit >= 0)
sprintf(dev->name, "eth%d", unit);
SET_NETDEV_DEV(dev, &board->dev);

for_each_func_rsrc(ndev) {
if (ndev->category != NUBUS_CAT_NETWORK ||
ndev->type != NUBUS_TYPE_ETHERNET)
for_each_board_func_rsrc(board, fres) {
if (fres->category != NUBUS_CAT_NETWORK ||
fres->type != NUBUS_TYPE_ETHERNET)
continue;

/* Have we seen it already? */
if (slots & (1 << ndev->board->slot))
continue;
slots |= 1 << ndev->board->slot;

cardtype = mac8390_ident(ndev);
cardtype = mac8390_ident(fres);
if (cardtype == MAC8390_NONE)
continue;

if (!mac8390_init(dev, ndev, cardtype))
continue;

/* Do the nasty 8390 stuff */
if (!mac8390_initdev(dev, ndev, cardtype))
if (mac8390_rsrc_init(dev, fres, cardtype))
break;
}
if (!fres)
goto out;

if (!ndev)
err = mac8390_initdev(dev, board, cardtype);
if (err)
goto out;

err = register_netdev(dev);
if (err)
goto out;
return dev;

nubus_set_drvdata(board, dev);
return 0;

out:
free_netdev(dev);
return ERR_PTR(err);
return err;
}

#ifdef MODULE
static int mac8390_device_remove(struct nubus_board *board)
{
struct net_device *dev = nubus_get_drvdata(board);

unregister_netdev(dev);
free_netdev(dev);
return 0;
}

static struct nubus_driver mac8390_driver = {
.probe = mac8390_device_probe,
.remove = mac8390_device_remove,
.driver = {
.name = KBUILD_MODNAME,
.owner = THIS_MODULE,
}
};

MODULE_AUTHOR("David Huggins-Daines <dhd@debian.org> and others");
MODULE_DESCRIPTION("Macintosh NS8390-based Nubus Ethernet driver");
MODULE_LICENSE("GPL");

static struct net_device *dev_mac8390;

int __init init_module(void)
static int __init mac8390_init(void)
{
dev_mac8390 = mac8390_probe(-1);
if (IS_ERR(dev_mac8390)) {
pr_warn("mac8390: No card found\n");
return PTR_ERR(dev_mac8390);
}
return 0;
return nubus_driver_register(&mac8390_driver);
}
module_init(mac8390_init);

void __exit cleanup_module(void)
static void __exit mac8390_exit(void)
{
unregister_netdev(dev_mac8390);
free_netdev(dev_mac8390);
nubus_driver_unregister(&mac8390_driver);
}

#endif /* MODULE */
module_exit(mac8390_exit);

static const struct net_device_ops mac8390_netdev_ops = {
.ndo_open = mac8390_open,
Expand All @@ -485,9 +481,8 @@ static const struct net_device_ops mac8390_netdev_ops = {
#endif
};

static int __init mac8390_initdev(struct net_device *dev,
struct nubus_rsrc *ndev,
enum mac8390_type type)
static int mac8390_initdev(struct net_device *dev, struct nubus_board *board,
enum mac8390_type type)
{
static u32 fwrd4_offsets[16] = {
0, 4, 8, 12,
Expand Down Expand Up @@ -605,15 +600,15 @@ static int __init mac8390_initdev(struct net_device *dev,

default:
pr_err("Card type %s is unsupported, sorry\n",
ndev->board->name);
board->name);
return -ENODEV;
}

__NS8390_init(dev, 0);

/* Good, done, now spit out some messages */
pr_info("%s: %s in slot %X (type %s)\n",
dev->name, ndev->board->name, ndev->board->slot,
dev->name, board->name, board->slot,
cardname[type]);
pr_info("MAC %pM IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",
dev->dev_addr, dev->irq,
Expand Down
1 change: 0 additions & 1 deletion include/net/Space.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ struct net_device *cs89x0_probe(int unit);
struct net_device *mvme147lance_probe(int unit);
struct net_device *tc515_probe(int unit);
struct net_device *lance_probe(int unit);
struct net_device *mac8390_probe(int unit);
struct net_device *mac89x0_probe(int unit);
struct net_device *cops_probe(int unit);
struct net_device *ltpc_probe(void);
Expand Down

0 comments on commit 494a973

Please sign in to comment.