mmc: suppress sdcard warnings we are happy about by default

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 812fea67a2126c1aa19d0beaf45e7bbb58996857..adbdedd46802e82d30e6d3e0eec9710bff6bb934 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -243,7 +243,7 @@ config MMC_SDHCI_BCM2708
 
 config MMC_SDHCI_BCM2708_DMA
        bool "DMA support on BCM2708 Arasan controller"
-       depends on MMC_SDHCI_BCM2708 && EXPERIMENTAL
+       depends on MMC_SDHCI_BCM2708
        help
          Enable DMA support on the Arasan SDHCI controller in Broadcom 2708
           based chips.

diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
index c3c71a4489301f9b0f056ede1748aec7067ee6c9..a5988019c39a6cc464c730ec63b2c2f20e806619 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm2708.c
+++ b/drivers/mmc/host/sdhci-bcm2708.c
@@ -139,6 +139,7 @@ static bool sync_after_dma = 1;
 static bool missing_status = 1;
 static bool spurious_crc_acmd51 = 0;
 bool enable_llm = 1;
+bool extra_messages = 0;
 
 #if 0
 static void hptime_test(void)
@@ -672,13 +673,16 @@ sdhci_bcm2708_platdma_reset(struct sdhci_host *host, struct mmc_data *data)
                        cs = readl(host_priv->dma_chan_base + BCM2708_DMA_CS);
 
                        if (!(BCM2708_DMA_ACTIVE & cs))
-                               printk(KERN_INFO "%s: missed completion of "
+                       {
+                               if (extra_messages)
+                                       printk(KERN_INFO "%s: missed completion of "
                                       "cmd %d DMA (%d/%d [%d]/[%d]) - "
                                       "ignoring it\n",
                                       mmc_hostname(host->mmc),
                                       host->last_cmdop,
                                       host_priv->sg_done, sg_todo,
                                       host_priv->sg_ix+1, sg_len);
+                       }
                        else
                                printk(KERN_INFO "%s: resetting ongoing cmd %d"
                                       "DMA before %d/%d [%d]/[%d] complete\n",
@@ -903,7 +907,8 @@ static irqreturn_t sdhci_bcm2708_dma_irq(int irq, void *dev_id)
 
                if (!host_priv->dma_wanted) {
                        /* ignore this interrupt - it was reset */
-                       printk(KERN_INFO "%s: DMA IRQ %X ignored - "
+                       if (extra_messages)
+                               printk(KERN_INFO "%s: DMA IRQ %X ignored - "
                               "results were reset\n",
                               mmc_hostname(host->mmc), dma_cs);
 #ifdef CHECK_DMA_USE
@@ -1397,6 +1402,7 @@ module_param(missing_status, bool, 0444);
 module_param(spurious_crc_acmd51, bool, 0444);
 module_param(enable_llm, bool, 0444);
 module_param(cycle_delay, int, 0444);
+module_param(extra_messages, bool, 0444);
 
 MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
 MODULE_AUTHOR("Broadcom <info@broadcom.com>");
@@ -1409,5 +1415,6 @@ MODULE_PARM_DESC(sync_after_dma, "Block in driver until dma complete");
 MODULE_PARM_DESC(missing_status, "Use the missing status quirk");
 MODULE_PARM_DESC(spurious_crc_acmd51, "Use the spurious crc quirk for reading SCR (ACMD51)");
 MODULE_PARM_DESC(enable_llm, "Enable low-latency mode");
+MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages");