public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/13] ACPI / PM: Rework power resources management
@ 2010-11-24 23:01 Rafael J. Wysocki
  0 siblings, 0 replies; 12+ messages in thread
From: Rafael J. Wysocki @ 2010-11-24 23:01 UTC (permalink / raw)
  To: Len Brown
  Cc: ACPI Devel Maling List, LKML, Linux-pm mailing list,
	Matthew Garrett, Maciej Rutecki

Hi,

Unfortunately there are a few problems with ACPI power resources management
that should be fixed by the following series of patches.

Patch [1/13] is necessary to fix a recent regression in the mainline kernel and
patch [2/13] also should go into 2.6.37 IMO.  The remaining patches are not so
urgent, but they all are necessary.

[1/13] - Fix regression if fan resume resulting from the rework of power
         resources reference counting.

[2/13] - Do not reference count power resources that can't be turned on.

[3/13] - Rework acpi_power_get_inferred_state() so that it doesn't update
         device->power.state behind the caller's back.

[4/13] - Introduce functions for handling lists of power resources.

[5/13] - Introduce helper function for reference counting power resources
         for a given device and power state.

[6/13] - Introduce function for reading device power state without modifying
         the device object.

[7/13] - Add function for device power state initialization.

[8/13] - Add function for updating device power state in a consistent way.

[9/13] - Register acpi_power_driver before scanning the root of the namespace.

[10/13] - Add power resource ACPI device objects as soon as they are needed.

[11/13] - Rework the management of ACPI power resources in the ACPI fan driver.

[12/13] - Drop acpi_bus_get_power() that has no users now.

[13/13] - Drop acpi_power_nocheck which isn't necessary any more.

The patches have been tested on my HP nx6325 (which is the only machine using
ACPI power resources I have) and a combo patch functionally equivalen to this
series has been tested by Maciej Rutecki.

Please apply.

Thanks,
Rafael


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
@ 2010-11-25  9:11 Sedat Dilek
  2010-11-25  9:41 ` Sedat Dilek
  2010-12-13 15:43 ` Sedat Dilek
  0 siblings, 2 replies; 12+ messages in thread
From: Sedat Dilek @ 2010-11-25  9:11 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: LKML

Hi Rafael,

I applied your patch-set against linux-next (next-20101124) with
backlight-type patches from Matthew.

# grep "error:" build_linux-next_next20101124.dileks.2.log
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
error: implicit declaration of function ‘acpi_bus_get_power’

Looking into the source:

# grep acpi_bus_get_power -r
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:
   result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:
   result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);

Checking the acpi tree:

# grep "acpi_bus_get_power(" -r
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/bus.c:static
int __acpi_bus_get_power(struct acpi_device *device, int *state)
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/bus.c:
      result = __acpi_bus_get_power(device, &state);
/home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/bus.c:
      result = __acpi_bus_get_power(device, &state);

Just wanna let you know.

Kind Regards,
- Sedat -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25  9:11 [PATCH 0/13] ACPI / PM: Rework power resources management Sedat Dilek
@ 2010-11-25  9:41 ` Sedat Dilek
  2010-11-25 16:13   ` Sedat Dilek
  2010-12-13 15:43 ` Sedat Dilek
  1 sibling, 1 reply; 12+ messages in thread
From: Sedat Dilek @ 2010-11-25  9:41 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: LKML

On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
<sedat.dilek@googlemail.com> wrote:
> Hi Rafael,
>
> I applied your patch-set against linux-next (next-20101124) with
> backlight-type patches from Matthew.
>
> # grep "error:" build_linux-next_next20101124.dileks.2.log
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
> error: implicit declaration of function ‘acpi_bus_get_power’
>
> Looking into the source:
>
> # grep acpi_bus_get_power -r
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:
>   result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:
>   result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
>
> Checking the acpi tree:
>
> # grep "acpi_bus_get_power(" -r
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/bus.c:static
> int __acpi_bus_get_power(struct acpi_device *device, int *state)
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/bus.c:
>      result = __acpi_bus_get_power(device, &state);
> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/acpi/bus.c:
>      result = __acpi_bus_get_power(device, &state);
>
> Just wanna let you know.
>
> Kind Regards,
> - Sedat -
>

Guess this is conflicting with your patch
"12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".

- Sedat -

P.S.: Note to myself, add the following snippet for testing purposes:

[ debian/config/i386/none/config.686 ]
...
##
## file: drivers/platform/x86/Kconfig
##
# CONFIG_FUJITSU_LAPTOP is not set
- EOT -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25  9:41 ` Sedat Dilek
@ 2010-11-25 16:13   ` Sedat Dilek
  2010-11-25 20:15     ` Rafael J. Wysocki
  0 siblings, 1 reply; 12+ messages in thread
