* [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-29 16:54 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-29 16:54 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: linux-kernel, linux-arm-kernel, kernel, Nicolas Ferre, Uwe Kleine-König Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..c414ebe 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct platform_device *pdev) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#else +#define atmci_suspend NULL +#define atmci_resume NULL +#endif + + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), + .suspend = atmci_suspend, + .resume = atmci_resume, .driver = { .name = "atmel_mci", }, -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-29 16:54 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-29 16:54 UTC (permalink / raw) To: linux-arm-kernel Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> --- drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..c414ebe 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct platform_device *pdev) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#else +#define atmci_suspend NULL +#define atmci_resume NULL +#endif + + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), + .suspend = atmci_suspend, + .resume = atmci_resume, .driver = { .name = "atmel_mci", }, -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-29 16:54 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-29 16:54 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: Nicolas Ferre, kernel, linux-kernel, linux-arm-kernel, Uwe Kleine-König Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..c414ebe 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct platform_device *pdev) +{ + struct atmel_mci *host = platform_get_drvdata(pdev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#else +#define atmci_suspend NULL +#define atmci_resume NULL +#endif + + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), + .suspend = atmci_suspend, + .resume = atmci_resume, .driver = { .name = "atmel_mci", }, -- 1.7.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci 2011-06-29 16:54 ` Nicolas Ferre @ 2011-06-29 16:01 ` Felipe Balbi -1 siblings, 0 replies; 38+ messages in thread From: Felipe Balbi @ 2011-06-29 16:01 UTC (permalink / raw) To: Nicolas Ferre Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel, Uwe Kleine-König [-- Attachment #1: Type: text/plain, Size: 2000 bytes --] Hi, On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 51 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index aa8039f..c414ebe 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) > +{ > + struct atmel_mci *host = platform_get_drvdata(pdev); > + struct atmel_mci_slot *slot; > + int i, ret; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot) > + mmc_resume_host(host->slot[i]->mmc); > + } > + return ret; > + } > + } > + > + return 0; > +} > + > +static int atmci_resume(struct platform_device *pdev) > +{ > + struct atmel_mci *host = platform_get_drvdata(pdev); > + struct atmel_mci_slot *slot; > + int i, ret; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_resume_host(slot->mmc); > + if (ret < 0) > + return ret; > + } > + > + return 0; > +} > +#else > +#define atmci_suspend NULL > +#define atmci_resume NULL > +#endif > + > + > + > static struct platform_driver atmci_driver = { > .remove = __exit_p(atmci_remove), > + .suspend = atmci_suspend, > + .resume = atmci_resume, should this be using dev_pm_ops instead ? -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-29 16:01 ` Felipe Balbi 0 siblings, 0 replies; 38+ messages in thread From: Felipe Balbi @ 2011-06-29 16:01 UTC (permalink / raw) To: linux-arm-kernel Hi, On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > --- > drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 51 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index aa8039f..c414ebe 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) > +{ > + struct atmel_mci *host = platform_get_drvdata(pdev); > + struct atmel_mci_slot *slot; > + int i, ret; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot) > + mmc_resume_host(host->slot[i]->mmc); > + } > + return ret; > + } > + } > + > + return 0; > +} > + > +static int atmci_resume(struct platform_device *pdev) > +{ > + struct atmel_mci *host = platform_get_drvdata(pdev); > + struct atmel_mci_slot *slot; > + int i, ret; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_resume_host(slot->mmc); > + if (ret < 0) > + return ret; > + } > + > + return 0; > +} > +#else > +#define atmci_suspend NULL > +#define atmci_resume NULL > +#endif > + > + > + > static struct platform_driver atmci_driver = { > .remove = __exit_p(atmci_remove), > + .suspend = atmci_suspend, > + .resume = atmci_resume, should this be using dev_pm_ops instead ? -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110629/849f5c6e/attachment.sig> ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci 2011-06-29 16:01 ` Felipe Balbi @ 2011-06-29 21:39 ` Rafael J. Wysocki -1 siblings, 0 replies; 38+ messages in thread From: Rafael J. Wysocki @ 2011-06-29 21:39 UTC (permalink / raw) To: balbi Cc: Nicolas Ferre, cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel, Uwe Kleine-König On Wednesday, June 29, 2011, Felipe Balbi wrote: > Hi, > > On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: > > Take care of slots while going to suspend state. > > > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > --- > > drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 51 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > > index aa8039f..c414ebe 100644 > > --- a/drivers/mmc/host/atmel-mci.c > > +++ b/drivers/mmc/host/atmel-mci.c > > @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) > > return 0; > > } > > > > +#ifdef CONFIG_PM > > +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) > > +{ > > + struct atmel_mci *host = platform_get_drvdata(pdev); > > + struct atmel_mci_slot *slot; > > + int i, ret; > > + > > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > > + slot = host->slot[i]; > > + if (!slot) > > + continue; > > + ret = mmc_suspend_host(slot->mmc); > > + if (ret < 0) { > > + while (--i >= 0) { > > + slot = host->slot[i]; > > + if (slot) > > + mmc_resume_host(host->slot[i]->mmc); > > + } > > + return ret; > > + } > > + } > > + > > + return 0; > > +} > > + > > +static int atmci_resume(struct platform_device *pdev) > > +{ > > + struct atmel_mci *host = platform_get_drvdata(pdev); > > + struct atmel_mci_slot *slot; > > + int i, ret; > > + > > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > > + slot = host->slot[i]; > > + if (!slot) > > + continue; > > + ret = mmc_resume_host(slot->mmc); > > + if (ret < 0) > > + return ret; > > + } > > + > > + return 0; > > +} > > +#else > > +#define atmci_suspend NULL > > +#define atmci_resume NULL > > +#endif > > + > > + > > + > > static struct platform_driver atmci_driver = { > > .remove = __exit_p(atmci_remove), > > + .suspend = atmci_suspend, > > + .resume = atmci_resume, > > should this be using dev_pm_ops instead ? It should. Also, please remember to initialize the hibernate callback pointers too, e.g. via the SIMPLE_DEV_PM_OPS() macro. Thanks, Rafael ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-29 21:39 ` Rafael J. Wysocki 0 siblings, 0 replies; 38+ messages in thread From: Rafael J. Wysocki @ 2011-06-29 21:39 UTC (permalink / raw) To: linux-arm-kernel On Wednesday, June 29, 2011, Felipe Balbi wrote: > Hi, > > On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: > > Take care of slots while going to suspend state. > > > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > > --- > > drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 51 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > > index aa8039f..c414ebe 100644 > > --- a/drivers/mmc/host/atmel-mci.c > > +++ b/drivers/mmc/host/atmel-mci.c > > @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) > > return 0; > > } > > > > +#ifdef CONFIG_PM > > +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) > > +{ > > + struct atmel_mci *host = platform_get_drvdata(pdev); > > + struct atmel_mci_slot *slot; > > + int i, ret; > > + > > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > > + slot = host->slot[i]; > > + if (!slot) > > + continue; > > + ret = mmc_suspend_host(slot->mmc); > > + if (ret < 0) { > > + while (--i >= 0) { > > + slot = host->slot[i]; > > + if (slot) > > + mmc_resume_host(host->slot[i]->mmc); > > + } > > + return ret; > > + } > > + } > > + > > + return 0; > > +} > > + > > +static int atmci_resume(struct platform_device *pdev) > > +{ > > + struct atmel_mci *host = platform_get_drvdata(pdev); > > + struct atmel_mci_slot *slot; > > + int i, ret; > > + > > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > > + slot = host->slot[i]; > > + if (!slot) > > + continue; > > + ret = mmc_resume_host(slot->mmc); > > + if (ret < 0) > > + return ret; > > + } > > + > > + return 0; > > +} > > +#else > > +#define atmci_suspend NULL > > +#define atmci_resume NULL > > +#endif > > + > > + > > + > > static struct platform_driver atmci_driver = { > > .remove = __exit_p(atmci_remove), > > + .suspend = atmci_suspend, > > + .resume = atmci_resume, > > should this be using dev_pm_ops instead ? It should. Also, please remember to initialize the hibernate callback pointers too, e.g. via the SIMPLE_DEV_PM_OPS() macro. Thanks, Rafael ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci 2011-06-29 21:39 ` Rafael J. Wysocki (?) @ 2011-06-30 8:30 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-30 8:30 UTC (permalink / raw) To: Rafael J. Wysocki, balbi Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel, Uwe Kleine-König Le 29/06/2011 23:39, Rafael J. Wysocki : > On Wednesday, June 29, 2011, Felipe Balbi wrote: >> Hi, >> >> On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: >>> Take care of slots while going to suspend state. >>> >>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >>> --- >>> drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ >>> 1 files changed, 51 insertions(+), 0 deletions(-) >>> >>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >>> index aa8039f..c414ebe 100644 >>> --- a/drivers/mmc/host/atmel-mci.c >>> +++ b/drivers/mmc/host/atmel-mci.c >>> @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) >>> return 0; >>> } >>> >>> +#ifdef CONFIG_PM >>> +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) >>> +{ >>> + struct atmel_mci *host = platform_get_drvdata(pdev); >>> + struct atmel_mci_slot *slot; >>> + int i, ret; >>> + >>> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >>> + slot = host->slot[i]; >>> + if (!slot) >>> + continue; >>> + ret = mmc_suspend_host(slot->mmc); >>> + if (ret < 0) { >>> + while (--i >= 0) { >>> + slot = host->slot[i]; >>> + if (slot) >>> + mmc_resume_host(host->slot[i]->mmc); >>> + } >>> + return ret; >>> + } >>> + } >>> + >>> + return 0; >>> +} >>> + >>> +static int atmci_resume(struct platform_device *pdev) >>> +{ >>> + struct atmel_mci *host = platform_get_drvdata(pdev); >>> + struct atmel_mci_slot *slot; >>> + int i, ret; >>> + >>> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >>> + slot = host->slot[i]; >>> + if (!slot) >>> + continue; >>> + ret = mmc_resume_host(slot->mmc); >>> + if (ret < 0) >>> + return ret; >>> + } >>> + >>> + return 0; >>> +} >>> +#else >>> +#define atmci_suspend NULL >>> +#define atmci_resume NULL >>> +#endif >>> + >>> + >>> + >>> static struct platform_driver atmci_driver = { >>> .remove = __exit_p(atmci_remove), >>> + .suspend = atmci_suspend, >>> + .resume = atmci_resume, >> >> should this be using dev_pm_ops instead ? > > It should. Also, please remember to initialize the hibernate callback > pointers too, e.g. via the SIMPLE_DEV_PM_OPS() macro. Felipe, Rafael, Thanks for your feedback. I will implement this in a v2 patch. BTW, should I use #ifdef CONFIG_PM or #ifdef CONFIG_PM_SLEEP? Best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-30 8:30 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-30 8:30 UTC (permalink / raw) To: linux-arm-kernel Le 29/06/2011 23:39, Rafael J. Wysocki : > On Wednesday, June 29, 2011, Felipe Balbi wrote: >> Hi, >> >> On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: >>> Take care of slots while going to suspend state. >>> >>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >>> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> >>> --- >>> drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ >>> 1 files changed, 51 insertions(+), 0 deletions(-) >>> >>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >>> index aa8039f..c414ebe 100644 >>> --- a/drivers/mmc/host/atmel-mci.c >>> +++ b/drivers/mmc/host/atmel-mci.c >>> @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) >>> return 0; >>> } >>> >>> +#ifdef CONFIG_PM >>> +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) >>> +{ >>> + struct atmel_mci *host = platform_get_drvdata(pdev); >>> + struct atmel_mci_slot *slot; >>> + int i, ret; >>> + >>> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >>> + slot = host->slot[i]; >>> + if (!slot) >>> + continue; >>> + ret = mmc_suspend_host(slot->mmc); >>> + if (ret < 0) { >>> + while (--i >= 0) { >>> + slot = host->slot[i]; >>> + if (slot) >>> + mmc_resume_host(host->slot[i]->mmc); >>> + } >>> + return ret; >>> + } >>> + } >>> + >>> + return 0; >>> +} >>> + >>> +static int atmci_resume(struct platform_device *pdev) >>> +{ >>> + struct atmel_mci *host = platform_get_drvdata(pdev); >>> + struct atmel_mci_slot *slot; >>> + int i, ret; >>> + >>> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >>> + slot = host->slot[i]; >>> + if (!slot) >>> + continue; >>> + ret = mmc_resume_host(slot->mmc); >>> + if (ret < 0) >>> + return ret; >>> + } >>> + >>> + return 0; >>> +} >>> +#else >>> +#define atmci_suspend NULL >>> +#define atmci_resume NULL >>> +#endif >>> + >>> + >>> + >>> static struct platform_driver atmci_driver = { >>> .remove = __exit_p(atmci_remove), >>> + .suspend = atmci_suspend, >>> + .resume = atmci_resume, >> >> should this be using dev_pm_ops instead ? > > It should. Also, please remember to initialize the hibernate callback > pointers too, e.g. via the SIMPLE_DEV_PM_OPS() macro. Felipe, Rafael, Thanks for your feedback. I will implement this in a v2 patch. BTW, should I use #ifdef CONFIG_PM or #ifdef CONFIG_PM_SLEEP? Best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-30 8:30 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-30 8:30 UTC (permalink / raw) To: Rafael J. Wysocki, balbi Cc: linux-mmc, kernel, linux-kernel, Uwe Kleine-König, cjb, hans-christian.egtvedt, linux-arm-kernel Le 29/06/2011 23:39, Rafael J. Wysocki : > On Wednesday, June 29, 2011, Felipe Balbi wrote: >> Hi, >> >> On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote: >>> Take care of slots while going to suspend state. >>> >>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >>> --- >>> drivers/mmc/host/atmel-mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ >>> 1 files changed, 51 insertions(+), 0 deletions(-) >>> >>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >>> index aa8039f..c414ebe 100644 >>> --- a/drivers/mmc/host/atmel-mci.c >>> +++ b/drivers/mmc/host/atmel-mci.c >>> @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev) >>> return 0; >>> } >>> >>> +#ifdef CONFIG_PM >>> +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg) >>> +{ >>> + struct atmel_mci *host = platform_get_drvdata(pdev); >>> + struct atmel_mci_slot *slot; >>> + int i, ret; >>> + >>> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >>> + slot = host->slot[i]; >>> + if (!slot) >>> + continue; >>> + ret = mmc_suspend_host(slot->mmc); >>> + if (ret < 0) { >>> + while (--i >= 0) { >>> + slot = host->slot[i]; >>> + if (slot) >>> + mmc_resume_host(host->slot[i]->mmc); >>> + } >>> + return ret; >>> + } >>> + } >>> + >>> + return 0; >>> +} >>> + >>> +static int atmci_resume(struct platform_device *pdev) >>> +{ >>> + struct atmel_mci *host = platform_get_drvdata(pdev); >>> + struct atmel_mci_slot *slot; >>> + int i, ret; >>> + >>> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >>> + slot = host->slot[i]; >>> + if (!slot) >>> + continue; >>> + ret = mmc_resume_host(slot->mmc); >>> + if (ret < 0) >>> + return ret; >>> + } >>> + >>> + return 0; >>> +} >>> +#else >>> +#define atmci_suspend NULL >>> +#define atmci_resume NULL >>> +#endif >>> + >>> + >>> + >>> static struct platform_driver atmci_driver = { >>> .remove = __exit_p(atmci_remove), >>> + .suspend = atmci_suspend, >>> + .resume = atmci_resume, >> >> should this be using dev_pm_ops instead ? > > It should. Also, please remember to initialize the hibernate callback > pointers too, e.g. via the SIMPLE_DEV_PM_OPS() macro. Felipe, Rafael, Thanks for your feedback. I will implement this in a v2 patch. BTW, should I use #ifdef CONFIG_PM or #ifdef CONFIG_PM_SLEEP? Best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V2] MMC: PM: add suspend/resume in atmel-mci 2011-06-29 21:39 ` Rafael J. Wysocki (?) @ 2011-06-30 13:49 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-30 13:49 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: linux-kernel, linux-arm-kernel, kernel, Nicolas Ferre, Uwe Kleine-König Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..058f1842 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = &atmci_pm, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH V2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-30 13:49 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-30 13:49 UTC (permalink / raw) To: linux-arm-kernel Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> --- V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..058f1842 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = &atmci_pm, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH V2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-30 13:49 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-30 13:49 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: Nicolas Ferre, kernel, linux-kernel, linux-arm-kernel, Uwe Kleine-König Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..058f1842 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot) + mmc_resume_host(host->slot[i]->mmc); + } + return ret; + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + struct atmel_mci_slot *slot; + int i, ret; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + slot = host->slot[i]; + if (!slot) + continue; + ret = mmc_resume_host(slot->mmc); + if (ret < 0) + return ret; + } + + return 0; +} +#endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = &atmci_pm, }, }; -- 1.7.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH V2] MMC: PM: add suspend/resume in atmel-mci 2011-06-30 13:49 ` Nicolas Ferre @ 2011-06-30 13:13 ` Uwe Kleine-König -1 siblings, 0 replies; 38+ messages in thread From: Uwe Kleine-König @ 2011-06-30 13:13 UTC (permalink / raw) To: Nicolas Ferre Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel Hello Nicolas, On Thu, Jun 30, 2011 at 03:49:41PM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > V2: move to pm_ops > > drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 47 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index aa8039f..058f1842 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + struct atmel_mci_slot *slot; > + int i, ret; slot and ret can have a more local scope. > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot) > + mmc_resume_host(host->slot[i]->mmc); hmm, mmc_resume_host could fail. But probably you cannot handle that in a sane way, do you? > + } > + return ret; > + } > + } > + > + return 0; > +} > + > +static int atmci_resume(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + struct atmel_mci_slot *slot; > + int i, ret; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_resume_host(slot->mmc); > + if (ret < 0) > + return ret; Maybe you should try to resume host 5 even if resuming host 4 failed? > + } > + > + return 0; > +} > +#endif > +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); > + > + For my taste a single empty line is enough. > static struct platform_driver atmci_driver = { > .remove = __exit_p(atmci_remove), > .driver = { > .name = "atmel_mci", > + .pm = &atmci_pm, > }, > }; -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V2] MMC: PM: add suspend/resume in atmel-mci @ 2011-06-30 13:13 ` Uwe Kleine-König 0 siblings, 0 replies; 38+ messages in thread From: Uwe Kleine-König @ 2011-06-30 13:13 UTC (permalink / raw) To: linux-arm-kernel Hello Nicolas, On Thu, Jun 30, 2011 at 03:49:41PM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > --- > V2: move to pm_ops > > drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 47 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index aa8039f..058f1842 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + struct atmel_mci_slot *slot; > + int i, ret; slot and ret can have a more local scope. > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot) > + mmc_resume_host(host->slot[i]->mmc); hmm, mmc_resume_host could fail. But probably you cannot handle that in a sane way, do you? > + } > + return ret; > + } > + } > + > + return 0; > +} > + > +static int atmci_resume(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + struct atmel_mci_slot *slot; > + int i, ret; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + slot = host->slot[i]; > + if (!slot) > + continue; > + ret = mmc_resume_host(slot->mmc); > + if (ret < 0) > + return ret; Maybe you should try to resume host 5 even if resuming host 4 failed? > + } > + > + return 0; > +} > +#endif > +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); > + > + For my taste a single empty line is enough. > static struct platform_driver atmci_driver = { > .remove = __exit_p(atmci_remove), > .driver = { > .name = "atmel_mci", > + .pm = &atmci_pm, > }, > }; -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH V2] MMC: PM: add suspend/resume in atmel-mci 2011-06-30 13:13 ` Uwe Kleine-König @ 2011-07-01 14:22 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-01 14:22 UTC (permalink / raw) To: Uwe Kleine-König Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel Le 30/06/2011 15:13, Uwe Kleine-König : > Hello Nicolas, > > On Thu, Jun 30, 2011 at 03:49:41PM +0200, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> >> --- >> V2: move to pm_ops >> >> drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 47 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >> index aa8039f..058f1842 100644 >> --- a/drivers/mmc/host/atmel-mci.c >> +++ b/drivers/mmc/host/atmel-mci.c >> @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) >> return 0; >> } >> >> +#ifdef CONFIG_PM >> +static int atmci_suspend(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + struct atmel_mci_slot *slot; >> + int i, ret; > slot and ret can have a more local scope. ok. >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + slot = host->slot[i]; >> + if (!slot) >> + continue; >> + ret = mmc_suspend_host(slot->mmc); >> + if (ret < 0) { >> + while (--i >= 0) { >> + slot = host->slot[i]; >> + if (slot) >> + mmc_resume_host(host->slot[i]->mmc); > hmm, mmc_resume_host could fail. But probably you cannot handle that in > a sane way, do you? Well, actually for the current implementation the only return code is... 0. And here I try to have a king of best effort approach ;-) >> + } >> + return ret; >> + } >> + } >> + >> + return 0; >> +} >> + >> +static int atmci_resume(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + struct atmel_mci_slot *slot; >> + int i, ret; >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + slot = host->slot[i]; >> + if (!slot) >> + continue; >> + ret = mmc_resume_host(slot->mmc); >> + if (ret < 0) >> + return ret; > Maybe you should try to resume host 5 even if resuming host 4 failed? In fact all other drivers that are dealing with multiple slots are doing the same... So I have difficulties to know the truth. The question is: is it better to return an error to the "resume" function so that we are called later again or do we have to do our best to thaw everything out? >> + } >> + >> + return 0; >> +} >> +#endif >> +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); >> + >> + > For my taste a single empty line is enough. Ok. >> static struct platform_driver atmci_driver = { >> .remove = __exit_p(atmci_remove), >> .driver = { >> .name = "atmel_mci", >> + .pm = &atmci_pm, >> }, >> }; > Thanks, best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V2] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-01 14:22 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-01 14:22 UTC (permalink / raw) To: linux-arm-kernel Le 30/06/2011 15:13, Uwe Kleine-K?nig : > Hello Nicolas, > > On Thu, Jun 30, 2011 at 03:49:41PM +0200, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> >> --- >> V2: move to pm_ops >> >> drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 47 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >> index aa8039f..058f1842 100644 >> --- a/drivers/mmc/host/atmel-mci.c >> +++ b/drivers/mmc/host/atmel-mci.c >> @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev) >> return 0; >> } >> >> +#ifdef CONFIG_PM >> +static int atmci_suspend(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + struct atmel_mci_slot *slot; >> + int i, ret; > slot and ret can have a more local scope. ok. >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + slot = host->slot[i]; >> + if (!slot) >> + continue; >> + ret = mmc_suspend_host(slot->mmc); >> + if (ret < 0) { >> + while (--i >= 0) { >> + slot = host->slot[i]; >> + if (slot) >> + mmc_resume_host(host->slot[i]->mmc); > hmm, mmc_resume_host could fail. But probably you cannot handle that in > a sane way, do you? Well, actually for the current implementation the only return code is... 0. And here I try to have a king of best effort approach ;-) >> + } >> + return ret; >> + } >> + } >> + >> + return 0; >> +} >> + >> +static int atmci_resume(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + struct atmel_mci_slot *slot; >> + int i, ret; >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + slot = host->slot[i]; >> + if (!slot) >> + continue; >> + ret = mmc_resume_host(slot->mmc); >> + if (ret < 0) >> + return ret; > Maybe you should try to resume host 5 even if resuming host 4 failed? In fact all other drivers that are dealing with multiple slots are doing the same... So I have difficulties to know the truth. The question is: is it better to return an error to the "resume" function so that we are called later again or do we have to do our best to thaw everything out? >> + } >> + >> + return 0; >> +} >> +#endif >> +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); >> + >> + > For my taste a single empty line is enough. Ok. >> static struct platform_driver atmci_driver = { >> .remove = __exit_p(atmci_remove), >> .driver = { >> .name = "atmel_mci", >> + .pm = &atmci_pm, >> }, >> }; > Thanks, best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH V2] MMC: PM: add suspend/resume in atmel-mci 2011-07-01 14:22 ` Nicolas Ferre @ 2011-07-01 14:32 ` Hans-Christian Egtvedt -1 siblings, 0 replies; 38+ messages in thread From: Hans-Christian Egtvedt @ 2011-07-01 14:32 UTC (permalink / raw) To: Nicolas Ferre Cc: Uwe Kleine-König, cjb, linux-mmc, linux-kernel, linux-arm-kernel, kernel On Fri, 2011-07-01 at 16:22 +0200, Nicolas Ferre wrote: > Le 30/06/2011 15:13, Uwe Kleine-König : <snipp> > Well, actually for the current implementation the only return code is... 0. > And here I try to have a king of best effort approach ;-) > > >> + } > >> + return ret; > >> + } > >> + } > >> + > >> + return 0; > >> +} > >> + > >> +static int atmci_resume(struct device *dev) > >> +{ > >> + struct atmel_mci *host = dev_get_drvdata(dev); > >> + struct atmel_mci_slot *slot; > >> + int i, ret; > >> + > >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > >> + slot = host->slot[i]; > >> + if (!slot) > >> + continue; > >> + ret = mmc_resume_host(slot->mmc); > >> + if (ret < 0) > >> + return ret; > > Maybe you should try to resume host 5 even if resuming host 4 failed? > > In fact all other drivers that are dealing with multiple slots are doing > the same... So I have difficulties to know the truth. > The question is: is it better to return an error to the "resume" > function so that we are called later again or do we have to do our best > to thaw everything out? Detect failures and return the error value, but also try to resume the other slots. You must however then keep track of which are restored for later calls to resume AFAICT. <snipp> -- Hans-Christian Egtvedt ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V2] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-01 14:32 ` Hans-Christian Egtvedt 0 siblings, 0 replies; 38+ messages in thread From: Hans-Christian Egtvedt @ 2011-07-01 14:32 UTC (permalink / raw) To: linux-arm-kernel On Fri, 2011-07-01 at 16:22 +0200, Nicolas Ferre wrote: > Le 30/06/2011 15:13, Uwe Kleine-K?nig : <snipp> > Well, actually for the current implementation the only return code is... 0. > And here I try to have a king of best effort approach ;-) > > >> + } > >> + return ret; > >> + } > >> + } > >> + > >> + return 0; > >> +} > >> + > >> +static int atmci_resume(struct device *dev) > >> +{ > >> + struct atmel_mci *host = dev_get_drvdata(dev); > >> + struct atmel_mci_slot *slot; > >> + int i, ret; > >> + > >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > >> + slot = host->slot[i]; > >> + if (!slot) > >> + continue; > >> + ret = mmc_resume_host(slot->mmc); > >> + if (ret < 0) > >> + return ret; > > Maybe you should try to resume host 5 even if resuming host 4 failed? > > In fact all other drivers that are dealing with multiple slots are doing > the same... So I have difficulties to know the truth. > The question is: is it better to return an error to the "resume" > function so that we are called later again or do we have to do our best > to thaw everything out? Detect failures and return the error value, but also try to resume the other slots. You must however then keep track of which are restored for later calls to resume AFAICT. <snipp> -- Hans-Christian Egtvedt ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci 2011-07-01 14:32 ` Hans-Christian Egtvedt (?) @ 2011-07-04 11:38 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-04 11:38 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: linux-kernel, linux-arm-kernel, kernel, u.kleine-koenig, Nicolas Ferre Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- V3: take care of each slot SUSPENDED state (adding a status bit in the slot "flags") V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..ed63bcd 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -203,6 +203,7 @@ struct atmel_mci_slot { #define ATMCI_CARD_PRESENT 0 #define ATMCI_CARD_NEED_INIT 1 #define ATMCI_SHUTDOWN 2 +#define ATMCI_SUSPENDED 3 int detect_pin; int wp_pin; @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int ret; + + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { + mmc_resume_host(host->slot[i]->mmc); + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + return ret; + } else { + set_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + int ret = 0; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int err; + + slot = host->slot[i]; + if (!slot) + continue; + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) + continue; + err = mmc_resume_host(slot->mmc); + if (err < 0) + ret = err; + else + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + + return ret; +} +#endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = &atmci_pm, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-04 11:38 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-04 11:38 UTC (permalink / raw) To: linux-arm-kernel Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- V3: take care of each slot SUSPENDED state (adding a status bit in the slot "flags") V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..ed63bcd 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -203,6 +203,7 @@ struct atmel_mci_slot { #define ATMCI_CARD_PRESENT 0 #define ATMCI_CARD_NEED_INIT 1 #define ATMCI_SHUTDOWN 2 +#define ATMCI_SUSPENDED 3 int detect_pin; int wp_pin; @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int ret; + + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { + mmc_resume_host(host->slot[i]->mmc); + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + return ret; + } else { + set_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + int ret = 0; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int err; + + slot = host->slot[i]; + if (!slot) + continue; + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) + continue; + err = mmc_resume_host(slot->mmc); + if (err < 0) + ret = err; + else + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + + return ret; +} +#endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = &atmci_pm, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-04 11:38 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-04 11:38 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: Nicolas Ferre, kernel, linux-kernel, linux-arm-kernel, u.kleine-koenig Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- V3: take care of each slot SUSPENDED state (adding a status bit in the slot "flags") V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..ed63bcd 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -203,6 +203,7 @@ struct atmel_mci_slot { #define ATMCI_CARD_PRESENT 0 #define ATMCI_CARD_NEED_INIT 1 #define ATMCI_SHUTDOWN 2 +#define ATMCI_SUSPENDED 3 int detect_pin; int wp_pin; @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int ret; + + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { + mmc_resume_host(host->slot[i]->mmc); + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + return ret; + } else { + set_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + int ret = 0; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int err; + + slot = host->slot[i]; + if (!slot) + continue; + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) + continue; + err = mmc_resume_host(slot->mmc); + if (err < 0) + ret = err; + else + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + + return ret; +} +#endif +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = &atmci_pm, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH V3] MMC: PM: add suspend/resume in atmel-mci 2011-07-04 11:38 ` Nicolas Ferre @ 2011-07-04 11:06 ` Felipe Balbi -1 siblings, 0 replies; 38+ messages in thread From: Felipe Balbi @ 2011-07-04 11:06 UTC (permalink / raw) To: Nicolas Ferre Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel, u.kleine-koenig [-- Attachment #1: Type: text/plain, Size: 2869 bytes --] Hi, On Mon, Jul 04, 2011 at 01:38:25PM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > V3: take care of each slot SUSPENDED state > (adding a status bit in the slot "flags") > V2: move to pm_ops > > drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 60 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index aa8039f..ed63bcd 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -203,6 +203,7 @@ struct atmel_mci_slot { > #define ATMCI_CARD_PRESENT 0 > #define ATMCI_CARD_NEED_INIT 1 > #define ATMCI_SHUTDOWN 2 > +#define ATMCI_SUSPENDED 3 > > int detect_pin; > int wp_pin; > @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + int i; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + struct atmel_mci_slot *slot = host->slot[i]; > + int ret; > + > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot > + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { > + mmc_resume_host(host->slot[i]->mmc); > + clear_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + } > + return ret; > + } else { > + set_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + } > + > + return 0; > +} > + > +static int atmci_resume(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + int i; > + int ret = 0; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + struct atmel_mci_slot *slot = host->slot[i]; > + int err; > + > + slot = host->slot[i]; > + if (!slot) > + continue; > + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) > + continue; > + err = mmc_resume_host(slot->mmc); > + if (err < 0) > + ret = err; > + else > + clear_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + > + return ret; > +} > +#endif > +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); if you disable CONFIG_PM this won't work. atmci_resume and atmci_suspend will be undefined. > static struct platform_driver atmci_driver = { > .remove = __exit_p(atmci_remove), > .driver = { > .name = "atmel_mci", > + .pm = &atmci_pm, this pointer will also be invalid. what most people do is: #ifdef CONFIG_PM suspend() resume() static SIMPLE_DEV_PM_OPS(atmci_pm, suspend, resume); #define DEV_PM_OPS (&atmci_pm) #else #define DEV_PM_OPS NULL #endif -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-04 11:06 ` Felipe Balbi 0 siblings, 0 replies; 38+ messages in thread From: Felipe Balbi @ 2011-07-04 11:06 UTC (permalink / raw) To: linux-arm-kernel Hi, On Mon, Jul 04, 2011 at 01:38:25PM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > V3: take care of each slot SUSPENDED state > (adding a status bit in the slot "flags") > V2: move to pm_ops > > drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 60 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index aa8039f..ed63bcd 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -203,6 +203,7 @@ struct atmel_mci_slot { > #define ATMCI_CARD_PRESENT 0 > #define ATMCI_CARD_NEED_INIT 1 > #define ATMCI_SHUTDOWN 2 > +#define ATMCI_SUSPENDED 3 > > int detect_pin; > int wp_pin; > @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + int i; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + struct atmel_mci_slot *slot = host->slot[i]; > + int ret; > + > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot > + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { > + mmc_resume_host(host->slot[i]->mmc); > + clear_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + } > + return ret; > + } else { > + set_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + } > + > + return 0; > +} > + > +static int atmci_resume(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + int i; > + int ret = 0; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + struct atmel_mci_slot *slot = host->slot[i]; > + int err; > + > + slot = host->slot[i]; > + if (!slot) > + continue; > + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) > + continue; > + err = mmc_resume_host(slot->mmc); > + if (err < 0) > + ret = err; > + else > + clear_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + > + return ret; > +} > +#endif > +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); if you disable CONFIG_PM this won't work. atmci_resume and atmci_suspend will be undefined. > static struct platform_driver atmci_driver = { > .remove = __exit_p(atmci_remove), > .driver = { > .name = "atmel_mci", > + .pm = &atmci_pm, this pointer will also be invalid. what most people do is: #ifdef CONFIG_PM suspend() resume() static SIMPLE_DEV_PM_OPS(atmci_pm, suspend, resume); #define DEV_PM_OPS (&atmci_pm) #else #define DEV_PM_OPS NULL #endif -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110704/8894dd1f/attachment.sig> ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH V3] MMC: PM: add suspend/resume in atmel-mci 2011-07-04 11:06 ` Felipe Balbi @ 2011-07-04 12:43 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-04 12:43 UTC (permalink / raw) To: balbi Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel, u.kleine-koenig Le 04/07/2011 13:06, Felipe Balbi : > Hi, > > On Mon, Jul 04, 2011 at 01:38:25PM +0200, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> --- >> V3: take care of each slot SUSPENDED state >> (adding a status bit in the slot "flags") >> V2: move to pm_ops >> >> drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 60 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >> index aa8039f..ed63bcd 100644 >> --- a/drivers/mmc/host/atmel-mci.c >> +++ b/drivers/mmc/host/atmel-mci.c >> @@ -203,6 +203,7 @@ struct atmel_mci_slot { >> #define ATMCI_CARD_PRESENT 0 >> #define ATMCI_CARD_NEED_INIT 1 >> #define ATMCI_SHUTDOWN 2 >> +#define ATMCI_SUSPENDED 3 >> >> int detect_pin; >> int wp_pin; >> @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) >> return 0; >> } >> >> +#ifdef CONFIG_PM >> +static int atmci_suspend(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + int i; >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + struct atmel_mci_slot *slot = host->slot[i]; >> + int ret; >> + >> + if (!slot) >> + continue; >> + ret = mmc_suspend_host(slot->mmc); >> + if (ret < 0) { >> + while (--i >= 0) { >> + slot = host->slot[i]; >> + if (slot >> + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { >> + mmc_resume_host(host->slot[i]->mmc); >> + clear_bit(ATMCI_SUSPENDED, &slot->flags); >> + } >> + } >> + return ret; >> + } else { >> + set_bit(ATMCI_SUSPENDED, &slot->flags); >> + } >> + } >> + >> + return 0; >> +} >> + >> +static int atmci_resume(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + int i; >> + int ret = 0; >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + struct atmel_mci_slot *slot = host->slot[i]; >> + int err; >> + >> + slot = host->slot[i]; >> + if (!slot) >> + continue; >> + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) >> + continue; >> + err = mmc_resume_host(slot->mmc); >> + if (err < 0) >> + ret = err; >> + else >> + clear_bit(ATMCI_SUSPENDED, &slot->flags); >> + } >> + >> + return ret; >> +} >> +#endif >> +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); > > if you disable CONFIG_PM this won't work. atmci_resume and atmci_suspend > will be undefined. > >> static struct platform_driver atmci_driver = { >> .remove = __exit_p(atmci_remove), >> .driver = { >> .name = "atmel_mci", >> + .pm = &atmci_pm, > > this pointer will also be invalid. > > what most people do is: > > #ifdef CONFIG_PM > > suspend() > resume() > > static SIMPLE_DEV_PM_OPS(atmci_pm, suspend, resume); > > #define DEV_PM_OPS (&atmci_pm) > #else > #define DEV_PM_OPS NULL > #endif Yes, sure that makes sense. Thanks, I will cook a V4. Best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-04 12:43 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-04 12:43 UTC (permalink / raw) To: linux-arm-kernel Le 04/07/2011 13:06, Felipe Balbi : > Hi, > > On Mon, Jul 04, 2011 at 01:38:25PM +0200, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> --- >> V3: take care of each slot SUSPENDED state >> (adding a status bit in the slot "flags") >> V2: move to pm_ops >> >> drivers/mmc/host/atmel-mci.c | 60 ++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 60 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c >> index aa8039f..ed63bcd 100644 >> --- a/drivers/mmc/host/atmel-mci.c >> +++ b/drivers/mmc/host/atmel-mci.c >> @@ -203,6 +203,7 @@ struct atmel_mci_slot { >> #define ATMCI_CARD_PRESENT 0 >> #define ATMCI_CARD_NEED_INIT 1 >> #define ATMCI_SHUTDOWN 2 >> +#define ATMCI_SUSPENDED 3 >> >> int detect_pin; >> int wp_pin; >> @@ -1878,10 +1879,69 @@ static int __exit atmci_remove(struct platform_device *pdev) >> return 0; >> } >> >> +#ifdef CONFIG_PM >> +static int atmci_suspend(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + int i; >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + struct atmel_mci_slot *slot = host->slot[i]; >> + int ret; >> + >> + if (!slot) >> + continue; >> + ret = mmc_suspend_host(slot->mmc); >> + if (ret < 0) { >> + while (--i >= 0) { >> + slot = host->slot[i]; >> + if (slot >> + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { >> + mmc_resume_host(host->slot[i]->mmc); >> + clear_bit(ATMCI_SUSPENDED, &slot->flags); >> + } >> + } >> + return ret; >> + } else { >> + set_bit(ATMCI_SUSPENDED, &slot->flags); >> + } >> + } >> + >> + return 0; >> +} >> + >> +static int atmci_resume(struct device *dev) >> +{ >> + struct atmel_mci *host = dev_get_drvdata(dev); >> + int i; >> + int ret = 0; >> + >> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { >> + struct atmel_mci_slot *slot = host->slot[i]; >> + int err; >> + >> + slot = host->slot[i]; >> + if (!slot) >> + continue; >> + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) >> + continue; >> + err = mmc_resume_host(slot->mmc); >> + if (err < 0) >> + ret = err; >> + else >> + clear_bit(ATMCI_SUSPENDED, &slot->flags); >> + } >> + >> + return ret; >> +} >> +#endif >> +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); > > if you disable CONFIG_PM this won't work. atmci_resume and atmci_suspend > will be undefined. > >> static struct platform_driver atmci_driver = { >> .remove = __exit_p(atmci_remove), >> .driver = { >> .name = "atmel_mci", >> + .pm = &atmci_pm, > > this pointer will also be invalid. > > what most people do is: > > #ifdef CONFIG_PM > > suspend() > resume() > > static SIMPLE_DEV_PM_OPS(atmci_pm, suspend, resume); > > #define DEV_PM_OPS (&atmci_pm) > #else > #define DEV_PM_OPS NULL > #endif Yes, sure that makes sense. Thanks, I will cook a V4. Best regards, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V4] MMC: PM: add suspend/resume in atmel-mci 2011-07-04 12:43 ` Nicolas Ferre (?) @ 2011-07-06 9:31 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-06 9:31 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: linux-kernel, linux-arm-kernel, kernel, balbi, Nicolas Ferre Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- V4: make CONFIG_PM logic work even if not selected V3: take care of each slot SUSPENDED state (adding a status bit in the slot "flags") V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..fa8cae1 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -203,6 +203,7 @@ struct atmel_mci_slot { #define ATMCI_CARD_PRESENT 0 #define ATMCI_CARD_NEED_INIT 1 #define ATMCI_SHUTDOWN 2 +#define ATMCI_SUSPENDED 3 int detect_pin; int wp_pin; @@ -1878,10 +1879,72 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int ret; + + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { + mmc_resume_host(host->slot[i]->mmc); + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + return ret; + } else { + set_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + int ret = 0; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int err; + + slot = host->slot[i]; + if (!slot) + continue; + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) + continue; + err = mmc_resume_host(slot->mmc); + if (err < 0) + ret = err; + else + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + + return ret; +} +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); +#define ATMCI_PM_OPS (&atmci_pm) +#else +#define ATMCI_PM_OPS NULL +#endif + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = ATMCI_PM_OPS, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH V4] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-06 9:31 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-06 9:31 UTC (permalink / raw) To: linux-arm-kernel Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- V4: make CONFIG_PM logic work even if not selected V3: take care of each slot SUSPENDED state (adding a status bit in the slot "flags") V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..fa8cae1 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -203,6 +203,7 @@ struct atmel_mci_slot { #define ATMCI_CARD_PRESENT 0 #define ATMCI_CARD_NEED_INIT 1 #define ATMCI_SHUTDOWN 2 +#define ATMCI_SUSPENDED 3 int detect_pin; int wp_pin; @@ -1878,10 +1879,72 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int ret; + + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { + mmc_resume_host(host->slot[i]->mmc); + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + return ret; + } else { + set_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + int ret = 0; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int err; + + slot = host->slot[i]; + if (!slot) + continue; + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) + continue; + err = mmc_resume_host(slot->mmc); + if (err < 0) + ret = err; + else + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + + return ret; +} +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); +#define ATMCI_PM_OPS (&atmci_pm) +#else +#define ATMCI_PM_OPS NULL +#endif + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = ATMCI_PM_OPS, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH V4] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-06 9:31 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-06 9:31 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: balbi, kernel, linux-kernel, linux-arm-kernel, Nicolas Ferre Take care of slots while going to suspend state. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- V4: make CONFIG_PM logic work even if not selected V3: take care of each slot SUSPENDED state (adding a status bit in the slot "flags") V2: move to pm_ops drivers/mmc/host/atmel-mci.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index aa8039f..fa8cae1 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -203,6 +203,7 @@ struct atmel_mci_slot { #define ATMCI_CARD_PRESENT 0 #define ATMCI_CARD_NEED_INIT 1 #define ATMCI_SHUTDOWN 2 +#define ATMCI_SUSPENDED 3 int detect_pin; int wp_pin; @@ -1878,10 +1879,72 @@ static int __exit atmci_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int atmci_suspend(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int ret; + + if (!slot) + continue; + ret = mmc_suspend_host(slot->mmc); + if (ret < 0) { + while (--i >= 0) { + slot = host->slot[i]; + if (slot + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { + mmc_resume_host(host->slot[i]->mmc); + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + return ret; + } else { + set_bit(ATMCI_SUSPENDED, &slot->flags); + } + } + + return 0; +} + +static int atmci_resume(struct device *dev) +{ + struct atmel_mci *host = dev_get_drvdata(dev); + int i; + int ret = 0; + + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + struct atmel_mci_slot *slot = host->slot[i]; + int err; + + slot = host->slot[i]; + if (!slot) + continue; + if (!test_bit(ATMCI_SUSPENDED, &slot->flags)) + continue; + err = mmc_resume_host(slot->mmc); + if (err < 0) + ret = err; + else + clear_bit(ATMCI_SUSPENDED, &slot->flags); + } + + return ret; +} +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume); +#define ATMCI_PM_OPS (&atmci_pm) +#else +#define ATMCI_PM_OPS NULL +#endif + static struct platform_driver atmci_driver = { .remove = __exit_p(atmci_remove), .driver = { .name = "atmel_mci", + .pm = ATMCI_PM_OPS, }, }; -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH V4] MMC: PM: add suspend/resume in atmel-mci 2011-07-06 9:31 ` Nicolas Ferre @ 2011-07-06 8:28 ` Felipe Balbi -1 siblings, 0 replies; 38+ messages in thread From: Felipe Balbi @ 2011-07-06 8:28 UTC (permalink / raw) To: Nicolas Ferre Cc: cjb, linux-mmc, hans-christian.egtvedt, linux-kernel, linux-arm-kernel, kernel, balbi [-- Attachment #1: Type: text/plain, Size: 1294 bytes --] Hi, On Wed, Jul 06, 2011 at 11:31:36AM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> FWIW: Reviewed-by: Felipe Balbi <balbi@ti.com> > @@ -1878,10 +1879,72 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + int i; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + struct atmel_mci_slot *slot = host->slot[i]; > + int ret; > + > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot > + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { > + mmc_resume_host(host->slot[i]->mmc); > + clear_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + } > + return ret; > + } else { > + set_bit(ATMCI_SUSPENDED, &slot->flags); > + } just one small nitpicking which you can ignore if you like, but you don't really need the else branch here. If you fall into if (ret < 0) you will return early anyway, so you can save two lines and an indentation level :-p -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V4] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-06 8:28 ` Felipe Balbi 0 siblings, 0 replies; 38+ messages in thread From: Felipe Balbi @ 2011-07-06 8:28 UTC (permalink / raw) To: linux-arm-kernel Hi, On Wed, Jul 06, 2011 at 11:31:36AM +0200, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> FWIW: Reviewed-by: Felipe Balbi <balbi@ti.com> > @@ -1878,10 +1879,72 @@ static int __exit atmci_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int atmci_suspend(struct device *dev) > +{ > + struct atmel_mci *host = dev_get_drvdata(dev); > + int i; > + > + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { > + struct atmel_mci_slot *slot = host->slot[i]; > + int ret; > + > + if (!slot) > + continue; > + ret = mmc_suspend_host(slot->mmc); > + if (ret < 0) { > + while (--i >= 0) { > + slot = host->slot[i]; > + if (slot > + && test_bit(ATMCI_SUSPENDED, &slot->flags)) { > + mmc_resume_host(host->slot[i]->mmc); > + clear_bit(ATMCI_SUSPENDED, &slot->flags); > + } > + } > + return ret; > + } else { > + set_bit(ATMCI_SUSPENDED, &slot->flags); > + } just one small nitpicking which you can ignore if you like, but you don't really need the else branch here. If you fall into if (ret < 0) you will return early anyway, so you can save two lines and an indentation level :-p -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110706/74a3c1a9/attachment-0001.sig> ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH V3] MMC: PM: add suspend/resume in atmel-mci 2011-07-04 11:38 ` Nicolas Ferre @ 2011-07-09 20:58 ` Chris Ball -1 siblings, 0 replies; 38+ messages in thread From: Chris Ball @ 2011-07-09 20:58 UTC (permalink / raw) To: Nicolas Ferre Cc: linux-mmc, hans-christian.egtvedt, kernel, linux-kernel, linux-arm-kernel, u.kleine-koenig Hi, On Mon, Jul 04 2011, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > V3: take care of each slot SUSPENDED state > (adding a status bit in the slot "flags") > V2: move to pm_ops Thanks, I've merged v3 of this patch for mmc-next/3.1 with Felipe's Reviewed-by, and your [2/2] kconfig change. - Chris. -- Chris Ball <cjb@laptop.org> <http://printf.net/> One Laptop Per Child ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-09 20:58 ` Chris Ball 0 siblings, 0 replies; 38+ messages in thread From: Chris Ball @ 2011-07-09 20:58 UTC (permalink / raw) To: linux-arm-kernel Hi, On Mon, Jul 04 2011, Nicolas Ferre wrote: > Take care of slots while going to suspend state. > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > V3: take care of each slot SUSPENDED state > (adding a status bit in the slot "flags") > V2: move to pm_ops Thanks, I've merged v3 of this patch for mmc-next/3.1 with Felipe's Reviewed-by, and your [2/2] kconfig change. - Chris. -- Chris Ball <cjb@laptop.org> <http://printf.net/> One Laptop Per Child ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH V3] MMC: PM: add suspend/resume in atmel-mci 2011-07-09 20:58 ` Chris Ball (?) @ 2011-07-11 9:47 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-11 9:47 UTC (permalink / raw) To: Chris Ball Cc: linux-mmc, hans-christian.egtvedt, kernel, linux-kernel, linux-arm-kernel, u.kleine-koenig Le 09/07/2011 22:58, Chris Ball : > Hi, > > On Mon, Jul 04 2011, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> --- >> V3: take care of each slot SUSPENDED state >> (adding a status bit in the slot "flags") >> V2: move to pm_ops > > Thanks, I've merged v3 of this patch for mmc-next/3.1 with Felipe's You mean v4, I have checked: everything is ok. > Reviewed-by, and your [2/2] kconfig change. Perfect, thanks a lot Chris! -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-11 9:47 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-11 9:47 UTC (permalink / raw) To: linux-arm-kernel Le 09/07/2011 22:58, Chris Ball : > Hi, > > On Mon, Jul 04 2011, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> --- >> V3: take care of each slot SUSPENDED state >> (adding a status bit in the slot "flags") >> V2: move to pm_ops > > Thanks, I've merged v3 of this patch for mmc-next/3.1 with Felipe's You mean v4, I have checked: everything is ok. > Reviewed-by, and your [2/2] kconfig change. Perfect, thanks a lot Chris! -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH V3] MMC: PM: add suspend/resume in atmel-mci @ 2011-07-11 9:47 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-07-11 9:47 UTC (permalink / raw) To: Chris Ball Cc: linux-mmc, kernel, linux-kernel, u.kleine-koenig, hans-christian.egtvedt, linux-arm-kernel Le 09/07/2011 22:58, Chris Ball : > Hi, > > On Mon, Jul 04 2011, Nicolas Ferre wrote: >> Take care of slots while going to suspend state. >> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> >> --- >> V3: take care of each slot SUSPENDED state >> (adding a status bit in the slot "flags") >> V2: move to pm_ops > > Thanks, I've merged v3 of this patch for mmc-next/3.1 with Felipe's You mean v4, I have checked: everything is ok. > Reviewed-by, and your [2/2] kconfig change. Perfect, thanks a lot Chris! -- Nicolas Ferre ^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 2/2] MMC: remove EXPERIMENTAL from the DMA selection of atmel-mci 2011-06-29 16:54 ` Nicolas Ferre @ 2011-06-29 16:54 ` Nicolas Ferre -1 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-29 16:54 UTC (permalink / raw) To: cjb, linux-mmc, hans-christian.egtvedt Cc: linux-kernel, linux-arm-kernel, kernel, Nicolas Ferre This driver has been used for years with this option enabled. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- drivers/mmc/host/Kconfig | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 56dbf3f..d459948 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -281,13 +281,12 @@ config MMC_ATMELMCI endchoice config MMC_ATMELMCI_DMA - bool "Atmel MCI DMA support (EXPERIMENTAL)" - depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE && EXPERIMENTAL + bool "Atmel MCI DMA support" + depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE help Say Y here to have the Atmel MCI driver use a DMA engine to do data transfers and thus increase the throughput and - reduce the CPU utilization. Note that this is highly - experimental and may cause the driver to lock up. + reduce the CPU utilization. If unsure, say N. -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 2/2] MMC: remove EXPERIMENTAL from the DMA selection of atmel-mci @ 2011-06-29 16:54 ` Nicolas Ferre 0 siblings, 0 replies; 38+ messages in thread From: Nicolas Ferre @ 2011-06-29 16:54 UTC (permalink / raw) To: linux-arm-kernel This driver has been used for years with this option enabled. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- drivers/mmc/host/Kconfig | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 56dbf3f..d459948 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -281,13 +281,12 @@ config MMC_ATMELMCI endchoice config MMC_ATMELMCI_DMA - bool "Atmel MCI DMA support (EXPERIMENTAL)" - depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE && EXPERIMENTAL + bool "Atmel MCI DMA support" + depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE help Say Y here to have the Atmel MCI driver use a DMA engine to do data transfers and thus increase the throughput and - reduce the CPU utilization. Note that this is highly - experimental and may cause the driver to lock up. + reduce the CPU utilization. If unsure, say N. -- 1.7.3 ^ permalink raw reply related [flat|nested] 38+ messages in thread
end of thread, other threads:[~2011-07-11 9:48 UTC | newest] Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-06-29 16:54 [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci Nicolas Ferre 2011-06-29 16:54 ` Nicolas Ferre 2011-06-29 16:54 ` Nicolas Ferre 2011-06-29 16:01 ` Felipe Balbi 2011-06-29 16:01 ` Felipe Balbi 2011-06-29 21:39 ` Rafael J. Wysocki 2011-06-29 21:39 ` Rafael J. Wysocki 2011-06-30 8:30 ` Nicolas Ferre 2011-06-30 8:30 ` Nicolas Ferre 2011-06-30 8:30 ` Nicolas Ferre 2011-06-30 13:49 ` [PATCH V2] " Nicolas Ferre 2011-06-30 13:49 ` Nicolas Ferre 2011-06-30 13:49 ` Nicolas Ferre 2011-06-30 13:13 ` Uwe Kleine-König 2011-06-30 13:13 ` Uwe Kleine-König 2011-07-01 14:22 ` Nicolas Ferre 2011-07-01 14:22 ` Nicolas Ferre 2011-07-01 14:32 ` Hans-Christian Egtvedt 2011-07-01 14:32 ` Hans-Christian Egtvedt 2011-07-04 11:38 ` [PATCH V3] " Nicolas Ferre 2011-07-04 11:38 ` Nicolas Ferre 2011-07-04 11:38 ` Nicolas Ferre 2011-07-04 11:06 ` Felipe Balbi 2011-07-04 11:06 ` Felipe Balbi 2011-07-04 12:43 ` Nicolas Ferre 2011-07-04 12:43 ` Nicolas Ferre 2011-07-06 9:31 ` [PATCH V4] " Nicolas Ferre 2011-07-06 9:31 ` Nicolas Ferre 2011-07-06 9:31 ` Nicolas Ferre 2011-07-06 8:28 ` Felipe Balbi 2011-07-06 8:28 ` Felipe Balbi 2011-07-09 20:58 ` [PATCH V3] " Chris Ball 2011-07-09 20:58 ` Chris Ball 2011-07-11 9:47 ` Nicolas Ferre 2011-07-11 9:47 ` Nicolas Ferre 2011-07-11 9:47 ` Nicolas Ferre 2011-06-29 16:54 ` [PATCH 2/2] MMC: remove EXPERIMENTAL from the DMA selection of atmel-mci Nicolas Ferre 2011-06-29 16:54 ` Nicolas Ferre
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.