Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 113006
b: refs/heads/master
c: af736fe
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Aug 29, 2008
1 parent abe0aee commit 1d3ae7d
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 48 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db1a8611c8733711b40bbce11c87336e3e374634
refs/heads/master: af736fede772d92096b52da9aa1b0cf5de62eceb
87 changes: 40 additions & 47 deletions trunk/drivers/net/sunlance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,15 @@ static char lancestr[] = "LANCE";
#include <linux/ethtool.h>
#include <linux/bitops.h>
#include <linux/dma-mapping.h>
#include <linux/of.h>
#include <linux/of_device.h>

#include <asm/system.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/pgtable.h>
#include <asm/byteorder.h> /* Used by the checksum routines */
#include <asm/idprom.h>
#include <asm/sbus.h>
#include <asm/prom.h>
#include <asm/auxio.h> /* For tpe-link-test? setting */
#include <asm/irq.h>
Expand Down Expand Up @@ -264,7 +265,8 @@ struct lance_private {
char *name;
dma_addr_t init_block_dvma;
struct net_device *dev; /* Backpointer */
struct sbus_dev *sdev;
struct of_device *op;
struct of_device *lebuffer;
struct timer_list multicast_timer;
};

Expand Down Expand Up @@ -1273,18 +1275,18 @@ static void lance_set_multicast_retry(unsigned long _opaque)
static void lance_free_hwresources(struct lance_private *lp)
{
if (lp->lregs)
sbus_iounmap(lp->lregs, LANCE_REG_SIZE);
of_iounmap(&lp->op->resource[0], lp->lregs, LANCE_REG_SIZE);
if (lp->dregs) {
struct of_device *ledma = lp->ledma;

of_iounmap(&ledma->resource[0], lp->dregs,
resource_size(&ledma->resource[0]));
}
if (lp->init_block_iomem) {
sbus_iounmap(lp->init_block_iomem,
sizeof(struct lance_init_block));
of_iounmap(&lp->lebuffer->resource[0], lp->init_block_iomem,
sizeof(struct lance_init_block));
} else if (lp->init_block_mem) {
dma_free_coherent(&lp->sdev->ofdev.dev,
dma_free_coherent(&lp->op->dev,
sizeof(struct lance_init_block),
lp->init_block_mem,
lp->init_block_dvma);
Expand All @@ -1294,12 +1296,8 @@ static void lance_free_hwresources(struct lance_private *lp)
/* Ethtool support... */
static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{
struct lance_private *lp = netdev_priv(dev);

strcpy(info->driver, "sunlance");
strcpy(info->version, "2.02");
sprintf(info->bus_info, "SBUS:%d",
lp->sdev->slot);
}

static u32 sparc_lance_get_link(struct net_device *dev)
Expand All @@ -1315,16 +1313,16 @@ static const struct ethtool_ops sparc_lance_ethtool_ops = {
.get_link = sparc_lance_get_link,
};

static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
static int __devinit sparc_lance_probe_one(struct of_device *op,
struct of_device *ledma,
struct sbus_dev *lebuffer)
struct of_device *lebuffer)
{
struct device_node *dp = op->node;
static unsigned version_printed;
struct device_node *dp = sdev->ofdev.node;
struct net_device *dev;
struct lance_private *lp;
int i;
struct net_device *dev;
DECLARE_MAC_BUF(mac);
int i;

dev = alloc_etherdev(sizeof(struct lance_private) + 8);
if (!dev)
Expand All @@ -1345,8 +1343,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
dev->dev_addr[i] = idprom->id_ethaddr[i];

/* Get the IO region */
lp->lregs = sbus_ioremap(&sdev->resource[0], 0,
LANCE_REG_SIZE, lancestr);
lp->lregs = of_ioremap(&op->resource[0], 0,
LANCE_REG_SIZE, lancestr);
if (!lp->lregs) {
printk(KERN_ERR "SunLance: Cannot map registers.\n");
goto fail;
Expand All @@ -1364,16 +1362,17 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
}
}

lp->sdev = sdev;
lp->op = op;
lp->lebuffer = lebuffer;
if (lebuffer) {
/* sanity check */
if (lebuffer->resource[0].start & 7) {
printk(KERN_ERR "SunLance: ERROR: Rx and Tx rings not on even boundary.\n");
goto fail;
}
lp->init_block_iomem =
sbus_ioremap(&lebuffer->resource[0], 0,
sizeof(struct lance_init_block), "lebuffer");
of_ioremap(&lebuffer->resource[0], 0,
sizeof(struct lance_init_block), "lebuffer");
if (!lp->init_block_iomem) {
printk(KERN_ERR "SunLance: Cannot map PIO buffer.\n");
goto fail;
Expand All @@ -1385,10 +1384,10 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
lp->tx = lance_tx_pio;
} else {
lp->init_block_mem =
dma_alloc_coherent(&sdev->ofdev.dev,
dma_alloc_coherent(&op->dev,
sizeof(struct lance_init_block),
&lp->init_block_dvma, GFP_ATOMIC);
if (!lp->init_block_mem || lp->init_block_dvma == 0) {
if (!lp->init_block_mem) {
printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");
goto fail;
}
Expand All @@ -1407,16 +1406,18 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
lp->burst_sizes = 0;
if (lp->ledma) {
struct device_node *ledma_dp = ledma->node;
const char *prop;
struct device_node *sbus_dp;
unsigned int sbmask;
const char *prop;
u32 csr;

/* Find burst-size property for ledma */
lp->burst_sizes = of_getintprop_default(ledma_dp,
"burst-sizes", 0);

/* ledma may be capable of fast bursts, but sbus may not. */
sbmask = of_getintprop_default(ledma_dp, "burst-sizes",
sbus_dp = ledma_dp->parent;
sbmask = of_getintprop_default(sbus_dp, "burst-sizes",
DMA_BURSTBITS);
lp->burst_sizes &= sbmask;

Expand Down Expand Up @@ -1463,7 +1464,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
lp->dregs = NULL;

lp->dev = dev;
SET_NETDEV_DEV(dev, &sdev->ofdev.dev);
SET_NETDEV_DEV(dev, &op->dev);
dev->open = &lance_open;
dev->stop = &lance_close;
dev->hard_start_xmit = &lance_start_xmit;
Expand All @@ -1472,9 +1473,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
dev->set_multicast_list = &lance_set_multicast;
dev->ethtool_ops = &sparc_lance_ethtool_ops;

dev->irq = sdev->irqs[0];

dev->dma = 0;
dev->irq = op->irqs[0];

/* We cannot sleep if the chip is busy during a
* multicast list update event, because such events
Expand All @@ -1490,7 +1489,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
goto fail;
}

dev_set_drvdata(&sdev->ofdev.dev, lp);
dev_set_drvdata(&op->dev, lp);

printk(KERN_INFO "%s: LANCE %s\n",
dev->name, print_mac(mac, dev->dev_addr));
Expand Down Expand Up @@ -1540,31 +1539,25 @@ static int __exit sunlance_sun4_remove(void)

#else /* !CONFIG_SUN4 */

static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)
static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)
{
struct sbus_dev *sdev = to_sbus_device(&dev->dev);
struct of_device *parent = to_of_device(op->dev.parent);
struct device_node *parent_dp = parent->node;
int err;

if (sdev->parent) {
struct device_node *parent_node = sdev->parent->ofdev.node;
struct of_device *parent;

parent = of_find_device_by_node(parent_node);
if (parent && !strcmp(parent->node->name, "ledma")) {
err = sparc_lance_probe_one(sdev, parent, NULL);
} else if (parent && !strcmp(parent->node->name, "lebuffer")) {
err = sparc_lance_probe_one(sdev, NULL, to_sbus_device(&parent->dev));
} else
err = sparc_lance_probe_one(sdev, NULL, NULL);
if (!strcmp(parent_dp->name, "ledma")) {
err = sparc_lance_probe_one(op, parent, NULL);
} else if (!strcmp(parent_dp->name, "lebuffer")) {
err = sparc_lance_probe_one(op, NULL, parent);
} else
err = sparc_lance_probe_one(sdev, NULL, NULL);
err = sparc_lance_probe_one(op, NULL, NULL);

return err;
}

static int __devexit sunlance_sbus_remove(struct of_device *dev)
static int __devexit sunlance_sbus_remove(struct of_device *op)
{
struct lance_private *lp = dev_get_drvdata(&dev->dev);
struct lance_private *lp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = lp->dev;

unregister_netdev(net_dev);
Expand All @@ -1573,7 +1566,7 @@ static int __devexit sunlance_sbus_remove(struct of_device *dev)

free_netdev(net_dev);

dev_set_drvdata(&dev->dev, NULL);
dev_set_drvdata(&op->dev, NULL);

return 0;
}
Expand All @@ -1598,7 +1591,7 @@ static struct of_platform_driver sunlance_sbus_driver = {
/* Find all the lance cards on the system and initialize them */
static int __init sparc_lance_init(void)
{
return of_register_driver(&sunlance_sbus_driver, &sbus_bus_type);
return of_register_driver(&sunlance_sbus_driver, &of_bus_type);
}
#endif /* !CONFIG_SUN4 */

Expand Down

0 comments on commit 1d3ae7d

Please sign in to comment.