Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1311929 > unrolled thread
| Started by | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| First post | 2016-01-19 04:50 +0100 |
| Last post | 2016-01-20 13:40 +0100 |
| Articles | 7 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call Shawn Lin <shawn.lin@rock-chips.com> - 2016-01-19 04:50 +0100
[PATCH 2/3] mmc: dw_mmc-rockchip: remove prepare_command hook Shawn Lin <shawn.lin@rock-chips.com> - 2016-01-19 05:00 +0100
[PATCH 3/3] mmc: dw_mmc-exynos: wrapper prepare_command Shawn Lin <shawn.lin@rock-chips.com> - 2016-01-19 05:00 +0100
Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call Jaehoon Chung <jh80.chung@samsung.com> - 2016-01-19 05:10 +0100
Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call Jaehoon Chung <jh80.chung@samsung.com> - 2016-01-20 09:30 +0100
Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call Shawn Lin <shawn.lin@rock-chips.com> - 2016-01-20 10:30 +0100
Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call Shawn Lin <shawn.lin@rock-chips.com> - 2016-01-20 13:40 +0100
| From | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| Date | 2016-01-19 04:50 +0100 |
| Subject | [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call |
| Message-ID | <qSvsS-20z-3@gated-at.bofh.it> |
This patchset expose dw_mci_pltfm_prepare_command towards to library call and remove the redundant code from dw_mmc-rockchip. Meanwhile we make dw_mmc-exynos to call it instead of changing cmdr in its variant drivers. Shawn Lin (3): mmc: dw_mmc: expose dw_mci_pltfm_prepare_command mmc: dw_mmc-rockchip: remove prepare_command hook mmc: dw_mmc-exynos: wrapper prepare_command drivers/mmc/host/dw_mmc-exynos.c | 4 ++-- drivers/mmc/host/dw_mmc-pltfm.c | 3 ++- drivers/mmc/host/dw_mmc-pltfm.h | 2 +- drivers/mmc/host/dw_mmc-rockchip.c | 9 ++------- 4 files changed, 7 insertions(+), 11 deletions(-) -- 2.3.7
[toc] | [next] | [standalone]
| From | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| Date | 2016-01-19 05:00 +0100 |
| Subject | [PATCH 2/3] mmc: dw_mmc-rockchip: remove prepare_command hook |
| Message-ID | <qSvCy-23U-3@gated-at.bofh.it> |
| In reply to | #1311929 |
This patch remove prepare_command hook from dw_mmc-rockchip
and use dw_mci_pltfm_prepare_command directly since it seems
it doesn't need any other work to be prepared.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/host/dw_mmc-rockchip.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index d9c92f3..e6968cd 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -26,11 +26,6 @@ struct dw_mci_rockchip_priv_data {
int default_sample_phase;
};
-static void dw_mci_rockchip_prepare_command(struct dw_mci *host, u32 *cmdr)
-{
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
-}
-
static int dw_mci_rk3288_setup_clock(struct dw_mci *host)
{
host->bus_hz /= RK3288_CLKGEN_DIV;
@@ -240,12 +235,12 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
}
static const struct dw_mci_drv_data rk2928_drv_data = {
- .prepare_command = dw_mci_rockchip_prepare_command,
+ .prepare_command = dw_mci_pltfm_prepare_command,
.init = dw_mci_rockchip_init,
};
static const struct dw_mci_drv_data rk3288_drv_data = {
- .prepare_command = dw_mci_rockchip_prepare_command,
+ .prepare_command = dw_mci_pltfm_prepare_command,
.set_ios = dw_mci_rk3288_set_ios,
.execute_tuning = dw_mci_rk3288_execute_tuning,
.parse_dt = dw_mci_rk3288_parse_dt,
--
2.3.7
[toc] | [prev] | [next] | [standalone]
| From | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| Date | 2016-01-19 05:00 +0100 |
| Subject | [PATCH 3/3] mmc: dw_mmc-exynos: wrapper prepare_command |
| Message-ID | <qSvCy-23U-15@gated-at.bofh.it> |
| In reply to | #1311929 |
This patch use dw_mci_pltfm_prepare_command call to
change cmdr instead of doing it in the driver itself.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/host/dw_mmc-exynos.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 3a7e835..37a337e 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -215,10 +215,10 @@ static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr)
if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS7 ||
priv->ctrl_type == DW_MCI_TYPE_EXYNOS7_SMU) {
if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL64)))
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
+ dw_mci_pltfm_prepare_command(host, cmdr);
} else {
if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL)))
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
+ dw_mci_pltfm_prepare_command(host, cmdr);
}
}
--
2.3.7
[toc] | [prev] | [next] | [standalone]
| From | Jaehoon Chung <jh80.chung@samsung.com> |
|---|---|
| Date | 2016-01-19 05:10 +0100 |
| Subject | Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call |
| Message-ID | <qSvMe-2nU-3@gated-at.bofh.it> |
| In reply to | #1311929 |
Hi, Shawn. On 01/19/2016 12:39 PM, Shawn Lin wrote: > This patchset expose dw_mci_pltfm_prepare_command towards to > library call and remove the redundant code from dw_mmc-rockchip. > Meanwhile we make dw_mmc-exynos to call it instead of changing cmdr > in its variant drivers. Thanks for your effort. Right way. We need to try that remove the hook for operation. Looks good to me. After check, i will pick these. Also other your patch. :) Best Regards, Jaehoon Chung > > > > Shawn Lin (3): > mmc: dw_mmc: expose dw_mci_pltfm_prepare_command > mmc: dw_mmc-rockchip: remove prepare_command hook > mmc: dw_mmc-exynos: wrapper prepare_command > > drivers/mmc/host/dw_mmc-exynos.c | 4 ++-- > drivers/mmc/host/dw_mmc-pltfm.c | 3 ++- > drivers/mmc/host/dw_mmc-pltfm.h | 2 +- > drivers/mmc/host/dw_mmc-rockchip.c | 9 ++------- > 4 files changed, 7 insertions(+), 11 deletions(-) >
[toc] | [prev] | [next] | [standalone]
| From | Jaehoon Chung <jh80.chung@samsung.com> |
|---|---|
| Date | 2016-01-20 09:30 +0100 |
| Subject | Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call |
| Message-ID | <qSWjo-3N7-11@gated-at.bofh.it> |
| In reply to | #1311929 |
Hi Shawn.
On 01/19/2016 12:39 PM, Shawn Lin wrote:
> This patchset expose dw_mci_pltfm_prepare_command towards to
> library call and remove the redundant code from dw_mmc-rockchip.
> Meanwhile we make dw_mmc-exynos to call it instead of changing cmdr
> in its variant drivers.
>
Actually, I want to remove *_prepare_command from entire dw-mmc driver.
Since exynos used USE_HOLD_REG bit in case of special condition, maybe you doesn't remove all, right?
I'm figuring out the using the generic solution.
Before that, how about this? I want to know your opinion.
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 3a7e835..ed08e4b 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -145,6 +145,16 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)
mci_writel(host, CLKSEL64, clksel);
else
mci_writel(host, CLKSEL, clksel);
+
+ /*
+ * Exynos4412 and Exynos5250 extends the use of CMD register with the
+ * use of bit 29 (which is reserved on standard MSHC controllers) for
+ * optionally bypassing the HOLD register for command and data. The
+ * HOLD register should be bypassed in case there is no phase shift
+ * applied on CMD/DATA that is sent to the card.
+ */
+ if (!SDMMC_CLKSEL_GET_DRV_WD3(clksel))
+ host->no_use_hold = 1;
}
#ifdef CONFIG_PM_SLEEP
@@ -202,26 +212,6 @@ static int dw_mci_exynos_resume_noirq(struct device *dev)
#define dw_mci_exynos_resume_noirq NULL
#endif /* CONFIG_PM_SLEEP */
-static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr)
-{
- struct dw_mci_exynos_priv_data *priv = host->priv;
- /*
- * Exynos4412 and Exynos5250 extends the use of CMD register with the
- * use of bit 29 (which is reserved on standard MSHC controllers) for
- * optionally bypassing the HOLD register for command and data. The
- * HOLD register should be bypassed in case there is no phase shift
- * applied on CMD/DATA that is sent to the card.
- */
- if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS7 ||
- priv->ctrl_type == DW_MCI_TYPE_EXYNOS7_SMU) {
- if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL64)))
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
- } else {
- if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL)))
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
- }
-}
-
static void dw_mci_exynos_config_hs400(struct dw_mci *host, u32 timing)
{
struct dw_mci_exynos_priv_data *priv = host->priv;
@@ -500,7 +490,6 @@ static const struct dw_mci_drv_data exynos_drv_data = {
.caps = exynos_dwmmc_caps,
.init = dw_mci_exynos_priv_init,
.setup_clock = dw_mci_exynos_setup_clock,
- .prepare_command = dw_mci_exynos_prepare_command,
.set_ios = dw_mci_exynos_set_ios,
.parse_dt = dw_mci_exynos_parse_dt,
.execute_tuning = dw_mci_exynos_execute_tuning,
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 81bdeeb..c0bb0c7 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -26,19 +26,6 @@
#include "dw_mmc.h"
#include "dw_mmc-pltfm.h"
-static void dw_mci_pltfm_prepare_command(struct dw_mci *host, u32 *cmdr)
-{
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
-}
-
-static const struct dw_mci_drv_data socfpga_drv_data = {
- .prepare_command = dw_mci_pltfm_prepare_command,
-};
-
-static const struct dw_mci_drv_data pistachio_drv_data = {
- .prepare_command = dw_mci_pltfm_prepare_command,
-};
-
int dw_mci_pltfm_register(struct platform_device *pdev,
const struct dw_mci_drv_data *drv_data)
{
@@ -94,10 +81,8 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
static const struct of_device_id dw_mci_pltfm_match[] = {
{ .compatible = "snps,dw-mshc", },
- { .compatible = "altr,socfpga-dw-mshc",
- .data = &socfpga_drv_data },
- { .compatible = "img,pistachio-dw-mshc",
- .data = &pistachio_drv_data },
+ { .compatible = "altr,socfpga-dw-mshc", },
+ { .compatible = "img,pistachio-dw-mshc", },
{},
};
MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index d9c92f3..84e50f3 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -26,11 +26,6 @@ struct dw_mci_rockchip_priv_data {
int default_sample_phase;
};
-static void dw_mci_rockchip_prepare_command(struct dw_mci *host, u32 *cmdr)
-{
- *cmdr |= SDMMC_CMD_USE_HOLD_REG;
-}
-
static int dw_mci_rk3288_setup_clock(struct dw_mci *host)
{
host->bus_hz /= RK3288_CLKGEN_DIV;
@@ -240,12 +235,10 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
}
static const struct dw_mci_drv_data rk2928_drv_data = {
- .prepare_command = dw_mci_rockchip_prepare_command,
.init = dw_mci_rockchip_init,
};
static const struct dw_mci_drv_data rk3288_drv_data = {
- .prepare_command = dw_mci_rockchip_prepare_command,
.set_ios = dw_mci_rk3288_set_ios,
.execute_tuning = dw_mci_rk3288_execute_tuning,
.parse_dt = dw_mci_rk3288_parse_dt,
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index ffef24a..844f8cf 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -234,7 +234,6 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
struct mmc_data *data;
struct dw_mci_slot *slot = mmc_priv(mmc);
struct dw_mci *host = slot->host;
- const struct dw_mci_drv_data *drv_data = slot->host->drv_data;
u32 cmdr;
cmd->error = -EINPROGRESS;
@@ -296,8 +295,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
cmdr |= SDMMC_CMD_DAT_WR;
}
- if (drv_data && drv_data->prepare_command)
- drv_data->prepare_command(slot->host, &cmdr);
+ if (!host->no_use_hold)
+ cmdr |= SDMMC_CMD_USE_HOLD_REG;
return cmdr;
}
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index a14b7fc..c0fc0e3 100644
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -277,7 +277,6 @@ struct dw_mci_slot {
* @caps: mmc subsystem specified capabilities of the controller(s).
* @init: early implementation specific initialization.
* @setup_clock: implementation specific clock configuration.
- * @prepare_command: handle CMD register extensions.
* @set_ios: handle bus specific extensions.
* @parse_dt: parse implementation specific device tree properties.
* @execute_tuning: implementation specific tuning procedure.
@@ -290,7 +289,6 @@ struct dw_mci_drv_data {
unsigned long *caps;
int (*init)(struct dw_mci *host);
int (*setup_clock)(struct dw_mci *host);
- void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
int (*parse_dt)(struct dw_mci *host);
int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode);
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 89df7ab..7b1416a 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -221,6 +221,8 @@ struct dw_mci {
struct timer_list cmd11_timer;
struct timer_list dto_timer;
+
+ int no_use_hold;
};
/* DMA ops for Internal/External DMAC interface */
>
>
> Shawn Lin (3):
> mmc: dw_mmc: expose dw_mci_pltfm_prepare_command
> mmc: dw_mmc-rockchip: remove prepare_command hook
> mmc: dw_mmc-exynos: wrapper prepare_command
>
> drivers/mmc/host/dw_mmc-exynos.c | 4 ++--
> drivers/mmc/host/dw_mmc-pltfm.c | 3 ++-
> drivers/mmc/host/dw_mmc-pltfm.h | 2 +-
> drivers/mmc/host/dw_mmc-rockchip.c | 9 ++-------
> 4 files changed, 7 insertions(+), 11 deletions(-)
>
[toc] | [prev] | [next] | [standalone]
| From | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| Date | 2016-01-20 10:30 +0100 |
| Subject | Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call |
| Message-ID | <qSXfs-4qR-1@gated-at.bofh.it> |
| In reply to | #1312989 |
On 2016/1/20 16:26, Jaehoon Chung wrote:
> Hi Shawn.
>
> On 01/19/2016 12:39 PM, Shawn Lin wrote:
>> This patchset expose dw_mci_pltfm_prepare_command towards to
>> library call and remove the redundant code from dw_mmc-rockchip.
>> Meanwhile we make dw_mmc-exynos to call it instead of changing cmdr
>> in its variant drivers.
>>
>
> Actually, I want to remove *_prepare_command from entire dw-mmc driver.
> Since exynos used USE_HOLD_REG bit in case of special condition, maybe you doesn't remove all, right?
>
Hi Jaehoon,
right, the only thing I can see in prepare_command hook is using
USE_HOLD_REG bit.
Rockchip soc : all of them need USE_HOLD_REG.
pistachio platform: all of them need it refering to the code.
dw_mmc-k3 and dw_mmc-pci: never use this bit.
exynos: used in special case.
So if we remove the prepare_command from entire dw-mmc driver, maybe we
should add a new flag in struct dw_mci for all the compatible platform
to decide whether they need use it or not. It that the right way? :)
> I'm figuring out the using the generic solution.
> Before that, how about this? I want to know your opinion.
>
> diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
> index 3a7e835..ed08e4b 100644
> --- a/drivers/mmc/host/dw_mmc-exynos.c
> +++ b/drivers/mmc/host/dw_mmc-exynos.c
> @@ -145,6 +145,16 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)
> mci_writel(host, CLKSEL64, clksel);
> else
> mci_writel(host, CLKSEL, clksel);
> +
> + /*
> + * Exynos4412 and Exynos5250 extends the use of CMD register with the
> + * use of bit 29 (which is reserved on standard MSHC controllers) for
> + * optionally bypassing the HOLD register for command and data. The
> + * HOLD register should be bypassed in case there is no phase shift
> + * applied on CMD/DATA that is sent to the card.
> + */
> + if (!SDMMC_CLKSEL_GET_DRV_WD3(clksel))
> + host->no_use_hold = 1;
> }
>
> #ifdef CONFIG_PM_SLEEP
> @@ -202,26 +212,6 @@ static int dw_mci_exynos_resume_noirq(struct device *dev)
> #define dw_mci_exynos_resume_noirq NULL
> #endif /* CONFIG_PM_SLEEP */
>
> -static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr)
> -{
> - struct dw_mci_exynos_priv_data *priv = host->priv;
> - /*
> - * Exynos4412 and Exynos5250 extends the use of CMD register with the
> - * use of bit 29 (which is reserved on standard MSHC controllers) for
> - * optionally bypassing the HOLD register for command and data. The
> - * HOLD register should be bypassed in case there is no phase shift
> - * applied on CMD/DATA that is sent to the card.
> - */
> - if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS7 ||
> - priv->ctrl_type == DW_MCI_TYPE_EXYNOS7_SMU) {
> - if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL64)))
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> - } else {
> - if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL)))
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> - }
> -}
> -
> static void dw_mci_exynos_config_hs400(struct dw_mci *host, u32 timing)
> {
> struct dw_mci_exynos_priv_data *priv = host->priv;
> @@ -500,7 +490,6 @@ static const struct dw_mci_drv_data exynos_drv_data = {
> .caps = exynos_dwmmc_caps,
> .init = dw_mci_exynos_priv_init,
> .setup_clock = dw_mci_exynos_setup_clock,
> - .prepare_command = dw_mci_exynos_prepare_command,
> .set_ios = dw_mci_exynos_set_ios,
> .parse_dt = dw_mci_exynos_parse_dt,
> .execute_tuning = dw_mci_exynos_execute_tuning,
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index 81bdeeb..c0bb0c7 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -26,19 +26,6 @@
> #include "dw_mmc.h"
> #include "dw_mmc-pltfm.h"
>
> -static void dw_mci_pltfm_prepare_command(struct dw_mci *host, u32 *cmdr)
> -{
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> -}
> -
> -static const struct dw_mci_drv_data socfpga_drv_data = {
> - .prepare_command = dw_mci_pltfm_prepare_command,
> -};
> -
> -static const struct dw_mci_drv_data pistachio_drv_data = {
> - .prepare_command = dw_mci_pltfm_prepare_command,
> -};
> -
> int dw_mci_pltfm_register(struct platform_device *pdev,
> const struct dw_mci_drv_data *drv_data)
> {
> @@ -94,10 +81,8 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
>
> static const struct of_device_id dw_mci_pltfm_match[] = {
> { .compatible = "snps,dw-mshc", },
> - { .compatible = "altr,socfpga-dw-mshc",
> - .data = &socfpga_drv_data },
> - { .compatible = "img,pistachio-dw-mshc",
> - .data = &pistachio_drv_data },
> + { .compatible = "altr,socfpga-dw-mshc", },
> + { .compatible = "img,pistachio-dw-mshc", },
> {},
> };
> MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
> diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
> index d9c92f3..84e50f3 100644
> --- a/drivers/mmc/host/dw_mmc-rockchip.c
> +++ b/drivers/mmc/host/dw_mmc-rockchip.c
> @@ -26,11 +26,6 @@ struct dw_mci_rockchip_priv_data {
> int default_sample_phase;
> };
>
> -static void dw_mci_rockchip_prepare_command(struct dw_mci *host, u32 *cmdr)
> -{
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> -}
> -
> static int dw_mci_rk3288_setup_clock(struct dw_mci *host)
> {
> host->bus_hz /= RK3288_CLKGEN_DIV;
> @@ -240,12 +235,10 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
> }
>
> static const struct dw_mci_drv_data rk2928_drv_data = {
> - .prepare_command = dw_mci_rockchip_prepare_command,
> .init = dw_mci_rockchip_init,
> };
>
> static const struct dw_mci_drv_data rk3288_drv_data = {
> - .prepare_command = dw_mci_rockchip_prepare_command,
> .set_ios = dw_mci_rk3288_set_ios,
> .execute_tuning = dw_mci_rk3288_execute_tuning,
> .parse_dt = dw_mci_rk3288_parse_dt,
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index ffef24a..844f8cf 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -234,7 +234,6 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
> struct mmc_data *data;
> struct dw_mci_slot *slot = mmc_priv(mmc);
> struct dw_mci *host = slot->host;
> - const struct dw_mci_drv_data *drv_data = slot->host->drv_data;
> u32 cmdr;
>
> cmd->error = -EINPROGRESS;
> @@ -296,8 +295,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
> cmdr |= SDMMC_CMD_DAT_WR;
> }
>
> - if (drv_data && drv_data->prepare_command)
> - drv_data->prepare_command(slot->host, &cmdr);
> + if (!host->no_use_hold)
> + cmdr |= SDMMC_CMD_USE_HOLD_REG;
>
> return cmdr;
> }
> diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
> index a14b7fc..c0fc0e3 100644
> --- a/drivers/mmc/host/dw_mmc.h
> +++ b/drivers/mmc/host/dw_mmc.h
> @@ -277,7 +277,6 @@ struct dw_mci_slot {
> * @caps: mmc subsystem specified capabilities of the controller(s).
> * @init: early implementation specific initialization.
> * @setup_clock: implementation specific clock configuration.
> - * @prepare_command: handle CMD register extensions.
> * @set_ios: handle bus specific extensions.
> * @parse_dt: parse implementation specific device tree properties.
> * @execute_tuning: implementation specific tuning procedure.
> @@ -290,7 +289,6 @@ struct dw_mci_drv_data {
> unsigned long *caps;
> int (*init)(struct dw_mci *host);
> int (*setup_clock)(struct dw_mci *host);
> - void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
> void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
> int (*parse_dt)(struct dw_mci *host);
> int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode);
> diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
> index 89df7ab..7b1416a 100644
> --- a/include/linux/mmc/dw_mmc.h
> +++ b/include/linux/mmc/dw_mmc.h
> @@ -221,6 +221,8 @@ struct dw_mci {
>
> struct timer_list cmd11_timer;
> struct timer_list dto_timer;
> +
> + int no_use_hold;
> };
>
> /* DMA ops for Internal/External DMAC interface */
>>
>>
>> Shawn Lin (3):
>> mmc: dw_mmc: expose dw_mci_pltfm_prepare_command
>> mmc: dw_mmc-rockchip: remove prepare_command hook
>> mmc: dw_mmc-exynos: wrapper prepare_command
>>
>> drivers/mmc/host/dw_mmc-exynos.c | 4 ++--
>> drivers/mmc/host/dw_mmc-pltfm.c | 3 ++-
>> drivers/mmc/host/dw_mmc-pltfm.h | 2 +-
>> drivers/mmc/host/dw_mmc-rockchip.c | 9 ++-------
>> 4 files changed, 7 insertions(+), 11 deletions(-)
>>
>
>
>
>
--
Best Regards
Shawn Lin
[toc] | [prev] | [next] | [standalone]
| From | Shawn Lin <shawn.lin@rock-chips.com> |
|---|---|
| Date | 2016-01-20 13:40 +0100 |
| Subject | Re: [PATCH 0/3] Convert dw_mci_pltfm_prepare_command into a library call |
| Message-ID | <qT0dk-6mw-1@gated-at.bofh.it> |
| In reply to | #1312989 |
On 2016/1/20 16:26, Jaehoon Chung wrote:
> Hi Shawn.
>
> On 01/19/2016 12:39 PM, Shawn Lin wrote:
>> This patchset expose dw_mci_pltfm_prepare_command towards to
>> library call and remove the redundant code from dw_mmc-rockchip.
>> Meanwhile we make dw_mmc-exynos to call it instead of changing cmdr
>> in its variant drivers.
>>
>
> Actually, I want to remove *_prepare_command from entire dw-mmc driver.
> Since exynos used USE_HOLD_REG bit in case of special condition, maybe you doesn't remove all, right?
>
> I'm figuring out the using the generic solution.
> Before that, how about this? I want to know your opinion.
>
oh sorry.... I missed to look at the following your patch when I reply
this thread last time. Your patch look good to me, and simply test it
for my rk3368 platform with emmc and sdcard.
> diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
> index 3a7e835..ed08e4b 100644
> --- a/drivers/mmc/host/dw_mmc-exynos.c
> +++ b/drivers/mmc/host/dw_mmc-exynos.c
> @@ -145,6 +145,16 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)
> mci_writel(host, CLKSEL64, clksel);
> else
> mci_writel(host, CLKSEL, clksel);
> +
> + /*
> + * Exynos4412 and Exynos5250 extends the use of CMD register with the
> + * use of bit 29 (which is reserved on standard MSHC controllers) for
> + * optionally bypassing the HOLD register for command and data. The
> + * HOLD register should be bypassed in case there is no phase shift
> + * applied on CMD/DATA that is sent to the card.
> + */
> + if (!SDMMC_CLKSEL_GET_DRV_WD3(clksel))
> + host->no_use_hold = 1;
> }
>
> #ifdef CONFIG_PM_SLEEP
> @@ -202,26 +212,6 @@ static int dw_mci_exynos_resume_noirq(struct device *dev)
> #define dw_mci_exynos_resume_noirq NULL
> #endif /* CONFIG_PM_SLEEP */
>
> -static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr)
> -{
> - struct dw_mci_exynos_priv_data *priv = host->priv;
> - /*
> - * Exynos4412 and Exynos5250 extends the use of CMD register with the
> - * use of bit 29 (which is reserved on standard MSHC controllers) for
> - * optionally bypassing the HOLD register for command and data. The
> - * HOLD register should be bypassed in case there is no phase shift
> - * applied on CMD/DATA that is sent to the card.
> - */
> - if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS7 ||
> - priv->ctrl_type == DW_MCI_TYPE_EXYNOS7_SMU) {
> - if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL64)))
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> - } else {
> - if (SDMMC_CLKSEL_GET_DRV_WD3(mci_readl(host, CLKSEL)))
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> - }
> -}
> -
> static void dw_mci_exynos_config_hs400(struct dw_mci *host, u32 timing)
> {
> struct dw_mci_exynos_priv_data *priv = host->priv;
> @@ -500,7 +490,6 @@ static const struct dw_mci_drv_data exynos_drv_data = {
> .caps = exynos_dwmmc_caps,
> .init = dw_mci_exynos_priv_init,
> .setup_clock = dw_mci_exynos_setup_clock,
> - .prepare_command = dw_mci_exynos_prepare_command,
> .set_ios = dw_mci_exynos_set_ios,
> .parse_dt = dw_mci_exynos_parse_dt,
> .execute_tuning = dw_mci_exynos_execute_tuning,
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index 81bdeeb..c0bb0c7 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -26,19 +26,6 @@
> #include "dw_mmc.h"
> #include "dw_mmc-pltfm.h"
>
> -static void dw_mci_pltfm_prepare_command(struct dw_mci *host, u32 *cmdr)
> -{
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> -}
> -
> -static const struct dw_mci_drv_data socfpga_drv_data = {
> - .prepare_command = dw_mci_pltfm_prepare_command,
> -};
> -
> -static const struct dw_mci_drv_data pistachio_drv_data = {
> - .prepare_command = dw_mci_pltfm_prepare_command,
> -};
> -
> int dw_mci_pltfm_register(struct platform_device *pdev,
> const struct dw_mci_drv_data *drv_data)
> {
> @@ -94,10 +81,8 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
>
> static const struct of_device_id dw_mci_pltfm_match[] = {
> { .compatible = "snps,dw-mshc", },
> - { .compatible = "altr,socfpga-dw-mshc",
> - .data = &socfpga_drv_data },
> - { .compatible = "img,pistachio-dw-mshc",
> - .data = &pistachio_drv_data },
> + { .compatible = "altr,socfpga-dw-mshc", },
> + { .compatible = "img,pistachio-dw-mshc", },
> {},
> };
> MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
> diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
> index d9c92f3..84e50f3 100644
> --- a/drivers/mmc/host/dw_mmc-rockchip.c
> +++ b/drivers/mmc/host/dw_mmc-rockchip.c
> @@ -26,11 +26,6 @@ struct dw_mci_rockchip_priv_data {
> int default_sample_phase;
> };
>
> -static void dw_mci_rockchip_prepare_command(struct dw_mci *host, u32 *cmdr)
> -{
> - *cmdr |= SDMMC_CMD_USE_HOLD_REG;
> -}
> -
> static int dw_mci_rk3288_setup_clock(struct dw_mci *host)
> {
> host->bus_hz /= RK3288_CLKGEN_DIV;
> @@ -240,12 +235,10 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
> }
>
> static const struct dw_mci_drv_data rk2928_drv_data = {
> - .prepare_command = dw_mci_rockchip_prepare_command,
> .init = dw_mci_rockchip_init,
> };
>
> static const struct dw_mci_drv_data rk3288_drv_data = {
> - .prepare_command = dw_mci_rockchip_prepare_command,
> .set_ios = dw_mci_rk3288_set_ios,
> .execute_tuning = dw_mci_rk3288_execute_tuning,
> .parse_dt = dw_mci_rk3288_parse_dt,
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index ffef24a..844f8cf 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -234,7 +234,6 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
> struct mmc_data *data;
> struct dw_mci_slot *slot = mmc_priv(mmc);
> struct dw_mci *host = slot->host;
> - const struct dw_mci_drv_data *drv_data = slot->host->drv_data;
> u32 cmdr;
>
> cmd->error = -EINPROGRESS;
> @@ -296,8 +295,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
> cmdr |= SDMMC_CMD_DAT_WR;
> }
>
> - if (drv_data && drv_data->prepare_command)
> - drv_data->prepare_command(slot->host, &cmdr);
> + if (!host->no_use_hold)
> + cmdr |= SDMMC_CMD_USE_HOLD_REG;
>
> return cmdr;
> }
> diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
> index a14b7fc..c0fc0e3 100644
> --- a/drivers/mmc/host/dw_mmc.h
> +++ b/drivers/mmc/host/dw_mmc.h
> @@ -277,7 +277,6 @@ struct dw_mci_slot {
> * @caps: mmc subsystem specified capabilities of the controller(s).
> * @init: early implementation specific initialization.
> * @setup_clock: implementation specific clock configuration.
> - * @prepare_command: handle CMD register extensions.
> * @set_ios: handle bus specific extensions.
> * @parse_dt: parse implementation specific device tree properties.
> * @execute_tuning: implementation specific tuning procedure.
> @@ -290,7 +289,6 @@ struct dw_mci_drv_data {
> unsigned long *caps;
> int (*init)(struct dw_mci *host);
> int (*setup_clock)(struct dw_mci *host);
> - void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
> void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
> int (*parse_dt)(struct dw_mci *host);
> int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode);
> diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
> index 89df7ab..7b1416a 100644
> --- a/include/linux/mmc/dw_mmc.h
> +++ b/include/linux/mmc/dw_mmc.h
> @@ -221,6 +221,8 @@ struct dw_mci {
>
> struct timer_list cmd11_timer;
> struct timer_list dto_timer;
> +
> + int no_use_hold;
> };
>
> /* DMA ops for Internal/External DMAC interface */
>>
>>
>> Shawn Lin (3):
>> mmc: dw_mmc: expose dw_mci_pltfm_prepare_command
>> mmc: dw_mmc-rockchip: remove prepare_command hook
>> mmc: dw_mmc-exynos: wrapper prepare_command
>>
>> drivers/mmc/host/dw_mmc-exynos.c | 4 ++--
>> drivers/mmc/host/dw_mmc-pltfm.c | 3 ++-
>> drivers/mmc/host/dw_mmc-pltfm.h | 2 +-
>> drivers/mmc/host/dw_mmc-rockchip.c | 9 ++-------
>> 4 files changed, 7 insertions(+), 11 deletions(-)
>>
>
>
>
>
--
Best Regards
Shawn Lin
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web