myri10ge: use pcie_get/set_readrq
Based on a patch from Peter Oruba, convert myri10ge to use pcie_get_readrq() and pcie_set_readrq() instead of our own PCI calls and arithmetics. These driver changes incorporate the proposed PCI-X / PCI-Express read byte count interface. Reading and setting those values doesn't take place "manually", instead wrapping functions are called to allow quirks for some PCI bridges. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off by: Peter Oruba <peter.oruba@amd.com> Based on work by Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
28721c890c
commit
302d242cfb
|
@ -2514,26 +2514,20 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
|
|||
{
|
||||
struct pci_dev *pdev = mgp->pdev;
|
||||
struct device *dev = &pdev->dev;
|
||||
int cap, status;
|
||||
u16 val;
|
||||
int status;
|
||||
|
||||
mgp->tx.boundary = 4096;
|
||||
/*
|
||||
* Verify the max read request size was set to 4KB
|
||||
* before trying the test with 4KB.
|
||||
*/
|
||||
cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
|
||||
if (cap < 64) {
|
||||
dev_err(dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
|
||||
goto abort;
|
||||
}
|
||||
status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
|
||||
if (status != 0) {
|
||||
status = pcie_get_readrq(pdev);
|
||||
if (status < 0) {
|
||||
dev_err(dev, "Couldn't read max read req size: %d\n", status);
|
||||
goto abort;
|
||||
}
|
||||
if ((val & (5 << 12)) != (5 << 12)) {
|
||||
dev_warn(dev, "Max Read Request size != 4096 (0x%x)\n", val);
|
||||
if (status != 4096) {
|
||||
dev_warn(dev, "Max Read Request size != 4096 (%d)\n", status);
|
||||
mgp->tx.boundary = 2048;
|
||||
}
|
||||
/*
|
||||
|
@ -2850,9 +2844,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
size_t bytes;
|
||||
int i;
|
||||
int status = -ENXIO;
|
||||
int cap;
|
||||
int dac_enabled;
|
||||
u16 val;
|
||||
|
||||
netdev = alloc_etherdev(sizeof(*mgp));
|
||||
if (netdev == NULL) {
|
||||
|
@ -2884,19 +2876,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
= pci_find_capability(pdev, PCI_CAP_ID_VNDR);
|
||||
|
||||
/* Set our max read request to 4KB */
|
||||
cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
|
||||
if (cap < 64) {
|
||||
dev_err(&pdev->dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);
|
||||
goto abort_with_netdev;
|
||||
}
|
||||
status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &val);
|
||||
if (status != 0) {
|
||||
dev_err(&pdev->dev, "Error %d reading PCI_EXP_DEVCTL\n",
|
||||
status);
|
||||
goto abort_with_netdev;
|
||||
}
|
||||
val = (val & ~PCI_EXP_DEVCTL_READRQ) | (5 << 12);
|
||||
status = pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, val);
|
||||
status = pcie_set_readrq(pdev, 4096);
|
||||
if (status != 0) {
|
||||
dev_err(&pdev->dev, "Error %d writing PCI_EXP_DEVCTL\n",
|
||||
status);
|
||||
|
|
Loading…
Reference in New Issue