1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From 30409c7d87c47a0a10d19cb87ca5ed0c2b1adca7 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 20 Jul 2015 17:32:18 +0100
Subject: [PATCH 130/222] bcm2835-sdhost: Ignore CRC7 for MMC CMD1
It seems that the sdhost interface returns CRC7 errors for CMD1,
which is the MMC-specific SEND_OP_COND. Returning these errors to
the MMC layer causes a downward spiral, but ignoring them seems
to be harmless.
---
drivers/mmc/host/bcm2835-sdhost.c | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
--- a/drivers/mmc/host/bcm2835-sdhost.c
+++ b/drivers/mmc/host/bcm2835-sdhost.c
@@ -959,25 +959,32 @@ static void bcm2835_sdhost_finish_comman
mmc_hostname(host->mmc), sdcmd, sdhsts,
bcm2835_sdhost_read(host, SDEDM));
- if (sdhsts & SDHSTS_CMD_TIME_OUT) {
- switch (host->cmd->opcode) {
- case 5: case 52: case 53:
- /* Don't warn about SDIO commands */
- break;
- default:
- pr_err("%s: command timeout\n",
+ if ((sdhsts & SDHSTS_CRC7_ERROR) &&
+ (host->cmd->opcode == 1)) {
+ if (host->debug)
+ pr_info("%s: ignoring CRC7 error for CMD1\n",
+ mmc_hostname(host->mmc));
+ } else {
+ if (sdhsts & SDHSTS_CMD_TIME_OUT) {
+ switch (host->cmd->opcode) {
+ case 5: case 52: case 53:
+ /* Don't warn about SDIO commands */
+ break;
+ default:
+ pr_err("%s: command timeout\n",
+ mmc_hostname(host->mmc));
+ break;
+ }
+ host->cmd->error = -ETIMEDOUT;
+ } else {
+ pr_err("%s: unexpected command error\n",
mmc_hostname(host->mmc));
- break;
+ bcm2835_sdhost_dumpregs(host);
+ host->cmd->error = -EIO;
}
- host->cmd->error = -ETIMEDOUT;
- } else {
- pr_err("%s: unexpected command error\n",
- mmc_hostname(host->mmc));
- bcm2835_sdhost_dumpregs(host);
- host->cmd->error = -EIO;
+ tasklet_schedule(&host->finish_tasklet);
+ return;
}
- tasklet_schedule(&host->finish_tasklet);
- return;
}
if (host->cmd->flags & MMC_RSP_PRESENT) {
|
