Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc
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
+12
-5
+9
-5
drivers/mmc/host/dw_mmc.c
+9
-5
drivers/mmc/host/dw_mmc.c
···
1112
1112
1113
1113
div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0;
1114
1114
1115
-
dev_info(&slot->mmc->class_dev,
1116
-
"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
1117
-
slot->id, host->bus_hz, clock,
1118
-
div ? ((host->bus_hz / div) >> 1) :
1119
-
host->bus_hz, div);
1115
+
if (clock != slot->__clk_old || force_clkinit)
1116
+
dev_info(&slot->mmc->class_dev,
1117
+
"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
1118
+
slot->id, host->bus_hz, clock,
1119
+
div ? ((host->bus_hz / div) >> 1) :
1120
+
host->bus_hz, div);
1120
1121
1121
1122
/* disable clock */
1122
1123
mci_writel(host, CLKENA, 0);
···
1140
1139
1141
1140
/* inform CIU */
1142
1141
mci_send_cmd(slot, sdmmc_cmd_bits, 0);
1142
+
1143
+
/* keep the last clock value that was requested from core */
1144
+
slot->__clk_old = clock;
1143
1145
}
1144
1146
1145
1147
host->current_speed = clock;
+3
drivers/mmc/host/dw_mmc.h
+3
drivers/mmc/host/dw_mmc.h
···
249
249
* @queue_node: List node for placing this node in the @queue list of
250
250
* &struct dw_mci.
251
251
* @clock: Clock rate configured by set_ios(). Protected by host->lock.
252
+
* @__clk_old: The last clock value that was requested from core.
253
+
* Keeping track of this helps us to avoid spamming the console.
252
254
* @flags: Random state bits associated with the slot.
253
255
* @id: Number of this slot.
254
256
* @sdio_id: Number of this slot in the SDIO interrupt registers.
···
265
263
struct list_head queue_node;
266
264
267
265
unsigned int clock;
266
+
unsigned int __clk_old;
268
267
269
268
unsigned long flags;
270
269
#define DW_MMC_CARD_PRESENT 0