From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfsBl-00015p-HV for qemu-devel@nongnu.org; Tue, 04 Dec 2012 08:05:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfsBc-00069a-0y for qemu-devel@nongnu.org; Tue, 04 Dec 2012 08:05:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfsBb-00069E-PV for qemu-devel@nongnu.org; Tue, 04 Dec 2012 08:05:19 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB4D5JZC019822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 4 Dec 2012 08:05:19 -0500 From: Gerd Hoffmann Date: Tue, 4 Dec 2012 14:05:07 +0100 Message-Id: <1354626315-31186-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1354626315-31186-1-git-send-email-kraxel@redhat.com> References: <1354626315-31186-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/18] apci: switch ich9 smi to memory api List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/acpi_ich9.c | 46 ++++++++++++++++++++++++++++++++++++---------- hw/acpi_ich9.h | 1 + 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index 5fc160a..0ed17da 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -119,12 +119,7 @@ static uint32_t pm_ioport_readw(void *opaque, uint32_t addr) static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val) { - ICH9LPCPMRegs *pm = opaque; - switch (addr & ICH9_PMIO_MASK) { - case ICH9_PMIO_SMI_EN: - pm->smi_en = val; - break; default: pm_ioport_write_fallback(opaque, addr, 4, val); break; @@ -134,14 +129,9 @@ static void pm_ioport_writel(void *opaque, uint32_t addr, uint32_t val) static uint32_t pm_ioport_readl(void *opaque, uint32_t addr) { - ICH9LPCPMRegs *pm = opaque; uint32_t val; switch (addr & ICH9_PMIO_MASK) { - case ICH9_PMIO_SMI_EN: - val = pm->smi_en; - break; - default: val = pm_ioport_read_fallback(opaque, addr, 4); break; @@ -223,6 +213,38 @@ static const MemoryRegionOps ich9_gpe_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; +static uint64_t ich9_smi_readl(void *opaque, hwaddr addr, unsigned width) +{ + ICH9LPCPMRegs *pm = opaque; + switch (addr) { + case 0: + return pm->smi_en; + case 4: + return pm->smi_sts; + default: + return 0; + } +} + +static void ich9_smi_writel(void *opaque, hwaddr addr, uint64_t val, + unsigned width) +{ + ICH9LPCPMRegs *pm = opaque; + switch (addr) { + case 0: + pm->smi_en = val; + break; + } +} + +static const MemoryRegionOps ich9_smi_ops = { + .read = ich9_smi_readl, + .write = ich9_smi_writel, + .valid.min_access_size = 4, + .valid.max_access_size = 4, + .endianness = DEVICE_LITTLE_ENDIAN, +}; + void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base) { ICH9_DEBUG("to 0x%x\n", pm_io_base); @@ -318,6 +340,10 @@ void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3) ICH9_PMIO_GPE0_LEN); memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe); + memory_region_init_io(&pm->io_smi, &ich9_smi_ops, pm, "apci-smi", + 8); + memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); + pm->irq = sci_irq; qemu_register_reset(pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req; diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h index f3b05d7..bc221d3 100644 --- a/hw/acpi_ich9.h +++ b/hw/acpi_ich9.h @@ -32,6 +32,7 @@ typedef struct ICH9LPCPMRegs { ACPIREGS acpi_regs; MemoryRegion io; MemoryRegion io_gpe; + MemoryRegion io_smi; uint32_t smi_en; uint32_t smi_sts; -- 1.7.1