From patchwork Tue Dec 18 12:41:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 207140 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 9E3D92C0080 for ; Wed, 19 Dec 2012 01:35:26 +1100 (EST) Received: from localhost ([::1]:35576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkyGS-0007aQ-Od for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 09:35:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwVa-0000H3-Kv for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkwVZ-00007O-DS for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:54 -0500 Received: from mail-bk0-f44.google.com ([209.85.214.44]:51113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwVZ-00007H-6Z for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:53 -0500 Received: by mail-bk0-f44.google.com with SMTP id w11so286745bku.17 for ; Tue, 18 Dec 2012 04:42:52 -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=RUK+owiDKJDAPQ/q/9PWQCbhlK4fztsj77gcoX3GXDA=; b=YbNk7z5PclyYEq1B4napcVoLxnZ2udnJFzXOICBNYZIDmP6L91mP6v32Bm9x96WTzW +tmewoqYI239Hknlfys+ZrjpbkdLZIJD/zHPVDh74rjP/XTOe9NNVns2C8RBK8kyYvIq uqSjhkaPGl8uT2AQuTTcOZEjn5hXiO32KJhEf7xUT6H7LStFvPwLytNgQ3FytZwPKrVw REwzoVO8bFU6NMgqmk56WJIaSQaolF/jqqVKkc0lpBqLvfIzSoJXqvy2AETsuviA2Q5b yDAj4dQg5V4UGl7QV/0owbDsruah5KkcHmgr0AZojiS59yhR+ZAAY2EuSi8wMINknDZl rzFw== X-Received: by 10.204.148.134 with SMTP id p6mr652524bkv.75.1355834572179; Tue, 18 Dec 2012 04:42:52 -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.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 04:42:51 -0800 (PST) From: Vasilis Liaskovitis To: qemu-devel@nongnu.org, seabios@seabios.org Date: Tue, 18 Dec 2012 13:41:52 +0100 Message-Id: <1355834518-17989-25-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: ALoCoQkW9qALFZH7UnXTn7hCMa4RuWOdufbiBL/qN1zfOYE3u+Mi4adbQsn+UxYMnWdTuCgtMvrQ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.214.44 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 24/30] acpi_piix4: 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 --- docs/specs/acpi_hotplug.txt | 8 ++++++++ hw/acpi_piix4.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/docs/specs/acpi_hotplug.txt b/docs/specs/acpi_hotplug.txt index 8391713..cf86242 100644 --- a/docs/specs/acpi_hotplug.txt +++ b/docs/specs/acpi_hotplug.txt @@ -12,3 +12,11 @@ Dimm hot-plug notification pending. One bit per slot. Read by ACPI BIOS GPE.3 handler to notify OS of memory hot-add or hot-remove events. Read-only. + +Memory Dimm ejection success notification (IO port 0xafa0, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _EJ0 notification. Byte value indicates Dimm slot that was +ejected. + +Written by ACPI memory device _EJ0 method to notify qemu of successfull +hot-removal. Write-only. diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 879d8a0..6e4718e 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -50,6 +50,7 @@ #define PCI_EJ_BASE 0xae08 #define PCI_RMV_BASE 0xae0c #define MEM_BASE 0xaf80 +#define MEM_EJ_BASE 0xafa0 #define PIIX4_MEM_HOTPLUG_STATUS 8 #define PIIX4_PCI_HOTPLUG_STATUS 2 @@ -544,12 +545,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 MEM_EJ_BASE - MEM_BASE: + dimm_notify(val, DIMM_REMOVE_SUCCESS); + break; + default: + PIIX4_DPRINTF("memhp write invalid %x <== %d\n", addr, val); + } + PIIX4_DPRINTF("memhp write %x <== %d\n", addr, val); +} + static const MemoryRegionOps piix4_memhp_ops = { .old_portio = (MemoryRegionPortio[]) { { .offset = 0, .len = DIMM_BITMAP_BYTES, .size = 1, .read = memhp_readb, }, + { + .offset = MEM_EJ_BASE - MEM_BASE, .len = 1, + .size = 1, + .write = memhp_writeb, + }, PORTIO_END_OF_LIST() }, .endianness = DEVICE_LITTLE_ENDIAN, @@ -635,7 +653,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) memory_region_add_subregion(get_system_io(), PCI_HOTPLUG_ADDR, &s->io_pci); memory_region_init_io(&s->io_memhp, &piix4_memhp_ops, s, "apci-memhp0", - DIMM_BITMAP_BYTES); + DIMM_BITMAP_BYTES + 1); memory_region_add_subregion(get_system_io(), MEM_BASE, &s->io_memhp); for (i = 0; i < DIMM_BITMAP_BYTES; i++) { @@ -665,6 +683,13 @@ static void enable_mem_device(PIIX4PMState *s, int memdevice) g->mems_sts[memdevice/8] |= (1 << (memdevice%8)); } +static void disable_mem_device(PIIX4PMState *s, int memdevice) +{ + struct gpe_regs *g = &s->gperegs; + s->ar.gpe.sts[0] |= PIIX4_MEM_HOTPLUG_STATUS; + g->mems_sts[memdevice/8] &= ~(1 << (memdevice%8)); +} + static int piix4_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int add) { @@ -674,6 +699,8 @@ static int piix4_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); return 0;