Skip to content

Commit

Permalink
tg3: Qualify use of tp->pcix_cap
Browse files Browse the repository at this point in the history 
This patch makes sure the device is a PCIX device before attempting to
use the pcix_cap device structure member.  This is prep work for the
following patch.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Matt Carlson authored and David S. Miller committed Nov 22, 2008
1 parent ad82926 commit 52f4490
Showing 1 changed file with 24 additions and 26 deletions.
50 changes: 24 additions & 26 deletions drivers/net/tg3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5876,7 +5876,7 @@ static void tg3_restore_pci_state(struct tg3 *tp)
}

/* Make sure PCI-X relaxed ordering bit is clear. */
if (tp->pcix_cap) {
if (tp->tg3_flags & TG3_FLAG_PCIX_MODE) {
u16 pcix_cmd;

pci_read_config_word(tp->pdev, tp->pcix_cap + PCI_X_CMD,
Expand Down Expand Up @@ -12190,6 +12190,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
(tp->tg3_flags2 & TG3_FLG2_5780_CLASS))
tp->tg3_flags2 |= TG3_FLG2_JUMBO_CAPABLE;

pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
&pci_state_reg);

pcie_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_EXP);
if (pcie_cap != 0) {
tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;
Expand All @@ -12205,8 +12208,20 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN)
tp->tg3_flags2 &= ~TG3_FLG2_HW_TSO_2;
}
} else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785)
} else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5785) {
tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;
} else if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
tp->pcix_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_PCIX);
if (!tp->pcix_cap) {
printk(KERN_ERR PFX "Cannot find PCI-X "
"capability, aborting.\n");
return -EIO;
}

if (!(pci_state_reg & PCISTATE_CONV_PCI_MODE))
tp->tg3_flags |= TG3_FLAG_PCIX_MODE;
}

/* If we have an AMD 762 or VIA K8T800 chipset, write
* reordering to the mailbox registers done by the host
Expand All @@ -12231,29 +12246,18 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
cacheline_sz_reg);
}

if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
tp->pcix_cap = pci_find_capability(tp->pdev, PCI_CAP_ID_PCIX);
if (!tp->pcix_cap) {
printk(KERN_ERR PFX "Cannot find PCI-X "
"capability, aborting.\n");
return -EIO;
}
}

pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
&pci_state_reg);

if (tp->pcix_cap && (pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0) {
tp->tg3_flags |= TG3_FLAG_PCIX_MODE;
if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX) {
/* 5700 BX chips need to have their TX producer index
* mailboxes written twice to workaround a bug.
*/
tp->tg3_flags |= TG3_FLAG_TXD_MBOX_HWBUG;

/* If this is a 5700 BX chipset, and we are in PCI-X
* mode, enable register write workaround.
/* If we are in PCI-X mode, enable register write workaround.
*
* The workaround is to use indirect register accesses
* for all chip writes not to mailbox registers.
*/
if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX) {
if (tp->tg3_flags & TG3_FLAG_PCIX_MODE) {
u32 pm_reg;

tp->tg3_flags |= TG3_FLAG_PCIX_TARGET_HWBUG;
Expand All @@ -12278,12 +12282,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
}
}

/* 5700 BX chips need to have their TX producer index mailboxes
* written twice to workaround a bug.
*/
if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX)
tp->tg3_flags |= TG3_FLAG_TXD_MBOX_HWBUG;

if ((pci_state_reg & PCISTATE_BUS_SPEED_HIGH) != 0)
tp->tg3_flags |= TG3_FLAG_PCI_HIGH_SPEED;
if ((pci_state_reg & PCISTATE_BUS_32BIT) != 0)
Expand Down

0 comments on commit 52f4490

Please sign in to comment.