korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

sky2: Allocate initial skbs in sky2_alloc_buffers

Browse Source 
Allocate everything in one place so there's a single point
of failure in sky2_up, and sky2_rx_start can no longer fail.

Don't leave the hardware in a partially initialized state in the
case rx ring allocation fails.

As with the old code, the rx ring still needs to be fully
allocated for sky2_up to succeed.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mike McCormack 2010-02-12 06:58:03 +00:00 committed by David S. Miller
parent 39ef110ba8
commit 200ac492b3
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/net/sky2.c
View File

@ -1363,8 +1363,32 @@ static inline void sky2_rx_update(struct sky2_port *sky2, unsigned rxq)
sky2_put_idx(sky2->hw, rxq, sky2->rx_put); sky2_put_idx(sky2->hw, rxq, sky2->rx_put);
} }
static int sky2_alloc_rx_skbs(struct sky2_port *sky2)
{
struct sky2_hw *hw = sky2->hw;
unsigned i;
sky2->rx_data_size = sky2_get_rx_data_size(sky2);
/* Fill Rx ring */
for (i = 0; i < sky2->rx_pending; i++) {
struct rx_ring_info *re = sky2->rx_ring + i;
re->skb = sky2_rx_alloc(sky2);
if (!re->skb)
return -ENOMEM;
if (sky2_rx_map_skb(hw->pdev, re, sky2->rx_data_size)) {
dev_kfree_skb(re->skb);
re->skb = NULL;
return -ENOMEM;
}
}
return 0;
}
/* /*
* Allocate and setup receiver buffer pool. * Setup receiver buffer pool.
* Normal case this ends up creating one list element for skb * Normal case this ends up creating one list element for skb
* in the receive ring. Worst case if using large MTU and each * in the receive ring. Worst case if using large MTU and each
* allocation falls on a different 64 bit region, that results * allocation falls on a different 64 bit region, that results
@ -1372,7 +1396,7 @@ static inline void sky2_rx_update(struct sky2_port *sky2, unsigned rxq)
* One element is used for checksum enable/disable, and one * One element is used for checksum enable/disable, and one
* extra to avoid wrap. * extra to avoid wrap.
*/ */
static int sky2_rx_start(struct sky2_port *sky2) static void sky2_rx_start(struct sky2_port *sky2)
{ {
struct sky2_hw *hw = sky2->hw; struct sky2_hw *hw = sky2->hw;
struct rx_ring_info *re; struct rx_ring_info *re;
@ -1398,22 +1422,9 @@ static int sky2_rx_start(struct sky2_port *sky2)
if (!(hw->flags & SKY2_HW_NEW_LE)) if (!(hw->flags & SKY2_HW_NEW_LE))
rx_set_checksum(sky2); rx_set_checksum(sky2);
sky2->rx_data_size = sky2_get_rx_data_size(sky2); /* submit Rx ring */
/* Fill Rx ring */
for (i = 0; i < sky2->rx_pending; i++) { for (i = 0; i < sky2->rx_pending; i++) {
re = sky2->rx_ring + i; re = sky2->rx_ring + i;
re->skb = sky2_rx_alloc(sky2);
if (!re->skb)
goto nomem;
if (sky2_rx_map_skb(hw->pdev, re, sky2->rx_data_size)) {
dev_kfree_skb(re->skb);
re->skb = NULL;
goto nomem;
}
sky2_rx_submit(sky2, re); sky2_rx_submit(sky2, re);
} }
@ -1455,13 +1466,6 @@ static int sky2_rx_start(struct sky2_port *sky2)
sky2_write32(hw, Q_ADDR(txqaddr[sky2->port], Q_TEST), sky2_write32(hw, Q_ADDR(txqaddr[sky2->port], Q_TEST),
TBMU_TEST_HOME_ADD_FIX_EN | TBMU_TEST_ROUTING_ADD_FIX_EN); TBMU_TEST_HOME_ADD_FIX_EN | TBMU_TEST_ROUTING_ADD_FIX_EN);
} }
return 0;
nomem:
sky2_rx_clean(sky2);
return -ENOMEM;
} }
static int sky2_alloc_buffers(struct sky2_port *sky2) static int sky2_alloc_buffers(struct sky2_port *sky2)
@ -1492,7 +1496,7 @@ static int sky2_alloc_buffers(struct sky2_port *sky2)
if (!sky2->rx_ring) if (!sky2->rx_ring)
goto nomem; goto nomem;
return 0; return sky2_alloc_rx_skbs(sky2);
nomem: nomem:
return -ENOMEM; return -ENOMEM;
} }
@ -1501,6 +1505,8 @@ static void sky2_free_buffers(struct sky2_port *sky2)
{ {
struct sky2_hw *hw = sky2->hw; struct sky2_hw *hw = sky2->hw;
sky2_rx_clean(sky2);
if (sky2->rx_le) { if (sky2->rx_le) {
pci_free_consistent(hw->pdev, RX_LE_BYTES, pci_free_consistent(hw->pdev, RX_LE_BYTES,
sky2->rx_le, sky2->rx_le_map); sky2->rx_le, sky2->rx_le_map);
@ -1590,9 +1596,7 @@ static int sky2_up(struct net_device *dev)
sky2_set_vlan_mode(hw, port, sky2->vlgrp != NULL); sky2_set_vlan_mode(hw, port, sky2->vlgrp != NULL);
#endif #endif
err = sky2_rx_start(sky2); sky2_rx_start(sky2);
if (err)
goto err_out;
/* Enable interrupts from phy/mac for port */ /* Enable interrupts from phy/mac for port */
imask = sky2_read32(hw, B0_IMSK); imask = sky2_read32(hw, B0_IMSK);
@ -1960,8 +1964,6 @@ static int sky2_down(struct net_device *dev)
/* Free any pending frames stuck in HW queue */ /* Free any pending frames stuck in HW queue */
sky2_tx_complete(sky2, sky2->tx_prod); sky2_tx_complete(sky2, sky2->tx_prod);
sky2_rx_clean(sky2);
sky2_free_buffers(sky2); sky2_free_buffers(sky2);
return 0; return 0;
@ -2257,7 +2259,11 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
sky2_write8(hw, RB_ADDR(rxqaddr[port], RB_CTRL), RB_ENA_OP_MD); sky2_write8(hw, RB_ADDR(rxqaddr[port], RB_CTRL), RB_ENA_OP_MD);
err = sky2_rx_start(sky2); err = sky2_alloc_rx_skbs(sky2);
if (!err)
sky2_rx_start(sky2);
else
sky2_rx_clean(sky2);
sky2_write32(hw, B0_IMSK, imask); sky2_write32(hw, B0_IMSK, imask);
sky2_read32(hw, B0_Y2_SP_LISR); sky2_read32(hw, B0_Y2_SP_LISR);