On Tue, Feb 26, 2019 at 6:06 PM Ming Lei <tom.leiming@xxxxxxxxx> wrote:
>
> On Tue, Feb 26, 2019 at 2:47 PM Faiz Abbas <faiz_abbas@xxxxxx> wrote:
> >
> > Hi Ming Lei,
> >
> > On 26/02/19 7:11 AM, Ming Lei wrote:
> > > On Mon, Feb 25, 2019 at 9:14 PM Faiz Abbas <faiz_abbas@xxxxxx> wrote:
> > >>
> > >> Hi Naresh,
> > >>
> > >> + Commit authors.
> > >>
> > >> On 19/02/19 6:38 PM, Faiz Abbas wrote:
> > >>> Hi Naresh,
> > >>>
> > >>> On 18/02/19 6:57 PM, Naresh Kamboju wrote:
> > >>>> Do you see this error on am57xx-evm running Linux next 20190218 ?
> > >>>> I have tested on multiple devices and found this error.
> > >>>> Please find the full boot log [1].
> > >>>> Am i missing any pre required configs [2] ?
> > >>>>
> > >>>> [ 5.620263] mmc1: ADMA error
> > >>>> [ 5.623266] mmc1: sdhci: ============ SDHCI REGISTER DUMP ===========
> > >>>> [ 5.629740] mmc1: sdhci: Sys addr: 0x00000000 | Version: 0x00003302
> > >>>> [ 5.636215] mmc1: sdhci: Blk size: 0x00000200 | Blk cnt: 0x0000ffff
> > >>>> [ 5.642690] mmc1: sdhci: Argument: 0x002cec70 | Trn mode: 0x00000033
> > >>>> [ 5.649162] mmc1: sdhci: Present: 0x01f00000 | Host ctl: 0x00000010
> > >>>> [ 5.655634] mmc1: sdhci: Power: 0x0000000f | Blk gap: 0x00000000
> > >>>> [ 5.662108] mmc1: sdhci: Wake-up: 0x00000000 | Clock: 0x00000107
> > >>>> [ 5.668582] mmc1: sdhci: Timeout: 0x0000000c | Int stat: 0x00000000
> > >>>> [ 5.675055] mmc1: sdhci: Int enab: 0x027f000b | Sig enab: 0x027f000b
> > >>>> [ 5.681529] mmc1: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000000
> > >>>> [ 5.688002] mmc1: sdhci: Caps: 0x21e90080 | Caps_1: 0x00000f77
> > >>>> [ 5.694474] mmc1: sdhci: Cmd: 0x0000123a | Max curr: 0x00000000
> > >>>> [ 5.700949] mmc1: sdhci: Resp[0]: 0x00000900 | Resp[1]: 0xffffffef
> > >>>> [ 5.707423] mmc1: sdhci: Resp[2]: 0x0f5903ff | Resp[3]: 0xd04f0132
> > >>>> [ 5.713896] mmc1: sdhci: Host ctl2: 0x00000004
> > >>>> [ 5.718364] mmc1: sdhci: ADMA Err: 0x00000007 | ADMA Ptr: 0xab868218
> > >>>>
> > >>>
> > >>> I see this as well on my setup. Trying to bisect now. Will keep you posted.
> > >>
> > >>
> > >> Reverting the following commit fixes this.
> > >> commit 07173c3ec276cbb18dc0e0687d37d310e98a1480
> > >> Author: Ming Lei <ming.lei@xxxxxxxxxx>
> > >> Date: Fri Feb 15 19:13:20 2019 +0800
> > >>
> > >> block: enable multipage bvecs
> > >>
> > >> This patch pulls the trigger for multi-page bvecs.
> > >>
> > >> Reviewed-by: Omar Sandoval <osandov@xxxxxx>
> > >> Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx>
> > >> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
> > >
> > > Hi,
> > >
> > > Thanks for your report & bisect.
> > >
> > > Could you test the following patch?
> > >
> > > https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.1/block&id=8f4e80da764ec1ca44c83f3e17dbc9bf0209bccc
> > >
> > > Or simply run the latest -next?
> >
> > That didn't fix it for me. Still see ADMA error.
> >
> > [ 13.126186] mmc0: ADMA error
> > [ 13.129084] mmc0: sdhci: ============ SDHCI REGISTER DUMP ===========
> > [ 13.135552] mmc0: sdhci: Sys addr: 0x00000000 | Version: 0x00003302
> > [ 13.142019] mmc0: sdhci: Blk size: 0x00000200 | Blk cnt: 0x00000000
> > [ 13.148485] mmc0: sdhci: Argument: 0x00000089 | Trn mode: 0x00000033
> > [ 13.154952] mmc0: sdhci: Present: 0x00000000 | Host ctl: 0x00000012
> > [ 13.161418] mmc0: sdhci: Power: 0x0000000f | Blk gap: 0x00000000
> > [ 13.167885] mmc0: sdhci: Wake-up: 0x00000000 | Clock: 0x00000107
> > [ 13.174351] mmc0: sdhci: Timeout: 0x0000000a | Int stat: 0x00000000
> > [ 13.180817] mmc0: sdhci: Int enab: 0x027f000b | Sig enab: 0x027f000b
> > [ 13.187282] mmc0: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000000
> > [ 13.193748] mmc0: sdhci: Caps: 0x25e90080 | Caps_1: 0x00000f77
> > [ 13.200215] mmc0: sdhci: Cmd: 0x0000123a | Max curr: 0x00000000
> > [ 13.206682] mmc0: sdhci: Resp[0]: 0x00000900 | Resp[1]: 0x3b377f80
> > [ 13.213148] mmc0: sdhci: Resp[2]: 0x5b590000 | Resp[3]: 0x400e0032
> > [ 13.219613] mmc0: sdhci: Host ctl2: 0x00000000
> > [ 13.224073] mmc0: sdhci: ADMA Err: 0x00000007 | ADMA Ptr: 0xae857288
> > [ 13.230538] mmc0: sdhci: ============================================
>
> OK, I will write a debug patch to dump the sg data and see if it is
> generated as wrong.
Hi Faiz,
Could you apply the attached debug patch and post the dmesg log?
Also please provide us the following log.
(cd /sys/block/mmcblk0/queue && find . -type f -exec grep -aH . {} \;)
Thanks,
Ming Lei
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index aef1185f383d..ba9cf888aa87 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1595,6 +1595,8 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
struct mmc_blk_data *md = mq->blkdata;
bool do_rel_wr, do_data_tag;
+ brq->mrq.rq = req;
+
mmc_blk_data_prep(mq, mqrq, disable_multi, &do_rel_wr, &do_data_tag);
brq->mrq.cmd = &brq->cmd;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index eba9bcc92ad3..40e8424d8eaf 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2842,6 +2842,31 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *intmask_p)
sdhci_finish_command(host);
}
+#include <linux/blkdev.h>
+static void sdhci_dump_sg(struct sdhci_host *host)
+{
+ struct scatterlist *sg;
+ struct request *rq = host->data->mrq->rq;
+ struct req_iterator rq_iter;
+ struct bio_vec tmp;
+ int i = 0;
+
+ printk("%s: dump sg list\n", __func__);
+ for (sg = host->data->sg; sg; sg = sg_next(sg))
+ printk("\t %d: %lu %u %u\n",
+ i++,
+ (unsigned long)page_to_pfn(sg_page(sg)),
+ sg->offset, sg->length);
+
+ printk("%s: dump request bvec\n", __func__);
+ i = 0;
+ rq_for_each_bvec(tmp, rq, rq_iter)
+ printk("\t %d: %lu %u %u\n",
+ i++,
+ (unsigned long)page_to_pfn(tmp.bv_page),
+ tmp.bv_offset, tmp.bv_len);
+}
+
static void sdhci_adma_show_error(struct sdhci_host *host)
{
void *desc = host->adma_table;
@@ -2941,6 +2966,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
else if (intmask & SDHCI_INT_ADMA_ERROR) {
pr_err("%s: ADMA error\n", mmc_hostname(host->mmc));
sdhci_adma_show_error(host);
+ sdhci_dump_sg(host);
host->data->error = -EIO;
if (host->ops->adma_workaround)
host->ops->adma_workaround(host, intmask);
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 134a6483347a..25565e640bfa 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -168,6 +168,7 @@ struct mmc_request {
bool cap_cmd_during_tfr;
int tag;
+ struct request *rq;
};
struct mmc_card;
