提交 effd1eda 编写于 作者: J Jon Mason 提交者: David S. Miller

myri10ge: remove unnecessary read of PCI_CAP_ID_EXP

The PCIE capability offset is saved during PCI bus walking.  It will
remove an unnecessary search in the PCI configuration space if this
value is referenced instead of reacquiring it.
Signed-off-by: NJon Mason <mason@myri.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 5dcd8467
...@@ -1081,7 +1081,7 @@ static int myri10ge_toggle_relaxed(struct pci_dev *pdev, int on) ...@@ -1081,7 +1081,7 @@ static int myri10ge_toggle_relaxed(struct pci_dev *pdev, int on)
int ret, cap, err; int ret, cap, err;
u16 ctl; u16 ctl;
cap = pci_find_capability(pdev, PCI_CAP_ID_EXP); cap = pci_pcie_cap(pdev);
if (!cap) if (!cap)
return 0; return 0;
...@@ -3191,7 +3191,7 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp) ...@@ -3191,7 +3191,7 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
{ {
struct pci_dev *bridge = mgp->pdev->bus->self; struct pci_dev *bridge = mgp->pdev->bus->self;
struct device *dev = &mgp->pdev->dev; struct device *dev = &mgp->pdev->dev;
unsigned cap; int cap;
unsigned err_cap; unsigned err_cap;
u16 val; u16 val;
u8 ext_type; u8 ext_type;
...@@ -3201,7 +3201,7 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp) ...@@ -3201,7 +3201,7 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
return; return;
/* check that the bridge is a root port */ /* check that the bridge is a root port */
cap = pci_find_capability(bridge, PCI_CAP_ID_EXP); cap = pci_pcie_cap(bridge);
pci_read_config_word(bridge, cap + PCI_CAP_FLAGS, &val); pci_read_config_word(bridge, cap + PCI_CAP_FLAGS, &val);
ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4; ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4;
if (ext_type != PCI_EXP_TYPE_ROOT_PORT) { if (ext_type != PCI_EXP_TYPE_ROOT_PORT) {
...@@ -3219,8 +3219,7 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp) ...@@ -3219,8 +3219,7 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
" to force ECRC\n"); " to force ECRC\n");
return; return;
} }
cap = cap = pci_pcie_cap(bridge);
pci_find_capability(bridge, PCI_CAP_ID_EXP);
pci_read_config_word(bridge, pci_read_config_word(bridge,
cap + PCI_CAP_FLAGS, &val); cap + PCI_CAP_FLAGS, &val);
ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4; ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4;
...@@ -3341,7 +3340,7 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp) ...@@ -3341,7 +3340,7 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
int link_width, exp_cap; int link_width, exp_cap;
u16 lnk; u16 lnk;
exp_cap = pci_find_capability(mgp->pdev, PCI_CAP_ID_EXP); exp_cap = pci_pcie_cap(mgp->pdev);
pci_read_config_word(mgp->pdev, exp_cap + PCI_EXP_LNKSTA, &lnk); pci_read_config_word(mgp->pdev, exp_cap + PCI_EXP_LNKSTA, &lnk);
link_width = (lnk >> 4) & 0x3f; link_width = (lnk >> 4) & 0x3f;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册