Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1565728 > unrolled thread

[PATCHv1 0/2] mmc: sdhci-msm: Addresses minor cleanups

Started byRitesh Harjani <riteshh@codeaurora.org>
First post2017-01-24 10:00 +0100
Last post2017-01-30 11:40 +0100
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCHv1 0/2] mmc: sdhci-msm: Addresses minor cleanups Ritesh Harjani <riteshh@codeaurora.org> - 2017-01-24 10:00 +0100
    [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops Ritesh Harjani <riteshh@codeaurora.org> - 2017-01-24 10:00 +0100
      Re: [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from  sdhci_msm_ops Adrian Hunter <adrian.hunter@intel.com> - 2017-01-30 10:50 +0100
      Re: [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops Ulf Hansson <ulf.hansson@linaro.org> - 2017-01-30 11:40 +0100

#1565728 — [PATCHv1 0/2] mmc: sdhci-msm: Addresses minor cleanups

FromRitesh Harjani <riteshh@codeaurora.org>
Date2017-01-24 10:00 +0100
Subject[PATCHv1 0/2] mmc: sdhci-msm: Addresses minor cleanups
Message-ID<t357l-24T-37@gated-at.bofh.it>
Hi Ulf/Adrian, 

I see that patch series at [1] was already taken by Ulf in next branch.
So as requested by Ulf, please find the below two patch fixes/cleanup on
top of next branch.

Patch 1:- Addresses comment from Adrian  [2]
Patch 2:- Addresses comment from Stephen [3]


links
[1]:- https://lkml.org/lkml/2017/1/10/70
[2]:- https://lkml.org/lkml/2017/1/19/153
[3]:- https://lkml.org/lkml/2017/1/20/542

Ritesh Harjani (2):
  mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops
  mmc: sdhci-msm: Remove unnecessary comments of CDC init sequence

 drivers/mmc/host/sdhci-msm.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, 
a Linux Foundation Collaborative Project.

[toc] | [next] | [standalone]


#1565729 — [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops

FromRitesh Harjani <riteshh@codeaurora.org>
Date2017-01-24 10:00 +0100
Subject[PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops
Message-ID<t357m-24T-49@gated-at.bofh.it>
In reply to#1565728
platform_execute_tuning should not really exist as it does not
do anything useful.

So remove this ops and directly plug sdhci_msm_execute_tuning
with mmc_host_ops.

Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once
HS400 related mode selection is done.

Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
---
 drivers/mmc/host/sdhci-msm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index f958697..b3e8f44 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -827,12 +827,12 @@ static int sdhci_msm_hs400_dll_calibration(struct sdhci_host *host)
 	return ret;
 }
 
-static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
+static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
 {
+	struct sdhci_host *host = mmc_priv(mmc);
 	int tuning_seq_cnt = 3;
 	u8 phase, tuned_phases[16], tuned_phase_cnt = 0;
 	int rc;
-	struct mmc_host *mmc = host->mmc;
 	struct mmc_ios ios = host->mmc->ios;
 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
 	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
@@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
 	if (host->flags & SDHCI_HS400_TUNING) {
 		sdhci_msm_hc_select_mode(host);
 		msm_set_clock_rate_for_bus_mode(host, ios.clock);
+		host->flags &= ~SDHCI_HS400_TUNING;
 	}
 
 retry:
@@ -1119,7 +1120,6 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
 MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
 
 static const struct sdhci_ops sdhci_msm_ops = {
-	.platform_execute_tuning = sdhci_msm_execute_tuning,
 	.reset = sdhci_reset,
 	.set_clock = sdhci_msm_set_clock,
 	.get_min_clock = sdhci_msm_get_min_clock,
@@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
 					 MSM_MMC_AUTOSUSPEND_DELAY_MS);
 	pm_runtime_use_autosuspend(&pdev->dev);
 
+	host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning;
 	ret = sdhci_add_host(host);
 	if (ret)
 		goto pm_runtime_disable;
-- 
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, 
a Linux Foundation Collaborative Project.

[toc] | [prev] | [next] | [standalone]


#1569499 — Re: [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops

FromAdrian Hunter <adrian.hunter@intel.com>
Date2017-01-30 10:50 +0100
SubjectRe: [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops
Message-ID<t5gL0-2ll-21@gated-at.bofh.it>
In reply to#1565729
On 24/01/17 10:50, Ritesh Harjani wrote:
> platform_execute_tuning should not really exist as it does not
> do anything useful.
> 
> So remove this ops and directly plug sdhci_msm_execute_tuning
> with mmc_host_ops.
> 
> Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once
> HS400 related mode selection is done.
> 
> Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci-msm.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index f958697..b3e8f44 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -827,12 +827,12 @@ static int sdhci_msm_hs400_dll_calibration(struct sdhci_host *host)
>  	return ret;
>  }
>  
> -static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
> +static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
>  {
> +	struct sdhci_host *host = mmc_priv(mmc);
>  	int tuning_seq_cnt = 3;
>  	u8 phase, tuned_phases[16], tuned_phase_cnt = 0;
>  	int rc;
> -	struct mmc_host *mmc = host->mmc;
>  	struct mmc_ios ios = host->mmc->ios;
>  	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
>  	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
> @@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
>  	if (host->flags & SDHCI_HS400_TUNING) {
>  		sdhci_msm_hc_select_mode(host);
>  		msm_set_clock_rate_for_bus_mode(host, ios.clock);
> +		host->flags &= ~SDHCI_HS400_TUNING;
>  	}
>  
>  retry:
> @@ -1119,7 +1120,6 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
>  MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
>  
>  static const struct sdhci_ops sdhci_msm_ops = {
> -	.platform_execute_tuning = sdhci_msm_execute_tuning,
>  	.reset = sdhci_reset,
>  	.set_clock = sdhci_msm_set_clock,
>  	.get_min_clock = sdhci_msm_get_min_clock,
> @@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
>  					 MSM_MMC_AUTOSUSPEND_DELAY_MS);
>  	pm_runtime_use_autosuspend(&pdev->dev);
>  
> +	host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning;
>  	ret = sdhci_add_host(host);
>  	if (ret)
>  		goto pm_runtime_disable;
> 

[toc] | [prev] | [next] | [standalone]


#1569570 — Re: [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops

FromUlf Hansson <ulf.hansson@linaro.org>
Date2017-01-30 11:40 +0100
SubjectRe: [PATCHv1 1/2] mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops
Message-ID<t5hxo-2QU-23@gated-at.bofh.it>
In reply to#1565729
On 24 January 2017 at 09:50, Ritesh Harjani <riteshh@codeaurora.org> wrote:
> platform_execute_tuning should not really exist as it does not
> do anything useful.
>
> So remove this ops and directly plug sdhci_msm_execute_tuning
> with mmc_host_ops.
>
> Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once
> HS400 related mode selection is done.
>
> Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-msm.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index f958697..b3e8f44 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -827,12 +827,12 @@ static int sdhci_msm_hs400_dll_calibration(struct sdhci_host *host)
>         return ret;
>  }
>
> -static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
> +static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
>  {
> +       struct sdhci_host *host = mmc_priv(mmc);
>         int tuning_seq_cnt = 3;
>         u8 phase, tuned_phases[16], tuned_phase_cnt = 0;
>         int rc;
> -       struct mmc_host *mmc = host->mmc;
>         struct mmc_ios ios = host->mmc->ios;
>         struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
>         struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
> @@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
>         if (host->flags & SDHCI_HS400_TUNING) {
>                 sdhci_msm_hc_select_mode(host);
>                 msm_set_clock_rate_for_bus_mode(host, ios.clock);
> +               host->flags &= ~SDHCI_HS400_TUNING;
>         }
>
>  retry:
> @@ -1119,7 +1120,6 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
>  MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
>
>  static const struct sdhci_ops sdhci_msm_ops = {
> -       .platform_execute_tuning = sdhci_msm_execute_tuning,
>         .reset = sdhci_reset,
>         .set_clock = sdhci_msm_set_clock,
>         .get_min_clock = sdhci_msm_get_min_clock,
> @@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
>                                          MSM_MMC_AUTOSUSPEND_DELAY_MS);
>         pm_runtime_use_autosuspend(&pdev->dev);
>
> +       host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning;
>         ret = sdhci_add_host(host);
>         if (ret)
>                 goto pm_runtime_disable;
> --
> The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> a Linux Foundation Collaborative Project.
>

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web