From patchwork Tue Jan 5 06:27:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F34F3B6EDD for ; Wed, 6 Jan 2010 08:27:38 +1100 (EST) Received: from localhost ([127.0.0.1]:53852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSGwB-00048i-IN for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 16:27:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSFPy-0007Z9-7m for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSFPt-0007VV-Lv for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:13 -0500 Received: from [199.232.76.173] (port=40923 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSFPs-0007Um-Eh for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:09 -0500 Received: from mx20.gnu.org ([199.232.41.8]:36255) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSFPr-0003Ef-Tn for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:08 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NS2uT-0003p6-P7 for qemu-devel@nongnu.org; Tue, 05 Jan 2010 01:28:54 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id ED68A18298; Tue, 5 Jan 2010 15:27:45 +0900 (JST) Received: (nullmailer pid 22647 invoked by uid 1000); Tue, 05 Jan 2010 06:27:50 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Tue, 5 Jan 2010 15:27:25 +0900 Message-Id: <1262672870-22607-3-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> References: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V11 02/27] acpi: split out apm register emulation from acpi.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Split out apm register emulation for acpi.c into pc_apm.c. The apm emulation will be used later. Signed-off-by: Isaku Yamahata --- Makefile.target | 4 +- hw/acpi.c | 57 ++++++++++-------------------------- hw/pc_apm.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/pc_apm.h | 22 ++++++++++++++ 4 files changed, 125 insertions(+), 43 deletions(-) create mode 100644 hw/pc_apm.c create mode 100644 hw/pc_apm.h diff --git a/Makefile.target b/Makefile.target index 2cde15f..94ab0ec 100644 --- a/Makefile.target +++ b/Makefile.target @@ -195,7 +195,7 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += ne2000-isa.o -obj-i386-y += pc_smbus.o +obj-i386-y += pc_smbus.o pc_apm.o # shared objects obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o @@ -226,7 +226,7 @@ obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o obj-mips-y += piix4.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y) obj-mips-y += mipsnet.o ne2000-isa.o -obj-mips-y += pc_smbus.o +obj-mips-y += pc_smbus.o pc_apm.o obj-mips-y += pflash_cfi01.o obj-mips-y += vmware_vga.o diff --git a/hw/acpi.c b/hw/acpi.c index 507b308..0e2f576 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -17,6 +17,7 @@ */ #include "hw.h" #include "pc.h" +#include "pc_apm.h" #include "pc_smbus.h" #include "pci.h" #include "qemu-timer.h" @@ -37,8 +38,9 @@ typedef struct PIIX4PMState { uint16_t pmsts; uint16_t pmen; uint16_t pmcntrl; - uint8_t apmc; - uint8_t apms; + + APMState apm; + QEMUTimer *tmr_timer; int64_t tmr_overflow_time; @@ -217,46 +219,20 @@ static uint32_t pm_ioport_readl(void *opaque, uint32_t addr) return val; } -static void pm_smi_writeb(void *opaque, uint32_t addr, uint32_t val) +static void apm_ctrl_changed(uint32_t val, void *arg) { - PIIX4PMState *s = opaque; - addr &= 1; -#ifdef DEBUG - printf("pm_smi_writeb addr=0x%x val=0x%02x\n", addr, val); -#endif - if (addr == 0) { - s->apmc = val; - - /* ACPI specs 3.0, 4.7.2.5 */ - if (val == ACPI_ENABLE) { - s->pmcntrl |= SCI_EN; - } else if (val == ACPI_DISABLE) { - s->pmcntrl &= ~SCI_EN; - } + PIIX4PMState *s = arg; - if (s->dev.config[0x5b] & (1 << 1)) { - cpu_interrupt(first_cpu, CPU_INTERRUPT_SMI); - } - } else { - s->apms = val; + /* ACPI specs 3.0, 4.7.2.5 */ + if (val == ACPI_ENABLE) { + s->pmcntrl |= SCI_EN; + } else if (val == ACPI_DISABLE) { + s->pmcntrl &= ~SCI_EN; } -} -static uint32_t pm_smi_readb(void *opaque, uint32_t addr) -{ - PIIX4PMState *s = opaque; - uint32_t val; - - addr &= 1; - if (addr == 0) { - val = s->apmc; - } else { - val = s->apms; + if (s->dev.config[0x5b] & (1 << 1)) { + cpu_interrupt(first_cpu, CPU_INTERRUPT_SMI); } -#ifdef DEBUG - printf("pm_smi_readb addr=0x%x val=0x%02x\n", addr, val); -#endif - return val; } static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) @@ -312,8 +288,7 @@ static const VMStateDescription vmstate_acpi = { VMSTATE_UINT16(pmsts, PIIX4PMState), VMSTATE_UINT16(pmen, PIIX4PMState), VMSTATE_UINT16(pmcntrl, PIIX4PMState), - VMSTATE_UINT8(apmc, PIIX4PMState), - VMSTATE_UINT8(apms, PIIX4PMState), + VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_pc_apm, APMState), VMSTATE_TIMER(tmr_timer, PIIX4PMState), VMSTATE_INT64(tmr_overflow_time, PIIX4PMState), VMSTATE_END_OF_LIST() @@ -373,8 +348,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, pci_conf[0x40] = 0x01; /* PM io base read only bit */ - register_ioport_write(0xb2, 2, 1, pm_smi_writeb, s); - register_ioport_read(0xb2, 2, 1, pm_smi_readb, s); + /* APM */ + apm_init(&s->apm, apm_ctrl_changed, s); register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s); diff --git a/hw/pc_apm.c b/hw/pc_apm.c new file mode 100644 index 0000000..f6bcd7d --- /dev/null +++ b/hw/pc_apm.c @@ -0,0 +1,85 @@ +/* + * QEMU PC APM controller Emulation + * This is split out from acpi.c + * + * Copyright (c) 2006 Fabrice Bellard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +#include "pc_apm.h" +#include "hw.h" +#include "isa.h" + +//#define DEBUG + +/* fixed I/O location */ +#define APM_CNT_IOPORT 0xb2 +#define APM_STS_IOPORT 0xb3 + +static void apm_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) +{ + APMState *apm = opaque; + addr &= 1; +#ifdef DEBUG + printf("apm_ioport_writeb addr=0x%x val=0x%02x\n", addr, val); +#endif + if (addr == 0) { + apm->apmc = val; + + if (apm->callback) { + (apm->callback)(val, apm->arg); + } + } else { + apm->apms = val; + } +} + +static uint32_t apm_ioport_readb(void *opaque, uint32_t addr) +{ + APMState *apm = opaque; + uint32_t val; + + addr &= 1; + if (addr == 0) { + val = apm->apmc; + } else { + val = apm->apms; + } +#ifdef DEBUG + printf("apm_ioport_readb addr=0x%x val=0x%02x\n", addr, val); +#endif + return val; +} + +const VMStateDescription vmstate_pc_apm = { + .name = "PC APM State", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT8(apmc, APMState), + VMSTATE_UINT8(apms, APMState), + VMSTATE_END_OF_LIST() + } +}; + +void apm_init(APMState *apm, apm_ctrl_changed_t callback, void *arg) +{ + apm->callback = callback; + apm->arg = arg; + + /* ioport 0xb2, 0xb3 */ + register_ioport_write(APM_CNT_IOPORT, 2, 1, apm_ioport_writeb, apm); + register_ioport_read(APM_CNT_IOPORT, 2, 1, apm_ioport_readb, apm); +} diff --git a/hw/pc_apm.h b/hw/pc_apm.h new file mode 100644 index 0000000..e8ff034 --- /dev/null +++ b/hw/pc_apm.h @@ -0,0 +1,22 @@ +#ifndef PC_APM_H +#define PC_APM_H + +#include +#include "qemu-common.h" +#include "hw.h" + +typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg); + +typedef struct APMState { + uint8_t apmc; + uint8_t apms; + + apm_ctrl_changed_t callback; + void *arg; +} APMState; + +void apm_init(APMState *s, apm_ctrl_changed_t callback, void *arg); + +extern const VMStateDescription vmstate_pc_apm; + +#endif /* PC_APM_H */