On 1/06/23 00:31, Marek Vasut wrote:
> On 5/31/23 15:13, Adrian Hunter wrote:
>> On 31/05/23 14:34, Marek Vasut wrote:
>>> On 5/31/23 07:46, Adrian Hunter wrote:
>>>> On 31/05/23 03:27, Marek Vasut wrote:
>>>>> This reverts commit 08ebf903af57cda6d773f3dd1671b64f73b432b8.
>>>>>
>>>>> On STM32MP153C DHCOR DRC Compact with microSD card
>>>>> Kingston Canvas Go! Plus MicroSDXC I 64 GiB U3/V30/A2 SDCG3/64GB
>>>>> it is no longer possible to mount ext4 filesystem.
>>>>>
>>>>> Git bisect points to this commit which is being reverted here. A bit of
>>>>> investigation shows that for non-working microSD cards
>>>>> cache_enabled=TRUE fua_enabled=false
>>>>> For working microSD card (Kingston Canvas React Plus, MicroSDXC II
>>>>> 64 GiB U3/V90/A1 SDCR2/64GB)
>>>>> cache_enabled=FALSE fua_enabled=false
>>>>>
>>>>> It seems enabling the cache for SD cards causes the issue. Before the
>>>>> reverted commit, the cache was not reported enabled for SD cards. I am
>>>>> not sure whether such blunt revert is the correct solution however, any
>>>>> ideas ?
>>>>
>>>> This does not disable the cache, it disables the block layer from issuing
>>>> cache flushes (by telling it there is no cache being used).
>>>>
>>>> It would be good to know what commands are failing, which should be visible
>>>> in the kernel messages if dynamic debug is enabled:
>>>>
>>>> Dynamic debug for mmc
>>>> ---------------------
>>>>
>>>> Kernel must be configured:
>>>>
>>>> CONFIG_DYNAMIC_DEBUG=y
>>>>
>>>> To enable mmc debug via sysfs:
>>>>
>>>> echo 'file drivers/mmc/core/* +p' > /sys/kernel/debug/dynamic_debug/control
>>>> echo 'file drivers/mmc/host/* +p' > /sys/kernel/debug/dynamic_debug/control
>>>>
>>>> To enable mmc debug via kernel command line:
>>>>
>>>> dyndbg="file drivers/mmc/core/* +p;file drivers/mmc/host/* +p"
>>>>
>>>> To disable mmc debug:
>>>>
>>>> echo 'file drivers/mmc/core/* -p' > /sys/kernel/debug/dynamic_debug/control
>>>> echo 'file drivers/mmc/host/* -p' > /sys/kernel/debug/dynamic_debug/control
>>>>
>>>> More general information in kernel documentation in kernel tree:
>>>>
>>>> Documentation/admin-guide/dynamic-debug-howto.rst
>>>
>>> Log is below, I added newlines around the mount failure.
>>> Do you see anything problematic there ?
>>>
>>> $ echo 'file drivers/mmc/core/* +p' > /sys/kernel/debug/dynamic_debug/control ; echo 'file drivers/mmc/host/* +p' > /sys/kernel/debug/dynamic_debug/control ; echo 8 > /proc/sys/kernel/printk ; mount /dev/mmcblk1p4 /mnt
>>> [ 61.061029] <mmc1: starting CMD23 arg 00000002 flags 00000015>
>>> [ 61.065637] mmc1: starting CMD18 arg 00002002 flags 000000b5
>>> [ 61.071144] mmc1: blksz 512 blocks 2 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.078096] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.083302] mmci-pl18x 58005000.mmc: blksz 0200 blks 0002 flags 00000200
>>> [ 61.090012] mmci-pl18x 58005000.mmc: op 17 arg 00000002 flags 00000015
>>> [ 61.096531] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.102332] mmci-pl18x 58005000.mmc: op 12 arg 00002002 flags 000000b5
>>> [ 61.108836] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.114575] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.120371] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.127178] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.134084] mmc1: 1024 bytes transferred: 0
>>> [ 61.138658] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.145533] <mmc1: starting CMD23 arg 00000008 flags 00000015>
>>> [ 61.150946] mmc1: starting CMD18 arg 00002000 flags 000000b5
>>> [ 61.156609] mmc1: blksz 512 blocks 8 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.163426] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.168759] mmci-pl18x 58005000.mmc: blksz 0200 blks 0008 flags 00000200
>>> [ 61.175368] mmci-pl18x 58005000.mmc: op 17 arg 00000008 flags 00000015
>>> [ 61.181985] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.187682] mmci-pl18x 58005000.mmc: op 12 arg 00002000 flags 000000b5
>>> [ 61.194185] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.199979] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.205769] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.212574] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.219478] mmc1: 4096 bytes transferred: 0
>>> [ 61.224050] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.231166] <mmc1: starting CMD23 arg 00000002 flags 00000015>
>>> [ 61.236378] mmc1: starting CMD18 arg 00002002 flags 000000b5
>>> [ 61.241983] mmc1: blksz 512 blocks 2 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.248940] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.254169] mmci-pl18x 58005000.mmc: blksz 0200 blks 0002 flags 00000200
>>> [ 61.260779] mmci-pl18x 58005000.mmc: op 17 arg 00000002 flags 00000015
>>> [ 61.267405] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.273101] mmci-pl18x 58005000.mmc: op 12 arg 00002002 flags 000000b5
>>> [ 61.279603] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.285431] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.291125] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.298032] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.304937] mmc1: 1024 bytes transferred: 0
>>> [ 61.309409] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.316256] <mmc1: starting CMD23 arg 00000008 flags 00000015>
>>> [ 61.321768] mmc1: starting CMD18 arg 00002000 flags 000000b5
>>> [ 61.327459] mmc1: blksz 512 blocks 8 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.334360] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.339459] mmci-pl18x 58005000.mmc: blksz 0200 blks 0008 flags 00000200
>>> [ 61.346167] mmci-pl18x 58005000.mmc: op 17 arg 00000008 flags 00000015
>>> [ 61.352782] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.358478] mmci-pl18x 58005000.mmc: op 12 arg 00002000 flags 000000b5
>>> [ 61.365082] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.370776] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.376565] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.383371] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.390275] mmc1: 4096 bytes transferred: 0
>>> [ 61.394848] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.401885] <mmc1: starting CMD23 arg 00000002 flags 00000015>
>>> [ 61.407193] mmc1: starting CMD18 arg 00002002 flags 000000b5
>>> [ 61.412794] mmc1: blksz 512 blocks 2 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.419748] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.424973] mmci-pl18x 58005000.mmc: blksz 0200 blks 0002 flags 00000200
>>> [ 61.431582] mmci-pl18x 58005000.mmc: op 17 arg 00000002 flags 00000015
>>> [ 61.438204] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.443901] mmci-pl18x 58005000.mmc: op 12 arg 00002002 flags 000000b5
>>> [ 61.450404] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.456232] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.461927] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.468834] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.475739] mmc1: 1024 bytes transferred: 0
>>> [ 61.480210] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.487054] <mmc1: starting CMD23 arg 00000008 flags 00000015>
>>> [ 61.492462] mmc1: starting CMD18 arg 00002000 flags 000000b5
>>> [ 61.498251] mmc1: blksz 512 blocks 8 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.505160] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.510260] mmci-pl18x 58005000.mmc: blksz 0200 blks 0008 flags 00000200
>>> [ 61.516969] mmci-pl18x 58005000.mmc: op 17 arg 00000008 flags 00000015
>>> [ 61.523592] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.529288] mmci-pl18x 58005000.mmc: op 12 arg 00002000 flags 000000b5
>>> [ 61.535789] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.541583] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.547271] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.554177] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.561082] mmc1: 4096 bytes transferred: 0
>>> [ 61.565654] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.572440] <mmc1: starting CMD23 arg 00000008 flags 00000015>
>>> [ 61.578017] mmc1: starting CMD18 arg 00002008 flags 000000b5
>>> [ 61.583653] mmc1: blksz 512 blocks 8 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.590465] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.595686] mmci-pl18x 58005000.mmc: blksz 0200 blks 0008 flags 00000200
>>> [ 61.602396] mmci-pl18x 58005000.mmc: op 17 arg 00000008 flags 00000015
>>> [ 61.608915] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.614712] mmci-pl18x 58005000.mmc: op 12 arg 00002008 flags 000000b5
>>> [ 61.621215] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.627034] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.632727] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.639633] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.646437] mmc1: 4096 bytes transferred: 0
>>> [ 61.651010] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.658908] <mmc1: starting CMD23 arg 00000108 flags 00000015>
>>> [ 61.663421] mmc1: starting CMD18 arg 00003be8 flags 000000b5
>>> [ 61.669102] mmc1: blksz 512 blocks 264 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.676155] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.681355] mmci-pl18x 58005000.mmc: blksz 0200 blks 0108 flags 00000200
>>> [ 61.688064] mmci-pl18x 58005000.mmc: op 17 arg 00000108 flags 00000015
>>> [ 61.694589] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.700284] mmci-pl18x 58005000.mmc: op 12 arg 00003be8 flags 000000b5
>>> [ 61.706887] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.712581] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.718372] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000100
>>> [ 61.724060] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.730965] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.737870] mmc1: 135168 bytes transferred: 0
>>> [ 61.742544] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.749064] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.755336] <mmc1: starting CMD23 arg 00000008 flags 00000015>
>>> [ 61.760649] mmc1: starting CMD18 arg 00442000 flags 000000b5
>>> [ 61.766327] mmc1: blksz 512 blocks 8 flags 00000200 tsac 100 ms nsac 0
>>> [ 61.773144] mmc1: CMD12 arg 00000000 flags 00000095
>>> [ 61.778489] mmci-pl18x 58005000.mmc: blksz 0200 blks 0008 flags 00000200
>>> [ 61.785100] mmci-pl18x 58005000.mmc: op 17 arg 00000008 flags 00000015
>>> [ 61.791616] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.797414] mmci-pl18x 58005000.mmc: op 12 arg 00442000 flags 000000b5
>>> [ 61.803916] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.809710] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.815399] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.822306] mmc1: req done (CMD18): 0: 00000900 00000000 00000000 00000000
>>> [ 61.829211] mmc1: 4096 bytes transferred: 0
>>> [ 61.833683] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.833952] mmc0: starting CMD7 arg fffd0000 flags 00000015
>>> [ 61.840205] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.845820] mmci-pl18x 48004000.mmc: op 07 arg fffd0000 flags 00000015
>>> [ 61.853036] <mmc1: starting CMD23 arg 00000008 flags 00000015>
>>> [ 61.858074] mmci-pl18x 48004000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.858098] mmc0: req done (CMD7): 0: 00001ed7 00000000 00000000 00000000
>>> [ 61.876506] mmc1: starting CMD25 arg 00002000 flags 000000b5
>>> [ 61.882106] mmc1: blksz 512 blocks 8 flags 00000100 tsac 3000 ms nsac 0
>>> [ 61.889107] mmc1: CMD12 arg 00000000 flags 0000049d
>>> [ 61.894346] mmci-pl18x 58005000.mmc: blksz 0200 blks 0008 flags 00000100
>>> [ 61.900957] mmci-pl18x 58005000.mmc: op 17 arg 00000008 flags 00000015
>>> [ 61.907588] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.913283] mmci-pl18x 58005000.mmc: op 19 arg 00002000 flags 000000b5
>>> [ 61.919786] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.925612] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000140
>>> [ 61.931309] mmc1: req done <CMD23>: 0: 00000900 00000000 00000000 00000000
>>> [ 61.938219] mmc1: req done (CMD25): 0: 00000900 00000000 00000000 00000000
>>> [ 61.945125] mmc1: 4096 bytes transferred: 0
>>> [ 61.949598] mmc1: (CMD12): 0: 00000000 00000000 00000000 00000000
>>> [ 61.956107] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.961888] mmc1: starting CMD13 arg 50480000 flags 00000195
>>> [ 61.967581] mmci-pl18x 58005000.mmc: op 0d arg 50480000 flags 00000195
>>> [ 61.974026] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 61.979718] mmc1: req done (CMD13): 0: 00000900 00000000 00000000 00000000
>>> [ 61.986630] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 61.992588] mmc1: starting CMD49 arg 10020a00 flags 00000035
>>> [ 61.998152] mmc1: blksz 512 blocks 1 flags 00000100 tsac 3000 ms nsac 0
>>> [ 62.005158] mmci-pl18x 58005000.mmc: blksz 0200 blks 0001 flags 00000100
>>> [ 62.011778] mmci-pl18x 58005000.mmc: op 31 arg 10020a00 flags 00000035
>>> [ 62.018317] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 62.024011] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000100
>>> [ 62.029801] mmc1: req done (CMD49): 0: 00000900 00000000 00000000 00000000
>>> [ 62.036708] mmc1: 512 bytes transferred: 0
>>> [ 62.041083] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>> [ 62.046988] mmc1: starting CMD48 arg 10020a00 flags 000000b5
>>> [ 62.052487] mmc1: blksz 512 blocks 1 flags 00000200 tsac 100 ms nsac 0
>>> [ 62.059443] mmci-pl18x 58005000.mmc: blksz 0200 blks 0001 flags 00000200
>>> [ 62.066154] mmci-pl18x 58005000.mmc: op 30 arg 10020a00 flags 000000b5
>>> [ 62.072688] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000040
>>> [ 62.078382] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000100
>>> [ 62.084173] mmc1: req done (CMD48): 0: 00000900 00000000 00000000 00000000
>>> [ 62.091081] mmc1: 512 bytes transferred: 0
>>> [ 62.095455] mmci-pl18x 58005000.mmc: irq0 (data+cmd) 00000000
>>
>> CMD48 was successful but it still became an error, which must have
>> been because it indicated the flush had not completed. We do not
>> allow for mmc_poll_for_busy() being too quick i.e. card has not
>> had a chance to indicate busy yet.
>>
>> Please try this:
>>
>> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
>> index 72b664ed90cf..9c3123867a99 100644
>> --- a/drivers/mmc/core/sd.c
>> +++ b/drivers/mmc/core/sd.c
>> @@ -1313,6 +1313,8 @@ static int sd_flush_cache(struct mmc_host *host)
>> {
>> struct mmc_card *card = host->card;
>> u8 *reg_buf, fno, page;
>> + unsigned long timeout;
>> + bool expired;
>> u16 offset;
>> int err;
>> @@ -1338,11 +1340,15 @@ static int sd_flush_cache(struct mmc_host *host)
>> goto out;
>> }
>> + timeout = jiffies + msecs_to_jiffies(SD_WRITE_EXTR_SINGLE_TIMEOUT_MS) + 1;
>> +again:
>> err = mmc_poll_for_busy(card, SD_WRITE_EXTR_SINGLE_TIMEOUT_MS, false,
>> MMC_BUSY_EXTR_SINGLE);
>> if (err)
>> goto out;
>> + expired = time_after(jiffies, timeout);
>> +
>> /*
>> * Read the Flush Cache bit. The card shall reset it, to confirm that
>> * it's has completed the flushing of the cache.
>> @@ -1354,8 +1360,12 @@ static int sd_flush_cache(struct mmc_host *host)
>> goto out;
>> }
>> - if (reg_buf[0] & BIT(0))
>> - err = -ETIMEDOUT;
>> + if (reg_buf[0] & BIT(0)) {
>
> I am getting here, multiple times, with expired=0 .
So either the host controller's busy detection does not work, or the
card is not indicating busy by pulling down DAT0.
Can you try to figure out which it is?
> After that, once, I get here with expired=1 and then the ext4 mount failure occurs.
>
>> + if (expired)
>> + err = -ETIMEDOUT;
>> + else
>> + goto again;
>> + }
>> out:
>> kfree(reg_buf);
>> return err;
>
> Also, I made another observation -- if I reduce the SD bus clock frequency to 10 MHz (current is 50 MHz), then I don't observe this problem.
The lower frequency might just be making the commands take a bit longer
so the flush just completes before the timeout.
It can also be that the card has less time to work on flushing if it is
being hammered by commands.
I imagine you can hack some debugging prints as well as I can,
but here is an example (untested) to try to find out how long
the flush takes and decrease the rate at which commands are sent.
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 72b664ed90cf..7bf5386d6e72 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -15,6 +15,7 @@
#include <linux/random.h>
#include <linux/scatterlist.h>
#include <linux/sysfs.h>
+#include <linux/ktime.h>
#include <linux/mmc/host.h>
#include <linux/mmc/card.h>
@@ -70,7 +71,7 @@ static const unsigned int sd_au_size[] = {
})
#define SD_POWEROFF_NOTIFY_TIMEOUT_MS 1000
-#define SD_WRITE_EXTR_SINGLE_TIMEOUT_MS 1000
+#define SD_WRITE_EXTR_SINGLE_TIMEOUT_MS 10000
struct sd_busy_data {
struct mmc_card *card;
@@ -1313,8 +1314,12 @@ static int sd_flush_cache(struct mmc_host *host)
{
struct mmc_card *card = host->card;
u8 *reg_buf, fno, page;
+ unsigned long timeout;
+ ktime_t start_time;
+ bool expired;
u16 offset;
int err;
+ int cnt;
if (!sd_cache_enabled(host))
return 0;
@@ -1332,32 +1337,43 @@ static int sd_flush_cache(struct mmc_host *host)
offset = card->ext_perf.offset + 261;
err = sd_write_ext_reg(card, fno, page, offset, BIT(0));
- if (err) {
- pr_warn("%s: error %d writing Cache Flush bit\n",
- mmc_hostname(host), err);
+ if (err)
goto out;
- }
+ timeout = jiffies + msecs_to_jiffies(SD_WRITE_EXTR_SINGLE_TIMEOUT_MS) + 1;
+ cnt = 0;
+ start_time = ktime_get();
+again:
+ cnt += 1;
err = mmc_poll_for_busy(card, SD_WRITE_EXTR_SINGLE_TIMEOUT_MS, false,
MMC_BUSY_EXTR_SINGLE);
if (err)
goto out;
+ expired = time_after(jiffies, timeout);
+
/*
* Read the Flush Cache bit. The card shall reset it, to confirm that
* it's has completed the flushing of the cache.
*/
err = sd_read_ext_reg(card, fno, page, offset, 1, reg_buf);
- if (err) {
- pr_warn("%s: error %d reading Cache Flush bit\n",
- mmc_hostname(host), err);
+ if (err)
goto out;
- }
- if (reg_buf[0] & BIT(0))
+ if (reg_buf[0] & BIT(0)) {
+ if (!expired) {
+ msleep(10);
+ goto again;
+ }
err = -ETIMEDOUT;
+ }
out:
+ pr_info("%s: flushing cache took %ld ms, %d iterations, error %d\n",
+ mmc_hostname(host), (long)ktime_ms_delta(ktime_get(), start_time), cnt, err);
kfree(reg_buf);
+ if (err)
+ pr_err("%s: error %d flushing cache\n",
+ mmc_hostname(host), err);
return err;
}
