[PATCHv2 4/5] mmc: shdci-bcm2835: add verify for 32-bit back-to-back workaround
Scott Branden
sbranden at broadcom.com
Tue Nov 4 21:27:09 PST 2014
On 14-11-04 08:44 PM, Stephen Warren wrote:
> On 10/30/2014 12:36 AM, Scott Branden wrote:
>> Add a verify option to driver to print out an error message if a
>> potential back to back write could cause a clock domain issue.
>
>> diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
>
>> static inline void bcm2835_sdhci_writel(struct sdhci_host *host,
>> u32 val, int reg)
>> {
>> +#ifdef CONFIG_MMC_SDHCI_BCM2835_VERIFY_WORKAROUND
>> + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
>> + struct bcm2835_sdhci_host *bcm2835_host = pltfm_host->priv;
>> +
>> + if (bcm2835_host->previous_reg == reg) {
>> + if ((reg != SDHCI_HOST_CONTROL)
>> + && (reg != SDHCI_CLOCK_CONTROL)) {
>> + dev_err(mmc_dev(host->mmc),
>> + "back-to-back write to 0x%x\n", reg);
>
> This fires a *ton* on reg 0x20 and 0x30 on my rev 2 model B with the
> patches applied on top of next-20141031. Without the patches applied,
> everything works fine. As far as I can tell, SD card accesses no longer
> work (or perhaps there's just so much log spew over serial that it takes
> more than 1.5 minutes to get to the login prompt).
>
Thanks for testing. Like I said in the cover message - I've never run
this on a PI actually. I've run it on other hardware with the same core
arasan block having the same clock domain issue. The registers printed
out do not have the clock domain issue - I'm still getting more details
from the silicon designers on this.
Without the verify patch the performance is actually quite good. See
tests result from Piotr:
On Fri, Oct 31, 2014 at 05:02:59PM +0000, Scott Branden wrote:
> Please let me know how this works for you.
>
Scott,
please ignore my previous mail I made mistake when applying patches.
Results of testing your code on top of 3.18-rc2 with Kingston SDC10/8GB:
* when compiling with CONFIG_MMC_SDHCI_BCM2835_VERIFY_WORKAROUND=y there
is a
lot of:
sdhci-bcm2835 20300000.sdhci: back-to-back write to 0x30
and
sdhci-bcm2835 20300000.sdhci: back-to-back write to 0x20
* performance w/o patches:
yncraspberrypi:~$ sync; time dd if=/dev/zero of=~/test.tmp bs=500K
count=1024; sy
1024+0 records in
1024+0 records out
524288000 bytes (524 MB) copied, 787.384 s, 666 kB/s
real 13m7.404s
user 0m0.080s
sys 0m56.300s
pi at raspberrypi:~$ time dd if=~/test.tmp of=/dev/null bs=500K count=1024
1024+0 records in
1024+0 records out
524288000 bytes (524 MB) copied, 34.2115 s, 15.3 MB/s
real 0m34.232s
user 0m0.020s
sys 0m31.190s
* performance w/ patches is great IMHO:
yncraspberrypi:~$ sync; time dd if=/dev/zero of=~/test.tmp bs=500K
count=1024; sy
1024+0 records in
1024+0 records out
524288000 bytes (524 MB) copied, 45.4886 s, 11.5 MB/s
real 0m45.515s
user 0m0.060s
sys 0m30.050s time dd if=~/test.tmp of=/dev/null bs=500K count=1024
1024+0 records in
1024+0 records out
524288000 bytes (524 MB) copied, 33.6292 s, 15.6 MB/s
real 0m33.649s
user 0m0.020s
sys 0m30.730s
Great work!
Have you got plans to enable DMA for this controller ? sys CPU load is quite
big for above code, my tests with bcm2835-mmc and slave_sg from RaspberryPi
Foundation gives about 15s instead of 31s. It would be great to relive CPU a
little bit.
Best Regards,
Piotr Król
More information about the linux-rpi-kernel
mailing list