target/linux/brcm2708/patches-3.10/0063-mmc-suppress-sdcard-warnings-we-are-happy-about-by-d.patch

   1 From c20b5189fa65427d6a9f2e70f7f8f2c485d21296 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/196] 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 diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
  12 index 3556ed3..c2409b9 100644
  13 --- a/drivers/mmc/host/sdhci-bcm2708.c
  14 +++ b/drivers/mmc/host/sdhci-bcm2708.c
  15 @@ -139,6 +139,7 @@ static bool sync_after_dma = 1;
  16  static bool missing_status = 1;
  17  static bool spurious_crc_acmd51 = 0;
  18  bool enable_llm = 1;
  19 +bool extra_messages = 0;
  20
  21  #if 0
  22  static void hptime_test(void)
  23 @@ -672,13 +673,16 @@ sdhci_bcm2708_platdma_reset(struct sdhci_host *host, struct mmc_data *data)
  24                         cs = readl(host_priv->dma_chan_base + BCM2708_DMA_CS);
  25
  26                         if (!(BCM2708_DMA_ACTIVE & cs))
  27 -                               printk(KERN_INFO "%s: missed completion of "
  28 +                       {
  29 +                               if (extra_messages)
  30 +                                       printk(KERN_INFO "%s: missed completion of "
  31                                        "cmd %d DMA (%d/%d [%d]/[%d]) - "
  32                                        "ignoring it\n",
  33                                        mmc_hostname(host->mmc),
  34                                        host->last_cmdop,
  35                                        host_priv->sg_done, sg_todo,
  36                                        host_priv->sg_ix+1, sg_len);
  37 +                       }
  38                         else
  39                                 printk(KERN_INFO "%s: resetting ongoing cmd %d"
  40                                        "DMA before %d/%d [%d]/[%d] complete\n",
  41 @@ -903,7 +907,8 @@ static irqreturn_t sdhci_bcm2708_dma_irq(int irq, void *dev_id)
  42
  43                 if (!host_priv->dma_wanted) {
  44                         /* ignore this interrupt - it was reset */
  45 -                       printk(KERN_INFO "%s: DMA IRQ %X ignored - "
  46 +                       if (extra_messages)
  47 +                               printk(KERN_INFO "%s: DMA IRQ %X ignored - "
  48                                "results were reset\n",
  49                                mmc_hostname(host->mmc), dma_cs);
  50  #ifdef CHECK_DMA_USE
  51 @@ -1397,6 +1402,7 @@ module_param(missing_status, bool, 0444);
  52  module_param(spurious_crc_acmd51, bool, 0444);
  53  module_param(enable_llm, bool, 0444);
  54  module_param(cycle_delay, int, 0444);
  55 +module_param(extra_messages, bool, 0444);
  56
  57  MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
  58  MODULE_AUTHOR("Broadcom <info@broadcom.com>");
  59 @@ -1409,5 +1415,6 @@ MODULE_PARM_DESC(sync_after_dma, "Block in driver until dma complete");
  60  MODULE_PARM_DESC(missing_status, "Use the missing status quirk");
  61  MODULE_PARM_DESC(spurious_crc_acmd51, "Use the spurious crc quirk for reading SCR (ACMD51)");
  62  MODULE_PARM_DESC(enable_llm, "Enable low-latency mode");
  63 +MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages");
  64
  65
  66 --
  67 1.9.1
  68