Hi Niklas, On Thu, Jun 07, 2018 at 01:22:50AM +0200, Niklas Söderlund wrote: > From: Masaharu Hayakawa <masaharu.hayakawa.ry@xxxxxxxxxxx> > > The initial value of the interrupt mask register may be different from > the H/W manual at the startup of the kernel by setting of initial program. s/initial program/bootloader/ ? > Since the error interrupts may be unmasked, the driver sets initial value. > > Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@xxxxxxxxxxx> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx> > --- > drivers/mmc/host/tmio_mmc.h | 1 + > drivers/mmc/host/tmio_mmc_core.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h > index e7d651352dc90fb8..bfb76b2963f80894 100644 > --- a/drivers/mmc/host/tmio_mmc.h > +++ b/drivers/mmc/host/tmio_mmc.h > @@ -102,6 +102,7 @@ > > /* Define some IRQ masks */ > /* This is the mask used at reset by the chip */ > +#define TMIO_MASK_INIT 0x8b7f031d /* H/W initial value */ known on R-Car 2+ only! > #define TMIO_MASK_ALL 0x837f031d > #define TMIO_MASK_READOP (TMIO_STAT_RXRDY | TMIO_STAT_DATAEND) > #define TMIO_MASK_WRITEOP (TMIO_STAT_TXRQ | TMIO_STAT_DATAEND) > diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c > index 3080299303045adc..2ede81476daf76ce 100644 > --- a/drivers/mmc/host/tmio_mmc_core.c > +++ b/drivers/mmc/host/tmio_mmc_core.c > @@ -1273,6 +1273,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) > tmio_mmc_clk_stop(_host); > tmio_mmc_reset(_host); > > + sd_ctrl_write32_as_16_and_16(_host, CTL_IRQ_MASK, TMIO_MASK_INIT); So, we should at least protect this with TMIO_MMC_MIN_RCAR2, I'd think. Maybe we should even move it to renesas_sdhi_core.c, but I am not too sure about that. Regards, Wolfram
Attachment:
signature.asc
Description: PGP signature
