| Message ID | 1538566587-29452-2-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag | expand |
> +static void tmio_mmc_reset(struct tmio_mmc_host *host) > +{ > + /* FIXME - should we set stop clock reg here */ > + sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); > + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); > + usleep_range(10000, 11000); > + sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); > + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); > + usleep_range(10000, 11000); > + > + if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { > + sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); > + sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); > + } > +} Yes, looks much safer now. > + host->reset = tmio_mmc_reset; So, you populate the new pointer here... > + if (!_host->reset) > + _host->reset = tmio_mmc_reset; ... and here. But it seems never used anywhere? Or am I missing something?
On Wed, Oct 10, 2018 at 8:49 AM Wolfram Sang <wsa@the-dreams.de> wrote: > > > > +static void tmio_mmc_reset(struct tmio_mmc_host *host) > > +{ > > + /* FIXME - should we set stop clock reg here */ > > + sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); > > + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); > > + usleep_range(10000, 11000); > > + sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); > > + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); > > + usleep_range(10000, 11000); > > + > > + if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { > > + sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); > > + sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); > > + } > > +} > > Yes, looks much safer now. > > > + host->reset = tmio_mmc_reset; > > So, you populate the new pointer here... > > > + if (!_host->reset) > > + _host->reset = tmio_mmc_reset; > > ... and here. But it seems never used anywhere? Or am I missing > something? > Bummer. I am totally screwed up. V3 is right away. Thanks!
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index e04c322..00d291c 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -78,6 +78,22 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, tmio_mmc_clk_start(host); } +static void tmio_mmc_reset(struct tmio_mmc_host *host) +{ + /* FIXME - should we set stop clock reg here */ + sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); + usleep_range(10000, 11000); + sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); + usleep_range(10000, 11000); + + if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { + sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); + sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); + } +} + #ifdef CONFIG_PM_SLEEP static int tmio_mmc_suspend(struct device *dev) { @@ -156,6 +172,7 @@ static int tmio_mmc_probe(struct platform_device *pdev) /* SD control register space size is 0x200, 0x400 for bus_shift=1 */ host->bus_shift = resource_size(res) >> 10; host->set_clock = tmio_mmc_set_clock; + host->reset = tmio_mmc_reset; host->mmc->f_max = pdata->hclk; host->mmc->f_min = pdata->hclk / 512; diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index e6aa13a..a1a661b 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -176,6 +176,7 @@ struct tmio_mmc_host { int (*multi_io_quirk)(struct mmc_card *card, unsigned int direction, int blk_size); int (*write16_hook)(struct tmio_mmc_host *host, int addr); + void (*reset)(struct tmio_mmc_host *host); void (*hw_reset)(struct tmio_mmc_host *host); void (*prepare_tuning)(struct tmio_mmc_host *host, unsigned long tap); bool (*check_scc_error)(struct tmio_mmc_host *host); diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 0611824..9bcc760 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -164,19 +164,14 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) { /* FIXME - should we set stop clock reg here */ sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); - if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) - sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); usleep_range(10000, 11000); sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); - if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) - sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); usleep_range(10000, 11000); if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); } - } static void tmio_mmc_reset_work(struct work_struct *work) @@ -1212,6 +1207,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) mmc->caps & MMC_CAP_NEEDS_POLL || !mmc_card_is_removable(mmc)); + if (!_host->reset) + _host->reset = tmio_mmc_reset; + /* * On Gen2+, eMMC with NONREMOVABLE currently fails because native * hotplug gets disabled. It seems RuntimePM related yet we need further
CTL_RESET_SDIO register is specific to the TMIO MFD (tmio_mmc.c). Add a new hook host->reset for performing a platform-specific reset sequence, and move CTL_RESET_SDIO over there. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: - Preserve the current sequence for tmio_mmc.c drivers/mmc/host/tmio_mmc.c | 17 +++++++++++++++++ drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 8 +++----- 3 files changed, 21 insertions(+), 5 deletions(-)