From: Sedat Dilek @ 2010-11-25 16:13 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: LKML

On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
<sedat.dilek@googlemail.com> wrote:
> On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
> <sedat.dilek@googlemail.com> wrote:
>> Hi Rafael,
>>
[ ... ]
>> # grep "error:" build_linux-next_next20101124.dileks.2.log
>> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
>> error: implicit declaration of function ‘acpi_bus_get_power’
[ ... ]
>
> Guess this is conflicting with your patch
> "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
>
> - Sedat -
>
> P.S.: Note to myself, add the following snippet for testing purposes:
>
> [ debian/config/i386/none/config.686 ]
> ...
> ##
> ## file: drivers/platform/x86/Kconfig
> ##
> # CONFIG_FUJITSU_LAPTOP is not set
> - EOT -
>

Applied on top of linux-next (next-20101125) and running.

     Tested-by: Sedat Dilek <sedat.dilek@gmail.com>

- Sedat -

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25 16:13   ` Sedat Dilek
@ 2010-11-25 20:15     ` Rafael J. Wysocki
  2010-11-25 20:29       ` Rafael J. Wysocki
  0 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2010-11-25 20:15 UTC (permalink / raw)
  To: sedat.dilek; +Cc: LKML

On Thursday, November 25, 2010, Sedat Dilek wrote:
> On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
> <sedat.dilek@googlemail.com> wrote:
> > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
> > <sedat.dilek@googlemail.com> wrote:
> >> Hi Rafael,
> >>
> [ ... ]
> >> # grep "error:" build_linux-next_next20101124.dileks.2.log
> >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
> >> error: implicit declaration of function ‘acpi_bus_get_power’
> [ ... ]
> >
> > Guess this is conflicting with your patch
> > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
> >
> > - Sedat -
> >
> > P.S.: Note to myself, add the following snippet for testing purposes:
> >
> > [ debian/config/i386/none/config.686 ]
> > ...
> > ##
> > ## file: drivers/platform/x86/Kconfig
> > ##
> > # CONFIG_FUJITSU_LAPTOP is not set
> > - EOT -
> >
> 
> Applied on top of linux-next (next-20101125) and running.
> 
>      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>

Great, thanks a lot!

I should have said the patchset is on top of the current Linus' tree.

Rafael

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25 20:15     ` Rafael J. Wysocki
@ 2010-11-25 20:29       ` Rafael J. Wysocki
  2010-11-25 20:37         ` Sedat Dilek
  0 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2010-11-25 20:29 UTC (permalink / raw)
  To: sedat.dilek; +Cc: LKML, Matthew Garrett, Len Brown

On Thursday, November 25, 2010, Rafael J. Wysocki wrote:
> On Thursday, November 25, 2010, Sedat Dilek wrote:
> > On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
> > <sedat.dilek@googlemail.com> wrote:
> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
> > > <sedat.dilek@googlemail.com> wrote:
> > >> Hi Rafael,
> > >>
> > [ ... ]
> > >> # grep "error:" build_linux-next_next20101124.dileks.2.log
> > >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
> > >> error: implicit declaration of function ‘acpi_bus_get_power’
> > [ ... ]
> > >
> > > Guess this is conflicting with your patch
> > > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
> > >
> > > - Sedat -
> > >
> > > P.S.: Note to myself, add the following snippet for testing purposes:
> > >
> > > [ debian/config/i386/none/config.686 ]
> > > ...
> > > ##
> > > ## file: drivers/platform/x86/Kconfig
> > > ##
> > > # CONFIG_FUJITSU_LAPTOP is not set
> > > - EOT -
> > >
> > 
> > Applied on top of linux-next (next-20101125) and running.
> > 
> >      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
> 
> Great, thanks a lot!
> 
> I should have said the patchset is on top of the current Linus' tree.

Actually it also breaks with the current Linus' tree, but the appended patch
should fix it.

