| Message ID | E1Wd2Wd-0003vp-S2@rmk-PC.arm.linux.org.uk |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Apr 23, 2014 at 08:08:07PM +0100, Russell King wrote: > @@ -1507,25 +1529,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) > host->ops->set_clock(host, host->clock); > } > > - if (host->ops->set_uhs_signaling) > - host->ops->set_uhs_signaling(host, ios->timing); > - else { > - ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); > - /* Select Bus Speed Mode for host */ > - ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; > - if ((ios->timing == MMC_TIMING_MMC_HS200) || > - (ios->timing == MMC_TIMING_UHS_SDR104)) > - ctrl_2 |= SDHCI_CTRL_UHS_SDR104; > - else if (ios->timing == MMC_TIMING_UHS_SDR12) > - ctrl_2 |= SDHCI_CTRL_UHS_SDR12; > - else if (ios->timing == MMC_TIMING_UHS_SDR25) > - ctrl_2 |= SDHCI_CTRL_UHS_SDR25; > - else if (ios->timing == MMC_TIMING_UHS_SDR50) > - ctrl_2 |= SDHCI_CTRL_UHS_SDR50; > - else if (ios->timing == MMC_TIMING_UHS_DDR50) > - ctrl_2 |= SDHCI_CTRL_UHS_DDR50; > - sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); > - } > + host->ops->set_uhs_signaling(host, ios->timing); > > if (!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN) && > ((ios->timing == MMC_TIMING_UHS_SDR12) || Whoever decided to poorly pick these patches up against my will has slightly messed this patch up - whereas my original patch left the code correctly formatted, when whoever applied this patch did so, they left an additional blank line in the above. The other thing I'd ask is that the MMC people learn C precedence rules, and realise that it's not necessary (and actively harmful) to add additional parenthesis around simple if() conditions. Testing for timing being one of two values does not need anything more than one set of parenthesis - it does not need if ((a == b) || (a == c)) - if (a == b || a == c) does just fine, and is less confusing when encountering more complex statements, such as: if ((((a == b) || (a == c)) && ((d > a) || (d < c))) || (z == f)) compared with: if (((a == b || a == c) && (d > a || d < c)) || z == f) With the former "style", I normally end up having to pull the file into the editor, and rewrite the damned statement to work out what the grouping is, because the excessive use of parenthesis is detrimental to readability. Don't do it. Learn the C precedence rules and keep code readable.
On 16 June 2014 12:46, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Wed, Apr 23, 2014 at 08:08:07PM +0100, Russell King wrote: >> @@ -1507,25 +1529,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) >> host->ops->set_clock(host, host->clock); >> } >> >> - if (host->ops->set_uhs_signaling) >> - host->ops->set_uhs_signaling(host, ios->timing); >> - else { >> - ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); >> - /* Select Bus Speed Mode for host */ >> - ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; >> - if ((ios->timing == MMC_TIMING_MMC_HS200) || >> - (ios->timing == MMC_TIMING_UHS_SDR104)) >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR104; >> - else if (ios->timing == MMC_TIMING_UHS_SDR12) >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR12; >> - else if (ios->timing == MMC_TIMING_UHS_SDR25) >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR25; >> - else if (ios->timing == MMC_TIMING_UHS_SDR50) >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR50; >> - else if (ios->timing == MMC_TIMING_UHS_DDR50) >> - ctrl_2 |= SDHCI_CTRL_UHS_DDR50; >> - sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); >> - } >> + host->ops->set_uhs_signaling(host, ios->timing); >> >> if (!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN) && >> ((ios->timing == MMC_TIMING_UHS_SDR12) || > > Whoever decided to poorly pick these patches up against my will has > slightly messed this patch up - whereas my original patch left the > code correctly formatted, when whoever applied this patch did so, they > left an additional blank line in the above. Hi Russell, We kindly pinged you several times asking for your state and for the PR, but I suppose you were just too busy. Your PR were kind of blocking patches for sdhci, if you remember. Anyway, we did get some folks to test the patches and was thus fairly confident that we could merge them. Chris asked me to try to collect them in a PR for him, so I did. Sorry if I managed to screw some things up, there were several conflicts and actual regressions, which I tried to take care of. The mmc people were also very helping in sending patches to fixup related regressions, immediately after we merged your patchset. Thus together I think we managed to pull it off. > > The other thing I'd ask is that the MMC people learn C precedence > rules, and realise that it's not necessary (and actively harmful) > to add additional parenthesis around simple if() conditions. Testing > for timing being one of two values does not need anything more than > one set of parenthesis - it does not need if ((a == b) || (a == c)) - > if (a == b || a == c) does just fine, and is less confusing when > encountering more complex statements, such as: > > if ((((a == b) || (a == c)) && ((d > a) || (d < c))) || (z == f)) > > compared with: > > if (((a == b || a == c) && (d > a || d < c)) || z == f) > > With the former "style", I normally end up having to pull the file into > the editor, and rewrite the damned statement to work out what the > grouping is, because the excessive use of parenthesis is detrimental to > readability. Don't do it. Learn the C precedence rules and keep code > readable. Sure, we will adopt. Please, feel free to send a patch to fixup my misstake. I will happily apply it. Kind regards Ulf Hansson -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 16 June 2014 14:17, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 16 June 2014 12:46, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: >> On Wed, Apr 23, 2014 at 08:08:07PM +0100, Russell King wrote: >>> @@ -1507,25 +1529,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) >>> host->ops->set_clock(host, host->clock); >>> } >>> >>> - if (host->ops->set_uhs_signaling) >>> - host->ops->set_uhs_signaling(host, ios->timing); >>> - else { >>> - ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); >>> - /* Select Bus Speed Mode for host */ >>> - ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; >>> - if ((ios->timing == MMC_TIMING_MMC_HS200) || >>> - (ios->timing == MMC_TIMING_UHS_SDR104)) >>> - ctrl_2 |= SDHCI_CTRL_UHS_SDR104; >>> - else if (ios->timing == MMC_TIMING_UHS_SDR12) >>> - ctrl_2 |= SDHCI_CTRL_UHS_SDR12; >>> - else if (ios->timing == MMC_TIMING_UHS_SDR25) >>> - ctrl_2 |= SDHCI_CTRL_UHS_SDR25; >>> - else if (ios->timing == MMC_TIMING_UHS_SDR50) >>> - ctrl_2 |= SDHCI_CTRL_UHS_SDR50; >>> - else if (ios->timing == MMC_TIMING_UHS_DDR50) >>> - ctrl_2 |= SDHCI_CTRL_UHS_DDR50; >>> - sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); >>> - } >>> + host->ops->set_uhs_signaling(host, ios->timing); >>> >>> if (!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN) && >>> ((ios->timing == MMC_TIMING_UHS_SDR12) || >> >> Whoever decided to poorly pick these patches up against my will has >> slightly messed this patch up - whereas my original patch left the >> code correctly formatted, when whoever applied this patch did so, they >> left an additional blank line in the above. > [snip] > Please, feel free to send a patch to fixup my misstake. I will happily apply it. I had a second look to fix it up myself, but I just can't find that your patch was different than the one I applied (beside the conflict I resolved). If you do find any other issue regarding the patches in this patchset - please let me know and I will try to help. Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 16, 2014 at 02:17:30PM +0200, Ulf Hansson wrote: > On 16 June 2014 12:46, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > > On Wed, Apr 23, 2014 at 08:08:07PM +0100, Russell King wrote: > >> @@ -1507,25 +1529,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) > >> host->ops->set_clock(host, host->clock); > >> } > >> > >> - if (host->ops->set_uhs_signaling) > >> - host->ops->set_uhs_signaling(host, ios->timing); > >> - else { > >> - ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); > >> - /* Select Bus Speed Mode for host */ > >> - ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; > >> - if ((ios->timing == MMC_TIMING_MMC_HS200) || > >> - (ios->timing == MMC_TIMING_UHS_SDR104)) > >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR104; > >> - else if (ios->timing == MMC_TIMING_UHS_SDR12) > >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR12; > >> - else if (ios->timing == MMC_TIMING_UHS_SDR25) > >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR25; > >> - else if (ios->timing == MMC_TIMING_UHS_SDR50) > >> - ctrl_2 |= SDHCI_CTRL_UHS_SDR50; > >> - else if (ios->timing == MMC_TIMING_UHS_DDR50) > >> - ctrl_2 |= SDHCI_CTRL_UHS_DDR50; > >> - sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); > >> - } > >> + host->ops->set_uhs_signaling(host, ios->timing); > >> > >> if (!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN) && > >> ((ios->timing == MMC_TIMING_UHS_SDR12) || > > > > Whoever decided to poorly pick these patches up against my will has > > slightly messed this patch up - whereas my original patch left the > > code correctly formatted, when whoever applied this patch did so, they > > left an additional blank line in the above. > > Hi Russell, > > We kindly pinged you several times asking for your state and for the > PR, but I suppose you were just too busy. Your PR were kind of > blocking patches for sdhci, if you remember. I wasn't "too busy". I had walked away from all kernel maintanence in disgust at the way many in the ARM community ignores questions, and ignores patches which need testing - I'm talking there about the L2C patch series which was extremely poorly tested, and still, to this day, has questions outstanding. Yes, the code now produces warnings. It produces warnings /because/ people were not willing to help. Those warnings serve as a reminder that there's still problems which need solving there, and they're not going to go away until those problems are solved. While I don't like pushing unfinished code into mainline, in this case, others deemed the patch set too important _not_ to go into mainline even with these problems. Now, it's been /soo/ long since I worked on that patch set that my knowledge has now diminished... so it's now going to be _much_ harder to resolve those issues than it would have been three months ago. And I'm also holding a grudge, and I bear grudges for a long time, so expect me to be "difficult" towards Linux stuff for a while yet. > The mmc people were also very helping in sending patches to fixup > related regressions, immediately after we merged your patchset. Thus > together I think we managed to pull it off. The formatting problem I refer to above is line 1532/1533 in sdhci.c - there's an additional blank line which somehow got left behind, caused presumably by insufficient attention paid to cleaning up a conflict between my original patches and the state of the tree they were applied to.
On Mon, Jun 16, 2014 at 02:17:30PM +0200, Ulf Hansson wrote: > Anyway, we did get some folks to test the patches and was thus fairly > confident that we could merge them. Chris asked me to try to collect > them in a PR for him, so I did. Sorry if I managed to screw some > things up, there were several conflicts and actual regressions, which > I tried to take care of. > > The mmc people were also very helping in sending patches to fixup > related regressions, immediately after we merged your patchset. Thus > together I think we managed to pull it off. I tend to look through slightly less rose-tinted glasses. The fact is... there's loads of ARM platforms which now fail in Olof's build/boot testing, and they all seem to have a very similar pattern: hummingboard: [ 1.149688] sdhci: Secure Digital Host Controller Interface driver [ 1.155901] sdhci: Copyright(c) Pierre Ossman ... [ 1.253630] Waiting for root device /dev/mmcblk0p2... [ 60.325469] imx-sdma 20ec000.sdma: firmware not found ~$off # PYBOOT: Exception: timeout jetson: [ 2.261355] Waiting for root device /dev/mmcblk0p1... wandboard: [ 1.186870] sdhci: Secure Digital Host Controller Interface driver [ 1.193075] sdhci: Copyright(c) Pierre Ossman ... [ 1.291064] Waiting for root device /dev/mmcblk0p2... Whether these are caused by the patch set or not is anyone's guess, because we (a) don't know what's causing these failures, and (b) my patch series was never tested on anything but iMX6. I'm pretty certain that the hummingboard failure is not related to my series as that's one of the platforms I did test my series on. There's more failures which look like possibly something in core MMC is rather screwed, as OMAP5 (which doesn't use SDHCI) is also failing at a similar point. What these failures /do/ mean is that when I'm pushing my ARM for-next branch out, Olof's builder picks it up and runs a build across it, and the report returns a whole load of failures. A whole load of failures means that those platforms haven't tested my changes, which means the quality of testing is much lower than it should be. With 26 passing and 15 failing, that's over 1/3 of platforms failing, which means 1/3 aren't getting tested. This level of failure has been going on for quite a while now, and (afaik) it remains uninvestigated and undiagnosed. (This is one of the complaints I have about Olof's build/boot test system, much of the information about the build and boot is hidden away and unpublished, which makes it almost impossible for third parties to diagnose any problem there. I've given up looking at most of Olof's build/boot mails because of this - it's just not interesting to see the same abbreviated boot failure logs which give no useful information time and time again.) We need to get on top of these failures and get them sorted.
On 06/19/2014 06:28 AM, Russell King - ARM Linux wrote: > On Mon, Jun 16, 2014 at 02:17:30PM +0200, Ulf Hansson wrote: >> Anyway, we did get some folks to test the patches and was thus fairly >> confident that we could merge them. Chris asked me to try to collect >> them in a PR for him, so I did. Sorry if I managed to screw some >> things up, there were several conflicts and actual regressions, which >> I tried to take care of. >> >> The mmc people were also very helping in sending patches to fixup >> related regressions, immediately after we merged your patchset. Thus >> together I think we managed to pull it off. > > I tend to look through slightly less rose-tinted glasses. > > The fact is... there's loads of ARM platforms which now fail in Olof's > build/boot testing, and they all seem to have a very similar pattern: > > hummingboard: > [ 1.149688] sdhci: Secure Digital Host Controller Interface driver > [ 1.155901] sdhci: Copyright(c) Pierre Ossman > ... > [ 1.253630] Waiting for root device /dev/mmcblk0p2... > [ 60.325469] imx-sdma 20ec000.sdma: firmware not found > ~$off > # PYBOOT: Exception: timeout > > jetson: > [ 2.261355] Waiting for root device /dev/mmcblk0p1... > > wandboard: > [ 1.186870] sdhci: Secure Digital Host Controller Interface driver > [ 1.193075] sdhci: Copyright(c) Pierre Ossman > ... > [ 1.291064] Waiting for root device /dev/mmcblk0p2... Any SDHCI failures in Linus' tree (but not linux-next) that occur only in multi_v7_defconfig are likely solved by: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-June/264012.html [PATCH] ARM: multi_v7_defconfig: re-enable SDHCI drivers > Whether these are caused by the patch set or not is anyone's guess, > because we (a) don't know what's causing these failures, and (b) > my patch series was never tested on anything but iMX6. I thought that I'd tested at least some of it on Tegra. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 19, 2014 at 5:28 AM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Mon, Jun 16, 2014 at 02:17:30PM +0200, Ulf Hansson wrote: >> Anyway, we did get some folks to test the patches and was thus fairly >> confident that we could merge them. Chris asked me to try to collect >> them in a PR for him, so I did. Sorry if I managed to screw some >> things up, there were several conflicts and actual regressions, which >> I tried to take care of. >> >> The mmc people were also very helping in sending patches to fixup >> related regressions, immediately after we merged your patchset. Thus >> together I think we managed to pull it off. > > I tend to look through slightly less rose-tinted glasses. > > The fact is... there's loads of ARM platforms which now fail in Olof's > build/boot testing, and they all seem to have a very similar pattern: > > hummingboard: > [ 1.149688] sdhci: Secure Digital Host Controller Interface driver > [ 1.155901] sdhci: Copyright(c) Pierre Ossman > ... > [ 1.253630] Waiting for root device /dev/mmcblk0p2... > [ 60.325469] imx-sdma 20ec000.sdma: firmware not found > ~$off > # PYBOOT: Exception: timeout > > jetson: > [ 2.261355] Waiting for root device /dev/mmcblk0p1... > > wandboard: > [ 1.186870] sdhci: Secure Digital Host Controller Interface driver > [ 1.193075] sdhci: Copyright(c) Pierre Ossman > ... > [ 1.291064] Waiting for root device /dev/mmcblk0p2... > > Whether these are caused by the patch set or not is anyone's guess, > because we (a) don't know what's causing these failures, and (b) > my patch series was never tested on anything but iMX6. > > I'm pretty certain that the hummingboard failure is not related to > my series as that's one of the platforms I did test my series on. > > There's more failures which look like possibly something in core MMC is > rather screwed, as OMAP5 (which doesn't use SDHCI) is also failing at > a similar point. > > What these failures /do/ mean is that when I'm pushing my ARM for-next > branch out, Olof's builder picks it up and runs a build across it, and > the report returns a whole load of failures. A whole load of failures > means that those platforms haven't tested my changes, which means the > quality of testing is much lower than it should be. > > With 26 passing and 15 failing, that's over 1/3 of platforms failing, > which means 1/3 aren't getting tested. > > This level of failure has been going on for quite a while now, and (afaik) > it remains uninvestigated and undiagnosed. (This is one of the complaints > I have about Olof's build/boot test system, much of the information about > the build and boot is hidden away and unpublished, which makes it almost > impossible for third parties to diagnose any problem there. I've given up > looking at most of Olof's build/boot mails because of this - it's just > not interesting to see the same abbreviated boot failure logs which give > no useful information time and time again.) Most of this is because I want to avoid sending huuuge emails out with the failures. I'll add a push of the full log to arm-soc.lixom.net and include a link to it in the emails, similar to how I do the build logs. I'll let you know when I've made that change. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index 323e2a688563..8ce3c28cb76e 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -106,6 +106,7 @@ static const struct sdhci_ops sdhci_acpi_ops_dflt = { .enable_dma = sdhci_acpi_enable_dma, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_ops sdhci_acpi_ops_int = { @@ -113,6 +114,7 @@ static const struct sdhci_ops sdhci_acpi_ops_int = { .enable_dma = sdhci_acpi_enable_dma, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_acpi_int_hw_reset, }; diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index e610811c09b0..dd780c315a63 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -212,6 +212,7 @@ static struct sdhci_ops sdhci_bcm_kona_ops = { .platform_send_init_74_clocks = sdhci_bcm_kona_init_74_clocks, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, .card_event = sdhci_bcm_kona_card_event, }; diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c index 74906d6008e1..46af9a439d7b 100644 --- a/drivers/mmc/host/sdhci-bcm2835.c +++ b/drivers/mmc/host/sdhci-bcm2835.c @@ -136,6 +136,7 @@ static const struct sdhci_ops bcm2835_sdhci_ops = { .get_min_clock = bcm2835_sdhci_get_min_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = { diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c index 587d73ef33ff..14b74075589a 100644 --- a/drivers/mmc/host/sdhci-cns3xxx.c +++ b/drivers/mmc/host/sdhci-cns3xxx.c @@ -81,6 +81,7 @@ static const struct sdhci_ops sdhci_cns3xxx_ops = { .set_clock = sdhci_cns3xxx_set_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data sdhci_cns3xxx_pdata = { diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c index 8ef4ab52f8e0..0d315f4496c8 100644 --- a/drivers/mmc/host/sdhci-dove.c +++ b/drivers/mmc/host/sdhci-dove.c @@ -89,6 +89,7 @@ static const struct sdhci_ops sdhci_dove_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data sdhci_dove_pdata = { diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index f0ee594f25d1..5bd1092310f2 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -57,6 +57,7 @@ static struct sdhci_ops sdhci_arasan_ops = { .get_timeout_clock = sdhci_arasan_get_timeout_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_arasan_pdata = { diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index c4f8cd3f83c8..fcaeae5f55b8 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -309,6 +309,7 @@ static const struct sdhci_ops sdhci_esdhc_ops = { .adma_workaround = esdhci_of_adma_workaround, .set_bus_width = esdhc_pltfm_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data sdhci_esdhc_pdata = { diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c index a4a1f0f2c0a0..b341661369a2 100644 --- a/drivers/mmc/host/sdhci-of-hlwd.c +++ b/drivers/mmc/host/sdhci-of-hlwd.c @@ -61,6 +61,7 @@ static const struct sdhci_ops sdhci_hlwd_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data sdhci_hlwd_pdata = { diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index b3a28f6b170e..52c42fcc284c 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -1082,6 +1082,7 @@ static const struct sdhci_ops sdhci_pci_ops = { .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_pci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset, }; diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 1fb89f44bd58..7e834fb78f42 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -48,6 +48,7 @@ static const struct sdhci_ops sdhci_pltfm_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; #ifdef CONFIG_OF diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c index db5257bf032e..3c0f3c0a1cc8 100644 --- a/drivers/mmc/host/sdhci-pxav2.c +++ b/drivers/mmc/host/sdhci-pxav2.c @@ -116,6 +116,7 @@ static const struct sdhci_ops pxav2_sdhci_ops = { .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = pxav2_mmc_set_bus_width, .reset = pxav2_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; #ifdef CONFIG_OF diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 05574104a254..f4f128947561 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -229,6 +229,7 @@ static const struct sdhci_ops pxav3_sdhci_ops = { .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = sdhci_set_bus_width, .reset = pxav3_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_pxav3_pdata = { diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 0ac075dfd844..76d7c12d8ef9 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -374,6 +374,7 @@ static struct sdhci_ops sdhci_s3c_ops = { .get_min_clock = sdhci_s3c_get_min_clock, .set_bus_width = sdhci_s3c_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static void sdhci_s3c_notify_change(struct platform_device *dev, int state) diff --git a/drivers/mmc/host/sdhci-sirf.c b/drivers/mmc/host/sdhci-sirf.c index 3b775348b470..17004531d089 100644 --- a/drivers/mmc/host/sdhci-sirf.c +++ b/drivers/mmc/host/sdhci-sirf.c @@ -32,6 +32,7 @@ static struct sdhci_ops sdhci_sirf_ops = { .get_max_clock = sdhci_sirf_get_max_clk, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_sirf_pdata = { diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index 8bf64ab36720..9d535c7336ef 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c @@ -41,6 +41,7 @@ static const struct sdhci_ops sdhci_pltfm_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; #ifdef CONFIG_OF diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index a0a8b5cc3b0c..d06b6ff60432 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -156,6 +156,7 @@ static const struct sdhci_ops tegra_sdhci_ops = { .set_clock = sdhci_set_clock, .set_bus_width = tegra_sdhci_set_bus_width, .reset = tegra_sdhci_reset, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data sdhci_tegra20_pdata = { diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 0bcef2d42da4..1afed0ab338c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1404,6 +1404,28 @@ void sdhci_set_bus_width(struct sdhci_host *host, int width) } EXPORT_SYMBOL_GPL(sdhci_set_bus_width); +void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) +{ + u16 ctrl_2; + + ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); + /* Select Bus Speed Mode for host */ + ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; + if ((timing == MMC_TIMING_MMC_HS200) || + (timing == MMC_TIMING_UHS_SDR104)) + ctrl_2 |= SDHCI_CTRL_UHS_SDR104; + else if (timing == MMC_TIMING_UHS_SDR12) + ctrl_2 |= SDHCI_CTRL_UHS_SDR12; + else if (timing == MMC_TIMING_UHS_SDR25) + ctrl_2 |= SDHCI_CTRL_UHS_SDR25; + else if (timing == MMC_TIMING_UHS_SDR50) + ctrl_2 |= SDHCI_CTRL_UHS_SDR50; + else if (timing == MMC_TIMING_UHS_DDR50) + ctrl_2 |= SDHCI_CTRL_UHS_DDR50; + sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); +} +EXPORT_SYMBOL_GPL(sdhci_set_uhs_signaling); + static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) { unsigned long flags; @@ -1507,25 +1529,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) host->ops->set_clock(host, host->clock); } - if (host->ops->set_uhs_signaling) - host->ops->set_uhs_signaling(host, ios->timing); - else { - ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); - /* Select Bus Speed Mode for host */ - ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; - if ((ios->timing == MMC_TIMING_MMC_HS200) || - (ios->timing == MMC_TIMING_UHS_SDR104)) - ctrl_2 |= SDHCI_CTRL_UHS_SDR104; - else if (ios->timing == MMC_TIMING_UHS_SDR12) - ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (ios->timing == MMC_TIMING_UHS_SDR25) - ctrl_2 |= SDHCI_CTRL_UHS_SDR25; - else if (ios->timing == MMC_TIMING_UHS_SDR50) - ctrl_2 |= SDHCI_CTRL_UHS_SDR50; - else if (ios->timing == MMC_TIMING_UHS_DDR50) - ctrl_2 |= SDHCI_CTRL_UHS_DDR50; - sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); - } + host->ops->set_uhs_signaling(host, ios->timing); if (!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN) && ((ios->timing == MMC_TIMING_UHS_SDR12) || diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 3179a8053019..7a35395e5f56 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -403,6 +403,7 @@ static inline bool sdhci_sdio_irq_enabled(struct sdhci_host *host) void sdhci_set_clock(struct sdhci_host *host, unsigned int clock); void sdhci_set_bus_width(struct sdhci_host *host, int width); void sdhci_reset(struct sdhci_host *host, u8 mask); +void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing); #ifdef CONFIG_PM extern int sdhci_suspend_host(struct sdhci_host *host);
Add sdhci_set_uhs_signaling() and always call the set_uhs_signaling method. This avoids quirks being added into sdhci_set_uhs_signaling(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/mmc/host/sdhci-acpi.c | 2 ++ drivers/mmc/host/sdhci-bcm-kona.c | 1 + drivers/mmc/host/sdhci-bcm2835.c | 1 + drivers/mmc/host/sdhci-cns3xxx.c | 1 + drivers/mmc/host/sdhci-dove.c | 1 + drivers/mmc/host/sdhci-of-arasan.c | 1 + drivers/mmc/host/sdhci-of-esdhc.c | 1 + drivers/mmc/host/sdhci-of-hlwd.c | 1 + drivers/mmc/host/sdhci-pci.c | 1 + drivers/mmc/host/sdhci-pltfm.c | 1 + drivers/mmc/host/sdhci-pxav2.c | 1 + drivers/mmc/host/sdhci-pxav3.c | 1 + drivers/mmc/host/sdhci-s3c.c | 1 + drivers/mmc/host/sdhci-sirf.c | 1 + drivers/mmc/host/sdhci-spear.c | 1 + drivers/mmc/host/sdhci-tegra.c | 1 + drivers/mmc/host/sdhci.c | 42 +++++++++++++++++++++----------------- drivers/mmc/host/sdhci.h | 1 + 18 files changed, 41 insertions(+), 19 deletions(-)