From patchwork Tue Dec 18 12:41:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 207120 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 2EE432C0087 for ; Wed, 19 Dec 2012 00:51:43 +1100 (EST) Received: from localhost ([::1]:52137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkxa9-0006iU-0U for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 08:51:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwVc-0000HJ-Rl for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkwVb-00007v-2o for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:56 -0500 Received: from mail-bk0-f42.google.com ([209.85.214.42]:59743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwVa-00007f-RD for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:54 -0500 Received: by mail-bk0-f42.google.com with SMTP id ji2so290134bkc.1 for ; Tue, 18 Dec 2012 04:42:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=klP2fZaGmoDYGney6i5L2T74RAEiCkrlhIuTqpvd7uU=; b=pMlaUzvIbvPUCDoKNP/O4D76Us3qNOHKkE0iVsJHiPXHW9a00kRMSSGDR9BXJxFjGb QWraYOqmj/ZLI+Zxh2Rw5k7fPSmpiK+g4fHGnpEF/JqNexKM16N95QUfBfxWodNijrQx SfdM0cgL3axwl9miZUvQQ6FGnDneXYFd7U3fXXC3Oxa5AFO1K3bpwHq2e/1DI544QWaN 5G/L+kRyAuOpA1e645vIEyzHVZzfnJi79nleBsvjUIXivOSTjxqKZ3BeP2qYaJRk/fdl zd8oQe3/J+vrxVvGiFcXtcwWkPW8xweXQCIhUADKxr9gtqNn1XepxC4mG6PQaZNCc59C 19sA== X-Received: by 10.204.149.86 with SMTP id s22mr683416bkv.57.1355834573877; Tue, 18 Dec 2012 04:42:53 -0800 (PST) Received: from dhcp-192-168-178-175.ri.profitbricks.localdomain ([62.217.45.26]) by mx.google.com with ESMTPS id f24sm1169954bkv.7.2012.12.18.04.42.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 04:42:53 -0800 (PST) From: Vasilis Liaskovitis To: qemu-devel@nongnu.org, seabios@seabios.org Date: Tue, 18 Dec 2012 13:41:53 +0100 Message-Id: <1355834518-17989-26-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1355834518-17989-1-git-send-email-vasilis.liaskovitis@profitbricks.com> References: <1355834518-17989-1-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Gm-Message-State: ALoCoQkV5rmPtr0sS939SkdOvET9MkMYAOzcP7hfuRdRJn6dnt5JVrbGGqJlHj5NdkSl2Nwqm79r X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.214.42 Cc: Vasilis Liaskovitis , pingfank@linux.vnet.ibm.com, gleb@redhat.com, stefanha@gmail.com, jbaron@redhat.com, blauwirbel@gmail.com, kevin@koconnor.net, kraxel@redhat.com, anthony@codemonkey.ws Subject: [Qemu-devel] [RFC PATCH v4 25/30] acpi_ich9: add hot-remove capability 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 --- hw/acpi_ich9.c | 28 +++++++++++++++++++++++++++- hw/acpi_ich9.h | 1 + 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index abafbb5..f5dc1c9 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -105,12 +105,29 @@ static uint32_t memhp_readb(void *opaque, uint32_t addr) return val; } +static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) +{ + switch (addr) { + case ICH9_MEM_EJ_BASE - ICH9_MEM_BASE: + dimm_notify(val, DIMM_REMOVE_SUCCESS); + break; + default: + ICH9_DEBUG("memhp write invalid %x <== %d\n", addr, val); + } + ICH9_DEBUG("memhp write %x <== %d\n", addr, val); +} + static const MemoryRegionOps ich9_memhp_ops = { .old_portio = (MemoryRegionPortio[]) { { .offset = 0, .len = DIMM_BITMAP_BYTES, .size = 1, .read = memhp_readb, }, + { + .offset = ICH9_MEM_EJ_BASE - ICH9_MEM_BASE, + .len = 1, .size = 1, + .write = memhp_writeb, + }, PORTIO_END_OF_LIST() }, .endianness = DEVICE_LITTLE_ENDIAN, @@ -234,6 +251,13 @@ static void enable_mem_device(ICH9LPCState *s, int memdevice) g->mems_sts[memdevice/8] |= (1 << (memdevice%8)); } +static void disable_mem_device(ICH9LPCState *s, int memdevice) +{ + struct gpe_regs *g = &s->pm.gperegs; + s->pm.acpi_regs.gpe.sts[0] |= ICH9_MEM_HOTPLUG_STATUS; + g->mems_sts[memdevice/8] &= ~(1 << (memdevice%8)); +} + static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int add) { @@ -243,6 +267,8 @@ static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int if (add) { enable_mem_device(s, slot->idx); + } else { + disable_mem_device(s, slot->idx); } pm_update_sci(&s->pm); return 0; @@ -270,7 +296,7 @@ void ich9_pm_init(void *device, qemu_irq sci_irq, qemu_irq cmos_s3) memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); memory_region_init_io(&pm->io_memhp, &ich9_memhp_ops, pm, "apci-memhp0", - DIMM_BITMAP_BYTES); + DIMM_BITMAP_BYTES + 1); memory_region_add_subregion(get_system_io(), ICH9_MEM_BASE, &pm->io_memhp); dimm_bus_hotplug(ich9_dimm_hotplug, &lpc->d.qdev); diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h index 4419247..af61a2d 100644 --- a/hw/acpi_ich9.h +++ b/hw/acpi_ich9.h @@ -24,6 +24,7 @@ #include "acpi.h" #define ICH9_MEM_BASE 0xaf80 +#define ICH9_MEM_EJ_BASE 0xafa0 #define ICH9_MEM_HOTPLUG_STATUS 8 typedef struct ICH9LPCPMRegs {