From patchwork Tue Jan 24 10:10:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 137536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49699B6EF2 for ; Tue, 24 Jan 2012 21:11:22 +1100 (EST) Received: from localhost ([::1]:38429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpdLQ-0001IM-SG for incoming@patchwork.ozlabs.org; Tue, 24 Jan 2012 05:11:16 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpdKY-0007oP-6S for qemu-devel@nongnu.org; Tue, 24 Jan 2012 05:10:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpdKX-0002MW-3w for qemu-devel@nongnu.org; Tue, 24 Jan 2012 05:10:22 -0500 Received: from mail-bk0-f45.google.com ([209.85.214.45]:42730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpdKW-0002Kd-RC for qemu-devel@nongnu.org; Tue, 24 Jan 2012 05:10:20 -0500 Received: by mail-bk0-f45.google.com with SMTP id zu17so1481247bkb.4 for ; Tue, 24 Jan 2012 02:10:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.204.148.84 with SMTP id o20mr2609490bkv.103.1327399820293; Tue, 24 Jan 2012 02:10:20 -0800 (PST) Received: from dhcp-192-168-178-175.profitbricks.localdomain (83-221-87-64.dynamic.primacom.net. [83.221.87.64]) by mx.google.com with ESMTPS id ek9sm35105845bkb.10.2012.01.24.02.10.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jan 2012 02:10:19 -0800 (PST) From: Vasilis Liaskovitis To: kvm@vger.kernel.org, qemu-devel@nongnu.org, seabios@seabios.org Date: Tue, 24 Jan 2012 11:10:07 +0100 Message-Id: <1327399808-31081-4-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1327399808-31081-1-git-send-email-vasilis.liaskovitis@profitbricks.com> References: <1327399808-31081-1-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Gm-Message-State: ALoCoQn/RNxKCJiarzLWHrwwzWdcMnHj0fAZsj9+RsfQwi3EpKsmEgyv4OEGvGGXlniVySRlqKes X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: gleb@redhat.com, jan.kiszka@siemens.com, mtosatti@redhat.com, kernelfans@gmail.com, Vasilis Liaskovitis , kevin@koconnor.net, avi@redhat.com Subject: [Qemu-devel] [PATCH v2 3/4] uq/master: Add CPU eject handling for acpi_piix4 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 Add stub functions for CPU eject callback. Define cpu_acpi_eject property and enable eject callback only for pc-1.1 machine model. Signed-off-by: Vasilis Liaskovitis --- hw/acpi_piix4.c | 20 ++++++++++++++++++++ hw/pc_piix.c | 8 ++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 96e1ce8..8475aa6 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -40,6 +40,7 @@ #define GPE_BASE 0xafe0 #define PROC_BASE 0xaf00 +#define PROC_EJ_BASE 0xaf20 #define GPE_LEN 4 #define PCI_BASE 0xae00 #define PCI_EJ_BASE 0xae08 @@ -80,6 +81,8 @@ typedef struct PIIX4PMState { struct gpe_regs gpe_cpu; struct pci_status pci0_status; uint32_t pci0_hotplug_enable; + /* for cpu hotplug */ + uint32_t cpu_acpi_eject; } PIIX4PMState; static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s); @@ -424,6 +427,7 @@ static PCIDeviceInfo piix4_pm_info = { .class_id = PCI_CLASS_BRIDGE_OTHER, .qdev.props = (Property[]) { DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0), + DEFINE_PROP_UINT32("cpu_acpi_eject", PIIX4PMState, cpu_acpi_eject, 0), DEFINE_PROP_END_OF_LIST(), } }; @@ -497,6 +501,17 @@ static void pcihotplug_write(void *opaque, uint32_t addr, uint32_t val) PIIX4_DPRINTF("pcihotplug write %x <== %d\n", addr, val); } +static uint32_t cpuej_read(void *opaque, uint32_t addr) +{ + PIIX4_DPRINTF("cpuej read %x\n", addr); + return 0; +} + +static void cpuej_write(void *opaque, uint32_t addr, uint32_t val) +{ + PIIX4_DPRINTF("cpuej write %x <== %d\n", addr, val); +} + static uint32_t pciej_read(void *opaque, uint32_t addr) { PIIX4_DPRINTF("pciej read %x\n", addr); @@ -555,6 +570,11 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) register_ioport_write(PROC_BASE, 32, 1, gpe_writeb, s); register_ioport_read(PROC_BASE, 32, 1, gpe_readb, s); + if (s->cpu_acpi_eject) { + register_ioport_write(PROC_EJ_BASE, 32, 1, cpuej_write, s); + register_ioport_read(PROC_EJ_BASE, 32, 1, cpuej_read, s); + } + register_ioport_write(PCI_BASE, 8, 4, pcihotplug_write, pci0_status); register_ioport_read(PCI_BASE, 8, 4, pcihotplug_read, pci0_status); diff --git a/hw/pc_piix.c b/hw/pc_piix.c index ac251c6..6d61567 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -380,6 +380,14 @@ static QEMUMachine pc_machine_v1_1 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + { + .driver = "PIIX4_PM", + .property = "cpu_acpi_eject", + .value = stringify(1), + }, + { /* end of list */ } + }, }; static QEMUMachine pc_machine_v1_0 = {