From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Grzegorz Uriasz <gorbak25@gmail.com>
Cc: artur@puzio.waw.pl, Wei Liu <wl@xen.org>,
jakub@bartmin.ski, Andrew Cooper <andrew.cooper3@citrix.com>,
marmarek@invisiblethingslab.com, Jan Beulich <jbeulich@suse.com>,
j.nowak26@student.uw.edu.pl, xen-devel@lists.xenproject.org
Subject: Re: [PATCH 1/1] x86/acpi: Use FADT flags to determine the PMTMR width
Date: Mon, 15 Jun 2020 09:05:49 +0200 [thread overview]
Message-ID: <20200615070549.GA735@Air-de-Roger> (raw)
In-Reply-To: <dba39869b788f7f9d937fac48f0476a0443925f0.1592142369.git.gorbak25@gmail.com>
On Sun, Jun 14, 2020 at 02:36:28PM +0000, Grzegorz Uriasz wrote:
> On some computers the bit width of the PM Timer as reported
> by ACPI is 32 bits when in fact the FADT flags report correctly
> that the timer is 24 bits wide. On affected machines such as the
> ASUS FX504GM and never gaming laptops this results in the inability
> to resume the machine from suspend. Without this patch suspend is
> broken on affected machines and even if a machine manages to resume
> correctly then the kernel time and xen timers are trashed.
>
> Signed-off-by: Grzegorz Uriasz <gorbak25@gmail.com>
> Tested-by: Grzegorz Uriasz <gorbak25@gmail.com>
Thanks for the patch! I'm not sure it's required to add your
Tested-by, I usually assume a patch has been tested by it's author
unless told otherwise.
> ---
> xen/arch/x86/acpi/boot.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
> index bcba52e232..2ad3eb4abc 100644
> --- a/xen/arch/x86/acpi/boot.c
> +++ b/xen/arch/x86/acpi/boot.c
> @@ -480,7 +480,10 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
> if (fadt->xpm_timer_block.space_id ==
> ACPI_ADR_SPACE_SYSTEM_IO) {
> pmtmr_ioport = fadt->xpm_timer_block.address;
> - pmtmr_width = fadt->xpm_timer_block.bit_width;
> + if (fadt->flags & ACPI_FADT_32BIT_TIMER)
> + pmtmr_width = 32;
> + else
> + pmtmr_width = 24;
I think there's also a block below that you need to fix, when
xpm_timer_block is not set the data is fetched from pm_timer_block
instead, which AFAICT also needs to take ACPI_FADT_32BIT_TIMER into
account in order to use the correct size.
FWIW, I would set pmtmr_width only once after pmtmr_ioport has been
set, since regardless of whether the port is discovered using
xpm_timer_block or pm_timer_block the size will always be derived from
the flags field.
Thanks, Roger.
next prev parent reply other threads:[~2020-06-15 7:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-14 14:36 [PATCH 0/1] Fix broken suspend on some machines Grzegorz Uriasz
2020-06-14 14:36 ` [PATCH 1/1] x86/acpi: Use FADT flags to determine the PMTMR width Grzegorz Uriasz
2020-06-15 7:05 ` Roger Pau Monné [this message]
2020-06-16 8:07 ` Jan Beulich
2020-06-16 10:32 ` Roger Pau Monné
2020-06-16 12:31 ` Jan Beulich
2020-06-16 13:25 ` Jan Beulich
2020-06-16 14:59 ` Roger Pau Monné
2020-06-16 15:10 ` Grzegorz Uriasz
2020-06-16 15:13 ` Jan Beulich
2020-06-16 15:11 ` Jan Beulich
2020-06-16 15:25 ` Roger Pau Monné
2020-06-17 6:16 ` Grzegorz Uriasz
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=20200615070549.GA735@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=artur@puzio.waw.pl \
--cc=gorbak25@gmail.com \
--cc=j.nowak26@student.uw.edu.pl \
--cc=jakub@bartmin.ski \
--cc=jbeulich@suse.com \
--cc=marmarek@invisiblethingslab.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).