* [PATCH V4]mmc: remove MMC bus legacy suspend/resume method
@ 2012-04-11 11:54 Chuanxiao Dong
2012-04-11 13:41 ` Ulf Hansson
2012-04-16 5:46 ` Hebbar, Gururaja
0 siblings, 2 replies; 5+ messages in thread
From: Chuanxiao Dong @ 2012-04-11 11:54 UTC (permalink / raw)
To: linux-mmc, linux-pm; +Cc: cjb, ulf.hansson
MMC bus is using legacy suspend/resume method, which is not compatible if
runtime pm callbacks are used. In this scenario, MMC bus suspend/resume
callbacks cannot be called when system entering S3. So change to use the new
defined dev_pm_ops for system sleeping mode
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
---
Changes in v2:
use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
suggested
Changes in v3:
remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
selected, as Ulf Hansson suggested
Changes in v4:
fix the warning when disable CONFIG_PM_RUNTIME
drivers/mmc/card/block.c | 2 +-
drivers/mmc/core/bus.c | 24 ++++++++----------------
include/linux/mmc/card.h | 2 +-
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index f2020d3..3582c03 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1826,7 +1826,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 5d011a3..aad8516 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -122,14 +122,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;
}
@@ -165,20 +165,14 @@ static int mmc_runtime_idle(struct device *dev)
return pm_runtime_suspend(dev);
}
+#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,
+ SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
+ mmc_runtime_idle)
+ SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, 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,
@@ -186,9 +180,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 1a1ca71..c984c9a 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -480,7 +480,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 *);
};
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V4]mmc: remove MMC bus legacy suspend/resume method
2012-04-11 11:54 [PATCH V4]mmc: remove MMC bus legacy suspend/resume method Chuanxiao Dong
@ 2012-04-11 13:41 ` Ulf Hansson
2012-04-11 14:44 ` Chris Ball
2012-04-16 5:46 ` Hebbar, Gururaja
1 sibling, 1 reply; 5+ messages in thread
From: Ulf Hansson @ 2012-04-11 13:41 UTC (permalink / raw)
To: Chuanxiao Dong; +Cc: linux-mmc, linux-pm, cjb
On 04/11/2012 01:54 PM, Chuanxiao Dong wrote:
> MMC bus is using legacy suspend/resume method, which is not compatible if
> runtime pm callbacks are used. In this scenario, MMC bus suspend/resume
> callbacks cannot be called when system entering S3. So change to use the new
> defined dev_pm_ops for system sleeping mode
>
> Signed-off-by: Chuanxiao Dong<chuanxiao.dong@intel.com>
> ---
> Changes in v2:
> use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
> suggested
>
> Changes in v3:
> remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
> selected, as Ulf Hansson suggested
>
> Changes in v4:
> fix the warning when disable CONFIG_PM_RUNTIME
>
Looks good to me! Acked-by: Ulf Hansson <ulf.hansson@stericsson.com>
Kind regards
Ulf Hansson
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V4]mmc: remove MMC bus legacy suspend/resume method
2012-04-11 13:41 ` Ulf Hansson
@ 2012-04-11 14:44 ` Chris Ball
2012-04-16 5:47 ` Hebbar, Gururaja
0 siblings, 1 reply; 5+ messages in thread
From: Chris Ball @ 2012-04-11 14:44 UTC (permalink / raw)
To: Ulf Hansson; +Cc: Chuanxiao Dong, linux-mmc, linux-pm
Hi,
On Wed, Apr 11 2012, Ulf Hansson wrote:
> On 04/11/2012 01:54 PM, Chuanxiao Dong wrote:
>> MMC bus is using legacy suspend/resume method, which is not compatible if
>> runtime pm callbacks are used. In this scenario, MMC bus suspend/resume
>> callbacks cannot be called when system entering S3. So change to use the new
>> defined dev_pm_ops for system sleeping mode
>>
>> Signed-off-by: Chuanxiao Dong<chuanxiao.dong@intel.com>
>> ---
>> Changes in v2:
>> use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
>> suggested
>>
>> Changes in v3:
>> remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
>> selected, as Ulf Hansson suggested
>>
>> Changes in v4:
>> fix the warning when disable CONFIG_PM_RUNTIME
>>
>
> Looks good to me! Acked-by: Ulf Hansson <ulf.hansson@stericsson.com>
Thanks! Pushed to mmc-next for 3.4.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH V4]mmc: remove MMC bus legacy suspend/resume method
2012-04-11 11:54 [PATCH V4]mmc: remove MMC bus legacy suspend/resume method Chuanxiao Dong
2012-04-11 13:41 ` Ulf Hansson
@ 2012-04-16 5:46 ` Hebbar, Gururaja
1 sibling, 0 replies; 5+ messages in thread
From: Hebbar, Gururaja @ 2012-04-16 5:46 UTC (permalink / raw)
To: Chuanxiao Dong, linux-mmc, linux-pm; +Cc: cjb, ulf.hansson
On Wed, Apr 11, 2012 at 17:24:38, Chuanxiao Dong wrote:
> MMC bus is using legacy suspend/resume method, which is not compatible if
> runtime pm callbacks are used. In this scenario, MMC bus suspend/resume
> callbacks cannot be called when system entering S3. So change to use the new
> defined dev_pm_ops for system sleeping mode
>
> Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
> ---
> Changes in v2:
> use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
> suggested
>
> Changes in v3:
> remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
> selected, as Ulf Hansson suggested
>
> Changes in v4:
> fix the warning when disable CONFIG_PM_RUNTIME
Tested on AM335x Platform. Solves major issue/crash reported at
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg65425.html
Tested-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
>
> drivers/mmc/card/block.c | 2 +-
> drivers/mmc/core/bus.c | 24 ++++++++----------------
> include/linux/mmc/card.h | 2 +-
> 3 files changed, 10 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index f2020d3..3582c03 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -1826,7 +1826,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 5d011a3..aad8516 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -122,14 +122,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;
> }
>
> @@ -165,20 +165,14 @@ static int mmc_runtime_idle(struct device *dev)
> return pm_runtime_suspend(dev);
> }
>
> +#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,
> + SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
> + mmc_runtime_idle)
> + SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, 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,
> @@ -186,9 +180,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 1a1ca71..c984c9a 100644
> --- a/include/linux/mmc/card.h
> +++ b/include/linux/mmc/card.h
> @@ -480,7 +480,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 *);
> };
>
> --
> 1.7.1
>
> --
> 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
>
Regards,
Gururaja
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH V4]mmc: remove MMC bus legacy suspend/resume method
2012-04-11 14:44 ` Chris Ball
@ 2012-04-16 5:47 ` Hebbar, Gururaja
0 siblings, 0 replies; 5+ messages in thread
From: Hebbar, Gururaja @ 2012-04-16 5:47 UTC (permalink / raw)
To: Chris Ball, Ulf Hansson; +Cc: Chuanxiao Dong, linux-mmc, linux-pm
On Wed, Apr 11, 2012 at 20:14:47, Chris Ball wrote:
> Hi,
>
> On Wed, Apr 11 2012, Ulf Hansson wrote:
> > On 04/11/2012 01:54 PM, Chuanxiao Dong wrote:
> >> MMC bus is using legacy suspend/resume method, which is not compatible if
> >> runtime pm callbacks are used. In this scenario, MMC bus suspend/resume
> >> callbacks cannot be called when system entering S3. So change to use the new
> >> defined dev_pm_ops for system sleeping mode
> >>
> >> Signed-off-by: Chuanxiao Dong<chuanxiao.dong@intel.com>
> >> ---
> >> Changes in v2:
> >> use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
> >> suggested
> >>
> >> Changes in v3:
> >> remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
> >> selected, as Ulf Hansson suggested
> >>
> >> Changes in v4:
> >> fix the warning when disable CONFIG_PM_RUNTIME
> >>
> >
> > Looks good to me! Acked-by: Ulf Hansson <ulf.hansson@stericsson.com>
>
> Thanks! Pushed to mmc-next for 3.4.
Can you consider my Tested-by for this patch.
Tested on AM335x Platform. Solves major issue/crash reported at
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg65425.html
Tested-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
>
> - Chris.
> --
> Chris Ball <cjb@laptop.org> <http://printf.net/>
> One Laptop Per Child
> --
> 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
>
Regards,
Gururaja
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-16 5:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-11 11:54 [PATCH V4]mmc: remove MMC bus legacy suspend/resume method Chuanxiao Dong
2012-04-11 13:41 ` Ulf Hansson
2012-04-11 14:44 ` Chris Ball
2012-04-16 5:47 ` Hebbar, Gururaja
2012-04-16 5:46 ` Hebbar, Gururaja
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.