[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] fix acpi regression
From: |
Isaku Yamahata |
Subject: |
Re: [Qemu-devel] [PATCH] fix acpi regression |
Date: |
Tue, 12 Apr 2011 17:48:50 +0900 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Tue, Apr 12, 2011 at 01:13:15PM +0800, Wen Congyang wrote:
> This bug is introduced by commit 23910d3f.
Oh, Thanks. Good catch. I agree with the first hunk.
But what is the second hunk for? The GPE STS register is W1C.
(NULL check and 0xff masking is okay. it's a bit redundant, though)
>From ACPI4 spec 4.7.4.1.1.
can only be cleared by software writing a "1" to its respective bit position.
thanks,
>
> Signed-off-by: Wen Congyang <address@hidden>
>
> ---
> hw/acpi.c | 10 +++-------
> 1 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/hw/acpi.c b/hw/acpi.c
> index e372474..790bd3b 100644
> --- a/hw/acpi.c
> +++ b/hw/acpi.c
> @@ -355,7 +355,7 @@ static uint8_t *acpi_gpe_ioport_get_ptr(ACPIGPE *gpe,
> uint32_t addr)
> if (addr < gpe->len / 2) {
> cur = gpe->sts + addr;
> } else if (addr < gpe->len) {
> - cur = gpe->en + addr;
> + cur = gpe->en + addr - gpe->len / 2;
> } else {
> abort();
> }
> @@ -369,12 +369,8 @@ void acpi_gpe_ioport_writeb(ACPIGPE *gpe, uint32_t addr,
> uint32_t val)
>
> addr -= gpe->blk;
> cur = acpi_gpe_ioport_get_ptr(gpe, addr);
> - if (addr < gpe->len / 2) {
> - /* GPE_STS */
> - *cur = (*cur) & ~val;
> - } else if (addr < gpe->len) {
> - /* GPE_EN */
> - *cur = val;
> + if (cur != NULL) {
> + *cur = val & 0xff;
> } else {
> abort();
> }
> --
> 1.7.1
>
--
yamahata