From: "H. Peter Anvin" <hpa@zytor.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: linux-kernel@vger.kernel.org, lenb@kernel.org,
linux-acpi@vger.kernel.org, ming.m.lin@intel.com, rjw@sisk.pl,
x86@kernel.org
Subject: Re: [PATCH 2/2] x86/acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler.
Date: Tue, 17 Apr 2012 11:36:45 -0700 [thread overview]
Message-ID: <4F8DB83D.8000208@zytor.com> (raw)
In-Reply-To: <1334687359-9970-3-git-send-email-konrad.wilk@oracle.com>
On 04/17/2012 11:29 AM, Konrad Rzeszutek Wilk wrote:
> diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
> index 13ab720..d3a18a4 100644
> --- a/arch/x86/kernel/acpi/wakeup_32.S
> +++ b/arch/x86/kernel/acpi/wakeup_32.S
> @@ -74,8 +74,7 @@ restore_registers:
> ENTRY(do_suspend_lowlevel)
> call save_processor_state
> call save_registers
> - pushl $3
> - call acpi_enter_sleep_state
> + call acpi_enter_s3
> addl $4, %esp
>
You need to drop the %esp adjustment here.
> # In case of S3 failure, we'll emerge here. Jump
> diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
> index 8ea5164..fea733d 100644
> --- a/arch/x86/kernel/acpi/wakeup_64.S
> +++ b/arch/x86/kernel/acpi/wakeup_64.S
> @@ -71,9 +71,8 @@ ENTRY(do_suspend_lowlevel)
> movq %rsi, saved_rsi
>
> addq $8, %rsp
> - movl $3, %edi
> xorl %eax, %eax
> - call acpi_enter_sleep_state
> + call acpi_enter_s3
> /* in case something went wrong, restore the machine status and go on */
You can presumably remove the xorl here ... setting %eax to zero
immediately before calling a non-varadic C function is meaningless.
-hpa
next prev parent reply other threads:[~2012-04-17 18:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-17 18:29 [PATCH] gts and bfs fixes (v3) Konrad Rzeszutek Wilk
2012-04-17 18:29 ` [PATCH 1/2] ACPI: Convert wake_sleep_flags to a value instead of function (v4) Konrad Rzeszutek Wilk
2012-04-17 18:29 ` [PATCH 2/2] x86/acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler Konrad Rzeszutek Wilk
2012-04-17 18:36 ` H. Peter Anvin [this message]
2012-05-08 6:31 ` [PATCH] gts and bfs fixes (v3) Len Brown
2012-05-08 21:38 ` Rafael J. Wysocki
2012-05-08 21:53 ` Moore, Robert
-- strict thread matches above, loose matches on Subject: below --
2012-04-18 17:18 [PATCH] gts and bfs fixes (v4) Konrad Rzeszutek Wilk
2012-04-18 17:18 ` [PATCH 2/2] x86/acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler Konrad Rzeszutek Wilk
2012-04-18 19:48 ` Rafael J. Wysocki
2012-04-18 20:49 ` H. Peter Anvin
2012-04-18 21:02 ` Rafael J. Wysocki
2012-05-08 6:35 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F8DB83D.8000208@zytor.com \
--to=hpa@zytor.com \
--cc=konrad.wilk@oracle.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.m.lin@intel.com \
--cc=rjw@sisk.pl \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox