From patchwork Wed May 22 03:46:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 245498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 67D1F2C00A8 for ; Wed, 22 May 2013 13:49:50 +1000 (EST) Received: from localhost ([::1]:44901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf03g-0003RM-NA for incoming@patchwork.ozlabs.org; Tue, 21 May 2013 23:49:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf03B-0003QW-K4 for qemu-devel@nongnu.org; Tue, 21 May 2013 23:49:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uf036-00017m-KZ for qemu-devel@nongnu.org; Tue, 21 May 2013 23:49:17 -0400 Received: from [222.73.24.84] (port=11978 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf035-00010i-PB for qemu-devel@nongnu.org; Tue, 21 May 2013 23:49:12 -0400 X-IronPort-AV: E=Sophos;i="4.87,718,1363104000"; d="scan'208";a="7330106" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 22 May 2013 11:46:01 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r4M3mniL015976; Wed, 22 May 2013 11:48:50 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013052211473258-1419842 ; Wed, 22 May 2013 11:47:32 +0800 From: liguang To: qemu-devel@nongnu.org Date: Wed, 22 May 2013 11:46:34 +0800 Message-Id: <1369194397-608-2-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1369194397-608-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1369194397-608-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/22 11:47:32, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/22 11:47:33, Serialize complete at 2013/05/22 11:47:33 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Anthony Liguori , Stefan Berger , "Michael S. Tsirkin" , Bruce Rogers , Joel Schopp , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , liguang , Isaku Yamahata Subject: [Qemu-devel] [PATCH 1/4] acpi: add ACPI Embedded Controller support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org this work implemented Embedded Controller chip emulation which was defined at ACPI SEPC v5 chapter 12: "ACPI Embedded Controller Interface Specification" commonly Embedded Controller will emulate keyboard, mouse, handle ACPI defined operations and some low-speed devices like SMbus. Signed-off-by: liguang --- default-configs/x86_64-softmmu.mak | 1 + hw/acpi/Makefile.objs | 1 + hw/acpi/ec.c | 192 ++++++++++++++++++++++++++++++++++++ include/hw/acpi/ec.h | 29 ++++++ 4 files changed, 223 insertions(+), 0 deletions(-) create mode 100644 hw/acpi/ec.c create mode 100644 include/hw/acpi/ec.h diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 599b630..c654ae9 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -46,3 +46,4 @@ CONFIG_APIC=y CONFIG_IOAPIC=y CONFIG_ICC_BUS=y CONFIG_PVPANIC=y +CONFIG_ACPI_EC=y diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index a0b63b5..0936f17 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -1,2 +1,3 @@ common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o +common-obj-$(CONFIG_ACPI_EC) += ec.o diff --git a/hw/acpi/ec.c b/hw/acpi/ec.c new file mode 100644 index 0000000..24c2d5a --- /dev/null +++ b/hw/acpi/ec.c @@ -0,0 +1,192 @@ +#include "hw/acpi/ec.h" +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "sysemu/sysemu.h" + +#define TYPE_EC_DEV "ACPI Embedded Controller" +#define EC_DEV(obj) \ + OBJECT_CHECK(ECState, (obj), TYPE_EC_DEV) + +static uint8_t ec_acpi_space[EC_ACPI_SPACE_SIZE] = {0}; +static uint8_t sci_event; +static bool ec_enabled = false; + +typedef struct ECState { + ISADevice parent_obj; + + uint8_t cmd; + uint8_t status; + uint8_t data; + uint8_t buf; + qemu_irq irq; + MemoryRegion io; +} ECState; + +static NotifierList ec_sci_notifiers = + NOTIFIER_LIST_INITIALIZER(ec_sci_notifiers); +void qemu_register_ec_sci_notifier(Notifier *notifier) +{ + notifier_list_add(&ec_sci_notifiers, notifier); +} + +bool qemu_ec_enabled(void) +{ + return ec_enabled; +} + +void ec_dev_init(ISABus *isabus) +{ + isa_create_simple(isabus, TYPE_EC_DEV); +} + +void ec_acpi_event(uint8_t evt) +{ + sci_event = evt; +} + +static void ec_generate_sci(void) +{ + notifier_list_notify(&ec_sci_notifiers, NULL); +} + +static void acpi_data_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + ECState *s = opaque; + uint8_t tmp = val & 0xff; + + if (s->status & EC_ACPI_CMD) { + s->buf = tmp & 0xff; + s->status &= ~EC_ACPI_CMD; + } else { + switch (tmp) { + case EC_ACPI_CMD_READ: + if (tmp < EC_ACPI_SPACE_SIZE) { + s->data = ec_acpi_space[tmp]; + } + s->status |= EC_ACPI_OBF; + break; + case EC_ACPI_CMD_WRITE: + if (tmp < EC_ACPI_SPACE_SIZE) { + ec_acpi_space[s->buf] = tmp; + } + break; + case EC_ACPI_CMD_QUERY: + s->data = sci_event; + default: + break; + } + } + ec_generate_sci(); +} + +static uint64_t acpi_data_read(void *opaque, hwaddr addr, unsigned size) +{ + ECState *s = opaque; + + s->status &= ~(EC_ACPI_OBF | EC_ACPI_SCI); + + return s->data; +} + +static void acpi_cmd_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) +{ + ECState *s = opaque; + bool is_cmd = false; + + s->status |= EC_ACPI_CMD; + + switch (val & 0xff) { + case EC_ACPI_CMD_READ: + case EC_ACPI_CMD_WRITE: + is_cmd = true; + break; + case EC_ACPI_BURST_EN: + s->status |= EC_ACPI_BST; + s->data = 0x90; + is_cmd = true; + break; + case EC_ACPI_BURST_DN: + s->status &= ~EC_ACPI_BST; + is_cmd = true; + break; + case EC_ACPI_CMD_QUERY: + is_cmd = true; + default: + break; + } + if (is_cmd) { + s->cmd = val & 0xff; + ec_generate_sci(); + s->status |= EC_ACPI_SCI; + } else { + s->cmd = 0; + } +} + +static uint64_t acpi_status_read(void *opaque, hwaddr addr, unsigned size) +{ + ECState *s = opaque; + + return s->status; +} + +static const MemoryRegionOps io62_io_ops = { + .write = acpi_data_write, + .read = acpi_data_read, + .endianness = DEVICE_NATIVE_ENDIAN, + .impl = { + .min_access_size = 1, + .max_access_size = 1, + }, +}; + +static const MemoryRegionOps io66_io_ops = { + .write = acpi_cmd_write, + .read = acpi_status_read, + .endianness = DEVICE_NATIVE_ENDIAN, + .impl = { + .min_access_size = 1, + .max_access_size = 1, + }, +}; + +static int ec_dev_initfn(ISADevice *dev) +{ + ISADevice *isadev = dev; + ECState *s = EC_DEV(dev); + +/* isa_init_irq(isadev, &s->irq, 0xb); */ + + memory_region_init_io(&s->io, &io62_io_ops, NULL, "ec-acpi-data", 1); + isa_register_ioport(isadev, &s->io, 0x62); + + memory_region_init_io(&s->io + 1, &io66_io_ops, NULL, "ec-acpi-cmd", 1); + isa_register_ioport(isadev, &s->io + 1, 0x66); + + return 0; +} + +static void ec_class_initfn(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + ISADeviceClass *ic = ISA_DEVICE_CLASS(oc); + + dc->no_user = 1; + ic->init = ec_dev_initfn; + ec_enabled = true; +} + +static TypeInfo acpi_ec_info = { + .name = TYPE_EC_DEV, + .parent = TYPE_ISA_DEVICE, + .class_init = ec_class_initfn, + .instance_size = sizeof(ECState), +}; + +static void ec_register_type(void) +{ + type_register_static(&acpi_ec_info); +} + +type_init(ec_register_type); diff --git a/include/hw/acpi/ec.h b/include/hw/acpi/ec.h new file mode 100644 index 0000000..3556acd --- /dev/null +++ b/include/hw/acpi/ec.h @@ -0,0 +1,29 @@ +#ifndef __EC_H +#define __EC_H + +#include "hw/i386/pc.h" +#include "qemu/notify.h" + +#define EC_ACPI_SPACE_SIZE 0x80 + +#define EC_ACPI_CMD_PORT 0x66 +#define EC_ACPI_DATA_PORT 0x62 + +#define EC_ACPI_OBF 0x1 +#define EC_ACPI_IBF 0x2 +#define EC_ACPI_CMD 0x8 +#define EC_ACPI_BST 0x10 +#define EC_ACPI_SCI 0x20 + +#define EC_ACPI_CMD_READ 0x80 +#define EC_ACPI_CMD_WRITE 0x81 +#define EC_ACPI_BURST_EN 0x82 +#define EC_ACPI_BURST_DN 0x83 +#define EC_ACPI_CMD_QUERY 0x84 + +void qemu_register_ec_sci_notifier(Notifier *notifier); +bool qemu_ec_enabled(void); +void ec_dev_init(ISABus *isabus); +void ec_acpi_event(uint8_t evt); + +#endif