| Message ID | 1441949469-27283-1-git-send-email-adam.lee@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 09/10/2015 11:31 PM, Adam Lee wrote: > BugLink: https://bugs.launchpad.net/bugs/1472843 > > This patch fixes MMC not working issue on O2Micro/BayHub Host, which > requires transfer mode register to be cleared when sending no DMA > command. > > Signed-off-by: Peter Guo <peter.guo@bayhubtech.com> > Signed-off-by: Adam Lee <adam.lee@canonical.com> > Cc: stable <stable@vger.kernel.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > (cherry picked from commit 143b648ddf1583905fa15d32be27a31442fc7933) > Signed-off-by: Adam Lee <adam.lee@canonical.com> > --- > drivers/mmc/host/sdhci-pci.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c > index 0955777..0339120 100644 > --- a/drivers/mmc/host/sdhci-pci.c > +++ b/drivers/mmc/host/sdhci-pci.c > @@ -517,6 +517,7 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) > static const struct sdhci_pci_fixes sdhci_o2 = { > .probe = sdhci_pci_o2_probe, > .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > + .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD, > .probe_slot = sdhci_pci_o2_probe_slot, > .resume = sdhci_pci_o2_resume, > }; > How is this going to compile in Trusty and Utopic ? SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD was not introduced until 3.19, nor do I see any backports of that commit in Trusty/Utopic(LTS). rtg
On Fri, Sep 11, 2015 at 07:28:52AM -0600, Tim Gardner wrote: > How is this going to compile in Trusty and Utopic ? > SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD was not introduced until > 3.19, nor do I see any backports of that commit in Trusty/Utopic(LTS). > > rtg Sorry, my fault. Appended those two missed patches: [Trusty][PATCH][Append 1/2] mmc: sdhci: Add a quirk for AMD SDHC transfer mode register need to be cleared for cmd without data [Utopic][PATCH][Append 2/2] mmc: sdhci: Add a quirk for AMD SDHC transfer mode register need to be cleared for cmd without data Great thanks for reviewing.
On 09/11/2015 08:30 AM, Adam Lee wrote: > On Fri, Sep 11, 2015 at 07:28:52AM -0600, Tim Gardner wrote: >> How is this going to compile in Trusty and Utopic ? >> SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD was not introduced until >> 3.19, nor do I see any backports of that commit in Trusty/Utopic(LTS). >> >> rtg > > Sorry, my fault. Appended those two missed patches: > [Trusty][PATCH][Append 1/2] mmc: sdhci: Add a quirk for AMD SDHC transfer mode register need to be cleared for cmd without data > [Utopic][PATCH][Append 2/2] mmc: sdhci: Add a quirk for AMD SDHC transfer mode register need to be cleared for cmd without data > > Great thanks for reviewing. > That looks better.
On Fri, Sep 11, 2015 at 01:31:09PM +0800, Adam Lee wrote: > BugLink: https://bugs.launchpad.net/bugs/1472843 > > This patch fixes MMC not working issue on O2Micro/BayHub Host, which > requires transfer mode register to be cleared when sending no DMA > command. > > Signed-off-by: Peter Guo <peter.guo@bayhubtech.com> > Signed-off-by: Adam Lee <adam.lee@canonical.com> > Cc: stable <stable@vger.kernel.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > (cherry picked from commit 143b648ddf1583905fa15d32be27a31442fc7933) > Signed-off-by: Adam Lee <adam.lee@canonical.com> > --- > drivers/mmc/host/sdhci-pci.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c > index 0955777..0339120 100644 > --- a/drivers/mmc/host/sdhci-pci.c > +++ b/drivers/mmc/host/sdhci-pci.c > @@ -517,6 +517,7 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) > static const struct sdhci_pci_fixes sdhci_o2 = { > .probe = sdhci_pci_o2_probe, > .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > + .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD, > .probe_slot = sdhci_pci_o2_probe_slot, > .resume = sdhci_pci_o2_resume, > }; > -- > 2.5.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
Applied to the master-next branch of Trusty and Vivid and the lts-backport-utopic-next branch of Trusty.
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 0955777..0339120 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -517,6 +517,7 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) static const struct sdhci_pci_fixes sdhci_o2 = { .probe = sdhci_pci_o2_probe, .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, + .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD, .probe_slot = sdhci_pci_o2_probe_slot, .resume = sdhci_pci_o2_resume, };