Commit f3a880cc authored by David S. Miller's avatar David S. Miller

[TG3]: More 5750 chip reset tweaks.

parent f6deceab
...@@ -3676,9 +3676,24 @@ static int tg3_chip_reset(struct tg3 *tp) ...@@ -3676,9 +3676,24 @@ static int tg3_chip_reset(struct tg3 *tp)
*/ */
pci_read_config_dword(tp->pdev, PCI_COMMAND, &val); pci_read_config_dword(tp->pdev, PCI_COMMAND, &val);
udelay(40); udelay(120);
udelay(40);
udelay(40); if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A0) {
int i;
u32 cfg_val;
/* Wait for link training to complete. */
for (i = 0; i < 5000; i++)
udelay(100);
pci_read_config_dword(tp->pdev, 0xc4, &cfg_val);
pci_write_config_dword(tp->pdev, 0xc4,
cfg_val | (1 << 15));
}
/* Set PCIE max payload size and clear error status. */
pci_write_config_dword(tp->pdev, 0xd8, 0xf5000);
}
/* Re-enable indirect register accesses. */ /* Re-enable indirect register accesses. */
pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL, pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
...@@ -3702,6 +3717,12 @@ static int tg3_chip_reset(struct tg3 *tp) ...@@ -3702,6 +3717,12 @@ static int tg3_chip_reset(struct tg3 *tp)
tw32(GRC_MODE, tp->grc_mode); tw32(GRC_MODE, tp->grc_mode);
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
u32 val = tr32(0xc4);
tw32(0xc4, val | (1 << 15));
}
if ((tp->nic_sram_data_cfg & NIC_SRAM_DATA_CFG_MINI_PCI) != 0 && if ((tp->nic_sram_data_cfg & NIC_SRAM_DATA_CFG_MINI_PCI) != 0 &&
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) { GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
tp->pci_clock_ctrl |= CLOCK_CTRL_CLKRUN_OENABLE; tp->pci_clock_ctrl |= CLOCK_CTRL_CLKRUN_OENABLE;
...@@ -3732,6 +3753,13 @@ static int tg3_chip_reset(struct tg3 *tp) ...@@ -3732,6 +3753,13 @@ static int tg3_chip_reset(struct tg3 *tp)
return -ENODEV; return -ENODEV;
} }
if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
tp->pci_chip_rev_id != CHIPREV_ID_5750_A0) {
u32 val = tr32(0x7c00);
tw32(0x7c00, val | (1 << 25));
}
/* Reprobe ASF enable state. */ /* Reprobe ASF enable state. */
tp->tg3_flags &= ~TG3_FLAG_ENABLE_ASF; tp->tg3_flags &= ~TG3_FLAG_ENABLE_ASF;
tp->tg3_flags2 &= ~TG3_FLG2_ASF_NEW_HANDSHAKE; tp->tg3_flags2 &= ~TG3_FLG2_ASF_NEW_HANDSHAKE;
......
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