Thanks,
Rafael

---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()

Use the new function acpi_bus_update_power(), which is safer than
acpi_bus_get_power(), for getting device power state in
acpi_fujitsu_add().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/platform/x86/fujitsu-laptop.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
===================================================================
--- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
+++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
@@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
 	if (error)
 		goto err_free_input_dev;
 
-	result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
+	result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
 	if (result) {
 		printk(KERN_ERR "Error reading power state\n");
 		goto err_unregister_input_dev;

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25 20:29       ` Rafael J. Wysocki
@ 2010-11-25 20:37         ` Sedat Dilek
  2010-11-25 20:45           ` Rafael J. Wysocki
  0 siblings, 1 reply; 12+ messages in thread
From: Sedat Dilek @ 2010-11-25 20:37 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: LKML, Matthew Garrett, Len Brown

On Thu, Nov 25, 2010 at 9:29 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Thursday, November 25, 2010, Rafael J. Wysocki wrote:
>> On Thursday, November 25, 2010, Sedat Dilek wrote:
>> > On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
>> > <sedat.dilek@googlemail.com> wrote:
>> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
>> > > <sedat.dilek@googlemail.com> wrote:
>> > >> Hi Rafael,
>> > >>
>> > [ ... ]
>> > >> # grep "error:" build_linux-next_next20101124.dileks.2.log
>> > >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
>> > >> error: implicit declaration of function ‘acpi_bus_get_power’
>> > [ ... ]
>> > >
>> > > Guess this is conflicting with your patch
>> > > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
>> > >
>> > > - Sedat -
>> > >
>> > > P.S.: Note to myself, add the following snippet for testing purposes:
>> > >
>> > > [ debian/config/i386/none/config.686 ]
>> > > ...
>> > > ##
>> > > ## file: drivers/platform/x86/Kconfig
>> > > ##
>> > > # CONFIG_FUJITSU_LAPTOP is not set
>> > > - EOT -
>> > >
>> >
>> > Applied on top of linux-next (next-20101125) and running.
>> >
>> >      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
>>
>> Great, thanks a lot!
>>
>> I should have said the patchset is on top of the current Linus' tree.
>
> Actually it also breaks with the current Linus' tree, but the appended patch
> should fix it.
>
> Thanks,
> Rafael
>
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
> Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
>
> Use the new function acpi_bus_update_power(), which is safer than
> acpi_bus_get_power(), for getting device power state in
> acpi_fujitsu_add().
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>  drivers/platform/x86/fujitsu-laptop.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> ===================================================================
> --- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
> +++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> @@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
>        if (error)
>                goto err_free_input_dev;
>
> -       result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
> +       result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
>        if (result) {
>                printk(KERN_ERR "Error reading power state\n");
>                goto err_unregister_input_dev;
>

Sorry, I crapped my own quotes.
Missed to catch line #860?

- Sedat -

$ cd ~/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none

$ grep --line-number -r acpi_bus_get_power -r drivers/platform/x86/
drivers/platform/x86/fujitsu-laptop.c:692:      result =
acpi_bus_get_power(fujitsu->acpi_handle, &state);
drivers/platform/x86/fujitsu-laptop.c:860:      result =
acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25 20:37         ` Sedat Dilek
@ 2010-11-25 20:45           ` Rafael J. Wysocki
  2010-11-26  8:12             ` Sedat Dilek
  0 siblings, 1 reply; 12+ messages in thread
From: Rafael J. Wysocki @ 2010-11-25 20:45 UTC (permalink / raw)
  To: sedat.dilek; +Cc: LKML, Matthew Garrett, Len Brown, ACPI Devel Maling List

On Thursday, November 25, 2010, Sedat Dilek wrote:
> On Thu, Nov 25, 2010 at 9:29 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Thursday, November 25, 2010, Rafael J. Wysocki wrote:
> >> On Thursday, November 25, 2010, Sedat Dilek wrote:
> >> > On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
> >> > <sedat.dilek@googlemail.com> wrote:
> >> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
> >> > > <sedat.dilek@googlemail.com> wrote:
> >> > >> Hi Rafael,
> >> > >>
> >> > [ ... ]
> >> > >> # grep "error:" build_linux-next_next20101124.dileks.2.log
> >> > >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
> >> > >> error: implicit declaration of function ‘acpi_bus_get_power’
> >> > [ ... ]
> >> > >
> >> > > Guess this is conflicting with your patch
> >> > > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
> >> > >
> >> > > - Sedat -
> >> > >
> >> > > P.S.: Note to myself, add the following snippet for testing purposes:
> >> > >
> >> > > [ debian/config/i386/none/config.686 ]
> >> > > ...
> >> > > ##
> >> > > ## file: drivers/platform/x86/Kconfig
> >> > > ##
> >> > > # CONFIG_FUJITSU_LAPTOP is not set
> >> > > - EOT -
> >> > >
> >> >
> >> > Applied on top of linux-next (next-20101125) and running.
> >> >
> >> >      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
> >>
> >> Great, thanks a lot!
> >>
> >> I should have said the patchset is on top of the current Linus' tree.
> >
> > Actually it also breaks with the current Linus' tree, but the appended patch
> > should fix it.
> >
> > Thanks,
> > Rafael
> >
> > ---
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> > Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
> >
> > Use the new function acpi_bus_update_power(), which is safer than
> > acpi_bus_get_power(), for getting device power state in
> > acpi_fujitsu_add().
> >
> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > ---
> >  drivers/platform/x86/fujitsu-laptop.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
> > +++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> > @@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
> >        if (error)
> >                goto err_free_input_dev;
> >
> > -       result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
> > +       result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
> >        if (result) {
> >                printk(KERN_ERR "Error reading power state\n");
> >                goto err_unregister_input_dev;
> >
> 
> Sorry, I crapped my own quotes.
> Missed to catch line #860?

Indeed, sorry.  Updated patch is appended.

Rafael


---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()

Use the new function acpi_bus_update_power(), which is safer than
acpi_bus_get_power(), for getting device power state in
acpi_fujitsu_add().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/platform/x86/fujitsu-laptop.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
===================================================================
--- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
+++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
@@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
 	if (error)
 		goto err_free_input_dev;
 
-	result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
+	result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
 	if (result) {
 		printk(KERN_ERR "Error reading power state\n");
 		goto err_unregister_input_dev;
@@ -857,7 +857,7 @@ static int acpi_fujitsu_hotkey_add(struc
 	if (error)
 		goto err_free_input_dev;
 
-	result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
+	result = acpi_bus_update_power(fujitsu_hotkey->acpi_handle, &state);
 	if (result) {
 		printk(KERN_ERR "Error reading power state\n");
 		goto err_unregister_input_dev;

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25 20:45           ` Rafael J. Wysocki
@ 2010-11-26  8:12             ` Sedat Dilek
  2010-11-26 19:26               ` Rafael J. Wysocki
  0 siblings, 1 reply; 12+ messages in thread
From: Sedat Dilek @ 2010-11-26  8:12 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: LKML, Matthew Garrett, Len Brown, ACPI Devel Maling List

On Thu, Nov 25, 2010 at 9:45 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Thursday, November 25, 2010, Sedat Dilek wrote:
>> On Thu, Nov 25, 2010 at 9:29 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
>> > On Thursday, November 25, 2010, Rafael J. Wysocki wrote:
>> >> On Thursday, November 25, 2010, Sedat Dilek wrote:
>> >> > On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
>> >> > <sedat.dilek@googlemail.com> wrote:
>> >> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
>> >> > > <sedat.dilek@googlemail.com> wrote:
>> >> > >> Hi Rafael,
>> >> > >>
>> >> > [ ... ]
>> >> > >> # grep "error:" build_linux-next_next20101124.dileks.2.log
>> >> > >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
>> >> > >> error: implicit declaration of function ‘acpi_bus_get_power’
>> >> > [ ... ]
>> >> > >
>> >> > > Guess this is conflicting with your patch
>> >> > > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
>> >> > >
>> >> > > - Sedat -
>> >> > >
>> >> > > P.S.: Note to myself, add the following snippet for testing purposes:
>> >> > >
>> >> > > [ debian/config/i386/none/config.686 ]
>> >> > > ...
>> >> > > ##
>> >> > > ## file: drivers/platform/x86/Kconfig
>> >> > > ##
>> >> > > # CONFIG_FUJITSU_LAPTOP is not set
>> >> > > - EOT -
>> >> > >
>> >> >
>> >> > Applied on top of linux-next (next-20101125) and running.
>> >> >
>> >> >      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
>> >>
>> >> Great, thanks a lot!
>> >>
>> >> I should have said the patchset is on top of the current Linus' tree.
>> >
>> > Actually it also breaks with the current Linus' tree, but the appended patch
>> > should fix it.
>> >
>> > Thanks,
>> > Rafael
>> >
>> > ---
>> > From: Rafael J. Wysocki <rjw@sisk.pl>
>> > Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
>> >
>> > Use the new function acpi_bus_update_power(), which is safer than
>> > acpi_bus_get_power(), for getting device power state in
>> > acpi_fujitsu_add().
>> >
>> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
>> > ---
>> >  drivers/platform/x86/fujitsu-laptop.c |    2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
>> > ===================================================================
>> > --- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
>> > +++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
>> > @@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
>> >        if (error)
>> >                goto err_free_input_dev;
>> >
>> > -       result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
>> > +       result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
>> >        if (result) {
>> >                printk(KERN_ERR "Error reading power state\n");
>> >                goto err_unregister_input_dev;
>> >
>>
>> Sorry, I crapped my own quotes.
>> Missed to catch line #860?
>
> Indeed, sorry.  Updated patch is appended.
>
> Rafael
>
>
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
> Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
>
> Use the new function acpi_bus_update_power(), which is safer than
> acpi_bus_get_power(), for getting device power state in
> acpi_fujitsu_add().
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>  drivers/platform/x86/fujitsu-laptop.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> ===================================================================
> --- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
> +++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> @@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
>        if (error)
>                goto err_free_input_dev;
>
> -       result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
> +       result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
>        if (result) {
>                printk(KERN_ERR "Error reading power state\n");
>                goto err_unregister_input_dev;
> @@ -857,7 +857,7 @@ static int acpi_fujitsu_hotkey_add(struc
>        if (error)
>                goto err_free_input_dev;
>
> -       result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
> +       result = acpi_bus_update_power(fujitsu_hotkey->acpi_handle, &state);
>        if (result) {
>                printk(KERN_ERR "Error reading power state\n");
>                goto err_unregister_input_dev;
>

Feel free to add for
"Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch":

     Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>

- Sedat -

# grep OK setup_linux-next_next20101126.dileks.1.log | grep ACPI-PM
  (+) OK   ACPI-PM/1-13-ACPI-PM-Check-device-state-before-refcounting-power-resources.patch
  (+) OK   ACPI-PM/2-13-ACPI-PM-Do-not-refcount-power-resources-that-can-t-be-turned-on.patch
  (+) OK   ACPI-PM/3-13-ACPI-PM-Prevent-acpi_power_get_inferred_state-from-making-changes.patch
  (+) OK   ACPI-PM/4-13-ACPI-PM-Add-functions-for-manipulating-lists-of-power-resources.patch
  (+) OK   ACPI-PM/5-13-ACPI-PM-Introduce-function-for-refcounting-device-power-resources.patch
  (+) OK   ACPI-PM/6-13-ACPI-PM-Introduce-__acpi_bus_get_power.patch
  (+) OK   ACPI-PM/7-13-ACPI-PM-Add-function-for-device-power-state-initialization.patch
  (+) OK   ACPI-PM/8-13-ACPI-PM-Add-function-for-updating-device-power-state-consistently.patch
  (+) OK   ACPI-PM/9-13-ACPI-PM-Register-acpi_power_driver-early.patch
  (+) OK   ACPI-PM/10-13-ACPI-PM-Register-power-resource-devices-as-soon-as-they-are-needed.patch
  (+) OK   ACPI-PM/11-13-ACPI-Fan-Rework-the-handling-of-power-resources.patch
  (+) OK   ACPI-PM/12-13-ACPI-PM-Drop-acpi_bus_get_power.patch
  (+) OK   ACPI-PM/13-13-ACPI-PM-Drop-acpi_power_nocheck.patch
  (+) OK   ACPI-PM-fix/Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch

# modinfo fujitsu-laptop
filename:
/lib/modules/2.6.37-rc3-686/kernel/drivers/platform/x86/fujitsu-laptop.ko
alias:          dmi:*:svnFUJITSU:*:pvr:rvnFUJITSU:rnFJNB19C:*:cvrS7020:*
alias:          dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1E6:*:cvrS6420:*
alias:          dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1D3:*:cvrS6410:*
license:        GPL
version:        0.6.0
description:    Fujitsu laptop extras support
author:         Jonathan Woithe, Peter Gruber, Tony Vroon
srcversion:     FFA7AB6B6C940453C0946B4
alias:          acpi*:FUJ02E3:*
alias:          pnp:dFUJ02E3*
alias:          acpi*:FUJ02B1:*
alias:          pnp:dFUJ02B1*
alias:          acpi*:FUJ02BF:*
alias:          pnp:dFUJ02bf*
depends:
vermagic:       2.6.37-rc3-686 SMP mod_unload modversions 686
parm:           use_alt_lcd_levels:Use alternative interface for
lcd_levels (needed for Lifebook s6410). (uint)
parm:           disable_brightness_adjust:Disable brightness adjustment . (uint)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-26  8:12             ` Sedat Dilek
@ 2010-11-26 19:26               ` Rafael J. Wysocki
  0 siblings, 0 replies; 12+ messages in thread
From: Rafael J. Wysocki @ 2010-11-26 19:26 UTC (permalink / raw)
  To: sedat.dilek; +Cc: LKML, Matthew Garrett, Len Brown, ACPI Devel Maling List

On Friday, November 26, 2010, Sedat Dilek wrote:
> On Thu, Nov 25, 2010 at 9:45 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Thursday, November 25, 2010, Sedat Dilek wrote:
> >> On Thu, Nov 25, 2010 at 9:29 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> >> > On Thursday, November 25, 2010, Rafael J. Wysocki wrote:
> >> >> On Thursday, November 25, 2010, Sedat Dilek wrote:
> >> >> > On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
> >> >> > <sedat.dilek@googlemail.com> wrote:
> >> >> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
> >> >> > > <sedat.dilek@googlemail.com> wrote:
> >> >> > >> Hi Rafael,
> >> >> > >>
> >> >> > [ ... ]
> >> >> > >> # grep "error:" build_linux-next_next20101124.dileks.2.log
> >> >> > >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
> >> >> > >> error: implicit declaration of function ‘acpi_bus_get_power’
> >> >> > [ ... ]
> >> >> > >
> >> >> > > Guess this is conflicting with your patch
> >> >> > > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
> >> >> > >
> >> >> > > - Sedat -
> >> >> > >
> >> >> > > P.S.: Note to myself, add the following snippet for testing purposes:
> >> >> > >
> >> >> > > [ debian/config/i386/none/config.686 ]
> >> >> > > ...
> >> >> > > ##
> >> >> > > ## file: drivers/platform/x86/Kconfig
> >> >> > > ##
> >> >> > > # CONFIG_FUJITSU_LAPTOP is not set
> >> >> > > - EOT -
> >> >> > >
> >> >> >
> >> >> > Applied on top of linux-next (next-20101125) and running.
> >> >> >
> >> >> >      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
> >> >>
> >> >> Great, thanks a lot!
> >> >>
> >> >> I should have said the patchset is on top of the current Linus' tree.
> >> >
> >> > Actually it also breaks with the current Linus' tree, but the appended patch
> >> > should fix it.
> >> >
> >> > Thanks,
> >> > Rafael
> >> >
> >> > ---
> >> > From: Rafael J. Wysocki <rjw@sisk.pl>
> >> > Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
> >> >
> >> > Use the new function acpi_bus_update_power(), which is safer than
> >> > acpi_bus_get_power(), for getting device power state in
> >> > acpi_fujitsu_add().
> >> >
> >> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> >> > ---
> >> >  drivers/platform/x86/fujitsu-laptop.c |    2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> >> > ===================================================================
> >> > --- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
> >> > +++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> >> > @@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
> >> >        if (error)
> >> >                goto err_free_input_dev;
> >> >
> >> > -       result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
> >> > +       result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
> >> >        if (result) {
> >> >                printk(KERN_ERR "Error reading power state\n");
> >> >                goto err_unregister_input_dev;
> >> >
> >>
> >> Sorry, I crapped my own quotes.
> >> Missed to catch line #860?
> >
> > Indeed, sorry.  Updated patch is appended.
> >
> > Rafael
> >
> >
> > ---
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> > Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
> >
> > Use the new function acpi_bus_update_power(), which is safer than
> > acpi_bus_get_power(), for getting device power state in
> > acpi_fujitsu_add().
> >
> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > ---
> >  drivers/platform/x86/fujitsu-laptop.c |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
> > +++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
> > @@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
> >        if (error)
> >                goto err_free_input_dev;
> >
> > -       result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
> > +       result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
> >        if (result) {
> >                printk(KERN_ERR "Error reading power state\n");
> >                goto err_unregister_input_dev;
> > @@ -857,7 +857,7 @@ static int acpi_fujitsu_hotkey_add(struc
> >        if (error)
> >                goto err_free_input_dev;
> >
> > -       result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
> > +       result = acpi_bus_update_power(fujitsu_hotkey->acpi_handle, &state);
> >        if (result) {
> >                printk(KERN_ERR "Error reading power state\n");
> >                goto err_unregister_input_dev;
> >
> 
> Feel free to add for
> "Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch":
> 
>      Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>

Thanks for testing!

Rafael

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-11-25  9:11 [PATCH 0/13] ACPI / PM: Rework power resources management Sedat Dilek
  2010-11-25  9:41 ` Sedat Dilek
@ 2010-12-13 15:43 ` Sedat Dilek
  2010-12-14  9:20   ` Sedat Dilek
  1 sibling, 1 reply; 12+ messages in thread
From: Sedat Dilek @ 2010-12-13 15:43 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: LKML, len.brown, Linux ACPI, Matthew Garrett, platform-driver-x86,
	Stephen Rothwell

Hi Rafael,

nice to see your patchset is in linux-next (next-20101213) now.
More precisely in linux-acpi-2.6: 1/13 + 2/13 in release and rest/13
in test GIT branch.

What about the fix
"Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch"
[1]?
Will this go over platform-x86/linux-next into linux-next GIT tree?
Are you co-ordinating this with mjg?

Regards,
- Sedat -

[1] https://patchwork.kernel.org/patch/357422/
[2] http://git.kernel.org/?p=linux/kernel/git/mjg59/platform-drivers-x86.git;a=shortlog;h=refs/heads/linux-next

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 0/13] ACPI / PM: Rework power resources management
  2010-12-13 15:43 ` Sedat Dilek
@ 2010-12-14  9:20   ` Sedat Dilek
  0 siblings, 0 replies; 12+ messages in thread
From: Sedat Dilek @ 2010-12-14  9:20 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: LKML, len.brown, Linux ACPI, Matthew Garrett, platform-driver-x86,
	Stephen Rothwell

On Mon, Dec 13, 2010 at 4:43 PM, Sedat Dilek <sedat.dilek@googlemail.com> wrote:
> Hi Rafael,
>
> nice to see your patchset is in linux-next (next-20101213) now.
> More precisely in linux-acpi-2.6: 1/13 + 2/13 in release and rest/13
> in test GIT branch.
>
> What about the fix
> "Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch"
> [1]?
> Will this go over platform-x86/linux-next into linux-next GIT tree?
> Are you co-ordinating this with mjg?
>
> Regards,
> - Sedat -
>
> [1] https://patchwork.kernel.org/patch/357422/
> [2] http://git.kernel.org/?p=linux/kernel/git/mjg59/platform-drivers-x86.git;a=shortlog;h=refs/heads/linux-next
>

Thanks, the patch is now included in linux-next (next-20101214) (see [1]).

- Sedat -

[1] http://git.kernel.org/?p=linux/kernel/git/lenb/linux-acpi-2.6.git;a=commit;h=5fd12c41e206d6bfda6eef1ed50e995a293e0777

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2010-12-14  9:20 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-25  9:11 [PATCH 0/13] ACPI / PM: Rework power resources management Sedat Dilek
2010-11-25  9:41 ` Sedat Dilek
2010-11-25 16:13   ` Sedat Dilek
2010-11-25 20:15     ` Rafael J. Wysocki
2010-11-25 20:29       ` Rafael J. Wysocki
2010-11-25 20:37         ` Sedat Dilek
2010-11-25 20:45           ` Rafael J. Wysocki
2010-11-26  8:12             ` Sedat Dilek
2010-11-26 19:26               ` Rafael J. Wysocki
2010-12-13 15:43 ` Sedat Dilek
2010-12-14  9:20   ` Sedat Dilek
  -- strict thread matches above, loose matches on Subject: below --
2010-11-24 23:01 Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox