diff options
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index f0b5dc7766bb..a4d0d61d6af0 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -7952,6 +7952,12 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
7952 | tp->pci_chip_rev_id = (misc_ctrl_reg >> | 7952 | tp->pci_chip_rev_id = (misc_ctrl_reg >> |
7953 | MISC_HOST_CTRL_CHIPREV_SHIFT); | 7953 | MISC_HOST_CTRL_CHIPREV_SHIFT); |
7954 | 7954 | ||
7955 | /* Wrong chip ID in 5752 A0. This code can be removed later | ||
7956 | * as A0 is not in production. | ||
7957 | */ | ||
7958 | if (tp->pci_chip_rev_id == CHIPREV_ID_5752_A0_HW) | ||
7959 | tp->pci_chip_rev_id = CHIPREV_ID_5752_A0; | ||
7960 | |||
7955 | /* Initialize misc host control in PCI block. */ | 7961 | /* Initialize misc host control in PCI block. */ |
7956 | tp->misc_host_ctrl |= (misc_ctrl_reg & | 7962 | tp->misc_host_ctrl |= (misc_ctrl_reg & |
7957 | MISC_HOST_CTRL_CHIPREV); | 7963 | MISC_HOST_CTRL_CHIPREV); |
@@ -7967,8 +7973,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
7967 | tp->pci_bist = (cacheline_sz_reg >> 24) & 0xff; | 7973 | tp->pci_bist = (cacheline_sz_reg >> 24) & 0xff; |
7968 | 7974 | ||
7969 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 || | 7975 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 || |
7970 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752_A0 || | 7976 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752) |
7971 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752_A1) | ||
7972 | tp->tg3_flags2 |= TG3_FLG2_5750_PLUS; | 7977 | tp->tg3_flags2 |= TG3_FLG2_5750_PLUS; |
7973 | 7978 | ||
7974 | if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) || | 7979 | if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) || |