iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc

Browse Source 
Pull MMC fix from Ulf Hansson:
 "MMC host:

   - dw_mmc: fix the spamming log message"

* tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: dw_mmc: fix the spamming log message
This commit is contained in:
Linus Torvalds
2016-09-23 11:10:53 -07:00
parent e47f2e50ea 005d675aa1
commit e7c5412f77
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mmc/host/dw_mmc.c
View File

@@ -1112,11 +1112,12 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)
div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0; div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0;
dev_info(&slot->mmc->class_dev, if (clock != slot->__clk_old || force_clkinit)
"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n", dev_info(&slot->mmc->class_dev,
slot->id, host->bus_hz, clock, "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
div ? ((host->bus_hz / div) >> 1) : slot->id, host->bus_hz, clock,
host->bus_hz, div); div ? ((host->bus_hz / div) >> 1) :
host->bus_hz, div);
/* disable clock */ /* disable clock */
mci_writel(host, CLKENA, 0); mci_writel(host, CLKENA, 0);
@@ -1139,6 +1140,9 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)
/* inform CIU */ /* inform CIU */
mci_send_cmd(slot, sdmmc_cmd_bits, 0); mci_send_cmd(slot, sdmmc_cmd_bits, 0);
/* keep the last clock value that was requested from core */
slot->__clk_old = clock;
} }
host->current_speed = clock; host->current_speed = clock;

3
drivers/mmc/host/dw_mmc.h
View File

@@ -249,6 +249,8 @@ extern int dw_mci_resume(struct dw_mci *host);
* @queue_node: List node for placing this node in the @queue list of * @queue_node: List node for placing this node in the @queue list of
* &struct dw_mci. * &struct dw_mci.
* @clock: Clock rate configured by set_ios(). Protected by host->lock. * @clock: Clock rate configured by set_ios(). Protected by host->lock.
* @__clk_old: The last clock value that was requested from core.
* Keeping track of this helps us to avoid spamming the console.
* @flags: Random state bits associated with the slot. * @flags: Random state bits associated with the slot.
* @id: Number of this slot. * @id: Number of this slot.
* @sdio_id: Number of this slot in the SDIO interrupt registers. * @sdio_id: Number of this slot in the SDIO interrupt registers.
@@ -263,6 +265,7 @@ struct dw_mci_slot {
struct list_head queue_node; struct list_head queue_node;
unsigned int clock; unsigned int clock;
unsigned int __clk_old;
unsigned long flags; unsigned long flags;
#define DW_MMC_CARD_PRESENT 0 #define DW_MMC_CARD_PRESENT 0