* [PATCH] ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
@ 2010-04-28 23:43 Kamal Mostafa
2010-09-13 17:34 ` Rafael J. Wysocki
0 siblings, 1 reply; 4+ messages in thread
From: Kamal Mostafa @ 2010-04-28 23:43 UTC (permalink / raw)
To: linux-acpi, linux-kernel, Len Brown, Rafael J. Wysocki,
Matthew Garrett, Jesse Barnes, Zhang Rui, linux-acpi,
linux-kernel
Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume'
list to fix hang on resume.
BugLink: http://bugs.launchpad.net/bugs/553498
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Alex Chiang <achiang@canonical.com>
Cc: stable@kernel.org
---
drivers/acpi/sleep.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index f74834a..d907c8a 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -458,6 +458,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
},
},
+ {
+ .callback = init_set_sci_en_on_resume,
+ .ident = "Dell Studio 1558",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
+ },
+ },
+ {
+ .callback = init_set_sci_en_on_resume,
+ .ident = "Dell Studio 1557",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
+ },
+ },
+ {
+ .callback = init_set_sci_en_on_resume,
+ .ident = "Dell Studio 1555",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
+ },
+ },
{},
};
#endif /* CONFIG_SUSPEND */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
2010-04-28 23:43 [PATCH] ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x Kamal Mostafa
@ 2010-09-13 17:34 ` Rafael J. Wysocki
2010-09-13 17:44 ` Kamal Mostafa
0 siblings, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2010-09-13 17:34 UTC (permalink / raw)
To: Kamal Mostafa
Cc: linux-acpi, linux-kernel, Len Brown, Matthew Garrett,
Jesse Barnes, Zhang Rui
On Thursday, April 29, 2010, Kamal Mostafa wrote:
> Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume'
> list to fix hang on resume.
>
> BugLink: http://bugs.launchpad.net/bugs/553498
This check was removed by commit b6dacf63e9fb2e7a1369843d6cef332f76fca6a3
(ACPI: Unconditionally set SCI_EN on resume), so the patch shouldn't be
necessary.
Thanks,
Rafael
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> Acked-by: Alex Chiang <achiang@canonical.com>
> Cc: stable@kernel.org
> ---
> drivers/acpi/sleep.c | 24 ++++++++++++++++++++++++
> 1 files changed, 24 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
> index f74834a..d907c8a 100644
> --- a/drivers/acpi/sleep.c
> +++ b/drivers/acpi/sleep.c
> @@ -458,6 +458,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
> DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
> },
> },
> + {
> + .callback = init_set_sci_en_on_resume,
> + .ident = "Dell Studio 1558",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
> + },
> + },
> + {
> + .callback = init_set_sci_en_on_resume,
> + .ident = "Dell Studio 1557",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
> + },
> + },
> + {
> + .callback = init_set_sci_en_on_resume,
> + .ident = "Dell Studio 1555",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
> + },
> + },
> {},
> };
> #endif /* CONFIG_SUSPEND */
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
2010-09-13 17:34 ` Rafael J. Wysocki
@ 2010-09-13 17:44 ` Kamal Mostafa
0 siblings, 0 replies; 4+ messages in thread
From: Kamal Mostafa @ 2010-09-13 17:44 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-acpi, linux-kernel, Len Brown, Matthew Garrett,
Jesse Barnes, Zhang Rui
[-- Attachment #1: Type: text/plain, Size: 1942 bytes --]
On Mon, 2010-09-13 at 19:34 +0200, Rafael J. Wysocki wrote:
> On Thursday, April 29, 2010, Kamal Mostafa wrote:
> > Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume'
> > list to fix hang on resume.
> >
> > BugLink: http://bugs.launchpad.net/bugs/553498
>
> This check was removed by commit b6dacf63e9fb2e7a1369843d6cef332f76fca6a3
> (ACPI: Unconditionally set SCI_EN on resume), so the patch shouldn't be
> necessary.
That is correct Rafael. I confirm that this Dell-specific patch is no
longer relevant. Thanks,
-Kamal
> Thanks,
> Rafael
>
>
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> > Acked-by: Alex Chiang <achiang@canonical.com>
> > Cc: stable@kernel.org
> > ---
> > drivers/acpi/sleep.c | 24 ++++++++++++++++++++++++
> > 1 files changed, 24 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
> > index f74834a..d907c8a 100644
> > --- a/drivers/acpi/sleep.c
> > +++ b/drivers/acpi/sleep.c
> > @@ -458,6 +458,30 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
> > DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
> > },
> > },
> > + {
> > + .callback = init_set_sci_en_on_resume,
> > + .ident = "Dell Studio 1558",
> > + .matches = {
> > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> > + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
> > + },
> > + },
> > + {
> > + .callback = init_set_sci_en_on_resume,
> > + .ident = "Dell Studio 1557",
> > + .matches = {
> > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> > + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
> > + },
> > + },
> > + {
> > + .callback = init_set_sci_en_on_resume,
> > + .ident = "Dell Studio 1555",
> > + .matches = {
> > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> > + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
> > + },
> > + },
> > {},
> > };
> > #endif /* CONFIG_SUSPEND */
> >
>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <201004272233.o3RMXLQ6010267@hera.kernel.org>]
* Re: [PATCH] ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
[not found] <201004272233.o3RMXLQ6010267@hera.kernel.org>
@ 2010-05-06 17:23 ` Len Brown
0 siblings, 0 replies; 4+ messages in thread
From: Len Brown @ 2010-05-06 17:23 UTC (permalink / raw)
To: Kamal Mostafa
Cc: Rafael J. Wysocki, Matthew Garrett, Jesse Barnes, Zhang Rui,
linux-acpi, linux-kernel, Alex Chiang
applied, along with achiang's lenovo list.
looking forward to deleting this list in 2.6.35...
thanks,
Len Brown, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-13 17:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-28 23:43 [PATCH] ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x Kamal Mostafa
2010-09-13 17:34 ` Rafael J. Wysocki
2010-09-13 17:44 ` Kamal Mostafa
[not found] <201004272233.o3RMXLQ6010267@hera.kernel.org>
2010-05-06 17:23 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox