rapidio/tsi721: fix hardcoded MRRS setting
authorAlexandre Bounine <alexandre.bounine@idt.com>
Tue, 22 Mar 2016 21:25:48 +0000 (14:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Mar 2016 22:36:02 +0000 (15:36 -0700)
Remove use of hardcoded setting for Maximum Read Request Size (MRRS)
value and use one set by PCIe bus driver.

Using hardcoded value can cause PCIe bus errors on platforms that have
tsi721 device on PCIe path that allows only smaller read request sizes.

This fix is applicable to kernel versions starting from v3.2.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rapidio/devices/tsi721.c

index eeca70ddbf61e1cd8c7331d54c51c842ddc784fd..f57ee9d699109ad99996059723b9c65c6c6e9358 100644 (file)
@@ -2426,11 +2426,9 @@ static int tsi721_probe(struct pci_dev *pdev,
 
        BUG_ON(!pci_is_pcie(pdev));
 
-       /* Clear "no snoop" and "relaxed ordering" bits, use default MRRS. */
+       /* Clear "no snoop" and "relaxed ordering" bits. */
        pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL,
-               PCI_EXP_DEVCTL_READRQ | PCI_EXP_DEVCTL_RELAX_EN |
-               PCI_EXP_DEVCTL_NOSNOOP_EN,
-               PCI_EXP_DEVCTL_READRQ_512B);
+               PCI_EXP_DEVCTL_RELAX_EN | PCI_EXP_DEVCTL_NOSNOOP_EN, 0);
 
        /* Adjust PCIe completion timeout. */
        pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL2, 0xf, 0x2);