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

bnx2x: Use PCI Express Capability accessors

Browse Source 
Use PCI Express Capability access functions to simplify bnx2x 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:26:51 -06:00 committed by Bjorn Helgaas
parent 8200bc72a8
commit 2a80eebcbf
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -1162,14 +1162,9 @@ static int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func,
static u8 bnx2x_is_pcie_pending(struct pci_dev *dev) static u8 bnx2x_is_pcie_pending(struct pci_dev *dev)
{ {
int pos;
u16 status; u16 status;
pos = pci_pcie_cap(dev); pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &status);
if (!pos)
return false;
pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &status);
return status & PCI_EXP_DEVSTA_TRPND; return status & PCI_EXP_DEVSTA_TRPND;
} }
@ -6149,8 +6144,7 @@ static void bnx2x_init_pxp(struct bnx2x *bp)
u16 devctl; u16 devctl;
int r_order, w_order; int r_order, w_order;
pci_read_config_word(bp->pdev, pcie_capability_read_word(bp->pdev, PCI_EXP_DEVCTL, &devctl);
pci_pcie_cap(bp->pdev) + PCI_EXP_DEVCTL, &devctl);
DP(NETIF_MSG_HW, "read 0x%x from devctl\n", devctl); DP(NETIF_MSG_HW, "read 0x%x from devctl\n", devctl);
w_order = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5); w_order = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5);
if (bp->mrrs == -1) if (bp->mrrs == -1)
@ -9386,15 +9380,10 @@ static int __devinit bnx2x_prev_mark_path(struct bnx2x *bp)
static bool __devinit bnx2x_can_flr(struct bnx2x *bp) static bool __devinit bnx2x_can_flr(struct bnx2x *bp)
{ {
int pos;
u32 cap; u32 cap;
struct pci_dev *dev = bp->pdev; struct pci_dev *dev = bp->pdev;
pos = pci_pcie_cap(dev); pcie_capability_read_dword(dev, PCI_EXP_DEVCAP, &cap);
if (!pos)
return false;
pci_read_config_dword(dev, pos + PCI_EXP_DEVCAP, &cap);
if (!(cap & PCI_EXP_DEVCAP_FLR)) if (!(cap & PCI_EXP_DEVCAP_FLR))
return false; return false;
@ -9403,7 +9392,7 @@ static bool __devinit bnx2x_can_flr(struct bnx2x *bp)
static int __devinit bnx2x_do_flr(struct bnx2x *bp) static int __devinit bnx2x_do_flr(struct bnx2x *bp)
{ {
int i, pos; int i;
u16 status; u16 status;
struct pci_dev *dev = bp->pdev; struct pci_dev *dev = bp->pdev;
@ -9411,16 +9400,12 @@ static int __devinit bnx2x_do_flr(struct bnx2x *bp)
if (bnx2x_can_flr(bp)) if (bnx2x_can_flr(bp))
return -ENOTTY; return -ENOTTY;
pos = pci_pcie_cap(dev);
if (!pos)
return -ENOTTY;
/* Wait for Transaction Pending bit clean */ /* Wait for Transaction Pending bit clean */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (i) if (i)
msleep((1 << (i - 1)) * 100); msleep((1 << (i - 1)) * 100);
pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &status); pcie_capability_read_word(dev, PCI_EXP_DEVSTA, &status);
if (!(status & PCI_EXP_DEVSTA_TRPND)) if (!(status & PCI_EXP_DEVSTA_TRPND))
goto clear; goto clear;
} }