From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756308Ab2DXCHX (ORCPT ); Mon, 23 Apr 2012 22:07:23 -0400 Received: from ch1ehsobe004.messaging.microsoft.com ([216.32.181.184]:30770 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756185Ab2DXCHV (ORCPT ); Mon, 23 Apr 2012 22:07:21 -0400 X-SpamScore: -15 X-BigFish: VPS-15(zz1432N98dK4015I1447Mzz1202hzzz2dh668h839h944hd25h) X-Forefront-Antispam-Report: CIP:163.181.249.109;KIP:(null);UIP:(null);IPV:NLI;H:ausb3twp02.amd.com;RD:none;EFVD:NLI X-WSS-ID: 0M2YOK3-02-022-02 X-M-MSG: Date: Tue, 24 Apr 2012 10:07:09 +0800 From: Aaron Lu To: "Rafael J. Wysocki" CC: Len Brown , Lin Ming , , , , Zhang Rui , Andiry Xu , Alex He Subject: Re: [PATCH] ACPI: evaluate _PS3 when entering D3 Cold Message-ID: <20120424020708.GA10397@localhost.amd.com> References: <1333217910-29579-1-git-send-email-aaron.lu@amd.com> <201204231343.03382.rjw@sisk.pl> <20120423151327.GA4019@fedora> <201204232150.57812.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <201204232150.57812.rjw@sisk.pl> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginalArrivalTime: 24 Apr 2012 02:07:08.0996 (UTC) FILETIME=[F44F6840:01CD21BE] X-OriginatorOrg: amd.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 23, 2012 at 09:50:57PM +0200, Rafael J. Wysocki wrote: > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > > index 3263b68..187433f 100644 > > --- a/drivers/acpi/bus.c > > +++ b/drivers/acpi/bus.c > > @@ -273,6 +273,9 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state) > > } > > } else { > > if (device->power.states[state].flags.explicit_set) { > > + /* evaluate _PS3 instead of _PS4 when entering D3Cold */ > > + if (state == ACPI_STATE_D3) > > + object_name[3] -= 1; > > Can you just put '3' here directly? That'll be much cleaner than the > subtraction (that could have been -- as well). > > > status = acpi_evaluate_object(device->handle, > > object_name, NULL, NULL); > > if (ACPI_FAILURE(status)) { > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > > index 7417267..de2ae10 100644 > > --- a/drivers/acpi/scan.c > > +++ b/drivers/acpi/scan.c > > @@ -887,8 +887,12 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) > > /* Evaluate "_PSx" to see if we can do explicit sets */ > > object_name[2] = 'S'; > > status = acpi_get_handle(device->handle, object_name, &handle); > > - if (ACPI_SUCCESS(status)) > > + if (ACPI_SUCCESS(status)) { > > ps->flags.explicit_set = 1; > > + /* Also set D3Cold's explicit flag when _PS3 exists */ > > + if (i == ACPI_STATE_D3_HOT) > > + (ps+1)->flags.explicit_set = 1; > > Please don't use pointer arithmetics here. I know it _happens_ to work, > but I don't think it's appropriate in this situation at all. > Thanks for the suggestions. What about this? diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 3263b68..3a7860f 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -273,6 +273,9 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state) } } else { if (device->power.states[state].flags.explicit_set) { + /* Evaluate _PS3 when entering D3cold */ + if (state == ACPI_STATE_D3) + object_name[3] = '3'; status = acpi_evaluate_object(device->handle, object_name, NULL, NULL); if (ACPI_FAILURE(status)) { diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 7417267..734d946 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -908,6 +908,10 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) device->power.states[ACPI_STATE_D3].flags.valid = 1; device->power.states[ACPI_STATE_D3].power = 0; + /* Also set D3cold's explicit flag when _PS3 exists */ + if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set) + device->power.states[ACPI_STATE_D3].flags.explicit_set = 1; + acpi_bus_init_power(device); return 0; Thanks, Aaron