Skip to content

L
linux-davinci
Commit f77a6a8e authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files
Options

tg3: Add tx and rx ring resource tracking 

This patch adds code to assign status block, tx producer ring and rx
return ring resources needed for the other interrupt vectors.
Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 646c9edd
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 85 deletions
drivers/net/tg3.c
View file @ f77a6a8e
...@@ -5722,28 +5722,31 @@ err_out: ...@@ -5722,28 +5722,31 @@ err_out:
*/ */
static void tg3_free_rings(struct tg3 *tp) static void tg3_free_rings(struct tg3 *tp)
{ {
struct tg3_napi *tnapi = &tp->napi[0]; int i, j;
int i;
for (i = 0; i < TG3_TX_RING_SIZE; ) { for (j = 0; j < tp->irq_cnt; j++) {
struct tx_ring_info *txp; struct tg3_napi *tnapi = &tp->napi[j];
struct sk_buff *skb;
txp = &tnapi->tx_buffers[i]; for (i = 0; i < TG3_TX_RING_SIZE; ) {
skb = txp->skb; struct tx_ring_info *txp;
struct sk_buff *skb;
if (skb == NULL) { txp = &tnapi->tx_buffers[i];
i++; skb = txp->skb;
continue;
}
skb_dma_unmap(&tp->pdev->dev, skb, DMA_TO_DEVICE); if (skb == NULL) {
i++;
continue;
}
txp->skb = NULL; skb_dma_unmap(&tp->pdev->dev, skb, DMA_TO_DEVICE);
i += skb_shinfo(skb)->nr_frags + 1; txp->skb = NULL;
dev_kfree_skb_any(skb); i += skb_shinfo(skb)->nr_frags + 1;
dev_kfree_skb_any(skb);
}
} }
tg3_rx_prodring_free(tp, &tp->prodring[0]); tg3_rx_prodring_free(tp, &tp->prodring[0]);
...@@ -5758,16 +5761,27 @@ static void tg3_free_rings(struct tg3 *tp) ...@@ -5758,16 +5761,27 @@ static void tg3_free_rings(struct tg3 *tp)
*/ */
static int tg3_init_rings(struct tg3 *tp) static int tg3_init_rings(struct tg3 *tp)
{ {
struct tg3_napi *tnapi = &tp->napi[0]; int i;
/* Free up all the SKBs. */ /* Free up all the SKBs. */
tg3_free_rings(tp); tg3_free_rings(tp);
/* Zero out all descriptors. */ for (i = 0; i < tp->irq_cnt; i++) {
memset(tnapi->tx_ring, 0, TG3_TX_RING_BYTES); struct tg3_napi *tnapi = &tp->napi[i];
tnapi->rx_rcb_ptr = 0; tnapi->last_tag = 0;
memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp)); tnapi->last_irq_tag = 0;
tnapi->hw_status->status = 0;
tnapi->hw_status->status_tag = 0;
memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE);
tnapi->tx_prod = 0;
tnapi->tx_cons = 0;
memset(tnapi->tx_ring, 0, TG3_TX_RING_BYTES);
tnapi->rx_rcb_ptr = 0;
memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
}
return tg3_rx_prodring_alloc(tp, &tp->prodring[0]); return tg3_rx_prodring_alloc(tp, &tp->prodring[0]);
} }
...@@ -5778,31 +5792,41 @@ static int tg3_init_rings(struct tg3 *tp) ...@@ -5778,31 +5792,41 @@ static int tg3_init_rings(struct tg3 *tp)
*/ */
static void tg3_free_consistent(struct tg3 *tp) static void tg3_free_consistent(struct tg3 *tp)
{ {
struct tg3_napi *tnapi = &tp->napi[0]; int i;
kfree(tnapi->tx_buffers); for (i = 0; i < tp->irq_cnt; i++) {
tnapi->tx_buffers = NULL; struct tg3_napi *tnapi = &tp->napi[i];
if (tnapi->tx_ring) {
pci_free_consistent(tp->pdev, TG3_TX_RING_BYTES, if (tnapi->tx_ring) {
tnapi->tx_ring, tnapi->tx_desc_mapping); pci_free_consistent(tp->pdev, TG3_TX_RING_BYTES,
tnapi->tx_ring = NULL; tnapi->tx_ring, tnapi->tx_desc_mapping);
} tnapi->tx_ring = NULL;
if (tnapi->rx_rcb) { }
pci_free_consistent(tp->pdev, TG3_RX_RCB_RING_BYTES(tp),
tnapi->rx_rcb, tnapi->rx_rcb_mapping); kfree(tnapi->tx_buffers);
tnapi->rx_rcb = NULL; tnapi->tx_buffers = NULL;
}
if (tnapi->hw_status) { if (tnapi->rx_rcb) {
pci_free_consistent(tp->pdev, TG3_HW_STATUS_SIZE, pci_free_consistent(tp->pdev, TG3_RX_RCB_RING_BYTES(tp),
tnapi->hw_status, tnapi->rx_rcb,
tnapi->status_mapping); tnapi->rx_rcb_mapping);
tnapi->hw_status = NULL; tnapi->rx_rcb = NULL;
}
if (tnapi->hw_status) {
pci_free_consistent(tp->pdev, TG3_HW_STATUS_SIZE,
tnapi->hw_status,
tnapi->status_mapping);
tnapi->hw_status = NULL;
}
} }
if (tp->hw_stats) { if (tp->hw_stats) {
pci_free_consistent(tp->pdev, sizeof(struct tg3_hw_stats), pci_free_consistent(tp->pdev, sizeof(struct tg3_hw_stats),
tp->hw_stats, tp->stats_mapping); tp->hw_stats, tp->stats_mapping);
tp->hw_stats = NULL; tp->hw_stats = NULL;
} }
tg3_rx_prodring_fini(tp, &tp->prodring[0]); tg3_rx_prodring_fini(tp, &tp->prodring[0]);
} }
...@@ -5812,44 +5836,49 @@ static void tg3_free_consistent(struct tg3 *tp) ...@@ -5812,44 +5836,49 @@ static void tg3_free_consistent(struct tg3 *tp)
*/ */
static int tg3_alloc_consistent(struct tg3 *tp) static int tg3_alloc_consistent(struct tg3 *tp)
{ {
struct tg3_napi *tnapi = &tp->napi[0]; int i;
if (tg3_rx_prodring_init(tp, &tp->prodring[0])) if (tg3_rx_prodring_init(tp, &tp->prodring[0]))
return -ENOMEM; return -ENOMEM;
tnapi->tx_buffers = kzalloc(sizeof(struct tx_ring_info) * tp->hw_stats = pci_alloc_consistent(tp->pdev,
TG3_TX_RING_SIZE, GFP_KERNEL); sizeof(struct tg3_hw_stats),
if (!tnapi->tx_buffers) &tp->stats_mapping);
if (!tp->hw_stats)
goto err_out; goto err_out;
tnapi->tx_ring = pci_alloc_consistent(tp->pdev, TG3_TX_RING_BYTES, memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
&tnapi->tx_desc_mapping);
if (!tnapi->tx_ring)
goto err_out;
tnapi->hw_status = pci_alloc_consistent(tp->pdev, for (i = 0; i < tp->irq_cnt; i++) {
TG3_HW_STATUS_SIZE, struct tg3_napi *tnapi = &tp->napi[i];
&tnapi->status_mapping);
if (!tnapi->hw_status)
goto err_out;
memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE); tnapi->hw_status = pci_alloc_consistent(tp->pdev,
TG3_HW_STATUS_SIZE,
&tnapi->status_mapping);
if (!tnapi->hw_status)
goto err_out;
tnapi->rx_rcb = pci_alloc_consistent(tp->pdev, memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE);
TG3_RX_RCB_RING_BYTES(tp),
&tnapi->rx_rcb_mapping);
if (!tnapi->rx_rcb)
goto err_out;
memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp)); tnapi->rx_rcb = pci_alloc_consistent(tp->pdev,
TG3_RX_RCB_RING_BYTES(tp),
&tnapi->rx_rcb_mapping);
if (!tnapi->rx_rcb)
goto err_out;
tp->hw_stats = pci_alloc_consistent(tp->pdev, memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
sizeof(struct tg3_hw_stats),
&tp->stats_mapping);
if (!tp->hw_stats)
goto err_out;
memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats)); tnapi->tx_buffers = kzalloc(sizeof(struct tx_ring_info) *
TG3_TX_RING_SIZE, GFP_KERNEL);
if (!tnapi->tx_buffers)
goto err_out;
tnapi->tx_ring = pci_alloc_consistent(tp->pdev,
TG3_TX_RING_BYTES,
&tnapi->tx_desc_mapping);
if (!tnapi->tx_ring)
goto err_out;
}
return 0; return 0;
...@@ -5910,7 +5939,6 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int ...@@ -5910,7 +5939,6 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int
static int tg3_abort_hw(struct tg3 *tp, int silent) static int tg3_abort_hw(struct tg3 *tp, int silent)
{ {
int i, err; int i, err;
struct tg3_napi *tnapi = &tp->napi[0];
tg3_disable_ints(tp); tg3_disable_ints(tp);
...@@ -5962,8 +5990,11 @@ static int tg3_abort_hw(struct tg3 *tp, int silent) ...@@ -5962,8 +5990,11 @@ static int tg3_abort_hw(struct tg3 *tp, int silent)
err |= tg3_stop_block(tp, BUFMGR_MODE, BUFMGR_MODE_ENABLE, silent); err |= tg3_stop_block(tp, BUFMGR_MODE, BUFMGR_MODE_ENABLE, silent);
err |= tg3_stop_block(tp, MEMARB_MODE, MEMARB_MODE_ENABLE, silent); err |= tg3_stop_block(tp, MEMARB_MODE, MEMARB_MODE_ENABLE, silent);
if (tnapi->hw_status) for (i = 0; i < tp->irq_cnt; i++) {
memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE); struct tg3_napi *tnapi = &tp->napi[i];
if (tnapi->hw_status)
memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE);
}
if (tp->hw_stats) if (tp->hw_stats)
memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats)); memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
...@@ -6290,12 +6321,15 @@ static int tg3_chip_reset(struct tg3 *tp) ...@@ -6290,12 +6321,15 @@ static int tg3_chip_reset(struct tg3 *tp)
* sharing or irqpoll. * sharing or irqpoll.
*/ */
tp->tg3_flags |= TG3_FLAG_CHIP_RESETTING; tp->tg3_flags |= TG3_FLAG_CHIP_RESETTING;
if (tp->napi[0].hw_status) { for (i = 0; i < tp->irq_cnt; i++) {
tp->napi[0].hw_status->status = 0; struct tg3_napi *tnapi = &tp->napi[i];
tp->napi[0].hw_status->status_tag = 0; if (tnapi->hw_status) {
tnapi->hw_status->status = 0;
tnapi->hw_status->status_tag = 0;
}
tnapi->last_tag = 0;
tnapi->last_irq_tag = 0;
} }
tp->napi[0].last_tag = 0;
tp->napi[0].last_irq_tag = 0;
smp_mb(); smp_mb();
for (i = 0; i < tp->irq_cnt; i++) for (i = 0; i < tp->irq_cnt; i++)
...@@ -6829,7 +6863,7 @@ static void __tg3_set_coalesce(struct tg3 *tp, struct ethtool_coalesce *ec) ...@@ -6829,7 +6863,7 @@ static void __tg3_set_coalesce(struct tg3 *tp, struct ethtool_coalesce *ec)
static void tg3_rings_reset(struct tg3 *tp) static void tg3_rings_reset(struct tg3 *tp)
{ {
int i; int i;
u32 txrcb, rxrcb, limit; u32 stblk, txrcb, rxrcb, limit;
struct tg3_napi *tnapi = &tp->napi[0]; struct tg3_napi *tnapi = &tp->napi[0];
/* Disable all transmit rings but the first. */ /* Disable all transmit rings but the first. */
...@@ -6861,10 +6895,20 @@ static void tg3_rings_reset(struct tg3 *tp) ...@@ -6861,10 +6895,20 @@ static void tg3_rings_reset(struct tg3 *tp)
tw32_mailbox_f(tp->napi[0].int_mbox, 1); tw32_mailbox_f(tp->napi[0].int_mbox, 1);
/* Zero mailbox registers. */ /* Zero mailbox registers. */
tp->napi[0].tx_prod = 0; if (tp->tg3_flags & TG3_FLAG_SUPPORT_MSIX) {
tp->napi[0].tx_cons = 0; for (i = 1; i < TG3_IRQ_MAX_VECS; i++) {
tw32_mailbox(tp->napi[0].prodmbox, 0); tp->napi[i].tx_prod = 0;
tw32_rx_mbox(tp->napi[0].consmbox, 0); tp->napi[i].tx_cons = 0;
tw32_mailbox(tp->napi[i].prodmbox, 0);
tw32_rx_mbox(tp->napi[i].consmbox, 0);
tw32_mailbox_f(tp->napi[i].int_mbox, 1);
}
} else {
tp->napi[0].tx_prod = 0;
tp->napi[0].tx_cons = 0;
tw32_mailbox(tp->napi[0].prodmbox, 0);
tw32_rx_mbox(tp->napi[0].consmbox, 0);
}
/* Make sure the NIC-based send BD rings are disabled. */ /* Make sure the NIC-based send BD rings are disabled. */
if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) { if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) {
...@@ -6885,14 +6929,44 @@ static void tg3_rings_reset(struct tg3 *tp) ...@@ -6885,14 +6929,44 @@ static void tg3_rings_reset(struct tg3 *tp)
tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW, tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
((u64) tnapi->status_mapping & 0xffffffff)); ((u64) tnapi->status_mapping & 0xffffffff));
tg3_set_bdinfo(tp, txrcb, tnapi->tx_desc_mapping, if (tnapi->tx_ring) {
(TG3_TX_RING_SIZE << tg3_set_bdinfo(tp, txrcb, tnapi->tx_desc_mapping,
BDINFO_FLAGS_MAXLEN_SHIFT), (TG3_TX_RING_SIZE <<
NIC_SRAM_TX_BUFFER_DESC); BDINFO_FLAGS_MAXLEN_SHIFT),
NIC_SRAM_TX_BUFFER_DESC);
txrcb += TG3_BDINFO_SIZE;
}
tg3_set_bdinfo(tp, rxrcb, tnapi->rx_rcb_mapping, if (tnapi->rx_rcb) {
(TG3_RX_RCB_RING_SIZE(tp) << tg3_set_bdinfo(tp, rxrcb, tnapi->rx_rcb_mapping,
BDINFO_FLAGS_MAXLEN_SHIFT), 0); (TG3_RX_RCB_RING_SIZE(tp) <<
BDINFO_FLAGS_MAXLEN_SHIFT), 0);
rxrcb += TG3_BDINFO_SIZE;
}
stblk = HOSTCC_STATBLCK_RING1;
for (i = 1, tnapi++; i < tp->irq_cnt; i++, tnapi++) {
u64 mapping = (u64)tnapi->status_mapping;
tw32(stblk + TG3_64BIT_REG_HIGH, mapping >> 32);
tw32(stblk + TG3_64BIT_REG_LOW, mapping & 0xffffffff);
/* Clear status block in ram. */
memset(tnapi->hw_status, 0, TG3_HW_STATUS_SIZE);
tg3_set_bdinfo(tp, txrcb, tnapi->tx_desc_mapping,
(TG3_TX_RING_SIZE <<
BDINFO_FLAGS_MAXLEN_SHIFT),
NIC_SRAM_TX_BUFFER_DESC);
tg3_set_bdinfo(tp, rxrcb, tnapi->rx_rcb_mapping,
(TG3_RX_RCB_RING_SIZE(tp) <<
BDINFO_FLAGS_MAXLEN_SHIFT), 0);
stblk += 8;
txrcb += TG3_BDINFO_SIZE;
rxrcb += TG3_BDINFO_SIZE;
}
} }
/* tp->lock is held. */ /* tp->lock is held. */
......
drivers/net/tg3.h
View file @ f77a6a8e
...@@ -1117,7 +1117,8 @@ ...@@ -1117,7 +1117,8 @@
#define HOSTCC_SND_CON_IDX_13 0x00003cf4 #define HOSTCC_SND_CON_IDX_13 0x00003cf4
#define HOSTCC_SND_CON_IDX_14 0x00003cf8 #define HOSTCC_SND_CON_IDX_14 0x00003cf8
#define HOSTCC_SND_CON_IDX_15 0x00003cfc #define HOSTCC_SND_CON_IDX_15 0x00003cfc
/* 0x3d00 --> 0x4000 unused */ #define HOSTCC_STATBLCK_RING1 0x00003d00
/* 0x3d04 --> 0x4000 unused */
/* Memory arbiter control registers */ /* Memory arbiter control registers */
#define MEMARB_MODE 0x00004000 #define MEMARB_MODE 0x00004000
......
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