From patchwork Wed Aug 27 08:09:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tang Chen X-Patchwork-Id: 383368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9957214009B for ; Wed, 27 Aug 2014 18:10:40 +1000 (EST) Received: from localhost ([::1]:58106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMYJS-0005cv-Mr for incoming@patchwork.ozlabs.org; Wed, 27 Aug 2014 04:10:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMYHz-00035O-HE for qemu-devel@nongnu.org; Wed, 27 Aug 2014 04:09:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMYHu-00032F-Rc for qemu-devel@nongnu.org; Wed, 27 Aug 2014 04:09:07 -0400 Received: from [59.151.112.132] (port=14584 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMYHu-000329-G4 for qemu-devel@nongnu.org; Wed, 27 Aug 2014 04:09:02 -0400 X-IronPort-AV: E=Sophos;i="5.04,409,1406563200"; d="scan'208";a="35133145" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 27 Aug 2014 16:06:03 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s7R88t1s000518; Wed, 27 Aug 2014 16:08:55 +0800 Received: from tangchen.fnst.cn.fujitsu.com (10.167.226.71) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 27 Aug 2014 16:09:02 +0800 From: Tang Chen To: , , , Date: Wed, 27 Aug 2014 16:09:46 +0800 Message-ID: <1409126988-22287-3-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1409126988-22287-1-git-send-email-tangchen@cn.fujitsu.com> References: <1409126988-22287-1-git-send-email-tangchen@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.71] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: hutao@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, zhugh.fnst@cn.fujitsu.com, tangchen@cn.fujitsu.com Subject: [Qemu-devel] [RFC PATCH v1 2/4] Add event handling for memory device insertion. 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 Define device insertion OST event and status, and add a function to handle memory insertion. Signed-off-by: Tang Chen --- hw/acpi/memory_hotplug.c | 18 ++++++++++++++++++ include/hw/acpi/acpi.h | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 1b21191..fddb0fd 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -85,6 +85,20 @@ static uint64_t acpi_memory_hotplug_read(void *opaque, hwaddr addr, return val; } +static void acpi_handle_insert(MemStatus *mdev) +{ + switch (mdev->ost_status) { + case ACPI_SUCCESS: + case ACPI_FAILURE: + case ACPI_UNRECOGNIZED_NOTIFY: + case ACPI_INSERT_DRIVER_LOAD_FAILURE: + case ACPI_INSERT_NOT_SUPPORTED: + case ACPI_INSERT_IN_PROGRESS: + default: + break; + } +} + static void acpi_handle_eject(MemStatus *mdev) { switch (mdev->ost_status) { @@ -121,6 +135,10 @@ static void acpi_handle_eject(MemStatus *mdev) static void acpi_handle_ost_event(MemStatus *mdev) { switch (mdev->ost_event) { + case ACPI_NOTIFY_DEVICE_CHECK: + case ACPI_OSPM_INSERT: + acpi_handle_insert(mdev); + break; case ACPI_NOTIFY_EJECT_REQUEST: /* Ejection triggered by hardware. */ case ACPI_OSPM_EJECT: /* Ejection triggered by guest OS. */ acpi_handle_eject(mdev); diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index e8499f6..ad706d8 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -93,21 +93,29 @@ /* OST_EVENT */ #define ACPI_OSPM_EJECT 0x103 +#define ACPI_OSPM_INSERT 0x200 /* NOTIFY_EVENT */ #define ACPI_NOTIFY_DEVICE_CHECK 0x1 #define ACPI_NOTIFY_EJECT_REQUEST 0x3 -/* OST_STATUS */ +/* general processing OST_STATUS */ #define ACPI_SUCCESS 0x0 #define ACPI_FAILURE 0x1 #define ACPI_UNRECOGNIZED_NOTIFY 0x2 + +/* ejection processing OST_STATUS */ #define ACPI_EJECT_NOT_SUPPORTED 0x80 #define ACPI_EJECT_DEVICE_IN_USE 0x81 #define ACPI_EJECT_DEVICE_BUSY 0x82 #define ACPI_EJECT_DEPENDENCY_BUSY 0x83 #define ACPI_EJECT_IN_PROGRESS 0x84 +/* insertion processing OST_STATUS */ +#define ACPI_INSERT_IN_PROGRESS 0x80 +#define ACPI_INSERT_DRIVER_LOAD_FAILURE 0x81 +#define ACPI_INSERT_NOT_SUPPORTED 0x82 + /* structs */ typedef struct ACPIPMTimer ACPIPMTimer; typedef struct ACPIPM1EVT ACPIPM1EVT;