via-velocity: move residual free rx descriptors count register update
Updates of the RBRDU have two different meanings depending on their context: 1. the receiving process has not started - the value which is written into the RBRDU register is supposed to be the free rx descriptors count (rounded to a multiple of 4) 2. the receiving process is running - the value increments the count above (sic) The update is currently issued deep inside the rx replenish chain (see velocity_give_many_rx_descs). Let's propagate enough information to the caller so that the rx replenish functions do not depend on hardware any more. It is needed to perform the Rx/Tx buffers housekeeping when MTU changes. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Родитель
8ac53afccf
Коммит
2813317608
|
@ -1155,7 +1155,7 @@ static void velocity_free_rings(struct velocity_info *vptr)
|
||||||
pci_free_consistent(vptr->pdev, size, vptr->rd_ring, vptr->rd_pool_dma);
|
pci_free_consistent(vptr->pdev, size, vptr->rd_ring, vptr->rd_pool_dma);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void velocity_give_many_rx_descs(struct velocity_info *vptr)
|
static void velocity_give_many_rx_descs(struct velocity_info *vptr)
|
||||||
{
|
{
|
||||||
struct mac_regs __iomem *regs = vptr->mac_regs;
|
struct mac_regs __iomem *regs = vptr->mac_regs;
|
||||||
int avail, dirty, unusable;
|
int avail, dirty, unusable;
|
||||||
|
@ -1182,7 +1182,7 @@ static inline void velocity_give_many_rx_descs(struct velocity_info *vptr)
|
||||||
|
|
||||||
static int velocity_rx_refill(struct velocity_info *vptr)
|
static int velocity_rx_refill(struct velocity_info *vptr)
|
||||||
{
|
{
|
||||||
int dirty = vptr->rd_dirty, done = 0, ret = 0;
|
int dirty = vptr->rd_dirty, done = 0;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
struct rx_desc *rd = vptr->rd_ring + dirty;
|
struct rx_desc *rd = vptr->rd_ring + dirty;
|
||||||
|
@ -1192,8 +1192,7 @@ static int velocity_rx_refill(struct velocity_info *vptr)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (!vptr->rd_info[dirty].skb) {
|
if (!vptr->rd_info[dirty].skb) {
|
||||||
ret = velocity_alloc_rx_buf(vptr, dirty);
|
if (velocity_alloc_rx_buf(vptr, dirty) < 0)
|
||||||
if (ret < 0)
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
done++;
|
done++;
|
||||||
|
@ -1203,10 +1202,9 @@ static int velocity_rx_refill(struct velocity_info *vptr)
|
||||||
if (done) {
|
if (done) {
|
||||||
vptr->rd_dirty = dirty;
|
vptr->rd_dirty = dirty;
|
||||||
vptr->rd_filled += done;
|
vptr->rd_filled += done;
|
||||||
velocity_give_many_rx_descs(vptr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return done;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1219,25 +1217,27 @@ static int velocity_rx_refill(struct velocity_info *vptr)
|
||||||
|
|
||||||
static int velocity_init_rd_ring(struct velocity_info *vptr)
|
static int velocity_init_rd_ring(struct velocity_info *vptr)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
int mtu = vptr->dev->mtu;
|
int mtu = vptr->dev->mtu;
|
||||||
|
int ret = -ENOMEM;
|
||||||
|
|
||||||
vptr->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;
|
vptr->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;
|
||||||
|
|
||||||
vptr->rd_info = kcalloc(vptr->options.numrx,
|
vptr->rd_info = kcalloc(vptr->options.numrx,
|
||||||
sizeof(struct velocity_rd_info), GFP_KERNEL);
|
sizeof(struct velocity_rd_info), GFP_KERNEL);
|
||||||
if (!vptr->rd_info)
|
if (!vptr->rd_info)
|
||||||
return -ENOMEM;
|
goto out;
|
||||||
|
|
||||||
vptr->rd_filled = vptr->rd_dirty = vptr->rd_curr = 0;
|
vptr->rd_filled = vptr->rd_dirty = vptr->rd_curr = 0;
|
||||||
|
|
||||||
ret = velocity_rx_refill(vptr);
|
if (velocity_rx_refill(vptr) != vptr->options.numrx) {
|
||||||
if (ret < 0) {
|
|
||||||
VELOCITY_PRT(MSG_LEVEL_ERR, KERN_ERR
|
VELOCITY_PRT(MSG_LEVEL_ERR, KERN_ERR
|
||||||
"%s: failed to allocate RX buffer.\n", vptr->dev->name);
|
"%s: failed to allocate RX buffer.\n", vptr->dev->name);
|
||||||
velocity_free_rd_ring(vptr);
|
velocity_free_rd_ring(vptr);
|
||||||
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1412,10 +1412,8 @@ static int velocity_rx_srv(struct velocity_info *vptr, int status)
|
||||||
|
|
||||||
vptr->rd_curr = rd_curr;
|
vptr->rd_curr = rd_curr;
|
||||||
|
|
||||||
if (works > 0 && velocity_rx_refill(vptr) < 0) {
|
if ((works > 0) && (velocity_rx_refill(vptr) > 0))
|
||||||
VELOCITY_PRT(MSG_LEVEL_ERR, KERN_ERR
|
velocity_give_many_rx_descs(vptr);
|
||||||
"%s: rx buf allocation failure\n", vptr->dev->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
VAR_USED(stats);
|
VAR_USED(stats);
|
||||||
return works;
|
return works;
|
||||||
|
@ -1877,6 +1875,8 @@ static int velocity_open(struct net_device *dev)
|
||||||
/* Ensure chip is running */
|
/* Ensure chip is running */
|
||||||
pci_set_power_state(vptr->pdev, PCI_D0);
|
pci_set_power_state(vptr->pdev, PCI_D0);
|
||||||
|
|
||||||
|
velocity_give_many_rx_descs(vptr);
|
||||||
|
|
||||||
velocity_init_registers(vptr, VELOCITY_INIT_COLD);
|
velocity_init_registers(vptr, VELOCITY_INIT_COLD);
|
||||||
|
|
||||||
ret = request_irq(vptr->pdev->irq, &velocity_intr, IRQF_SHARED,
|
ret = request_irq(vptr->pdev->irq, &velocity_intr, IRQF_SHARED,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче