From patchwork Thu Feb 5 13:42:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 5641 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n15DjDBU019193 for ; Thu, 5 Feb 2009 13:45:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752329AbZBENpK (ORCPT ); Thu, 5 Feb 2009 08:45:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754954AbZBENpK (ORCPT ); Thu, 5 Feb 2009 08:45:10 -0500 Received: from mx2.redhat.com ([66.187.237.31]:53976 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752329AbZBENpJ (ORCPT ); Thu, 5 Feb 2009 08:45:09 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n15Dj9PZ024791 for ; Thu, 5 Feb 2009 08:45:09 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n15Dj8pU002691; Thu, 5 Feb 2009 08:45:09 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n15Dj4el009658; Thu, 5 Feb 2009 08:45:06 -0500 Received: from dhcp-1-237.tlv.redhat.com (localhost [127.0.0.1]) by dhcp-1-237.tlv.redhat.com (Postfix) with ESMTP id 7BA0C18D43A; Thu, 5 Feb 2009 15:42:41 +0200 (IST) From: Gleb Natapov Subject: [PATCH 1/4] Fix GPE registers read/write handling. To: avi@redhat.com Cc: kvm@vger.kernel.org Date: Thu, 05 Feb 2009 15:42:41 +0200 Message-ID: <20090205134240.20515.10999.stgit@dhcp-1-237.tlv.redhat.com> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For STS register bit are cleared by writing 1 into it. Signed-off-by: Gleb Natapov --- qemu/hw/acpi.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c index b998225..7074166 100644 --- a/qemu/hw/acpi.c +++ b/qemu/hw/acpi.c @@ -590,6 +590,13 @@ struct pci_status { static struct gpe_regs gpe; static struct pci_status pci0_status; +static uint32_t gpe_read_val(uint16_t val, uint32_t addr) +{ + if (addr & 1) + return (val >> 8) & 0xff; + return val & 0xff; +} + static uint32_t gpe_readb(void *opaque, uint32_t addr) { uint32_t val = 0; @@ -603,16 +610,12 @@ static uint32_t gpe_readb(void *opaque, uint32_t addr) break; case GPE_BASE: - val = g->sts & 0xFF; - break; case GPE_BASE + 1: - val = (g->sts >> 8) & 0xFF; + val = gpe_read_val(g->sts, addr); break; case GPE_BASE + 2: - val = g->en & 0xFF; - break; case GPE_BASE + 3: - val = (g->en >> 8) & 0xFF; + val = gpe_read_val(g->en, addr); break; default: break; @@ -624,6 +627,26 @@ static uint32_t gpe_readb(void *opaque, uint32_t addr) return val; } +static void gpe_write_val(uint16_t *cur, int addr, uint32_t val) +{ + if (addr & 1) + *cur = (*cur & 0xff) | (val << 8); + else + *cur = (*cur & 0xff00) | (val & 0xff); +} + +static void gpe_reset_val(uint16_t *cur, int addr, uint32_t val) +{ + uint16_t x1, x0 = val & 0xff; + int shift = (addr & 1) ? 8 : 0; + + x1 = (*cur >> shift) & 0xff; + + x1 = x1 & ~x0; + + *cur = (*cur & (0xff << (8 - shift))) | (x1 << shift); +} + static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val) { struct gpe_regs *g = opaque; @@ -636,16 +659,12 @@ static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val) break; case GPE_BASE: - g->sts = (g->sts & ~0xFFFF) | (val & 0xFFFF); - break; case GPE_BASE + 1: - g->sts = (g->sts & 0xFFFF) | (val << 8); + gpe_reset_val(&g->sts, addr, val); break; case GPE_BASE + 2: - g->en = (g->en & ~0xFFFF) | (val & 0xFFFF); - break; case GPE_BASE + 3: - g->en = (g->en & 0xFFFF) | (val << 8); + gpe_write_val(&g->en, addr, val); break; default: break;