[PATCH 1/2] ACPI/Sleep: Add init_nvs_nosave_s3() function

[PATCH 1/2] ACPI/Sleep: Add init_nvs_nosave_s3() function

[Lan Tianyu]

commit 1bad2f19f7f7 introduces nvs_nosave_s3 flag to just ban
saving nvs in ths s3 rather than both of s3 and s4. This patch
is to add init_nvs_nosave_s3() to set nvs_nosave_s3 to true for
those machines in the nonvs blacklist which only don't need to
saving nvs during s3 rather than both s3 and s4.

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
---
 drivers/acpi/sleep.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 2fcc67d..405b962 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -141,6 +141,12 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
 	return 0;
 }
 
+static int __init init_nvs_nosave_s3(const struct dmi_system_id *d)
+{
+	acpi_nvs_nosave_s3();
+	return 0;
+}
+
 static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 	{
 	.callback = init_old_suspend_ordering,
-- 
1.7.10.4

[PATCH 2/2] ACPI/Sleep: use init_nvs_nosave_s3() for Sony Vaio VPCCW29FX and VPCEB1S1E callback in the non-nvs blacklist

[Lan Tianyu]

Sony Vaio VPCCW29FX and VPCEB1S1E just need to ban saving
nvs during s3 rather than both s3 and s4. So this patch is
to set their callbacks to be init_nvs_nosave_s3().

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
---
 drivers/acpi/sleep.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 405b962..ee33a9a 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -230,7 +230,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 		},
 	},
 	{
-	.callback = init_nvs_nosave,
+	.callback = init_nvs_nosave_s3,
 	.ident = "Sony Vaio VPCCW29FX",
 	.matches = {
 		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
@@ -270,7 +270,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 		},
 	},
 	{
-	.callback = init_nvs_nosave,
+	.callback = init_nvs_nosave_s3,
 	.ident = "Sony Vaio VPCEB1S1E",
 	.matches = {
 		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-- 
1.7.10.4

Re: [PATCH 1/2] ACPI/Sleep: Add init_nvs_nosave_s3() function

[Rafael J. Wysocki]

On Monday, January 28, 2013 03:47:04 PM Lan Tianyu wrote:
> commit 1bad2f19f7f7 introduces nvs_nosave_s3 flag to just ban
> saving nvs in ths s3 rather than both of s3 and s4. This patch
> is to add init_nvs_nosave_s3() to set nvs_nosave_s3 to true for
> those machines in the nonvs blacklist which only don't need to
> saving nvs during s3 rather than both s3 and s4.
> 
> Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>

Please fold [2/2] into [1/2] and resend.

Thanks,
Rafael


> ---
>  drivers/acpi/sleep.c |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
> index 2fcc67d..405b962 100644
> --- a/drivers/acpi/sleep.c
> +++ b/drivers/acpi/sleep.c
> @@ -141,6 +141,12 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
>  	return 0;
>  }
>  
> +static int __init init_nvs_nosave_s3(const struct dmi_system_id *d)
> +{
> +	acpi_nvs_nosave_s3();
> +	return 0;
> +}
> +
>  static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
>  	{
>  	.callback = init_old_suspend_ordering,
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH 1/2] ACPI/Sleep: Add init_nvs_nosave_s3() function

[Lan Tianyu]

于 2013/1/28 20:21, Rafael J. Wysocki 写道:
> On Monday, January 28, 2013 03:47:04 PM Lan Tianyu wrote:
>> commit 1bad2f19f7f7 introduces nvs_nosave_s3 flag to just ban
>> saving nvs in ths s3 rather than both of s3 and s4. This patch
>> is to add init_nvs_nosave_s3() to set nvs_nosave_s3 to true for
>> those machines in the nonvs blacklist which only don't need to
>> saving nvs during s3 rather than both s3 and s4.
>>
>> Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
>
> Please fold [2/2] into [1/2] and resend.
>
Ok. I get it and will update.
> Thanks,
> Rafael
>
>
>> ---
>>   drivers/acpi/sleep.c |    6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
>> index 2fcc67d..405b962 100644
>> --- a/drivers/acpi/sleep.c
>> +++ b/drivers/acpi/sleep.c
>> @@ -141,6 +141,12 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
>>   	return 0;
>>   }
>>
>> +static int __init init_nvs_nosave_s3(const struct dmi_system_id *d)
>> +{
>> +	acpi_nvs_nosave_s3();
>> +	return 0;
>> +}
>> +
>>   static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
>>   	{
>>   	.callback = init_old_suspend_ordering,
>>

-- 
Best regards
Tianyu Lan
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html