| Message ID | Pine.LNX.4.64.1208220840400.26767@axis700.grange (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hello Guennadi, Thank you for your patch. I will test this next week. > One more question - is this only needed for 3.7 or also for 3.6 / stable? I hope this also for 3.6 / stable because it is more robust. The other hand, we need investigate why this strange interrupt happens. (2012/08/22 15:49), Guennadi Liakhovetski wrote: > On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious > interrupts without any active request. To prevent the Oops, that results > in such cases, don't dereference the mmc request pointer until we make > sure, that we are indeed processing such a request. > > Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > > Hello Kobayashi-san > > On Mon, 20 Aug 2012, Tetsuyuki Kobayashi wrote: > > ... > >> After applying this patch on kzm9g board, I got this error regarding eMMC. >> I think this is another problem. >> >> >> Unable to handle kernel NULL pointer dereference at virtual address 00000008 >> pgd = c0004000 >> [00000008] *pgd=00000000 >> Internal error: Oops: 17 [#1] PREEMPT SMP ARM >> Modules linked in: >> CPU: 1 Not tainted (3.6.0-rc2+ #103) >> PC is at sh_mmcif_irqt+0x20/0xb30 >> LR is at irq_thread+0x94/0x16c > > [snip] > >> My quick fix is below. >> >> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >> index 5d81427..e587fbc 100644 >> --- a/drivers/mmc/host/sh_mmcif.c >> +++ b/drivers/mmc/host/sh_mmcif.c >> @@ -1104,7 +1104,15 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) >> { >> struct sh_mmcif_host *host = dev_id; >> struct mmc_request *mrq = host->mrq; >> - struct mmc_data *data = mrq->data; >> + /*struct mmc_data *data = mrq->data; -- this cause null pointer access*/ >> + struct mmc_data *data; >> + >> + /* quick fix by koba */ >> + if (mrq == NULL) { >> + printk("sh_mmcif_irqt: mrq == NULL: host->wait_for=%d\n", host->wait_for); >> + } else { >> + data = mrq->data; >> + } >> >> cancel_delayed_work_sync(&host->timeout_work); >> >> >> With this patch, there is no null pointer accesses and got this log. >> >> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >> ... >> >> host->wait_for is 0. it is MMCIF_WAIT_FOR_REQUEST. >> There is code such like: >> >> host->wait_for = MMCIF_WAIT_FOR_REQUEST; >> host->mrq = NULL; >> >> So, at the top of sh_mmcif_irqt, if host->wait_for == MMCIF_WAIT_FOR_REQUEST, >> host->mrq = NULL. >> It is too earlier to access mrq->data before checking host->mrq. it may >> cause null pointer access. >> >> Goda-san, could you check this and refine the code of sh_mmcif_irqt? > > Thanks for your report and a fix. Could you please double-check, whether > the below patch also fixes your problem? Since such spurious interrupts > are possible I would commit a check like this one, but in the longer run > we want to identify and eliminate them, if possible. But since so far > these interrupts only happen on 1 board model and also not on all units > and not upon each boot, this could be a bit tricky. > > One more question - is this only needed for 3.7 or also for 3.6 / stable? > > Thanks > Guennadi > > drivers/mmc/host/sh_mmcif.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > index 5d81427..82bf921 100644 > --- a/drivers/mmc/host/sh_mmcif.c > +++ b/drivers/mmc/host/sh_mmcif.c > @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > { > struct sh_mmcif_host *host = dev_id; > struct mmc_request *mrq = host->mrq; > - struct mmc_data *data = mrq->data; > > cancel_delayed_work_sync(&host->timeout_work); > > @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > case MMCIF_WAIT_FOR_READ_END: > case MMCIF_WAIT_FOR_WRITE_END: > if (host->sd_error) > - data->error = sh_mmcif_error_manage(host); > + mrq->data->error = sh_mmcif_error_manage(host); > break; > default: > BUG(); > } > > if (host->wait_for != MMCIF_WAIT_FOR_STOP) { > + struct mmc_data *data = mrq->data; > if (!mrq->cmd->error && data && !data->error) > data->bytes_xfered = > data->blocks * data->blksz; > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Kobayashi-san On Wed, 22 Aug 2012, Tetsuyuki Kobayashi wrote: > Hello Guennadi, > > Thank you for your patch. I will test this next week. Great, thanks very much! I'l also try to fund some time early in September to test on my board. Could you please send me your .config kernel configuration (off-list)? Thanks Guennadi > > One more question - is this only needed for 3.7 or also for 3.6 / stable? > > I hope this also for 3.6 / stable because it is more robust. > The other hand, we need investigate why this strange interrupt happens. > > (2012/08/22 15:49), Guennadi Liakhovetski wrote: > > On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious > > interrupts without any active request. To prevent the Oops, that results > > in such cases, don't dereference the mmc request pointer until we make > > sure, that we are indeed processing such a request. > > > > Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > --- > > > > Hello Kobayashi-san > > > > On Mon, 20 Aug 2012, Tetsuyuki Kobayashi wrote: > > > > ... > > > > > After applying this patch on kzm9g board, I got this error regarding eMMC. > > > I think this is another problem. > > > > > > > > > Unable to handle kernel NULL pointer dereference at virtual address > > > 00000008 > > > pgd = c0004000 > > > [00000008] *pgd=00000000 > > > Internal error: Oops: 17 [#1] PREEMPT SMP ARM > > > Modules linked in: > > > CPU: 1 Not tainted (3.6.0-rc2+ #103) > > > PC is at sh_mmcif_irqt+0x20/0xb30 > > > LR is at irq_thread+0x94/0x16c > > > > [snip] > > > > > My quick fix is below. > > > > > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > > > index 5d81427..e587fbc 100644 > > > --- a/drivers/mmc/host/sh_mmcif.c > > > +++ b/drivers/mmc/host/sh_mmcif.c > > > @@ -1104,7 +1104,15 @@ static irqreturn_t sh_mmcif_irqt(int irq, void > > > *dev_id) > > > { > > > struct sh_mmcif_host *host = dev_id; > > > struct mmc_request *mrq = host->mrq; > > > - struct mmc_data *data = mrq->data; > > > + /*struct mmc_data *data = mrq->data; -- this cause null pointer > > > access*/ > > > + struct mmc_data *data; > > > + > > > + /* quick fix by koba */ > > > + if (mrq == NULL) { > > > + printk("sh_mmcif_irqt: mrq == NULL: host->wait_for=%d\n", > > > host->wait_for); > > > + } else { > > > + data = mrq->data; > > > + } > > > > > > cancel_delayed_work_sync(&host->timeout_work); > > > > > > > > > With this patch, there is no null pointer accesses and got this log. > > > > > > sh_mmcif_irqt: mrq == NULL: host->wait_for=0 > > > sh_mmcif_irqt: mrq == NULL: host->wait_for=0 > > > ... > > > > > > host->wait_for is 0. it is MMCIF_WAIT_FOR_REQUEST. > > > There is code such like: > > > > > > host->wait_for = MMCIF_WAIT_FOR_REQUEST; > > > host->mrq = NULL; > > > > > > So, at the top of sh_mmcif_irqt, if host->wait_for == > > > MMCIF_WAIT_FOR_REQUEST, > > > host->mrq = NULL. > > > It is too earlier to access mrq->data before checking host->mrq. it may > > > cause null pointer access. > > > > > > Goda-san, could you check this and refine the code of sh_mmcif_irqt? > > > > Thanks for your report and a fix. Could you please double-check, whether > > the below patch also fixes your problem? Since such spurious interrupts > > are possible I would commit a check like this one, but in the longer run > > we want to identify and eliminate them, if possible. But since so far > > these interrupts only happen on 1 board model and also not on all units > > and not upon each boot, this could be a bit tricky. > > > > One more question - is this only needed for 3.7 or also for 3.6 / stable? > > > > Thanks > > Guennadi > > > > drivers/mmc/host/sh_mmcif.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > > index 5d81427..82bf921 100644 > > --- a/drivers/mmc/host/sh_mmcif.c > > +++ b/drivers/mmc/host/sh_mmcif.c > > @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void > > *dev_id) > > { > > struct sh_mmcif_host *host = dev_id; > > struct mmc_request *mrq = host->mrq; > > - struct mmc_data *data = mrq->data; > > > > cancel_delayed_work_sync(&host->timeout_work); > > > > @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void > > *dev_id) > > case MMCIF_WAIT_FOR_READ_END: > > case MMCIF_WAIT_FOR_WRITE_END: > > if (host->sd_error) > > - data->error = sh_mmcif_error_manage(host); > > + mrq->data->error = sh_mmcif_error_manage(host); > > break; > > default: > > BUG(); > > } > > > > if (host->wait_for != MMCIF_WAIT_FOR_STOP) { > > + struct mmc_data *data = mrq->data; > > if (!mrq->cmd->error && data && !data->error) > > data->bytes_xfered = > > data->blocks * data->blksz; > > > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Guennadi (2012/08/22 15:49), Guennadi Liakhovetski wrote: > On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious > interrupts without any active request. To prevent the Oops, that results > in such cases, don't dereference the mmc request pointer until we make > sure, that we are indeed processing such a request. > > Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > > Hello Kobayashi-san > > On Mon, 20 Aug 2012, Tetsuyuki Kobayashi wrote: > > ... > >> After applying this patch on kzm9g board, I got this error regarding eMMC. >> I think this is another problem. >> >> >> Unable to handle kernel NULL pointer dereference at virtual address 00000008 >> pgd = c0004000 >> [00000008] *pgd=00000000 >> Internal error: Oops: 17 [#1] PREEMPT SMP ARM >> Modules linked in: >> CPU: 1 Not tainted (3.6.0-rc2+ #103) >> PC is at sh_mmcif_irqt+0x20/0xb30 >> LR is at irq_thread+0x94/0x16c > > [snip] > >> My quick fix is below. >> >> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >> index 5d81427..e587fbc 100644 >> --- a/drivers/mmc/host/sh_mmcif.c >> +++ b/drivers/mmc/host/sh_mmcif.c >> @@ -1104,7 +1104,15 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) >> { >> struct sh_mmcif_host *host = dev_id; >> struct mmc_request *mrq = host->mrq; >> - struct mmc_data *data = mrq->data; >> + /*struct mmc_data *data = mrq->data; -- this cause null pointer access*/ >> + struct mmc_data *data; >> + >> + /* quick fix by koba */ >> + if (mrq == NULL) { >> + printk("sh_mmcif_irqt: mrq == NULL: host->wait_for=%d\n", host->wait_for); >> + } else { >> + data = mrq->data; >> + } >> >> cancel_delayed_work_sync(&host->timeout_work); >> >> >> With this patch, there is no null pointer accesses and got this log. >> >> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >> ... >> >> host->wait_for is 0. it is MMCIF_WAIT_FOR_REQUEST. >> There is code such like: >> >> host->wait_for = MMCIF_WAIT_FOR_REQUEST; >> host->mrq = NULL; >> >> So, at the top of sh_mmcif_irqt, if host->wait_for == MMCIF_WAIT_FOR_REQUEST, >> host->mrq = NULL. >> It is too earlier to access mrq->data before checking host->mrq. it may >> cause null pointer access. >> >> Goda-san, could you check this and refine the code of sh_mmcif_irqt? > > Thanks for your report and a fix. Could you please double-check, whether > the below patch also fixes your problem? Since such spurious interrupts > are possible I would commit a check like this one, but in the longer run > we want to identify and eliminate them, if possible. But since so far > these interrupts only happen on 1 board model and also not on all units > and not upon each boot, this could be a bit tricky. > > One more question - is this only needed for 3.7 or also for 3.6 / stable? > > Thanks > Guennadi > > drivers/mmc/host/sh_mmcif.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > index 5d81427..82bf921 100644 > --- a/drivers/mmc/host/sh_mmcif.c > +++ b/drivers/mmc/host/sh_mmcif.c > @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > { > struct sh_mmcif_host *host = dev_id; > struct mmc_request *mrq = host->mrq; > - struct mmc_data *data = mrq->data; > > cancel_delayed_work_sync(&host->timeout_work); > > @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > case MMCIF_WAIT_FOR_READ_END: > case MMCIF_WAIT_FOR_WRITE_END: > if (host->sd_error) > - data->error = sh_mmcif_error_manage(host); > + mrq->data->error = sh_mmcif_error_manage(host); > break; > default: > BUG(); > } > > if (host->wait_for != MMCIF_WAIT_FOR_STOP) { > + struct mmc_data *data = mrq->data; > if (!mrq->cmd->error && data && !data->error) > data->bytes_xfered = > data->blocks * data->blksz; > I tried this patch. It seems better. But I think this still have potential race condition. I am afraid that one cpu enter sh_mmcif_irqt and other cpu write to host->wait_for for new request at the same time. How about add this code at the top of sh_mmcif_irqt or before returning IRQ_WAKE_THREAD in sh_mmcif_intr ? if (host->state == STATE_IDLE) return IRQ_HANDLED; I will rebase my test environment to v3.6-rc3 or later. Then I will send you my .config. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Guennadi, (2012/08/23 16:11), Guennadi Liakhovetski wrote:> Hello Kobayashi-san > > On Wed, 22 Aug 2012, Tetsuyuki Kobayashi wrote: > >> Hello Guennadi, >> >> Thank you for your patch. I will test this next week. > > Great, thanks very much! I'l also try to fund some time early in September > to test on my board. Could you please send me your .config kernel > configuration (off-list)? I attached my .config file for kzm9g board. My working source tree is: git clone git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git checkout kzm9g branch apply these 3 patches: [PATCH] ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs' http://www.spinics.net/lists/linux-sh/msg12970.html Paul's irqdomain patch http://www.spinics.net/lists/linux-sh/msg12760.html [PATCH] ARM: shmobile: sh73a0: fixup RELOC_BASE of intca_irq_pins_desc http://www.spinics.net/lists/linux-sh/msg12876.html and then, apply your patch for sh_mmcif.c Simon's Booting DT kernel on a non-DT bootloader is helpful, too. http://www.spinics.net/lists/linux-sh/msg13051.html I made 1 partition of eMMC by fdisk command and made ext4 file system on it. The spurious interrupts occurs at boot time and when accesses file sytem on eMMC. >> (2012/08/22 15:49), Guennadi Liakhovetski wrote: >>> On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious >>> interrupts without any active request. To prevent the Oops, that results >>> in such cases, don't dereference the mmc request pointer until we make >>> sure, that we are indeed processing such a request. >>> >>> Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> >>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >>> --- >>> >>> Hello Kobayashi-san >>> >>> On Mon, 20 Aug 2012, Tetsuyuki Kobayashi wrote: >>> >>> ... >>> >>>> After applying this patch on kzm9g board, I got this error regarding eMMC. >>>> I think this is another problem. >>>> >>>> >>>> Unable to handle kernel NULL pointer dereference at virtual address >>>> 00000008 >>>> pgd = c0004000 >>>> [00000008] *pgd=00000000 >>>> Internal error: Oops: 17 [#1] PREEMPT SMP ARM >>>> Modules linked in: >>>> CPU: 1 Not tainted (3.6.0-rc2+ #103) >>>> PC is at sh_mmcif_irqt+0x20/0xb30 >>>> LR is at irq_thread+0x94/0x16c >>> >>> [snip] >>> >>>> My quick fix is below. >>>> >>>> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >>>> index 5d81427..e587fbc 100644 >>>> --- a/drivers/mmc/host/sh_mmcif.c >>>> +++ b/drivers/mmc/host/sh_mmcif.c >>>> @@ -1104,7 +1104,15 @@ static irqreturn_t sh_mmcif_irqt(int irq, void >>>> *dev_id) >>>> { >>>> struct sh_mmcif_host *host = dev_id; >>>> struct mmc_request *mrq = host->mrq; >>>> - struct mmc_data *data = mrq->data; >>>> + /*struct mmc_data *data = mrq->data; -- this cause null pointer >>>> access*/ >>>> + struct mmc_data *data; >>>> + >>>> + /* quick fix by koba */ >>>> + if (mrq == NULL) { >>>> + printk("sh_mmcif_irqt: mrq == NULL: host->wait_for=%d\n", >>>> host->wait_for); >>>> + } else { >>>> + data = mrq->data; >>>> + } >>>> >>>> cancel_delayed_work_sync(&host->timeout_work); >>>> >>>> >>>> With this patch, there is no null pointer accesses and got this log. >>>> >>>> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >>>> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >>>> ... >>>> >>>> host->wait_for is 0. it is MMCIF_WAIT_FOR_REQUEST. >>>> There is code such like: >>>> >>>> host->wait_for = MMCIF_WAIT_FOR_REQUEST; >>>> host->mrq = NULL; >>>> >>>> So, at the top of sh_mmcif_irqt, if host->wait_for == >>>> MMCIF_WAIT_FOR_REQUEST, >>>> host->mrq = NULL. >>>> It is too earlier to access mrq->data before checking host->mrq. it may >>>> cause null pointer access. >>>> >>>> Goda-san, could you check this and refine the code of sh_mmcif_irqt? >>> >>> Thanks for your report and a fix. Could you please double-check, whether >>> the below patch also fixes your problem? Since such spurious interrupts >>> are possible I would commit a check like this one, but in the longer run >>> we want to identify and eliminate them, if possible. But since so far >>> these interrupts only happen on 1 board model and also not on all units >>> and not upon each boot, this could be a bit tricky. >>> >>> One more question - is this only needed for 3.7 or also for 3.6 / stable? >>> >>> Thanks >>> Guennadi >>> >>> drivers/mmc/host/sh_mmcif.c | 4 ++-- >>> 1 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >>> index 5d81427..82bf921 100644 >>> --- a/drivers/mmc/host/sh_mmcif.c >>> +++ b/drivers/mmc/host/sh_mmcif.c >>> @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void >>> *dev_id) >>> { >>> struct sh_mmcif_host *host = dev_id; >>> struct mmc_request *mrq = host->mrq; >>> - struct mmc_data *data = mrq->data; >>> >>> cancel_delayed_work_sync(&host->timeout_work); >>> >>> @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void >>> *dev_id) >>> case MMCIF_WAIT_FOR_READ_END: >>> case MMCIF_WAIT_FOR_WRITE_END: >>> if (host->sd_error) >>> - data->error = sh_mmcif_error_manage(host); >>> + mrq->data->error = sh_mmcif_error_manage(host); >>> break; >>> default: >>> BUG(); >>> } >>> >>> if (host->wait_for != MMCIF_WAIT_FOR_STOP) { >>> + struct mmc_data *data = mrq->data; >>> if (!mrq->cmd->error && data && !data->error) >>> data->bytes_xfered = >>> data->blocks * data->blksz; >>> # CONFIG_ARM_PATCH_PHYS_VIRT is not set CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_SHMOBILE=y CONFIG_KEYBOARD_GPIO_POLLED=y CONFIG_ARCH_SH73A0=y CONFIG_MACH_KZM9G=y CONFIG_MEMORY_START=0x41000000 CONFIG_MEMORY_SIZE=0x1f000000 CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y CONFIG_ARM_ERRATA_743622=y CONFIG_ARM_ERRATA_751472=y CONFIG_ARM_ERRATA_754322=y CONFIG_ARM_ERRATA_754327=y CONFIG_ARM_ERRATA_764369=y CONFIG_PL310_ERRATA_769419=y CONFIG_SMP=y CONFIG_SCHED_MC=y CONFIG_PREEMPT=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200" CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_IRDA=y CONFIG_SH_IRDA=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_NETDEVICES=y CONFIG_SMSC911X=y # CONFIG_WLAN is not set CONFIG_INPUT_SPARSEKMAP=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ST1232=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=9 CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C_CHARDEV=y CONFIG_I2C_SH_MOBILE=y CONFIG_GPIO_PCF857X=y # CONFIG_HWMON is not set CONFIG_FB=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_FB_SH_MOBILE_MERAM=y CONFIG_SOUND=y CONFIG_SND=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y CONFIG_SND_SOC_SH4_FSI=y CONFIG_USB=y CONFIG_USB_R8A66597_HCD=y CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=y CONFIG_USB_ETH=m CONFIG_USB_MASS_STORAGE=m CONFIG_MMC=y # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_RS5C372=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y CONFIG_ASYNC_TX_DMA=y CONFIG_STAGING=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_INFO=y # CONFIG_FTRACE is not set CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_DES=y
Hello Guennadi (2012/08/31 12:05), Tetsuyuki Kobayashi wrote: > (2012/08/22 15:49), Guennadi Liakhovetski wrote: >> On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious >> interrupts without any active request. To prevent the Oops, that results >> in such cases, don't dereference the mmc request pointer until we make >> sure, that we are indeed processing such a request. >> >> Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> >> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >> --- >> >> Hello Kobayashi-san >> >> On Mon, 20 Aug 2012, Tetsuyuki Kobayashi wrote: >> >> ... >> >>> After applying this patch on kzm9g board, I got this error regarding >>> eMMC. >>> I think this is another problem. >>> >>> >>> Unable to handle kernel NULL pointer dereference at virtual address >>> 00000008 >>> pgd = c0004000 >>> [00000008] *pgd=00000000 >>> Internal error: Oops: 17 [#1] PREEMPT SMP ARM >>> Modules linked in: >>> CPU: 1 Not tainted (3.6.0-rc2+ #103) >>> PC is at sh_mmcif_irqt+0x20/0xb30 >>> LR is at irq_thread+0x94/0x16c >> >> [snip] >> >>> My quick fix is below. >>> >>> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >>> index 5d81427..e587fbc 100644 >>> --- a/drivers/mmc/host/sh_mmcif.c >>> +++ b/drivers/mmc/host/sh_mmcif.c >>> @@ -1104,7 +1104,15 @@ static irqreturn_t sh_mmcif_irqt(int irq, void >>> *dev_id) >>> { >>> struct sh_mmcif_host *host = dev_id; >>> struct mmc_request *mrq = host->mrq; >>> - struct mmc_data *data = mrq->data; >>> + /*struct mmc_data *data = mrq->data; -- this cause null >>> pointer access*/ >>> + struct mmc_data *data; >>> + >>> + /* quick fix by koba */ >>> + if (mrq == NULL) { >>> + printk("sh_mmcif_irqt: mrq == NULL: >>> host->wait_for=%d\n", host->wait_for); >>> + } else { >>> + data = mrq->data; >>> + } >>> >>> cancel_delayed_work_sync(&host->timeout_work); >>> >>> >>> With this patch, there is no null pointer accesses and got this log. >>> >>> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >>> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >>> ... >>> >>> host->wait_for is 0. it is MMCIF_WAIT_FOR_REQUEST. >>> There is code such like: >>> >>> host->wait_for = MMCIF_WAIT_FOR_REQUEST; >>> host->mrq = NULL; >>> >>> So, at the top of sh_mmcif_irqt, if host->wait_for == >>> MMCIF_WAIT_FOR_REQUEST, >>> host->mrq = NULL. >>> It is too earlier to access mrq->data before checking host->mrq. it may >>> cause null pointer access. >>> >>> Goda-san, could you check this and refine the code of sh_mmcif_irqt? >> >> Thanks for your report and a fix. Could you please double-check, whether >> the below patch also fixes your problem? Since such spurious interrupts >> are possible I would commit a check like this one, but in the longer run >> we want to identify and eliminate them, if possible. But since so far >> these interrupts only happen on 1 board model and also not on all units >> and not upon each boot, this could be a bit tricky. >> >> One more question - is this only needed for 3.7 or also for 3.6 / stable? >> >> Thanks >> Guennadi >> >> drivers/mmc/host/sh_mmcif.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >> index 5d81427..82bf921 100644 >> --- a/drivers/mmc/host/sh_mmcif.c >> +++ b/drivers/mmc/host/sh_mmcif.c >> @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void >> *dev_id) >> { >> struct sh_mmcif_host *host = dev_id; >> struct mmc_request *mrq = host->mrq; >> - struct mmc_data *data = mrq->data; >> >> cancel_delayed_work_sync(&host->timeout_work); >> >> @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void >> *dev_id) >> case MMCIF_WAIT_FOR_READ_END: >> case MMCIF_WAIT_FOR_WRITE_END: >> if (host->sd_error) >> - data->error = sh_mmcif_error_manage(host); >> + mrq->data->error = sh_mmcif_error_manage(host); >> break; >> default: >> BUG(); >> } >> >> if (host->wait_for != MMCIF_WAIT_FOR_STOP) { >> + struct mmc_data *data = mrq->data; >> if (!mrq->cmd->error && data && !data->error) >> data->bytes_xfered = >> data->blocks * data->blksz; >> > > I tried this patch. It seems better. > But I think this still have potential race condition. > I am afraid that one cpu enter sh_mmcif_irqt and other cpu write to > host->wait_for for new request at the same time. > How about add this code at the top of sh_mmcif_irqt or before returning > IRQ_WAKE_THREAD in sh_mmcif_intr ? > > if (host->state == STATE_IDLE) > return IRQ_HANDLED; > > I will rebase my test environment to v3.6-rc3 or later. Then I will > send you my .config. > How is this? I hope this fixed in v3.6. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
(2012/08/22 15:49), Guennadi Liakhovetski wrote: > On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious > interrupts without any active request. To prevent the Oops, that results > in such cases, don't dereference the mmc request pointer until we make > sure, that we are indeed processing such a request. > > Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> I verified on kzm9g. This works with [PATCH] mmc: sh-mmcif: properly handle MMC_WRITE_MULTIPLE_BLOCK completion IRQ Tested-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > --- > > Hello Kobayashi-san > > On Mon, 20 Aug 2012, Tetsuyuki Kobayashi wrote: > > ... > >> After applying this patch on kzm9g board, I got this error regarding eMMC. >> I think this is another problem. >> >> >> Unable to handle kernel NULL pointer dereference at virtual address 00000008 >> pgd = c0004000 >> [00000008] *pgd=00000000 >> Internal error: Oops: 17 [#1] PREEMPT SMP ARM >> Modules linked in: >> CPU: 1 Not tainted (3.6.0-rc2+ #103) >> PC is at sh_mmcif_irqt+0x20/0xb30 >> LR is at irq_thread+0x94/0x16c > > [snip] > >> My quick fix is below. >> >> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >> index 5d81427..e587fbc 100644 >> --- a/drivers/mmc/host/sh_mmcif.c >> +++ b/drivers/mmc/host/sh_mmcif.c >> @@ -1104,7 +1104,15 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) >> { >> struct sh_mmcif_host *host = dev_id; >> struct mmc_request *mrq = host->mrq; >> - struct mmc_data *data = mrq->data; >> + /*struct mmc_data *data = mrq->data; -- this cause null pointer access*/ >> + struct mmc_data *data; >> + >> + /* quick fix by koba */ >> + if (mrq == NULL) { >> + printk("sh_mmcif_irqt: mrq == NULL: host->wait_for=%d\n", host->wait_for); >> + } else { >> + data = mrq->data; >> + } >> >> cancel_delayed_work_sync(&host->timeout_work); >> >> >> With this patch, there is no null pointer accesses and got this log. >> >> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >> sh_mmcif_irqt: mrq == NULL: host->wait_for=0 >> ... >> >> host->wait_for is 0. it is MMCIF_WAIT_FOR_REQUEST. >> There is code such like: >> >> host->wait_for = MMCIF_WAIT_FOR_REQUEST; >> host->mrq = NULL; >> >> So, at the top of sh_mmcif_irqt, if host->wait_for == MMCIF_WAIT_FOR_REQUEST, >> host->mrq = NULL. >> It is too earlier to access mrq->data before checking host->mrq. it may >> cause null pointer access. >> >> Goda-san, could you check this and refine the code of sh_mmcif_irqt? > > Thanks for your report and a fix. Could you please double-check, whether > the below patch also fixes your problem? Since such spurious interrupts > are possible I would commit a check like this one, but in the longer run > we want to identify and eliminate them, if possible. But since so far > these interrupts only happen on 1 board model and also not on all units > and not upon each boot, this could be a bit tricky. > > One more question - is this only needed for 3.7 or also for 3.6 / stable? > > Thanks > Guennadi > > drivers/mmc/host/sh_mmcif.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c > index 5d81427..82bf921 100644 > --- a/drivers/mmc/host/sh_mmcif.c > +++ b/drivers/mmc/host/sh_mmcif.c > @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > { > struct sh_mmcif_host *host = dev_id; > struct mmc_request *mrq = host->mrq; > - struct mmc_data *data = mrq->data; > > cancel_delayed_work_sync(&host->timeout_work); > > @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > case MMCIF_WAIT_FOR_READ_END: > case MMCIF_WAIT_FOR_WRITE_END: > if (host->sd_error) > - data->error = sh_mmcif_error_manage(host); > + mrq->data->error = sh_mmcif_error_manage(host); > break; > default: > BUG(); > } > > if (host->wait_for != MMCIF_WAIT_FOR_STOP) { > + struct mmc_data *data = mrq->data; > if (!mrq->cmd->error && data && !data->error) > data->bytes_xfered = > data->blocks * data->blksz; > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wed, Aug 22 2012, Guennadi Liakhovetski wrote: > On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious > interrupts without any active request. To prevent the Oops, that results > in such cases, don't dereference the mmc request pointer until we make > sure, that we are indeed processing such a request. > > Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Thanks, pushed to mmc-next for 3.7. - Chris.
Hello, Chris (2012/09/19 15:24), Chris Ball wrote: > Hi, > > On Wed, Aug 22 2012, Guennadi Liakhovetski wrote: >> On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious >> interrupts without any active request. To prevent the Oops, that results >> in such cases, don't dereference the mmc request pointer until we make >> sure, that we are indeed processing such a request. >> >> Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> >> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > Thanks, pushed to mmc-next for 3.7. It needs this patch for kzm9g board to boot kernel 3.6-rc6 successfully. Can I ask you to queue this patch for 3.6-rc7 ? -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Dear linux-mmc maintainer, (09/19/2012 11:50 AM), Tetsuyuki Kobayashi wrote: > (2012/08/22 15:49), Guennadi Liakhovetski wrote: >> On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious >> interrupts without any active request. To prevent the Oops, that results >> in such cases, don't dereference the mmc request pointer until we make >> sure, that we are indeed processing such a request. >> >> Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> >> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > I verified on kzm9g. > This works with > [PATCH] mmc: sh-mmcif: properly handle MMC_WRITE_MULTIPLE_BLOCK > completion IRQ > > Tested-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > >> --- [snip] >> >> drivers/mmc/host/sh_mmcif.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c >> index 5d81427..82bf921 100644 >> --- a/drivers/mmc/host/sh_mmcif.c >> +++ b/drivers/mmc/host/sh_mmcif.c >> @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) >> { >> struct sh_mmcif_host *host = dev_id; >> struct mmc_request *mrq = host->mrq; >> - struct mmc_data *data = mrq->data; >> >> cancel_delayed_work_sync(&host->timeout_work); >> >> @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) >> case MMCIF_WAIT_FOR_READ_END: >> case MMCIF_WAIT_FOR_WRITE_END: >> if (host->sd_error) >> - data->error = sh_mmcif_error_manage(host); >> + mrq->data->error = sh_mmcif_error_manage(host); >> break; >> default: >> BUG(); >> } >> >> if (host->wait_for != MMCIF_WAIT_FOR_STOP) { >> + struct mmc_data *data = mrq->data; >> if (!mrq->cmd->error && data && !data->error) >> data->bytes_xfered = >> data->blocks * data->blksz; >> > Without this patch, the following Oops occurs. (kzm9g on v3.6-rc7) Please push this to v3.6, not only 3.7-next. [ 20.273437] Unable to handle kernel NULL pointer dereference at virtual address 00000008 [ 20.281250] pgd = c0004000 [ 20.281250] [00000008] *pgd=00000000 [ 20.281250] Internal error: Oops: 17 [#1] PREEMPT SMP ARM [ 20.281250] Modules linked in: [ 20.281250] CPU: 1 Not tainted (3.6.0-rc7 #28) [ 20.281250] PC is at sh_mmcif_irqt+0x18/0xb1c [ 20.281250] LR is at irq_thread+0x90/0x15c [ 20.281250] pc : [<c0250250>] lr : [<c005f180>] psr: 60000113 [ 20.281250] sp : de23df58 ip : 00000000 fp : 00000000 [ 20.281250] r10: 00000000 r9 : de1dcab4 r8 : dd9f6360 [ 20.281250] r7 : de23c000 r6 : de23c000 r5 : 00000000 r4 : de1dca80 [ 20.281250] r3 : c0250238 r2 : 00000000 r1 : de1dca80 r0 : de1dcab4 [ 20.281250] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel [ 20.281250] Control: 10c5387d Table: 5eb4804a DAC: 00000015 [ 20.281250] Process irq/173-sh_mmc: (pid: 406, stack limit = 0xde23c2f0) [ 20.281250] Stack: (0xde23df58 to 0xde23e000) [ 20.281250] df40: 00000003 00000000 [ 20.281250] df60: c0331f6c de1dca80 c046634c c0468190 dd9ca800 00000001 00000000 dd9f6340 [ 20.281250] df80: de00bc40 de23c000 de23c000 dd9f6360 00000000 00000000 00000000 c005f180 [ 20.281250] dfa0: 00000000 de23dfa4 c005f02c de043e3c dd9f6340 de043e3c dd9f6340 c005f0f0 [ 20.281250] dfc0: 00000013 00000000 00000000 c00387ac 00000000 dd9f6340 00000000 00000000 [ 20.281250] dfe0: de23dfe0 de23dfe0 de043e3c c0038728 c000f178 c000f178 00000000 00000000 [ 20.281250] [<c0250250>] (sh_mmcif_irqt+0x18/0xb1c) from [<c005f180>] (irq_thread+0x90/0x15c) [ 20.281250] [<c005f180>] (irq_thread+0x90/0x15c) from [<c00387ac>] (kthread+0x84/0x90) [ 20.281250] [<c00387ac>] (kthread+0x84/0x90) from [<c000f178>] (kernel_thread_exit+0x0/0x8) [ 20.281250] Code: e5915004 e1a04001 e24dd024 e1a00009 (e595a008) [ 20.281250] ---[ end trace 6efe730b0884a251 ]--- -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Kobayashi, On Tue, Sep 25 2012, Tetsuyuki Kobayashi wrote: > (09/19/2012 11:50 AM), Tetsuyuki Kobayashi wrote: >> (2012/08/22 15:49), Guennadi Liakhovetski wrote: >>> On some systems, e.g., kzm9g, MMCIF interfaces can produce spurious >>> interrupts without any active request. To prevent the Oops, that results >>> in such cases, don't dereference the mmc request pointer until we make >>> sure, that we are indeed processing such a request. >>> >>> Reported-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> >>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >> >> I verified on kzm9g. >> This works with >> [PATCH] mmc: sh-mmcif: properly handle MMC_WRITE_MULTIPLE_BLOCK >> completion IRQ >> >> Tested-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> > > Without this patch, the following Oops occurs. (kzm9g on v3.6-rc7) > Please push this to v3.6, not only 3.7-next. I'm traveling from Shanghai to Boston (home) at the moment, so I can't push this immediately. I'll either get it into 3.6, or 3.7 with a tag for 3.6-stable. Thanks, - Chris.
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 5d81427..82bf921 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1104,7 +1104,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) { struct sh_mmcif_host *host = dev_id; struct mmc_request *mrq = host->mrq; - struct mmc_data *data = mrq->data; cancel_delayed_work_sync(&host->timeout_work); @@ -1152,13 +1151,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) case MMCIF_WAIT_FOR_READ_END: case MMCIF_WAIT_FOR_WRITE_END: if (host->sd_error) - data->error = sh_mmcif_error_manage(host); + mrq->data->error = sh_mmcif_error_manage(host); break; default: BUG(); } if (host->wait_for != MMCIF_WAIT_FOR_STOP) { + struct mmc_data *data = mrq->data; if (!mrq->cmd->error && data && !data->error) data->bytes_xfered = data->blocks * data->blksz;