iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tg3: Use PCI Express Capability accessors

Browse Source 
Use PCI Express Capability access functions to simplify tg3 driver.

[bhelgaas: split bnx2x and tg3 into separate patches]
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Jiang Liu 2012-08-20 13:28:20 -06:00 committed by Bjorn Helgaas
parent 2a80eebcbf
commit 0f49bfbd0f
1 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/net/ethernet/broadcom/tg3.c
View File

@ -3653,17 +3653,9 @@ static int tg3_power_down_prepare(struct tg3 *tp)
tg3_enable_register_access(tp); tg3_enable_register_access(tp);
/* Restore the CLKREQ setting. */ /* Restore the CLKREQ setting. */
if (tg3_flag(tp, CLKREQ_BUG)) { if (tg3_flag(tp, CLKREQ_BUG))
u16 lnkctl; pcie_capability_set_word(tp->pdev, PCI_EXP_LNKCTL,
PCI_EXP_LNKCTL_CLKREQ_EN);
pci_read_config_word(tp->pdev,
pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,
&lnkctl);
lnkctl |= PCI_EXP_LNKCTL_CLKREQ_EN;
pci_write_config_word(tp->pdev,
pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,
lnkctl);
}
misc_host_ctrl = tr32(TG3PCI_MISC_HOST_CTRL); misc_host_ctrl = tr32(TG3PCI_MISC_HOST_CTRL);
tw32(TG3PCI_MISC_HOST_CTRL, tw32(TG3PCI_MISC_HOST_CTRL,
@ -4434,20 +4426,13 @@ relink:
/* Prevent send BD corruption. */ /* Prevent send BD corruption. */
if (tg3_flag(tp, CLKREQ_BUG)) { if (tg3_flag(tp, CLKREQ_BUG)) {
u16 oldlnkctl, newlnkctl;
pci_read_config_word(tp->pdev,
pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,
&oldlnkctl);
if (tp->link_config.active_speed == SPEED_100 || if (tp->link_config.active_speed == SPEED_100 ||
tp->link_config.active_speed == SPEED_10) tp->link_config.active_speed == SPEED_10)
newlnkctl = oldlnkctl & ~PCI_EXP_LNKCTL_CLKREQ_EN; pcie_capability_clear_word(tp->pdev, PCI_EXP_LNKCTL,
PCI_EXP_LNKCTL_CLKREQ_EN);
else else
newlnkctl = oldlnkctl | PCI_EXP_LNKCTL_CLKREQ_EN; pcie_capability_set_word(tp->pdev, PCI_EXP_LNKCTL,
if (newlnkctl != oldlnkctl) PCI_EXP_LNKCTL_CLKREQ_EN);
pci_write_config_word(tp->pdev,
pci_pcie_cap(tp->pdev) +
PCI_EXP_LNKCTL, newlnkctl);
} }
if (current_link_up != netif_carrier_ok(tp->dev)) { if (current_link_up != netif_carrier_ok(tp->dev)) {
@ -8054,7 +8039,7 @@ static int tg3_chip_reset(struct tg3 *tp)
udelay(120); udelay(120);
if (tg3_flag(tp, PCI_EXPRESS) && pci_pcie_cap(tp->pdev)) { if (tg3_flag(tp, PCI_EXPRESS) && pci_is_pcie(tp->pdev)) {
u16 val16; u16 val16;
if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A0) { if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A0) {
@ -8071,24 +8056,17 @@ static int tg3_chip_reset(struct tg3 *tp)
} }
/* Clear the "no snoop" and "relaxed ordering" bits. */ /* Clear the "no snoop" and "relaxed ordering" bits. */
pci_read_config_word(tp->pdev, val16 = PCI_EXP_DEVCTL_RELAX_EN | PCI_EXP_DEVCTL_NOSNOOP_EN;
pci_pcie_cap(tp->pdev) + PCI_EXP_DEVCTL,
&val16);
val16 &= ~(PCI_EXP_DEVCTL_RELAX_EN |
PCI_EXP_DEVCTL_NOSNOOP_EN);
/* /*
* Older PCIe devices only support the 128 byte * Older PCIe devices only support the 128 byte
* MPS setting. Enforce the restriction. * MPS setting. Enforce the restriction.
*/ */
if (!tg3_flag(tp, CPMU_PRESENT)) if (!tg3_flag(tp, CPMU_PRESENT))
val16 &= ~PCI_EXP_DEVCTL_PAYLOAD; val16 |= PCI_EXP_DEVCTL_PAYLOAD;
pci_write_config_word(tp->pdev, pcie_capability_clear_word(tp->pdev, PCI_EXP_DEVCTL, val16);
pci_pcie_cap(tp->pdev) + PCI_EXP_DEVCTL,
val16);
/* Clear error status */ /* Clear error status */
pci_write_config_word(tp->pdev, pcie_capability_write_word(tp->pdev, PCI_EXP_DEVSTA,
pci_pcie_cap(tp->pdev) + PCI_EXP_DEVSTA,
PCI_EXP_DEVSTA_CED | PCI_EXP_DEVSTA_CED |
PCI_EXP_DEVSTA_NFED | PCI_EXP_DEVSTA_NFED |
PCI_EXP_DEVSTA_FED | PCI_EXP_DEVSTA_FED |
@ -14565,9 +14543,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
tg3_flag_set(tp, PCI_EXPRESS); tg3_flag_set(tp, PCI_EXPRESS);
pci_read_config_word(tp->pdev, pcie_capability_read_word(tp->pdev, PCI_EXP_LNKCTL, &lnkctl);
pci_pcie_cap(tp->pdev) + PCI_EXP_LNKCTL,
&lnkctl);
if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) { if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) {
if (GET_ASIC_REV(tp->pci_chip_rev_id) == if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
ASIC_REV_5906) { ASIC_REV_5906) {