* [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag
@ 2018-10-10 3:51 Masahiro Yamada
2018-10-10 3:51 ` [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook Masahiro Yamada
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Masahiro Yamada @ 2018-10-10 3:51 UTC (permalink / raw)
To: Wolfram Sang, linux-mmc
Cc: Ulf Hansson, linux-renesas-soc, Masahiro Yamada, Lee Jones, linux-kernel
CTL_SDIO_REGS is a register specific to tmio_mmc.c
Currently, we handle it in tmio_mmc_core.c, hence need
TMIO_MMC_HAVE_HIGH_REG flag to prevent the other platforms
from accessing to it.
We can just move CTL_SDIO_REGS to tmio_mmc.c
and delete the confusing TMIO_MMC_HAVE_HIGH_REG flag.
Masahiro Yamada (2):
mmc: tmio: move MFD variant reset to a platform hook
mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag
drivers/mmc/host/tmio_mmc.c | 24 ++++++++++++++++++++++--
drivers/mmc/host/tmio_mmc.h | 4 +---
drivers/mmc/host/tmio_mmc_core.c | 14 ++++++--------
include/linux/mfd/tmio.h | 7 -------
4 files changed, 29 insertions(+), 20 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook 2018-10-10 3:51 [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada @ 2018-10-10 3:51 ` Masahiro Yamada 2018-10-14 22:27 ` Wolfram Sang 2018-10-10 3:51 ` [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada ` (2 subsequent siblings) 3 siblings, 1 reply; 9+ messages in thread From: Masahiro Yamada @ 2018-10-10 3:51 UTC (permalink / raw) To: Wolfram Sang, linux-mmc Cc: Ulf Hansson, linux-renesas-soc, Masahiro Yamada, linux-kernel 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 v3: - Replace all tmio_mmc_reset() calls with host->reset() 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 | 14 ++++++-------- 3 files changed, 24 insertions(+), 8 deletions(-) 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..a571106 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) @@ -217,7 +212,7 @@ static void tmio_mmc_reset_work(struct work_struct *work) spin_unlock_irqrestore(&host->lock, flags); - tmio_mmc_reset(host); + host->reset(host); /* Ready for new calls */ host->mrq = NULL; @@ -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 @@ -1233,7 +1231,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) _host->sdio_irq_mask = TMIO_SDIO_MASK_ALL; _host->set_clock(_host, 0); - tmio_mmc_reset(_host); + _host->reset(_host); _host->sdcard_irq_mask = sd_ctrl_read16_and_16_as_32(_host, CTL_IRQ_MASK); tmio_mmc_disable_mmc_irqs(_host, TMIO_MASK_ALL); @@ -1333,7 +1331,7 @@ int tmio_mmc_host_runtime_resume(struct device *dev) { struct tmio_mmc_host *host = dev_get_drvdata(dev); - tmio_mmc_reset(host); + host->reset(host); tmio_mmc_clk_enable(host); if (host->clk_cache) -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook 2018-10-10 3:51 ` [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook Masahiro Yamada @ 2018-10-14 22:27 ` Wolfram Sang 2018-10-15 11:32 ` Wolfram Sang 0 siblings, 1 reply; 9+ messages in thread From: Wolfram Sang @ 2018-10-14 22:27 UTC (permalink / raw) To: Masahiro Yamada Cc: Wolfram Sang, linux-mmc, Ulf Hansson, linux-renesas-soc, linux-kernel [-- Attachment #1: Type: text/plain, Size: 397 bytes --] On Wed, Oct 10, 2018 at 12:51:31PM +0900, Masahiro Yamada wrote: > 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> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook 2018-10-14 22:27 ` Wolfram Sang @ 2018-10-15 11:32 ` Wolfram Sang 0 siblings, 0 replies; 9+ messages in thread From: Wolfram Sang @ 2018-10-15 11:32 UTC (permalink / raw) To: Masahiro Yamada Cc: Wolfram Sang, linux-mmc, Ulf Hansson, linux-renesas-soc, linux-kernel [-- Attachment #1: Type: text/plain, Size: 703 bytes --] On Mon, Oct 15, 2018 at 12:27:58AM +0200, Wolfram Sang wrote: > On Wed, Oct 10, 2018 at 12:51:31PM +0900, Masahiro Yamada wrote: > > 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> > > Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested on R-Car H3 ES1.0 and ES2.0, M3N, and H2. No regressions. I pulled the SD card out during transfer to ensure the reset function will surely be called. Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag 2018-10-10 3:51 [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada 2018-10-10 3:51 ` [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook Masahiro Yamada @ 2018-10-10 3:51 ` Masahiro Yamada 2018-10-14 22:28 ` Wolfram Sang 2018-10-14 22:30 ` [PATCH v3 0/2] mmc: tmio: remove confusing " Wolfram Sang 2018-10-15 13:15 ` Ulf Hansson 3 siblings, 1 reply; 9+ messages in thread From: Masahiro Yamada @ 2018-10-10 3:51 UTC (permalink / raw) To: Wolfram Sang, linux-mmc Cc: Ulf Hansson, linux-renesas-soc, Masahiro Yamada, Lee Jones, linux-kernel TMIO_MMC_HAVE_HIGH_REG is confusing due to its counter-intuitive name. All the TMIO MMC variants (TMIO MMC, Renesas SDHI, UniPhier SD) actually have high registers. It is just that each of them implements its own registers there. The original IP from Panasonic only defines registers 0x00-0xff in the bus_shift=1 review. The register area above them is platform-dependent. In fact, TMIO_MMC_HAVE_HIGH_REG is set only by tmio-mmc.c and used to test the accessibility of CTL_SDIO_REGS. Because it is specific to the TMIO MFD variant, the right thing to do is to move such registers to tmio_mmc.c and delete the TMIO_MMC_HAVE_HIGH_REG flag. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v3: None Changes in v2: None drivers/mmc/host/tmio_mmc.c | 7 +++++-- drivers/mmc/host/tmio_mmc.h | 3 --- include/linux/mfd/tmio.h | 7 ------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index 00d291c..4e91020 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -24,6 +24,11 @@ #include "tmio_mmc.h" +/* Registers specific to this variant */ +#define CTL_SDIO_REGS 0x100 +#define CTL_CLK_AND_WAIT_CTL 0x138 +#define CTL_RESET_SDIO 0x1e0 + static void tmio_mmc_clk_start(struct tmio_mmc_host *host) { sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, CLK_CTL_SCLKEN | @@ -161,8 +166,6 @@ static int tmio_mmc_probe(struct platform_device *pdev) goto cell_disable; } - pdata->flags |= TMIO_MMC_HAVE_HIGH_REG; - host = tmio_mmc_host_alloc(pdev, pdata); if (IS_ERR(host)) { ret = PTR_ERR(host); diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index a1a661b..18b4308 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -47,9 +47,6 @@ #define CTL_RESET_SD 0xe0 #define CTL_VERSION 0xe2 #define CTL_SDIF_MODE 0xe6 -#define CTL_SDIO_REGS 0x100 -#define CTL_CLK_AND_WAIT_CTL 0x138 -#define CTL_RESET_SDIO 0x1e0 /* Definitions for values the CTL_STOP_INTERNAL_ACTION register can take */ #define TMIO_STOP_STP BIT(0) diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 7786621..1e70060 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -62,13 +62,6 @@ #define TMIO_MMC_USE_GPIO_CD BIT(5) /* - * Some controllers doesn't have over 0x100 register. - * it is used to checking accessibility of - * CTL_SD_CARD_CLK_CTL / CTL_CLK_AND_WAIT_CTL - */ -#define TMIO_MMC_HAVE_HIGH_REG BIT(6) - -/* * Some controllers have CMD12 automatically * issue/non-issue register */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag 2018-10-10 3:51 ` [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada @ 2018-10-14 22:28 ` Wolfram Sang 2018-10-15 11:32 ` Wolfram Sang 0 siblings, 1 reply; 9+ messages in thread From: Wolfram Sang @ 2018-10-14 22:28 UTC (permalink / raw) To: Masahiro Yamada Cc: Wolfram Sang, linux-mmc, Ulf Hansson, linux-renesas-soc, Lee Jones, linux-kernel [-- Attachment #1: Type: text/plain, Size: 878 bytes --] On Wed, Oct 10, 2018 at 12:51:32PM +0900, Masahiro Yamada wrote: > TMIO_MMC_HAVE_HIGH_REG is confusing due to its counter-intuitive name. > > All the TMIO MMC variants (TMIO MMC, Renesas SDHI, UniPhier SD) actually > have high registers. It is just that each of them implements its own > registers there. The original IP from Panasonic only defines registers > 0x00-0xff in the bus_shift=1 review. The register area above them is > platform-dependent. > > In fact, TMIO_MMC_HAVE_HIGH_REG is set only by tmio-mmc.c and used to > test the accessibility of CTL_SDIO_REGS. Because it is specific to > the TMIO MFD variant, the right thing to do is to move such registers > to tmio_mmc.c and delete the TMIO_MMC_HAVE_HIGH_REG flag. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag 2018-10-14 22:28 ` Wolfram Sang @ 2018-10-15 11:32 ` Wolfram Sang 0 siblings, 0 replies; 9+ messages in thread From: Wolfram Sang @ 2018-10-15 11:32 UTC (permalink / raw) To: Masahiro Yamada Cc: Wolfram Sang, linux-mmc, Ulf Hansson, linux-renesas-soc, Lee Jones, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1200 bytes --] On Mon, Oct 15, 2018 at 12:28:12AM +0200, Wolfram Sang wrote: > On Wed, Oct 10, 2018 at 12:51:32PM +0900, Masahiro Yamada wrote: > > TMIO_MMC_HAVE_HIGH_REG is confusing due to its counter-intuitive name. > > > > All the TMIO MMC variants (TMIO MMC, Renesas SDHI, UniPhier SD) actually > > have high registers. It is just that each of them implements its own > > registers there. The original IP from Panasonic only defines registers > > 0x00-0xff in the bus_shift=1 review. The register area above them is > > platform-dependent. > > > > In fact, TMIO_MMC_HAVE_HIGH_REG is set only by tmio-mmc.c and used to > > test the accessibility of CTL_SDIO_REGS. Because it is specific to > > the TMIO MFD variant, the right thing to do is to move such registers > > to tmio_mmc.c and delete the TMIO_MMC_HAVE_HIGH_REG flag. > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested on R-Car H3 ES1.0 and ES2.0, M3N, and H2. No regressions. I pulled the SD card out during transfer to ensure the reset function will surely be called. Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag 2018-10-10 3:51 [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada 2018-10-10 3:51 ` [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook Masahiro Yamada 2018-10-10 3:51 ` [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada @ 2018-10-14 22:30 ` Wolfram Sang 2018-10-15 13:15 ` Ulf Hansson 3 siblings, 0 replies; 9+ messages in thread From: Wolfram Sang @ 2018-10-14 22:30 UTC (permalink / raw) To: Masahiro Yamada Cc: Wolfram Sang, linux-mmc, Ulf Hansson, linux-renesas-soc, Lee Jones, linux-kernel [-- Attachment #1: Type: text/plain, Size: 475 bytes --] On Wed, Oct 10, 2018 at 12:51:30PM +0900, Masahiro Yamada wrote: > CTL_SDIO_REGS is a register specific to tmio_mmc.c > > Currently, we handle it in tmio_mmc_core.c, hence need > TMIO_MMC_HAVE_HIGH_REG flag to prevent the other platforms > from accessing to it. > > We can just move CTL_SDIO_REGS to tmio_mmc.c > and delete the confusing TMIO_MMC_HAVE_HIGH_REG flag. Looks good, thanks! Ulf, please give me Monday to test the changes on some more devices... [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag 2018-10-10 3:51 [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada ` (2 preceding siblings ...) 2018-10-14 22:30 ` [PATCH v3 0/2] mmc: tmio: remove confusing " Wolfram Sang @ 2018-10-15 13:15 ` Ulf Hansson 3 siblings, 0 replies; 9+ messages in thread From: Ulf Hansson @ 2018-10-15 13:15 UTC (permalink / raw) To: Masahiro Yamada Cc: Wolfram Sang, linux-mmc, Linux-Renesas, Lee Jones, Linux Kernel Mailing List On 10 October 2018 at 05:51, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > CTL_SDIO_REGS is a register specific to tmio_mmc.c > > Currently, we handle it in tmio_mmc_core.c, hence need > TMIO_MMC_HAVE_HIGH_REG flag to prevent the other platforms > from accessing to it. > > We can just move CTL_SDIO_REGS to tmio_mmc.c > and delete the confusing TMIO_MMC_HAVE_HIGH_REG flag. > > > Masahiro Yamada (2): > mmc: tmio: move MFD variant reset to a platform hook > mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag > > drivers/mmc/host/tmio_mmc.c | 24 ++++++++++++++++++++++-- > drivers/mmc/host/tmio_mmc.h | 4 +--- > drivers/mmc/host/tmio_mmc_core.c | 14 ++++++-------- > include/linux/mfd/tmio.h | 7 ------- > 4 files changed, 29 insertions(+), 20 deletions(-) > > -- > 2.7.4 > Applied for next, thanks! Kind regards Uffe ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-10-15 13:16 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-10-10 3:51 [PATCH v3 0/2] mmc: tmio: remove confusing TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada 2018-10-10 3:51 ` [PATCH v3 1/2] mmc: tmio: move MFD variant reset to a platform hook Masahiro Yamada 2018-10-14 22:27 ` Wolfram Sang 2018-10-15 11:32 ` Wolfram Sang 2018-10-10 3:51 ` [PATCH v3 2/2] mmc: tmio: remove TMIO_MMC_HAVE_HIGH_REG flag Masahiro Yamada 2018-10-14 22:28 ` Wolfram Sang 2018-10-15 11:32 ` Wolfram Sang 2018-10-14 22:30 ` [PATCH v3 0/2] mmc: tmio: remove confusing " Wolfram Sang 2018-10-15 13:15 ` Ulf Hansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).