The patch titled Subject: rapidio/tsi721: fix hardcoded MRRS setting has been added to the -mm tree. Its filename is rapidio-tsi721-fix-hardcoded-mrrs-setting.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/rapidio-tsi721-fix-hardcoded-mrrs-setting.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/rapidio-tsi721-fix-hardcoded-mrrs-setting.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Alexandre Bounine <alexandre.bounine@xxxxxxx> Subject: rapidio/tsi721: fix hardcoded MRRS setting 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@xxxxxxx> Cc: Matt Porter <mporter@xxxxxxxxxxxxxxxxxxx> Cc: Aurelien Jacquiot <a-jacquiot@xxxxxx> Cc: Andre van Herk <andre.van.herk@xxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rapidio/devices/tsi721.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/rapidio/devices/tsi721.c~rapidio-tsi721-fix-hardcoded-mrrs-setting drivers/rapidio/devices/tsi721.c --- a/drivers/rapidio/devices/tsi721.c~rapidio-tsi721-fix-hardcoded-mrrs-setting +++ a/drivers/rapidio/devices/tsi721.c @@ -2426,11 +2426,9 @@ static int tsi721_probe(struct pci_dev * 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); _ Patches currently in -mm which might be from alexandre.bounine@xxxxxxx are rapidio-tsi721-fix-hardcoded-mrrs-setting.patch rapidio-tsi721-add-check-for-overlapped-ib-window-mappings.patch rapidio-tsi721-add-option-to-configure-direct-mapping-of-ib-window.patch rapidio-tsi721_dma-fix-pending-transaction-queue-handling.patch rapidio-add-query_mport-operation.patch rapidio-tsi721-add-query_mport-callback.patch rapidio-add-shutdown-notification-for-rapidio-devices.patch rapidio-tsi721-add-shutdown-notification-callback.patch rapidio-rionet-add-shutdown-event-handling.patch rapidio-rework-common-rio-device-add-delete-routines.patch rapidio-move-net-allocation-into-core-code.patch rapidio-add-core-mport-removal-support.patch rapidio-tsi721-add-hw-specific-mport-removal.patch powerpc-fsl_rio-changes-to-mport-registration.patch rapidio-rionet-add-locking-into-add-remove-device.patch rapidio-rionet-add-mport-removal-handling.patch rapidio-add-lock-protection-for-doorbell-list.patch rapidio-move-rio_local_set_device_id-function-to-the-common-core.patch rapidio-move-rio_pw_enable-into-core-code.patch rapidio-add-global-inbound-port-write-interfaces.patch rapidio-tsi721-fix-locking-in-ob_msg-processing.patch rapidio-add-outbound-window-support.patch rapidio-tsi721-add-outbound-windows-mapping-support.patch rapidio-tsi721-add-filtered-debug-output.patch rapidio-tsi721_dma-update-error-reporting-from-prep_sg-callback.patch rapidio-tsi721_dma-fix-synchronization-issues.patch rapidio-tsi721_dma-fix-hardware-error-handling.patch rapidio-add-mport-char-device-driver.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html