Skip to content

L
linux
Commit 9ff8213d authored by Ralf Bächle's avatar Ralf Bächle
Browse files
Options

[PATCH] Use netdev_priv in sgiseeq 

The combined allocation of of receive and transmit rings and driver data
so far made the use of netdev_priv impossible.  Split the allocation
and use netdev_priv to access the non-ring driver_private data.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c2c9c9ea
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 70 deletions
drivers/net/sgiseeq.c
View file @ 9ff8213d
......@@ -64,13 +64,13 @@ static char *sgiseeqstr = "SGI Seeq8003";
#define DEBUG
struct sgiseeq_rx_desc {
struct hpc_dma_desc rdma;
signed int buf_vaddr;
volatile struct hpc_dma_desc rdma;
volatile signed int buf_vaddr;
};
struct sgiseeq_tx_desc {
struct hpc_dma_desc tdma;
signed int buf_vaddr;
volatile struct hpc_dma_desc tdma;
volatile signed int buf_vaddr;
};
/*
......@@ -79,17 +79,17 @@ struct sgiseeq_tx_desc {
* some care.
*/
struct sgiseeq_init_block { /* Note the name ;-) */
/* Ptrs to the descriptors in KSEG1 uncached space. */
struct sgiseeq_rx_desc *rx_desc;
struct sgiseeq_tx_desc *tx_desc;
unsigned int _padding[30]; /* Pad out to largest cache line size. */
struct sgiseeq_rx_desc rxvector[SEEQ_RX_BUFFERS];
struct sgiseeq_tx_desc txvector[SEEQ_TX_BUFFERS];
};
struct sgiseeq_private {
volatile struct sgiseeq_init_block srings;
struct sgiseeq_init_block *srings;
/* Ptrs to the descriptors in uncached space. */
struct sgiseeq_rx_desc *rx_desc;
struct sgiseeq_tx_desc *tx_desc;
char *name;
struct hpc3_ethregs *hregs;
struct sgiseeq_regs *sregs;
......@@ -152,8 +152,7 @@ static inline void seeq_load_eaddr(struct net_device *dev,
static int seeq_init_ring(struct net_device *dev)
{
struct sgiseeq_private *sp = dev->priv;
volatile struct sgiseeq_init_block *ib = &sp->srings;
struct sgiseeq_private *sp = netdev_priv(dev);
int i;
netif_stop_queue(dev);
......@@ -170,32 +169,32 @@ static int seeq_init_ring(struct net_device *dev)
/* Setup tx ring. */
for(i = 0; i < SEEQ_TX_BUFFERS; i++) {
if (!ib->tx_desc[i].tdma.pbuf) {
if (!sp->tx_desc[i].tdma.pbuf) {
unsigned long buffer;
buffer = (unsigned long) kmalloc(PKT_BUF_SZ, GFP_KERNEL);
if (!buffer)
return -ENOMEM;
ib->tx_desc[i].buf_vaddr = KSEG1ADDR(buffer);
ib->tx_desc[i].tdma.pbuf = CPHYSADDR(buffer);
sp->tx_desc[i].buf_vaddr = KSEG1ADDR(buffer);
sp->tx_desc[i].tdma.pbuf = CPHYSADDR(buffer);
}
ib->tx_desc[i].tdma.cntinfo = TCNTINFO_INIT;
sp->tx_desc[i].tdma.cntinfo = TCNTINFO_INIT;
}
/* And now the rx ring. */
for (i = 0; i < SEEQ_RX_BUFFERS; i++) {
if (!ib->rx_desc[i].rdma.pbuf) {
if (!sp->rx_desc[i].rdma.pbuf) {
unsigned long buffer;
buffer = (unsigned long) kmalloc(PKT_BUF_SZ, GFP_KERNEL);
if (!buffer)
return -ENOMEM;
ib->rx_desc[i].buf_vaddr = KSEG1ADDR(buffer);
ib->rx_desc[i].rdma.pbuf = CPHYSADDR(buffer);
sp->rx_desc[i].buf_vaddr = KSEG1ADDR(buffer);
sp->rx_desc[i].rdma.pbuf = CPHYSADDR(buffer);
}
ib->rx_desc[i].rdma.cntinfo = RCNTINFO_INIT;
sp->rx_desc[i].rdma.cntinfo = RCNTINFO_INIT;
}
ib->rx_desc[i - 1].rdma.cntinfo |= HPCDMA_EOR;
sp->rx_desc[i - 1].rdma.cntinfo |= HPCDMA_EOR;
return 0;
}
......@@ -206,8 +205,8 @@ static struct net_device *gdev;
void sgiseeq_dump_rings(void)
{
static int once;
struct sgiseeq_rx_desc *r = gpriv->srings.rx_desc;
struct sgiseeq_tx_desc *t = gpriv->srings.tx_desc;
struct sgiseeq_rx_desc *r = gpriv->rx_desc;
struct sgiseeq_tx_desc *t = gpriv->tx_desc;
struct hpc3_ethregs *hregs = gpriv->hregs;
int i;
......@@ -268,8 +267,8 @@ static int init_seeq(struct net_device *dev, struct sgiseeq_private *sp,
hregs->rx_dconfig |= RDMACFG_INIT;
hregs->rx_ndptr = CPHYSADDR(sp->srings.rx_desc);
hregs->tx_ndptr = CPHYSADDR(sp->srings.tx_desc);
hregs->rx_ndptr = CPHYSADDR(sp->rx_desc);
hregs->tx_ndptr = CPHYSADDR(sp->tx_desc);
seeq_go(sp, hregs, sregs);
return 0;
......@@ -294,14 +293,14 @@ static inline void rx_maybe_restart(struct sgiseeq_private *sp,
struct sgiseeq_regs *sregs)
{
if (!(hregs->rx_ctrl & HPC3_ERXCTRL_ACTIVE)) {
hregs->rx_ndptr = CPHYSADDR(sp->srings.rx_desc + sp->rx_new);
hregs->rx_ndptr = CPHYSADDR(sp->rx_desc + sp->rx_new);
seeq_go(sp, hregs, sregs);
}
}
#define for_each_rx(rd, sp) for((rd) = &(sp)->srings.rx_desc[(sp)->rx_new]; \
#define for_each_rx(rd, sp) for((rd) = &(sp)->rx_desc[(sp)->rx_new]; \
!((rd)->rdma.cntinfo & HPCDMA_OWN); \
(rd) = &(sp)->srings.rx_desc[(sp)->rx_new])
(rd) = &(sp)->rx_desc[(sp)->rx_new])
static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp,
struct hpc3_ethregs *hregs,
......@@ -349,8 +348,8 @@ static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp
rd->rdma.cntinfo = RCNTINFO_INIT;
sp->rx_new = NEXT_RX(sp->rx_new);
}
sp->srings.rx_desc[orig_end].rdma.cntinfo &= ~(HPCDMA_EOR);
sp->srings.rx_desc[PREV_RX(sp->rx_new)].rdma.cntinfo |= HPCDMA_EOR;
sp->rx_desc[orig_end].rdma.cntinfo &= ~(HPCDMA_EOR);
sp->rx_desc[PREV_RX(sp->rx_new)].rdma.cntinfo |= HPCDMA_EOR;
rx_maybe_restart(sp, hregs, sregs);
}
......@@ -403,7 +402,7 @@ static inline void sgiseeq_tx(struct net_device *dev, struct sgiseeq_private *sp
/* Ack 'em... */
for (j = sp->tx_old; j != sp->tx_new; j = NEXT_TX(j)) {
td = &sp->srings.tx_desc[j];
td = &sp->tx_desc[j];
if (!(td->tdma.cntinfo & (HPCDMA_XIU)))
break;
......@@ -424,7 +423,7 @@ static inline void sgiseeq_tx(struct net_device *dev, struct sgiseeq_private *sp
static irqreturn_t sgiseeq_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct sgiseeq_private *sp = dev->priv;
struct sgiseeq_private *sp = netdev_priv(dev);
struct hpc3_ethregs *hregs = sp->hregs;
struct sgiseeq_regs *sregs = sp->sregs;
......@@ -450,21 +449,33 @@ static irqreturn_t sgiseeq_interrupt(int irq, void *dev_id, struct pt_regs *regs
static int sgiseeq_open(struct net_device *dev)
{
struct sgiseeq_private *sp = dev->priv;
struct sgiseeq_private *sp = netdev_priv(dev);
struct sgiseeq_regs *sregs = sp->sregs;
unsigned int irq = dev->irq;
int err;
int err = init_seeq(dev, sp, sregs);
if (request_irq(irq, sgiseeq_interrupt, 0, sgiseeqstr, dev)) {
printk(KERN_ERR "Seeq8003: Can't get irq %d\n", dev->irq);
err = -EAGAIN;
}
err = init_seeq(dev, sp, sregs);
if (err)
return err;
goto out_free_irq;
netif_start_queue(dev);
return 0;
out_free_irq:
free_irq(irq, dev);
return err;
}
static int sgiseeq_close(struct net_device *dev)
{
struct sgiseeq_private *sp = dev->priv;
struct sgiseeq_private *sp = netdev_priv(dev);
struct sgiseeq_regs *sregs = sp->sregs;
netif_stop_queue(dev);
......@@ -477,7 +488,7 @@ static int sgiseeq_close(struct net_device *dev)
static inline int sgiseeq_reset(struct net_device *dev)
{
struct sgiseeq_private *sp = dev->priv;
struct sgiseeq_private *sp = netdev_priv(dev);
struct sgiseeq_regs *sregs = sp->sregs;
int err;
......@@ -499,7 +510,7 @@ void sgiseeq_my_reset(void)
static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct sgiseeq_private *sp = dev->priv;
struct sgiseeq_private *sp = netdev_priv(dev);
struct hpc3_ethregs *hregs = sp->hregs;
unsigned long flags;
struct sgiseeq_tx_desc *td;
......@@ -512,7 +523,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen;
sp->stats.tx_bytes += len;
entry = sp->tx_new;
td = &sp->srings.tx_desc[entry];
td = &sp->tx_desc[entry];
/* Create entry. There are so many races with adding a new
* descriptor to the chain:
......@@ -535,14 +546,14 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (sp->tx_old != sp->tx_new) {
struct sgiseeq_tx_desc *backend;
backend = &sp->srings.tx_desc[PREV_TX(sp->tx_new)];
backend = &sp->tx_desc[PREV_TX(sp->tx_new)];
backend->tdma.cntinfo &= ~HPCDMA_EOX;
}
sp->tx_new = NEXT_TX(sp->tx_new); /* Advance. */
/* Maybe kick the HPC back into motion. */
if (!(hregs->tx_ctrl & HPC3_ETXCTRL_ACTIVE))
kick_tx(&sp->srings.tx_desc[sp->tx_old], hregs);
kick_tx(&sp->tx_desc[sp->tx_old], hregs);
dev->trans_start = jiffies;
dev_kfree_skb(skb);
......@@ -565,7 +576,7 @@ static void timeout(struct net_device *dev)
static struct net_device_stats *sgiseeq_get_stats(struct net_device *dev)
{
struct sgiseeq_private *sp = dev->priv;
struct sgiseeq_private *sp = netdev_priv(dev);
return &sp->stats;
}
......@@ -601,31 +612,29 @@ static inline void setup_rx_ring(struct sgiseeq_rx_desc *buf, int nbufs)
#define ALIGNED(x) ((((unsigned long)(x)) + 0xf) & ~(0xf))
int sgiseeq_init(struct hpc3_regs* regs, int irq)
static int sgiseeq_init(struct hpc3_regs* regs, int irq)
{
struct net_device *dev;
struct sgiseeq_init_block *sr;
struct sgiseeq_private *sp;
struct net_device *dev;
int err, i;
dev = alloc_etherdev(0);
dev = alloc_etherdev(sizeof (struct sgiseeq_private));
if (!dev) {
printk(KERN_ERR "Sgiseeq: Etherdev alloc failed, aborting.\n");
err = -ENOMEM;
goto err_out;
}
sp = netdev_priv(dev);
/* Make private data page aligned */
sp = (struct sgiseeq_private *) get_zeroed_page(GFP_KERNEL);
if (!sp) {
sr = (struct sgiseeq_init_block *) get_zeroed_page(GFP_KERNEL);
if (!sr) {
printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n");
err = -ENOMEM;
goto err_out_free_dev;
}
if (request_irq(irq, sgiseeq_interrupt, 0, sgiseeqstr, dev)) {
printk(KERN_ERR "Seeq8003: Can't get irq %d\n", dev->irq);
err = -EAGAIN;
goto err_out_free_page;
}
sp->srings = sr;
#define EADDR_NVOFS 250
for (i = 0; i < 3; i++) {
......@@ -643,18 +652,18 @@ int sgiseeq_init(struct hpc3_regs* regs, int irq)
sp->hregs = &hpc3c0->ethregs;
sp->name = sgiseeqstr;
sp->srings.rx_desc = (struct sgiseeq_rx_desc *)
KSEG1ADDR(ALIGNED(&sp->srings.rxvector[0]));
dma_cache_wback_inv((unsigned long)&sp->srings.rxvector,
sizeof(sp->srings.rxvector));
sp->srings.tx_desc = (struct sgiseeq_tx_desc *)
KSEG1ADDR(ALIGNED(&sp->srings.txvector[0]));
dma_cache_wback_inv((unsigned long)&sp->srings.txvector,
sizeof(sp->srings.txvector));
sp->rx_desc = (struct sgiseeq_rx_desc *)
KSEG1ADDR(ALIGNED(&sp->srings->rxvector[0]));
dma_cache_wback_inv((unsigned long)&sp->srings->rxvector,
sizeof(sp->srings->rxvector));
sp->tx_desc = (struct sgiseeq_tx_desc *)
KSEG1ADDR(ALIGNED(&sp->srings->txvector[0]));
dma_cache_wback_inv((unsigned long)&sp->srings->txvector,
sizeof(sp->srings->txvector));
/* A couple calculations now, saves many cycles later. */
setup_rx_ring(sp->srings.rx_desc, SEEQ_RX_BUFFERS);
setup_tx_ring(sp->srings.tx_desc, SEEQ_TX_BUFFERS);
setup_rx_ring(sp->rx_desc, SEEQ_RX_BUFFERS);
setup_tx_ring(sp->tx_desc, SEEQ_TX_BUFFERS);
/* Reset the chip. */
hpc3_eth_reset(sp->hregs);
......@@ -673,14 +682,12 @@ int sgiseeq_init(struct hpc3_regs* regs, int irq)
dev->get_stats = sgiseeq_get_stats;
dev->set_multicast_list = sgiseeq_set_multicast;
dev->irq = irq;
dev->dma = 0;
dev->priv = sp;
if (register_netdev(dev)) {
printk(KERN_ERR "Sgiseeq: Cannot register net device, "
"aborting.\n");
err = -ENODEV;
goto err_out_free_irq;
goto err_out_free_page;
}
printk(KERN_INFO "%s: SGI Seeq8003 ", dev->name);
......@@ -692,8 +699,6 @@ int sgiseeq_init(struct hpc3_regs* regs, int irq)
return 0;
err_out_free_irq:
free_irq(irq, dev);
err_out_free_page:
free_page((unsigned long) sp);
err_out_free_dev:
......@@ -718,12 +723,12 @@ static void __exit sgiseeq_exit(void)
int irq;
for (dev = root_sgiseeq_dev; dev; dev = next) {
sp = (struct sgiseeq_private *) dev->priv;
sp = (struct sgiseeq_private *) netdev_priv(dev);
next = sp->next_module;
irq = dev->irq;
unregister_netdev(dev);
free_irq(irq, dev);
free_page((unsigned long) dev->priv);
free_page((unsigned long) sp);
free_netdev(dev);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7