| Message ID | 20110711061726.GA19185@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday, July 11, 2011, Chuanxiao Dong wrote: > MMC bus suspend/resume was using legacy method. In system entering > S3 patch, the suspend/resume function cannot be called since MMC > bus also implemented the new suspend/resume method (dev_pm_ops struct). > So if dev_pm_ops is defined but .suspend/.resume callbacks not implemented, > mmc_queue will not be suspended/resumed. > > This patch will remove the legacy suspend/resume method and change to > use the new method totally. > > Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> > --- > drivers/mmc/card/block.c | 2 +- > drivers/mmc/core/bus.c | 24 +++++++++++------------- > include/linux/mmc/card.h | 2 +- > 3 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c > index 38d0149..224f1bb 100644 > --- a/drivers/mmc/card/block.c > +++ b/drivers/mmc/card/block.c > @@ -1549,7 +1549,7 @@ static void mmc_blk_remove(struct mmc_card *card) > } > > #ifdef CONFIG_PM > -static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state) > +static int mmc_blk_suspend(struct mmc_card *card) > { > struct mmc_blk_data *part_md; > struct mmc_blk_data *md = mmc_get_drvdata(card); > diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c > index 393d817..03be6d0 100644 > --- a/drivers/mmc/core/bus.c > +++ b/drivers/mmc/core/bus.c > @@ -120,14 +120,14 @@ static int mmc_bus_remove(struct device *dev) > return 0; > } > > -static int mmc_bus_suspend(struct device *dev, pm_message_t state) > +static int mmc_bus_suspend(struct device *dev) > { > struct mmc_driver *drv = to_mmc_driver(dev->driver); > struct mmc_card *card = mmc_dev_to_card(dev); > int ret = 0; > > if (dev->driver && drv->suspend) > - ret = drv->suspend(card, state); > + ret = drv->suspend(card); > return ret; > } > > @@ -163,20 +163,20 @@ static int mmc_runtime_idle(struct device *dev) > return pm_runtime_suspend(dev); > } > > +#else /* !CONFIG_PM_RUNTIME */ > +#define mmc_runtime_suspend NULL > +#define mmc_runtime_resume NULL > +#define mmc_runtime_idle NULL > +#endif /* !CONFIG_PM_RUNTIME */ > + > static const struct dev_pm_ops mmc_bus_pm_ops = { > .runtime_suspend = mmc_runtime_suspend, > .runtime_resume = mmc_runtime_resume, > .runtime_idle = mmc_runtime_idle, > + .suspend = mmc_bus_suspend, > + .resume = mmc_bus_resume, > }; Please define hibernate callbacks too, for example by using the SIMPLE_DEV_PM_OPS() convenience macro, defined in include/linux/pm.h. Thanks, Rafael > -#define MMC_PM_OPS_PTR (&mmc_bus_pm_ops) > - > -#else /* !CONFIG_PM_RUNTIME */ > - > -#define MMC_PM_OPS_PTR NULL > - > -#endif /* !CONFIG_PM_RUNTIME */ > - > static struct bus_type mmc_bus_type = { > .name = "mmc", > .dev_attrs = mmc_dev_attrs, > @@ -184,9 +184,7 @@ static struct bus_type mmc_bus_type = { > .uevent = mmc_bus_uevent, > .probe = mmc_bus_probe, > .remove = mmc_bus_remove, > - .suspend = mmc_bus_suspend, > - .resume = mmc_bus_resume, > - .pm = MMC_PM_OPS_PTR, > + .pm = &mmc_bus_pm_ops, > }; > > int mmc_register_bus(void) > diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h > index b460fc2..978f395 100644 > --- a/include/linux/mmc/card.h > +++ b/include/linux/mmc/card.h > @@ -393,7 +393,7 @@ struct mmc_driver { > struct device_driver drv; > int (*probe)(struct mmc_card *); > void (*remove)(struct mmc_card *); > - int (*suspend)(struct mmc_card *, pm_message_t); > + int (*suspend)(struct mmc_card *); > int (*resume)(struct mmc_card *); > }; > > -- 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 38d0149..224f1bb 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1549,7 +1549,7 @@ static void mmc_blk_remove(struct mmc_card *card) } #ifdef CONFIG_PM -static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state) +static int mmc_blk_suspend(struct mmc_card *card) { struct mmc_blk_data *part_md; struct mmc_blk_data *md = mmc_get_drvdata(card); diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 393d817..03be6d0 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -120,14 +120,14 @@ static int mmc_bus_remove(struct device *dev) return 0; } -static int mmc_bus_suspend(struct device *dev, pm_message_t state) +static int mmc_bus_suspend(struct device *dev) { struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_card *card = mmc_dev_to_card(dev); int ret = 0; if (dev->driver && drv->suspend) - ret = drv->suspend(card, state); + ret = drv->suspend(card); return ret; } @@ -163,20 +163,20 @@ static int mmc_runtime_idle(struct device *dev) return pm_runtime_suspend(dev); } +#else /* !CONFIG_PM_RUNTIME */ +#define mmc_runtime_suspend NULL +#define mmc_runtime_resume NULL +#define mmc_runtime_idle NULL +#endif /* !CONFIG_PM_RUNTIME */ + static const struct dev_pm_ops mmc_bus_pm_ops = { .runtime_suspend = mmc_runtime_suspend, .runtime_resume = mmc_runtime_resume, .runtime_idle = mmc_runtime_idle, + .suspend = mmc_bus_suspend, + .resume = mmc_bus_resume, }; -#define MMC_PM_OPS_PTR (&mmc_bus_pm_ops) - -#else /* !CONFIG_PM_RUNTIME */ - -#define MMC_PM_OPS_PTR NULL - -#endif /* !CONFIG_PM_RUNTIME */ - static struct bus_type mmc_bus_type = { .name = "mmc", .dev_attrs = mmc_dev_attrs, @@ -184,9 +184,7 @@ static struct bus_type mmc_bus_type = { .uevent = mmc_bus_uevent, .probe = mmc_bus_probe, .remove = mmc_bus_remove, - .suspend = mmc_bus_suspend, - .resume = mmc_bus_resume, - .pm = MMC_PM_OPS_PTR, + .pm = &mmc_bus_pm_ops, }; int mmc_register_bus(void) diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index b460fc2..978f395 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -393,7 +393,7 @@ struct mmc_driver { struct device_driver drv; int (*probe)(struct mmc_card *); void (*remove)(struct mmc_card *); - int (*suspend)(struct mmc_card *, pm_message_t); + int (*suspend)(struct mmc_card *); int (*resume)(struct mmc_card *); };
MMC bus suspend/resume was using legacy method. In system entering S3 patch, the suspend/resume function cannot be called since MMC bus also implemented the new suspend/resume method (dev_pm_ops struct). So if dev_pm_ops is defined but .suspend/.resume callbacks not implemented, mmc_queue will not be suspended/resumed. This patch will remove the legacy suspend/resume method and change to use the new method totally. Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> --- drivers/mmc/card/block.c | 2 +- drivers/mmc/core/bus.c | 24 +++++++++++------------- include/linux/mmc/card.h | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-)