2014-06-10 18:27:25

by Stephen Boyd

[permalink] [raw]
Subject: [PATCH] mmc: sdhci-msm: Fix fallout from sdhci refactoring

The sdhci core was refactored recently and some of those
refactorings required changes in every sdhci platform driver.
Those updates happened around the same time as when the msm
driver was merged so the refactorings missed the msm driver.
Hook in the basic library functions so that we can boot apq8074
dragonboards again instead of crashing when we try to jump to
NULL function pointers.

Reported-by: Kevin Hilman <[email protected]>
Cc: Georgi Djakov <[email protected]>
Cc: Russell King <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
---

Patch based on next-20140610

drivers/mmc/host/sdhci-msm.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index acb0e9eb55f1..40573a58486a 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -468,6 +468,10 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);

static struct sdhci_ops sdhci_msm_ops = {
.platform_execute_tuning = sdhci_msm_execute_tuning,
+ .reset = sdhci_reset,
+ .set_clock = sdhci_set_clock,
+ .set_bus_width = sdhci_set_bus_width,
+ .set_uhs_signaling = sdhci_set_uhs_signaling,
};

static int sdhci_msm_probe(struct platform_device *pdev)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation


2014-06-10 18:59:34

by Kumar Gala

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-msm: Fix fallout from sdhci refactoring


On Jun 10, 2014, at 1:27 PM, Stephen Boyd <[email protected]> wrote:

> The sdhci core was refactored recently and some of those
> refactorings required changes in every sdhci platform driver.
> Those updates happened around the same time as when the msm
> driver was merged so the refactorings missed the msm driver.
> Hook in the basic library functions so that we can boot apq8074
> dragonboards again instead of crashing when we try to jump to
> NULL function pointers.
>
> Reported-by: Kevin Hilman <[email protected]>
> Cc: Georgi Djakov <[email protected]>
> Cc: Russell King <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>
> ---
>
> Patch based on next-20140610
>
> drivers/mmc/host/sdhci-msm.c | 4 ++++
> 1 file changed, 4 insertions(+)

Acked-by: Kumar Gala <[email protected]>

Feel free to pick up this version of the patch and ignore mine.

- k

--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

2014-06-10 19:39:28

by Georgi Djakov

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-msm: Fix fallout from sdhci refactoring

On 10.06.14, 21:27, Stephen Boyd wrote:
> The sdhci core was refactored recently and some of those
> refactorings required changes in every sdhci platform driver.
> Those updates happened around the same time as when the msm
> driver was merged so the refactorings missed the msm driver.
> Hook in the basic library functions so that we can boot apq8074
> dragonboards again instead of crashing when we try to jump to
> NULL function pointers.
>
> Reported-by: Kevin Hilman <[email protected]>
> Cc: Georgi Djakov <[email protected]>
> Cc: Russell King <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>

Reviewed-by: Georgi Djakov <[email protected]>

2014-06-10 19:42:05

by Kevin Hilman

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-msm: Fix fallout from sdhci refactoring

Stephen Boyd <[email protected]> writes:

> The sdhci core was refactored recently and some of those
> refactorings required changes in every sdhci platform driver.
> Those updates happened around the same time as when the msm
> driver was merged so the refactorings missed the msm driver.
> Hook in the basic library functions so that we can boot apq8074
> dragonboards again instead of crashing when we try to jump to
> NULL function pointers.
>
> Reported-by: Kevin Hilman <[email protected]>
> Cc: Georgi Djakov <[email protected]>
> Cc: Russell King <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>

Tested-by: Kevin Hilman <[email protected]>

I verifed that this patch on top of next-20140610 gets the qcom
dragonboard booting again.

Kevin

2014-06-12 08:59:58

by Ulf Hansson

[permalink] [raw]
Subject: Re: [PATCH] mmc: sdhci-msm: Fix fallout from sdhci refactoring

On 10 June 2014 20:27, Stephen Boyd <[email protected]> wrote:
> The sdhci core was refactored recently and some of those
> refactorings required changes in every sdhci platform driver.
> Those updates happened around the same time as when the msm
> driver was merged so the refactorings missed the msm driver.
> Hook in the basic library functions so that we can boot apq8074
> dragonboards again instead of crashing when we try to jump to
> NULL function pointers.
>
> Reported-by: Kevin Hilman <[email protected]>
> Cc: Georgi Djakov <[email protected]>
> Cc: Russell King <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>

Thanks!

Applied for fixes.

Kind regards
Uffe

> ---
>
> Patch based on next-20140610
>
> drivers/mmc/host/sdhci-msm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index acb0e9eb55f1..40573a58486a 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -468,6 +468,10 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
>
> static struct sdhci_ops sdhci_msm_ops = {
> .platform_execute_tuning = sdhci_msm_execute_tuning,
> + .reset = sdhci_reset,
> + .set_clock = sdhci_set_clock,
> + .set_bus_width = sdhci_set_bus_width,
> + .set_uhs_signaling = sdhci_set_uhs_signaling,
> };
>
> static int sdhci_msm_probe(struct platform_device *pdev)
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>