lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[BNX2]: Add 5709 reset and runtime code.

Browse Source 
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan
2006-11-19 14:11:41 -08:00
committed by David S. Miller
parent 59b47d8ad3
commit 234754d5c1
1 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/net/bnx2.c
View File

@@ -3247,31 +3247,44 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
* before we issue a reset. */ * before we issue a reset. */
val = REG_RD(bp, BNX2_MISC_ID); val = REG_RD(bp, BNX2_MISC_ID);
val = BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ | if (CHIP_NUM(bp) == CHIP_NUM_5709) {
BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA | REG_WR(bp, BNX2_MISC_COMMAND, BNX2_MISC_COMMAND_SW_RESET);
BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP; REG_RD(bp, BNX2_MISC_COMMAND);
udelay(5);
/* Chip reset. */ val = BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |
REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val); BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP;
if ((CHIP_ID(bp) == CHIP_ID_5706_A0) || pci_write_config_dword(bp->pdev, BNX2_PCICFG_MISC_CONFIG, val);
(CHIP_ID(bp) == CHIP_ID_5706_A1))
msleep(15);
/* Reset takes approximate 30 usec */ } else {
for (i = 0; i < 10; i++) { val = BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
val = REG_RD(bp, BNX2_PCICFG_MISC_CONFIG); BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |
if ((val & (BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ | BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP;
BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY)) == 0) {
break; /* Chip reset. */
REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
(CHIP_ID(bp) == CHIP_ID_5706_A1)) {
current->state = TASK_UNINTERRUPTIBLE;
schedule_timeout(HZ / 50);
} }
udelay(10);
}
if (val & (BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ | /* Reset takes approximate 30 usec */
BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY)) { for (i = 0; i < 10; i++) {
printk(KERN_ERR PFX "Chip reset did not complete\n"); val = REG_RD(bp, BNX2_PCICFG_MISC_CONFIG);
return -EBUSY; if ((val & (BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY)) == 0)
break;
udelay(10);
}
if (val & (BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY)) {
printk(KERN_ERR PFX "Chip reset did not complete\n");
return -EBUSY;
}
} }
/* Make sure byte swapping is properly configured. */ /* Make sure byte swapping is properly configured. */
@@ -3976,8 +3989,8 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
bp->tx_prod = NEXT_TX_BD(bp->tx_prod); bp->tx_prod = NEXT_TX_BD(bp->tx_prod);
bp->tx_prod_bseq += pkt_size; bp->tx_prod_bseq += pkt_size;
REG_WR16(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BIDX, bp->tx_prod); REG_WR16(bp, bp->tx_bidx_addr, bp->tx_prod);
REG_WR(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BSEQ, bp->tx_prod_bseq); REG_WR(bp, bp->tx_bseq_addr, bp->tx_prod_bseq);
udelay(100); udelay(100);
@@ -4529,8 +4542,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
prod = NEXT_TX_BD(prod); prod = NEXT_TX_BD(prod);
bp->tx_prod_bseq += skb->len; bp->tx_prod_bseq += skb->len;
REG_WR16(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BIDX, prod); REG_WR16(bp, bp->tx_bidx_addr, prod);
REG_WR(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BSEQ, bp->tx_prod_bseq); REG_WR(bp, bp->tx_bseq_addr, bp->tx_prod_bseq);
mmiowb(); mmiowb();