3.16.78-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Koop andreas.koop@zf.com
commit 3a6ffb3c8c3274a39dc8f2514526e645c5d21753 upstream.
While using the mmc_spi driver occasionally errors like this popped up:
mmcblk0: error -84 transferring data end_request: I/O error, dev mmcblk0, sector 581756
I looked on the Internet for occurrences of the same problem and came across a helpful post [1]. It includes source code to reproduce the bug. There is also an analysis about the cause. During transmission data in the supplied buffer is being modified. Thus the previously calculated checksum is not correct anymore.
After some digging I found out that device drivers are supposed to report they need stable writes. To fix this I set the appropriate flag at queue initialization if CRC checksumming is enabled for that SPI host.
[1] https://groups.google.com/forum/#%21msg/sim1/gLlzWeXGFr8/KevXinUXfc8J
Signed-off-by: Andreas Koop andreas.koop@zf.com [shihpo: Rebase on top of v5.3-rc1] Signed-off-by: ShihPo Hung shihpo.hung@sifive.com Cc: Paul Walmsley paul.walmsley@sifive.com Signed-off-by: Ulf Hansson ulf.hansson@linaro.org [bwh: Backported to 3.16: - request_queue::backing_dev_info is a struct not a pointer - Adjust context] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- drivers/mmc/card/queue.c | 5 +++++ 1 file changed, 5 insertions(+)
--- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -16,6 +16,7 @@ #include <linux/kthread.h> #include <linux/scatterlist.h> #include <linux/dma-mapping.h> +#include <linux/backing-dev.h>
#include <linux/mmc/card.h> #include <linux/mmc/host.h> @@ -204,6 +205,10 @@ int mmc_init_queue(struct mmc_queue *mq, if (!mq->queue) return -ENOMEM;
+ if (mmc_host_is_spi(host) && host->use_spi_crc) + mq->queue->backing_dev_info.capabilities |= + BDI_CAP_STABLE_WRITES; + mq->mqrq_cur = mqrq_cur; mq->mqrq_prev = mqrq_prev; mq->queue->queuedata = mq;