From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUi5H-00030h-Eu for qemu-devel@nongnu.org; Wed, 04 Feb 2009 08:46:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUi5G-00030C-Qu for qemu-devel@nongnu.org; Wed, 04 Feb 2009 08:46:30 -0500 Received: from [199.232.76.173] (port=37329 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUi5G-000306-D0 for qemu-devel@nongnu.org; Wed, 04 Feb 2009 08:46:30 -0500 Received: from mx2.redhat.com ([66.187.237.31]:34153) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LUi5F-0000hv-R9 for qemu-devel@nongnu.org; Wed, 04 Feb 2009 08:46:30 -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 n14DkTqV010805 for ; Wed, 4 Feb 2009 08:46:29 -0500 Message-Id: <20090204133924.766955393@localhost.localdomain> References: <20090204133303.113145633@localhost.localdomain> Date: Wed, 04 Feb 2009 11:33:19 -0200 From: Marcelo Tosatti Content-Disposition: inline; filename=gpe Subject: [Qemu-devel] [patch 16/18] qemu: initialize hot add system / acpi gpe Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti ACPI GPE support, used by PCI (and CPU) hotplug. From: Glauber Costa Signed-off-by: Marcelo Tosatti Index: trunk/hw/acpi.c =================================================================== --- trunk.orig/hw/acpi.c +++ trunk/hw/acpi.c @@ -561,3 +561,71 @@ void qemu_system_powerdown(void) } } #endif + +#define GPE_BASE 0xafe0 + +struct gpe_regs { + uint16_t sts; /* status */ + uint16_t en; /* enabled */ +}; + +static struct gpe_regs gpe; + +static uint32_t gpe_readb(void *opaque, uint32_t addr) +{ + uint32_t val = 0; + struct gpe_regs *g = opaque; + switch (addr) { + case GPE_BASE: + val = g->sts & 0xFF; + break; + case GPE_BASE + 1: + val = (g->sts >> 8) & 0xFF; + break; + case GPE_BASE + 2: + val = g->en & 0xFF; + break; + case GPE_BASE + 3: + val = (g->en >> 8) & 0xFF; + break; + default: + break; + } + +#if defined(DEBUG) + printf("gpe read %lx == %lx\n", addr, val); +#endif + return val; +} + +static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val) +{ + struct gpe_regs *g = opaque; + switch (addr) { + case GPE_BASE: + g->sts = (g->sts & ~0xFFFF) | (val & 0xFFFF); + break; + case GPE_BASE + 1: + g->sts = (g->sts & 0xFFFF) | (val << 8); + break; + case GPE_BASE + 2: + g->en = (g->en & ~0xFFFF) | (val & 0xFFFF); + break; + case GPE_BASE + 3: + g->en = (g->en & 0xFFFF) | (val << 8); + break; + default: + break; + } + +#if defined(DEBUG) + printf("gpe write %lx <== %d\n", addr, val); +#endif +} + +void qemu_system_hot_add_init(void) +{ + register_ioport_write(GPE_BASE, 4, 1, gpe_writeb, &gpe); + register_ioport_read(GPE_BASE, 4, 1, gpe_readb, &gpe); + +} Index: trunk/hw/pc.c =================================================================== --- trunk.orig/hw/pc.c +++ trunk/hw/pc.c @@ -1010,6 +1010,8 @@ vga_bios_error: pci_nic_init(pci_bus, nd, -1, "ne2k_pci"); } + qemu_system_hot_add_init(); + if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { fprintf(stderr, "qemu: too many IDE bus\n"); exit(1); Index: trunk/sysemu.h =================================================================== --- trunk.orig/sysemu.h +++ trunk/sysemu.h @@ -166,6 +166,9 @@ extern int nb_drives_opt; extern int drive_add(const char *file, const char *fmt, ...); extern int drive_init(struct drive_opt *arg, int snapshot, void *machine); +/* acpi */ +void qemu_system_hot_add_init(void); + /* serial ports */ #define MAX_SERIAL_PORTS 4 --