diff mbox

UBUNTU: SAUCE: acpi: Fixes battery power regression on HP laptops (bug 453963)

Message ID 4B4ACCD7.1020105@wastelands.net
State Changes Requested
Headers show

Commit Message

Gadi Cohen Jan. 11, 2010, 7:01 a.m. UTC 
DMI init_set_sci_en_on_resume for varios HP/Compaq laptops.
Patched against Ubuntu- 2.6.31-17.54. Shipped in linux-2.6.32.

BugLink: http://bugs.launchpad.net/bugs/453963

Signed-off-by: Gadi Cohen <dragon@wastelands.net>
---
 drivers/acpi/sleep.c |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

     .matches = {

Comments

Stefan Bader Jan. 12, 2010, 5:18 p.m. UTC | #1 
Gadi Cohen wrote:
> DMI init_set_sci_en_on_resume for varios HP/Compaq laptops.
> Patched against Ubuntu- 2.6.31-17.54. Shipped in linux-2.6.32.
> 
> BugLink: http://bugs.launchpad.net/bugs/453963
> 
> Signed-off-by: Gadi Cohen <dragon@wastelands.net>

Having a quick lock it seems that this patch just merges several upstream
commits into one patch. Which is not how things should happen. Could you rather
send us the upstream commit ids of the patches that should get applied.
The changes itself look like stable material. Depending on the age of them we
should also ask for upstream stable inclusion.
But it helps a lot if you could do the research part on the patches required
from upstream.

Thanks,
Stefan


> ---
>  drivers/acpi/sleep.c |   42 ++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 42 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
> index 42159a2..53f7ee8 100644
> --- a/drivers/acpi/sleep.c
> +++ b/drivers/acpi/sleep.c
> @@ -405,6 +405,48 @@ static struct dmi_system_id __initdata
> acpisleep_dmi_table[] = {
>          },
>      },
>      {
> +    .callback = init_set_sci_en_on_resume,
> +    .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
> +    .matches = {
> +        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
> +        },
> +    },
> +    {
> +    .callback = init_set_sci_en_on_resume,
> +    .ident = "Hewlett-Packard Pavilion dv4",
> +    .matches = {
> +        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"),
> +        },
> +    },
> +    {
> +    .callback = init_set_sci_en_on_resume,
> +    .ident = "Hewlett-Packard Pavilion dv7",
> +    .matches = {
> +        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"),
> +        },
> +    },
> +    {
> +    .callback = init_set_sci_en_on_resume,
> +    .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC",
> +    .matches = {
> +        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +        DMI_MATCH(DMI_PRODUCT_NAME,
> +                "Compaq Presario CQ40 Notebook PC"),
> +        },
> +    },
> +    {
> +    .callback = init_set_sci_en_on_resume,
> +    .ident = "Hewlett-Packard Compaq Presario C700 Notebook PC",
> +    .matches = {
> +        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +        DMI_MATCH(DMI_PRODUCT_NAME,
> +                "Compaq Presario C700 Notebook PC""),
> +        },
> +    },
> +    {
>      .callback = init_old_suspend_ordering,
>      .ident = "Panasonic CF51-2L",
>      .matches = {
Gadi Cohen Jan. 15, 2010, 3:17 p.m. UTC | #2 
Stefan Bader wrote:

> Having a quick lock it seems that this patch just merges several upstream
> commits into one patch. Which is not how things should happen. Could you rather
> send us the upstream commit ids of the patches that should get applied.
> The changes itself look like stable material. Depending on the age of them we
> should also ask for upstream stable inclusion.
> But it helps a lot if you could do the research part on the patches required
> from upstream.
>   
Sure.  Thanks for the pointers.  Here are the commit ids:

commit 87c687be055e67bc04189ce476690be73d16063e
ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700

commit 2839d396e3ae0891c1fdd87aa1cea218e6f5c4df
ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume

commit 8a1cbf64977f89e9e9bc1d80dd01503337424f96
ACPI: add DMI entry for SCI_EN resume quirk on HP dv4

commit eb0ca849863ecdc593ba7faa95fda5695af891c8
ACPI: sleep: another HP DMI entry for init_set_sci_en_on_resume
(dv3)

Gadi

> Gadi Cohen wrote:
>   
>> DMI init_set_sci_en_on_resume for varios HP/Compaq laptops.
>> Patched against Ubuntu- 2.6.31-17.54. Shipped in linux-2.6.32.
>>
>> BugLink: http://bugs.launchpad.net/bugs/453963
>>
>> Signed-off-by: Gadi Cohen <dragon@wastelands.net>
>>
Stefan Bader Jan. 18, 2010, 3:22 p.m. UTC | #3 
Gadi Cohen wrote:
> Stefan Bader wrote:
> 
>> Having a quick lock it seems that this patch just merges several upstream
>> commits into one patch. Which is not how things should happen. Could you rather
>> send us the upstream commit ids of the patches that should get applied.
>> The changes itself look like stable material. Depending on the age of them we
>> should also ask for upstream stable inclusion.
>> But it helps a lot if you could do the research part on the patches required
>> from upstream.
>>   
> Sure.  Thanks for the pointers.  Here are the commit ids:
> 
> commit 87c687be055e67bc04189ce476690be73d16063e
> ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700
> 
> commit 2839d396e3ae0891c1fdd87aa1cea218e6f5c4df
> ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume
> 
> commit 8a1cbf64977f89e9e9bc1d80dd01503337424f96
> ACPI: add DMI entry for SCI_EN resume quirk on HP dv4
> 
> commit eb0ca849863ecdc593ba7faa95fda5695af891c8
> ACPI: sleep: another HP DMI entry for init_set_sci_en_on_resume
> (dv3)
> 
> Gadi
> 
>> Gadi Cohen wrote:
>>   
>>> DMI init_set_sci_en_on_resume for varios HP/Compaq laptops.
>>> Patched against Ubuntu- 2.6.31-17.54. Shipped in linux-2.6.32.
>>>
>>> BugLink: http://bugs.launchpad.net/bugs/453963
>>>
>>> Signed-off-by: Gadi Cohen <dragon@wastelands.net>
>>>     

Greg was kind enough to squeeze them in for the last upstream stable release.
So those should come with inclusion of 2.6.31.12

-Stefan
Gadi Cohen Jan. 19, 2010, 7:09 a.m. UTC | #4 
Stefan Bader wrote:

> Greg was kind enough to squeeze them in for the last upstream stable release.
> So those should come with inclusion of 2.6.31.12
>   
Ah amazing... you guys are the best, thanks :)  This is really, really
helpful for the affected users.

Did you mean 2.6.31-18?  Latest stable on Karmic is 2.6.31-17.

Thanks again
Gadi
Stefan Bader Jan. 19, 2010, 8:01 a.m. UTC | #5 
Gadi Cohen wrote:
> Stefan Bader wrote:
> 
>> Greg was kind enough to squeeze them in for the last upstream stable release.
>> So those should come with inclusion of 2.6.31.12
>>   
> Ah amazing... you guys are the best, thanks :)  This is really, really
> helpful for the affected users.
> 
> Did you mean 2.6.31-18?  Latest stable on Karmic is 2.6.31-17.

No, it will be something after that. It take a while to get upstream releases
back into Ubuntu releases. So 2.6.31-18 contains "only" the upstream releases
2.6.31.7 to 2.6.31.9. The sci_en fixes should be in 2.6.31.12 which has not been
released, yet. And after that it is still a bit of time to pull it it (security
updates can get in between as well. So it is hard to give a good ETA at the moment.

-Stefan

> Thanks again
> Gadi
>
Gadi Cohen Jan. 19, 2010, 8:35 a.m. UTC | #6 
Stefan Bader wrote:

> No, it will be something after that. It take a while to get upstream releases
> back into Ubuntu releases. So 2.6.31-18 contains "only" the upstream releases
> 2.6.31.7 to 2.6.31.9. The sci_en fixes should be in 2.6.31.12 which has not been
> released, yet. And after that it is still a bit of time to pull it it (security
> updates can get in between as well. So it is hard to give a good ETA at the moment.
>   
Ok, no problem... thanks again for the help and explanations.

Gadi
diff mbox

Patch

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 42159a2..53f7ee8 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -405,6 +405,48 @@  static struct dmi_system_id __initdata
acpisleep_dmi_table[] = {
         },
     },
     {
+    .callback = init_set_sci_en_on_resume,
+    .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC",
+    .matches = {
+        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"),
+        },
+    },
+    {
+    .callback = init_set_sci_en_on_resume,
+    .ident = "Hewlett-Packard Pavilion dv4",
+    .matches = {
+        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"),
+        },
+    },
+    {
+    .callback = init_set_sci_en_on_resume,
+    .ident = "Hewlett-Packard Pavilion dv7",
+    .matches = {
+        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"),
+        },
+    },
+    {
+    .callback = init_set_sci_en_on_resume,
+    .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC",
+    .matches = {
+        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME,
+                "Compaq Presario CQ40 Notebook PC"),
+        },
+    },
+    {
+    .callback = init_set_sci_en_on_resume,
+    .ident = "Hewlett-Packard Compaq Presario C700 Notebook PC",
+    .matches = {
+        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+        DMI_MATCH(DMI_PRODUCT_NAME,
+                "Compaq Presario C700 Notebook PC""),
+        },
+    },
+    {
     .callback = init_old_suspend_ordering,
     .ident = "Panasonic CF51-2L",