brcm2708: update against latest rpi-3.10.y branch
[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-3.10 / 0063-mmc-suppress-sdcard-warnings-we-are-happy-about-by-d.patch
1 From dfe5d158300e7500873f1f81d89a05842460befc Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Fri, 10 May 2013 19:42:38 +0100
4 Subject: [PATCH 063/174] mmc: suppress sdcard warnings we are happy about by
5 default
6
7 ---
8 drivers/mmc/host/sdhci-bcm2708.c | 11 +++++++++--
9 1 file changed, 9 insertions(+), 2 deletions(-)
10
11 --- a/drivers/mmc/host/sdhci-bcm2708.c
12 +++ b/drivers/mmc/host/sdhci-bcm2708.c
13 @@ -139,6 +139,7 @@ static bool sync_after_dma = 1;
14 static bool missing_status = 1;
15 static bool spurious_crc_acmd51 = 0;
16 bool enable_llm = 1;
17 +bool extra_messages = 0;
18
19 #if 0
20 static void hptime_test(void)
21 @@ -672,13 +673,16 @@ sdhci_bcm2708_platdma_reset(struct sdhci
22 cs = readl(host_priv->dma_chan_base + BCM2708_DMA_CS);
23
24 if (!(BCM2708_DMA_ACTIVE & cs))
25 - printk(KERN_INFO "%s: missed completion of "
26 + {
27 + if (extra_messages)
28 + printk(KERN_INFO "%s: missed completion of "
29 "cmd %d DMA (%d/%d [%d]/[%d]) - "
30 "ignoring it\n",
31 mmc_hostname(host->mmc),
32 host->last_cmdop,
33 host_priv->sg_done, sg_todo,
34 host_priv->sg_ix+1, sg_len);
35 + }
36 else
37 printk(KERN_INFO "%s: resetting ongoing cmd %d"
38 "DMA before %d/%d [%d]/[%d] complete\n",
39 @@ -903,7 +907,8 @@ static irqreturn_t sdhci_bcm2708_dma_irq
40
41 if (!host_priv->dma_wanted) {
42 /* ignore this interrupt - it was reset */
43 - printk(KERN_INFO "%s: DMA IRQ %X ignored - "
44 + if (extra_messages)
45 + printk(KERN_INFO "%s: DMA IRQ %X ignored - "
46 "results were reset\n",
47 mmc_hostname(host->mmc), dma_cs);
48 #ifdef CHECK_DMA_USE
49 @@ -1397,6 +1402,7 @@ module_param(missing_status, bool, 0444)
50 module_param(spurious_crc_acmd51, bool, 0444);
51 module_param(enable_llm, bool, 0444);
52 module_param(cycle_delay, int, 0444);
53 +module_param(extra_messages, bool, 0444);
54
55 MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
56 MODULE_AUTHOR("Broadcom <info@broadcom.com>");
57 @@ -1409,5 +1415,6 @@ MODULE_PARM_DESC(sync_after_dma, "Block
58 MODULE_PARM_DESC(missing_status, "Use the missing status quirk");
59 MODULE_PARM_DESC(spurious_crc_acmd51, "Use the spurious crc quirk for reading SCR (ACMD51)");
60 MODULE_PARM_DESC(enable_llm, "Enable low-latency mode");
61 +MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages");
62
63