| Message ID | 1479380356-7228-1-git-send-email-thierry.escande@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016/11/17 18:59, Thierry Escande wrote: > From: zhaojohn <john.zhao@intel.com> > > Hynix eMMC devices sometimes take 50% longer to resume from sleep. This > occurs on Braswell based chromebook with acpi sdhci controller. > > Based on a recommendation from Hynix engineers, this patch sends a > Power-Off Notification using mmc_poweroff_notify() before going to S3 to > have a resume time consistently within spec. No voltage regulator are > being cut through this notification but merely tells the eMMC firmware > that we're about to do so and get it to behave better on resume. > > Signed-off-by: zhaojohn <john.zhao@intel.com> > Signed-off-by: Arindam Roy <arindam.roy@intel.com> > Tested-by: Freddy Paul <freddy.paul@intel.com> > Reviewed-by: Icarus W Sparry <icarus.w.sparry@intel.com> > Reviewed-by: Marc Herbert <marc.herbert@intel.com> > Reviewed-by: Eric Caruso <ejcaruso@chromium.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> > Signed-off-by: Thierry Escande <thierry.escande@collabora.com> You shouldn't carry on these tags from your local tree. > --- > > Changes in v2: > - Add a few more details in the commit message > > drivers/mmc/card/block.c | 8 ++++++++ > drivers/mmc/core/mmc.c | 8 +++++++- > include/linux/mmc/card.h | 2 ++ > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c > index 709a872..3db5344 100644 > --- a/drivers/mmc/card/block.c > +++ b/drivers/mmc/card/block.c > @@ -2573,6 +2573,14 @@ static const struct mmc_fixup blk_fixups[] = > MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc, > MMC_QUIRK_TRIM_BROKEN), > > + /* > + * Hynix eMMC devices sometimes take 50% longer to resume from sleep. > + * Based on a recommendation from Hynix, send a Power-Off Notification > + * before going to S3 to restore a resume time consistently within spec. > + */ I don't have time to check this although I have handful of Hynix eMMCs on my test farm.. But it doesn't seem correct to me that *ALL* of the Hynix eMMCs have the same problems and they won't be fixed? > + MMC_FIXUP(CID_NAME_ANY, CID_MANFID_HYNIX, CID_OEMID_ANY, add_quirk_mmc, > + MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP), > + > END_FIXUP > }; > > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index df19777..774d478 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -1941,8 +1941,14 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend) > if (mmc_can_poweroff_notify(host->card) && > ((host->caps2 & MMC_CAP2_FULL_PWR_CYCLE) || !is_suspend)) > err = mmc_poweroff_notify(host->card, notify_type); > - else if (mmc_can_sleep(host->card)) > + else if (mmc_can_sleep(host->card)) { > + if (host->card->quirks & MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP) { > + err = mmc_poweroff_notify(host->card, notify_type); > + if (err) > + goto out; > + } > err = mmc_sleep(host); > + } > else if (!mmc_host_is_spi(host)) > err = mmc_deselect_cards(host); > > diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h > index 73fad83..e4940f4 100644 > --- a/include/linux/mmc/card.h > +++ b/include/linux/mmc/card.h > @@ -281,6 +281,8 @@ struct mmc_card { > #define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling SDIO_CCCR_INTx could create a fake interrupt */ > #define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */ > #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */ > +#define MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP \ > + (1<<14) /* Poweroff notification*/ > > > unsigned int erase_size; /* erase size in sectors */ >
Hi Shawn, On 18/11/2016 05:27, Shawn Lin wrote: > On 2016/11/17 18:59, Thierry Escande wrote: >> From: zhaojohn <john.zhao@intel.com> >> >> Hynix eMMC devices sometimes take 50% longer to resume from sleep. This >> occurs on Braswell based chromebook with acpi sdhci controller. >> >> Based on a recommendation from Hynix engineers, this patch sends a >> Power-Off Notification using mmc_poweroff_notify() before going to S3 to >> have a resume time consistently within spec. No voltage regulator are >> being cut through this notification but merely tells the eMMC firmware >> that we're about to do so and get it to behave better on resume. >> >> Signed-off-by: zhaojohn <john.zhao@intel.com> >> Signed-off-by: Arindam Roy <arindam.roy@intel.com> >> Tested-by: Freddy Paul <freddy.paul@intel.com> >> Reviewed-by: Icarus W Sparry <icarus.w.sparry@intel.com> >> Reviewed-by: Marc Herbert <marc.herbert@intel.com> >> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> >> Signed-off-by: Brian Norris <briannorris@chromium.org> >> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> > > You shouldn't carry on these tags from your local tree. > >> --- >> >> Changes in v2: >> - Add a few more details in the commit message >> >> drivers/mmc/card/block.c | 8 ++++++++ >> drivers/mmc/core/mmc.c | 8 +++++++- >> include/linux/mmc/card.h | 2 ++ >> 3 files changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c >> index 709a872..3db5344 100644 >> --- a/drivers/mmc/card/block.c >> +++ b/drivers/mmc/card/block.c >> @@ -2573,6 +2573,14 @@ static const struct mmc_fixup blk_fixups[] = >> MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, >> add_quirk_mmc, >> MMC_QUIRK_TRIM_BROKEN), >> >> + /* >> + * Hynix eMMC devices sometimes take 50% longer to resume from >> sleep. >> + * Based on a recommendation from Hynix, send a Power-Off >> Notification >> + * before going to S3 to restore a resume time consistently >> within spec. >> + */ > > I don't have time to check this although I have handful of Hynix eMMCs > on my test farm.. But it doesn't seem correct to me that *ALL* of the > Hynix eMMCs have the same problems and they won't be fixed? Sure. I can link the quirk to the cid name (HBG4e, which seems to be a very commonly used one) and the oemid as well. Regards, Thierry > >> + MMC_FIXUP(CID_NAME_ANY, CID_MANFID_HYNIX, CID_OEMID_ANY, >> add_quirk_mmc, >> + MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP), >> + >> END_FIXUP >> }; >> >> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c >> index df19777..774d478 100644 >> --- a/drivers/mmc/core/mmc.c >> +++ b/drivers/mmc/core/mmc.c >> @@ -1941,8 +1941,14 @@ static int _mmc_suspend(struct mmc_host *host, >> bool is_suspend) >> if (mmc_can_poweroff_notify(host->card) && >> ((host->caps2 & MMC_CAP2_FULL_PWR_CYCLE) || !is_suspend)) >> err = mmc_poweroff_notify(host->card, notify_type); >> - else if (mmc_can_sleep(host->card)) >> + else if (mmc_can_sleep(host->card)) { >> + if (host->card->quirks & MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP) { >> + err = mmc_poweroff_notify(host->card, notify_type); >> + if (err) >> + goto out; >> + } >> err = mmc_sleep(host); >> + } >> else if (!mmc_host_is_spi(host)) >> err = mmc_deselect_cards(host); >> >> diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h >> index 73fad83..e4940f4 100644 >> --- a/include/linux/mmc/card.h >> +++ b/include/linux/mmc/card.h >> @@ -281,6 +281,8 @@ struct mmc_card { >> #define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling >> SDIO_CCCR_INTx could create a fake interrupt */ >> #define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */ >> #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI >> support */ >> +#define MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP \ >> + (1<<14) /* Poweroff notification*/ >> >> >> unsigned int erase_size; /* erase size in sectors */ >> > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" 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/card/block.c b/drivers/mmc/card/block.c index 709a872..3db5344 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2573,6 +2573,14 @@ static const struct mmc_fixup blk_fixups[] = MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc, MMC_QUIRK_TRIM_BROKEN), + /* + * Hynix eMMC devices sometimes take 50% longer to resume from sleep. + * Based on a recommendation from Hynix, send a Power-Off Notification + * before going to S3 to restore a resume time consistently within spec. + */ + MMC_FIXUP(CID_NAME_ANY, CID_MANFID_HYNIX, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP), + END_FIXUP }; diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index df19777..774d478 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1941,8 +1941,14 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend) if (mmc_can_poweroff_notify(host->card) && ((host->caps2 & MMC_CAP2_FULL_PWR_CYCLE) || !is_suspend)) err = mmc_poweroff_notify(host->card, notify_type); - else if (mmc_can_sleep(host->card)) + else if (mmc_can_sleep(host->card)) { + if (host->card->quirks & MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP) { + err = mmc_poweroff_notify(host->card, notify_type); + if (err) + goto out; + } err = mmc_sleep(host); + } else if (!mmc_host_is_spi(host)) err = mmc_deselect_cards(host); diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 73fad83..e4940f4 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -281,6 +281,8 @@ struct mmc_card { #define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling SDIO_CCCR_INTx could create a fake interrupt */ #define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */ #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */ +#define MMC_QUIRK_NOTIFY_POWEROFF_ON_SLEEP \ + (1<<14) /* Poweroff notification*/ unsigned int erase_size; /* erase size in sectors */