mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/9 mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd
Core ensures that there are no commands with cmd->data being set and nothing to transfer. And we don't have to reset bit CMD_CFG_DATA_NUM because cmd_cfg was zero-initialized and this bit isn't set.
---
v2:
- adjusted commit message because branch xfer_bytes == 0 is never reached
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +1 -8
@@ -516,14 +516,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) desc->cmd_cfg &= ~CMD_CFG_DATA_WR ; } -if (xfer_bytes >0 ) { - desc->cmd_cfg &= ~CMD_CFG_DATA_NUM ; - desc->cmd_data = host->bounce_dma_addr &CMD_DATA_MASK ; - }else { -/* write data to data_addr */ - desc->cmd_cfg |=CMD_CFG_DATA_NUM ; - desc->cmd_data =0 ; - } + desc->cmd_data = host->bounce_dma_addr &CMD_DATA_MASK ; cmd_cfg_timeout =12 ; }else {
Signature · 1 line
2.11.1
PATCH v2 2/9 mmc: meson-gx: make two functions return void
In reply to a message not in the archiveThe return value of meson_mmc_request_done and meson_mmc_read_resp isn't used, so make both functions return void.
---
v2:
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +3 -6
@@ -426,7 +426,8 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) __func__, orig, val); } -static int meson_mmc_request_done (struct mmc_host *mmc,struct mmc_request *mrq) +static void meson_mmc_request_done (struct mmc_host *mmc, +struct mmc_request *mrq) {struct meson_host *host =mmc_priv (mmc);
@@ -435,8 +436,6 @@ static int meson_mmc_request_done(struct mmc_host *mmc, struct mmc_request *mrq) host->mrq =NULL ; host->cmd =NULL ;mmc_request_done (host->mmc, mrq); - -return 0 ; }static void meson_mmc_start_cmd (struct mmc_host *mmc,struct mmc_command *cmd)
@@ -554,7 +553,7 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)meson_mmc_start_cmd (mmc, mrq->cmd); } -static int meson_mmc_read_resp (struct mmc_host *mmc,struct mmc_command *cmd) +static void meson_mmc_read_resp (struct mmc_host *mmc,struct mmc_command *cmd) {struct meson_host *host =mmc_priv (mmc);
@@ -566,8 +565,6 @@ static int meson_mmc_read_resp(struct mmc_host *mmc, struct mmc_command *cmd) }else if (cmd->flags &MMC_RSP_PRESENT ) { cmd->resp[0 ] =readl (host->regs +SD_EMMC_CMD_RSP ); } - -return 0 ; }static irqreturn_t meson_mmc_irq (int irq,void *dev_id)
Signature · 1 line
2.11.1
PATCH v2 3/9 mmc: meson-gx: remove unused members irq, ocr_mask from struct meson_host
In reply to a message not in the archiveMember ocr_mask is never used and member irq we can replace with a local variable in meson_mmc_probe. So let's remove both members.
---
v2:
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +6 -8
@@ -127,8 +127,6 @@ struct meson_host {spinlock_t lock;void __iomem *regs; -int irq; -u32 ocr_mask;struct clk *core_clk;struct clk_mux mux;struct clk *mux_clk;
@@ -712,7 +710,7 @@ static int meson_mmc_probe(struct platform_device *pdev)struct resource *res;struct meson_host *host;struct mmc_host *mmc; -int ret; +int ret, irq; mmc =mmc_alloc_host (sizeof (struct meson_host ), &pdev->dev);if (!mmc)
@@ -744,8 +742,8 @@ static int meson_mmc_probe(struct platform_device *pdev) goto free_host; } - host->irq =platform_get_irq (pdev,0 ); -if (host->irq ==0 ) { + irq =platform_get_irq (pdev,0 ); +if (!irq) {dev_err (&pdev->dev,"failed to get interrupt resource.\n" ); ret = -EINVAL ; goto free_host;
@@ -773,9 +771,9 @@ static int meson_mmc_probe(struct platform_device *pdev)writel (IRQ_EN_MASK , host->regs +SD_EMMC_STATUS );writel (IRQ_EN_MASK , host->regs +SD_EMMC_IRQ_EN ); - ret =devm_request_threaded_irq (&pdev->dev, host->irq, - meson_mmc_irq, meson_mmc_irq_thread, -IRQF_SHARED ,DRIVER_NAME , host); + ret =devm_request_threaded_irq (&pdev->dev, irq, meson_mmc_irq, + meson_mmc_irq_thread,IRQF_SHARED , +DRIVER_NAME , host);if (ret) goto free_host;
Signature · 1 line
2.11.1
PATCH v2 4/9 mmc: meson-gx: remove unneeded variable in meson_mmc_clk_init
In reply to a message not in the archiveBecause the DT requires a fixed number of mux parent clocks, variable mux_parent_count can be replaced with constant MUX_CLK_NUM_PARENTS, so remove it.
---
v2:
- adjusted commit message
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +1 -3
@@ -242,7 +242,6 @@ static int meson_mmc_clk_init(struct meson_host *host)char clk_name[32 ];int i, ret =0 ;const char *mux_parent_names[MUX_CLK_NUM_PARENTS ]; -unsigned int mux_parent_count =0 ;const char *clk_div_parents[1 ];u32 clk_reg, cfg;
@@ -261,7 +260,6 @@ static int meson_mmc_clk_init(struct meson_host *host) } mux_parent_names[i] =__clk_get_name (host->mux_parent[i]); - mux_parent_count++; }/* create the mux */
@@ -270,7 +268,7 @@ static int meson_mmc_clk_init(struct meson_host *host) init.ops = &clk_mux_ops; init.flags =0 ; init.parent_names = mux_parent_names; - init.num_parents = mux_parent_count; + init.num_parents =MUX_CLK_NUM_PARENTS ; host->mux.reg = host->regs +SD_EMMC_CLOCK ; host->mux.shift =CLK_SRC_SHIFT ;
Signature · 1 line
2.11.1
PATCH v2 5/9 mmc: meson-gx: remove member parent_mux from struct meson_host
In reply to a message not in the archiveMember mux_parent isn't used outside meson_mmc_clk_init. So remove it and replace it with a local variable in meson_mmc_clk_init.
---
v2:
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +6 -8
@@ -130,7 +130,6 @@ struct meson_host {struct clk *core_clk;struct clk_mux mux;struct clk *mux_clk; -struct clk *mux_parent[MUX_CLK_NUM_PARENTS ];unsigned long current_clock;struct clk_divider cfg_div;
@@ -247,19 +246,18 @@ static int meson_mmc_clk_init(struct meson_host *host)/* get the mux parents */ for (i =0 ; i <MUX_CLK_NUM_PARENTS ; i++) { +struct clk *clk;char name[16 ];snprintf (name,sizeof (name),"clkin%d" , i); - host->mux_parent[i] =devm_clk_get (host->dev, name); -if (IS_ERR (host->mux_parent[i])) { - ret =PTR_ERR (host->mux_parent[i]); -if (PTR_ERR (host->mux_parent[i]) != -EPROBE_DEFER ) + clk =devm_clk_get (host->dev, name); +if (IS_ERR (clk)) { +if (clk !=ERR_PTR (-EPROBE_DEFER ))dev_err (host->dev,"Missing clock %s\n" , name); - host->mux_parent[i] =NULL ; -return ret; +return PTR_ERR (clk); } - mux_parent_names[i] =__clk_get_name (host->mux_parent[i]); + mux_parent_names[i] =__clk_get_name (clk); }/* create the mux */
Signature · 1 line
2.11.1
PATCH v2 6/9 mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init
In reply to a message not in the archiveThis clk_disable_unprepare isn't right here. At first the condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails.
And if the previous command fails and meson_mmc_clk_init returns an error, then probe jumps to label free_host where we have this disable/unprepare already.
---
v2:
- extended commit message
--- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +1 -5
@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* Get the nearest minimum clock to 400KHz */ host->mmc->f_min =clk_round_rate (host->cfg_div_clk,400000 ); - ret =meson_mmc_clk_set (host, host->mmc->f_min); -if (!ret) -clk_disable_unprepare (host->cfg_div_clk); - -return ret; +return meson_mmc_clk_set (host, host->mmc->f_min); }static void meson_mmc_set_ios (struct mmc_host *mmc,struct mmc_ios *ios)
Signature · 1 line
2.11.1
Kevin Hilman
maintainerPATCH v2 6/9 mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init
Quoted 8 lines · Heiner Kallweit
This
clk_disable_unprepareisn't right here. At first the condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails.
And if the previous command fails andmeson_mmc_clk_initreturns an error, then probe jumps to labelfree_hostwhere we have this disable/unprepare already.Signed-off-by Heiner Kallweit <[email protected]>
Quoted 24 lines
---
v2:
- extended commit message--- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/mmc/host/meson-gx-mmc.c +1
-5@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* Get the nearest minimum clock to 400KHz */ host->mmc->f_min =clk_round_rate (host->cfg_div_clk,400000 ); - ret =meson_mmc_clk_set (host, host->mmc->f_min); -if (!ret) -clk_disable_unprepare (host->cfg_div_clk); - -return ret; +return meson_mmc_clk_set (host, host->mmc->f_min); }static void meson_mmc_set_ios (struct mmc_host *mmc,struct mmc_ios *ios)
PATCH v2 6/9 mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init
In reply to Heiner KallweitHello Heiner,
W dniu 16.02.2017 o 20:42, Heiner Kallweit pisze:
Quoted 23 lines
This
clk_disable_unprepareisn't right here. At first the condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails.
And if the previous command fails andmeson_mmc_clk_initreturns an error, then probe jumps to labelfree_hostwhere we have this disable/unprepare already.Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- extended commit message--- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/mmc/host/meson-gx-mmc.c +0
-0@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* Get the nearest minimum clock to 400KHz */ host->mmc->f_min =clk_round_rate (host->cfg_div_clk,400000 );
drivers/mmc/host/meson-gx-mmc.c static int meson_mmc_clk_init(struct meson_host *host) · line 326
Quoted 10 lines
drivers/mmc/host/meson-gx-mmc.c +1
-5- ret =meson_mmc_clk_set (host, host->mmc->f_min); -if (!ret) -clk_disable_unprepare (host->cfg_div_clk); - -return ret; +return meson_mmc_clk_set (host, host->mmc->f_min); }static void meson_mmc_set_ios (struct mmc_host *mmc,struct mmc_ios *ios)
I see one problem here.
As you said, if the previous command (that is the meson_mmc_clk_set function call) fails, then the whole meson_mmc_clk_init returns an error value, and meson_mmc_probe jumps to free_host and disables the clock there. But what happens if the clk_prepare_enable is the line that fails? in this case, the function returns an error value too, and in the free_host meson_mmc_probe tries to disable the clock that is not enabled, and that probably results in a kernel warning because you tried to disable a disabled clock.
I was preparing a patch to disable clocks in the probe function only if they were enabled before, but then the meson_mmc_clk_init function remains a problem, because we don't know if the clock was enabled successfully or not when it returns an error.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 525 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20170218/eb637f3f/attachment.sig>
PATCH v2 6/9 mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init
Am 18.02.2017 um 04:44 schrieb Micha? Zegan:
Quoted 34 lines
Hello Heiner,
W dniu 16.02.2017 o 20:42, Heiner Kallweit pisze:
Quoted 31 lines
This
clk_disable_unprepareisn't right here. At first the condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails.
And if the previous command fails andmeson_mmc_clk_initreturns an error, then probe jumps to labelfree_hostwhere we have this disable/unprepare already.Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- extended commit message--- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/mmc/host/meson-gx-mmc.c +1
-5@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* Get the nearest minimum clock to 400KHz */ host->mmc->f_min =clk_round_rate (host->cfg_div_clk,400000 ); - ret =meson_mmc_clk_set (host, host->mmc->f_min); -if (!ret) -clk_disable_unprepare (host->cfg_div_clk); - -return ret; +return meson_mmc_clk_set (host, host->mmc->f_min); }
Quoted 17 lines
drivers/mmc/host/meson-gx-mmc.c static int meson_mmc_clk_init(struct meson_host *host) · line 326
Quoted 2 lines
drivers/mmc/host/meson-gx-mmc.c +0
-0static void meson_mmc_set_ios (struct mmc_host *mmc,struct mmc_ios *ios)I see one problem here.
As you said, if the previous command (that is themeson_mmc_clk_setfunction call) fails, then the wholemeson_mmc_clk_initreturns an error value, andmeson_mmc_probejumps tofree_hostand disables the clock there. But what happens if theclk_prepare_enableis the line that fails? in this case, the function returns an error value too, and in thefree_hostmeson_mmc_probetries to disable the clock that is not enabled, and that probably results in a kernel warning because you tried to disable a disabled clock.
I was preparing a patch to disable clocks in the probe function only if they were enabled before, but then themeson_mmc_clk_initfunction remains a problem, because we don't know if the clock was enabled successfully or not when it returns an error.
Thanks for pointing out, you're right. The solution however should be quite easy. I meson_mmc_clk_init we just change the condition of the disable/unprepare to "if (ret)" and in probe we remove this disable/unprepare from the error path.
PATCH v2 6/9 mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init
Am 18.02.2017 um 11:37 schrieb Heiner Kallweit:
Quoted 52 lines
Am 18.02.2017 um 04:44 schrieb Micha? Zegan:
Quoted 34 lines
Hello Heiner,
W dniu 16.02.2017 o 20:42, Heiner Kallweit pisze:
Quoted 31 lines
This
clk_disable_unprepareisn't right here. At first the condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails.
And if the previous command fails andmeson_mmc_clk_initreturns an error, then probe jumps to labelfree_hostwhere we have this disable/unprepare already.Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- extended commit message--- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/mmc/host/meson-gx-mmc.c +1
-5@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* Get the nearest minimum clock to 400KHz */ host->mmc->f_min =clk_round_rate (host->cfg_div_clk,400000 ); - ret =meson_mmc_clk_set (host, host->mmc->f_min); -if (!ret) -clk_disable_unprepare (host->cfg_div_clk); - -return ret; +return meson_mmc_clk_set (host, host->mmc->f_min); }Quoted 17 lines
drivers/mmc/host/meson-gx-mmc.c static int meson_mmc_clk_init(struct meson_host *host) · line 326
Quoted 2 lines
drivers/mmc/host/meson-gx-mmc.c +0
-0static void meson_mmc_set_ios (struct mmc_host *mmc,struct mmc_ios *ios)I see one problem here.
As you said, if the previous command (that is themeson_mmc_clk_setfunction call) fails, then the wholemeson_mmc_clk_initreturns an error value, andmeson_mmc_probejumps tofree_hostand disables the clock there. But what happens if theclk_prepare_enableis the line that fails? in this case, the function returns an error value too, and in thefree_hostmeson_mmc_probetries to disable the clock that is not enabled, and that probably results in a kernel warning because you tried to disable a disabled clock.
I was preparing a patch to disable clocks in the probe function only if they were enabled before, but then themeson_mmc_clk_initfunction remains a problem, because we don't know if the clock was enabled successfully or not when it returns an error.
Quoted 5 lines
Thanks for pointing out, you're right. The solution however should be quite easy. I
meson_mmc_clk_initwe just change the condition of the disable/unprepare to "if (ret)" and in probe we remove this disable/unprepare from the error path.
This was a little too fast, it's not that easy. But I'll come up with a changed version.
PATCH v2 6/9 mmc: meson-gx: remove unneeded meson_mmc_clk_set in meson_mmc_clk_init
In reply to Heiner KallweitW dniu 18.02.2017 o 11:37, Heiner Kallweit pisze:
Quoted 52 lines
Am 18.02.2017 um 04:44 schrieb Micha? Zegan:
Quoted 34 lines
Hello Heiner,
W dniu 16.02.2017 o 20:42, Heiner Kallweit pisze:
Quoted 31 lines
This
clk_disable_unprepareisn't right here. At first the condition should be "if (ret)" as the disable/unprepare is supposed to be executed if the previous command fails.
And if the previous command fails andmeson_mmc_clk_initreturns an error, then probe jumps to labelfree_hostwhere we have this disable/unprepare already.Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- extended commit message--- drivers/mmc/host/meson-gx-mmc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/mmc/host/meson-gx-mmc.c +1
-5@@ -320,11 +320,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* Get the nearest minimum clock to 400KHz */ host->mmc->f_min =clk_round_rate (host->cfg_div_clk,400000 ); - ret =meson_mmc_clk_set (host, host->mmc->f_min); -if (!ret) -clk_disable_unprepare (host->cfg_div_clk); - -return ret; +return meson_mmc_clk_set (host, host->mmc->f_min); }Quoted 17 lines
drivers/mmc/host/meson-gx-mmc.c static int meson_mmc_clk_init(struct meson_host *host) · line 326
Quoted 2 lines
drivers/mmc/host/meson-gx-mmc.c +0
-0static void meson_mmc_set_ios (struct mmc_host *mmc,struct mmc_ios *ios)I see one problem here.
As you said, if the previous command (that is themeson_mmc_clk_setfunction call) fails, then the wholemeson_mmc_clk_initreturns an error value, andmeson_mmc_probejumps tofree_hostand disables the clock there. But what happens if theclk_prepare_enableis the line that fails? in this case, the function returns an error value too, and in thefree_hostmeson_mmc_probetries to disable the clock that is not enabled, and that probably results in a kernel warning because you tried to disable a disabled clock.
I was preparing a patch to disable clocks in the probe function only if they were enabled before, but then themeson_mmc_clk_initfunction remains a problem, because we don't know if the clock was enabled successfully or not when it returns an error.
Quoted 5 lines
Thanks for pointing out, you're right. The solution however should be quite easy. I
meson_mmc_clk_initwe just change the condition of the disable/unprepare to "if (ret)" and in probe we remove this disable/unprepare from the error path.
If you do that, then if something fails *after* the meson_mmc_clk_init returns success, but something else fails later, then you will end up not disabling those clocks. What I thought about is: change the condition as you said. but in meson_mmc_probe, either check if clock is enabled in free_host before disabling it, or have two additional error
passes: one used after the core_clk is enabled (currently if it fails then it will also be a kernel warning), and one used after the meson_mmc_clk_init returns success that would also disable the div clock. Not sure if that second one is appropriate or not.
Quoted 6 lines
_______________________________________________
linux-amlogic mailing list
linux-amlogic at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 525 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20170218/aa2e76bb/attachment.sig>
PATCH v2 7/9 mmc: meson-gx: remove unneeded devm_kstrdup in meson_mmc_clk_init
In reply to a message not in the archiveCLK core does a deep copy of init.name, therefore it's fully ok to provide a local variable.
---
v2:
- fixed commit message
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/meson-gx-mmc.c +1 -1
@@ -281,7 +281,7 @@ static int meson_mmc_clk_init(struct meson_host *host)/* create the divider */ snprintf (clk_name,sizeof (clk_name),"%s#div" ,dev_name (host->dev)); - init.name =devm_kstrdup (host->dev, clk_name,GFP_KERNEL ); + init.name = clk_name; init.ops = &clk_divider_ops; init.flags =CLK_SET_RATE_PARENT ; clk_div_parents[0 ] =__clk_get_name (host->mux_clk);
Signature · 1 line
2.11.1
PATCH v2 8/9 mmc: meson-gx: improve initial configuration
In reply to a message not in the archiveConfig values which are not changed during runtime we can set in the probe function already.
The block size setting is overwritten later in meson_mmc_start_cmd anyway if needed, so it doesn't harm if we remove this setting in meson_mmc_set_ios.
In addition:
- write config register only if configuration changed
- Initialize clocks after other config registers have been initialized
---
v2:
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +21 -16
@@ -390,15 +390,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) val &= ~(CFG_BUS_WIDTH_MASK <<CFG_BUS_WIDTH_SHIFT ); val |= bus_width <<CFG_BUS_WIDTH_SHIFT ; - val &= ~(CFG_BLK_LEN_MASK <<CFG_BLK_LEN_SHIFT ); - val |=ilog2 (SD_EMMC_CFG_BLK_SIZE ) <<CFG_BLK_LEN_SHIFT ; - - val &= ~(CFG_RESP_TIMEOUT_MASK <<CFG_RESP_TIMEOUT_SHIFT ); - val |=ilog2 (SD_EMMC_CFG_RESP_TIMEOUT ) <<CFG_RESP_TIMEOUT_SHIFT ; - - val &= ~(CFG_RC_CC_MASK <<CFG_RC_CC_SHIFT ); - val |=ilog2 (SD_EMMC_CFG_CMD_GAP ) <<CFG_RC_CC_SHIFT ; - val &= ~CFG_DDR ; if (ios->timing == MMC_TIMING_UHS_DDR50 || ios->timing == MMC_TIMING_MMC_DDR52 ||
@@ -409,11 +400,11 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)if (ios->timing ==MMC_TIMING_MMC_HS400 ) val |=CFG_CHK_DS ; -writel (val, host->regs +SD_EMMC_CFG ); - -if (val != orig) +if (val != orig) { +writel (val, host->regs +SD_EMMC_CFG );dev_dbg (host->dev,"%s: SD_EMMC_CFG: 0x%08x -> 0x%08x\n" , __func__, orig, val); + } } static void meson_mmc_request_done(struct mmc_host *mmc,
@@ -691,6 +682,17 @@ static int meson_mmc_get_cd(struct mmc_host *mmc)return status; } +static void meson_mmc_cfg_init (struct meson_host *host) +{ +u32 cfg =0 ; + + cfg |=ilog2 (SD_EMMC_CFG_RESP_TIMEOUT ) <<CFG_RESP_TIMEOUT_SHIFT ; + cfg |=ilog2 (SD_EMMC_CFG_CMD_GAP ) <<CFG_RC_CC_SHIFT ; + cfg |=ilog2 (SD_EMMC_CFG_BLK_SIZE ) <<CFG_BLK_LEN_SHIFT ; + +writel (cfg, host->regs +SD_EMMC_CFG ); +} +static const struct mmc_host_ops meson_mmc_ops = { .request = meson_mmc_request, .set_ios = meson_mmc_set_ios,
@@ -751,10 +753,6 @@ static int meson_mmc_probe(struct platform_device *pdev)if (ret) goto free_host; - ret =meson_mmc_clk_init (host); -if (ret) - goto free_host; -/* Stop execution */ writel (0 , host->regs +SD_EMMC_START );
@@ -763,6 +761,13 @@ static int meson_mmc_probe(struct platform_device *pdev)writel (IRQ_EN_MASK , host->regs +SD_EMMC_STATUS );writel (IRQ_EN_MASK , host->regs +SD_EMMC_IRQ_EN ); +/* set config to sane default */ +meson_mmc_cfg_init (host); + + ret =meson_mmc_clk_init (host); +if (ret) + goto free_host; + ret =devm_request_threaded_irq (&pdev->dev, irq, meson_mmc_irq, meson_mmc_irq_thread,IRQF_SHARED ,DRIVER_NAME , host);
Signature · 1 line
2.11.1
PATCH v2 9/9 mmc: meson-gx: remove member mrq from struct meson_host
In reply to a message not in the archiveStruct mmc_command includes a reference to the related mmc_request. Therefore we don't have to store mrq separately in struct meson_host. And we can remove some now unneeded WARN_ON's.
---
v2:
- extended commit message
- added acked-by
--- drivers/mmc/host/meson-gx-mmc.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +3 -21
@@ -122,7 +122,6 @@struct meson_host {struct device *dev;struct mmc_host *mmc; -struct mmc_request *mrq;struct mmc_command *cmd;spinlock_t lock;
@@ -412,9 +411,6 @@ static void meson_mmc_request_done(struct mmc_host *mmc, {struct meson_host *host =mmc_priv (mmc); -WARN_ON (host->mrq != mrq); - - host->mrq =NULL ; host->cmd =NULL ;mmc_request_done (host->mmc, mrq); }
@@ -521,13 +517,9 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) {struct meson_host *host =mmc_priv (mmc); -WARN_ON (host->mrq !=NULL ); -/* Stop execution */ writel (0 , host->regs +SD_EMMC_START ); - host->mrq = mrq; -if (mrq->sbc)meson_mmc_start_cmd (mmc, mrq->sbc);else
@@ -551,7 +543,6 @@ static void meson_mmc_read_resp(struct mmc_host *mmc, struct mmc_command *cmd)static irqreturn_t meson_mmc_irq (int irq,void *dev_id) {struct meson_host *host = dev_id; -struct mmc_request *mrq;struct mmc_command *cmd;u32 irq_en, status, raw_status;irqreturn_t ret =IRQ_HANDLED ;
@@ -561,11 +552,6 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) cmd = host->cmd; - mrq = host->mrq; - -if (WARN_ON (!mrq)) -return IRQ_NONE ; -if (WARN_ON (!cmd))return IRQ_NONE ;
@@ -612,7 +598,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)else {dev_warn (host->dev,"Unknown IRQ! status=0x%04x: MMC CMD%u arg=0x%08x flags=0x%08x stop=%d\n" , status, cmd->opcode, cmd->arg, - cmd->flags, mrq->stop ?1 :0 ); + cmd->flags, cmd->mrq->stop ?1 :0 );if (cmd->data) {struct mmc_data *data = cmd->data;
@@ -639,14 +625,10 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)static irqreturn_t meson_mmc_irq_thread (int irq,void *dev_id) {struct meson_host *host = dev_id; -struct mmc_request *mrq = host->mrq;struct mmc_command *cmd = host->cmd;struct mmc_data *data;unsigned int xfer_bytes; -if (WARN_ON (!mrq)) -return IRQ_NONE ; -if (WARN_ON (!cmd))return IRQ_NONE ;
@@ -660,8 +642,8 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) }meson_mmc_read_resp (host->mmc, cmd); -if (!data || !data->stop || mrq->sbc) -meson_mmc_request_done (host->mmc, mrq); +if (!data || !data->stop || cmd->mrq->sbc) +meson_mmc_request_done (host->mmc, cmd->mrq);else meson_mmc_start_cmd (host->mmc, data->stop);
Signature · 1 line
2.11.1