From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmp-0000Ng-6D for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zpdmk-0005Xk-Sq for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmk-0005XV-MO for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:38 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 57ACA8E228 for ; Fri, 23 Oct 2015 14:57:38 +0000 (UTC) From: Igor Mammedov Date: Fri, 23 Oct 2015 16:57:16 +0200 Message-Id: <1445612242-79172-14-git-send-email-imammedo@redhat.com> In-Reply-To: <1445612242-79172-1-git-send-email-imammedo@redhat.com> References: <1445612242-79172-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 13/19] pc: acpi: memhp: move MHPD.MOST method into MHPT table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com Signed-off-by: Igor Mammedov --- hw/acpi/memory_hotplug_acpi_table.c | 22 +++++++++++++++++++--- hw/i386/acpi-dsdt-mem-hotplug.dsl | 10 ---------- include/hw/acpi/pc-hotplug.h | 3 --- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c index 3d35ac1..7300624 100644 --- a/hw/acpi/memory_hotplug_acpi_table.c +++ b/hw/acpi/memory_hotplug_acpi_table.c @@ -11,6 +11,9 @@ #define MEMORY_SLOT_ENABLED "MES" #define MEMORY_SLOT_PROXIMITY_METHOD "MPXM" #define MEMORY_SLOT_PROXIMITY "MPX" +#define MEMORY_SLOT_OST_METHOD "MOST" +#define MEMORY_SLOT_OST_EVENT "MOEV" +#define MEMORY_SLOT_OST_STATUS "MOSC" #define BASEPATH "\\_SB.PCI0." stringify(MEMORY_HOTPLUG_DEVICE) "." @@ -78,9 +81,9 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_append(field, /* DIMM selector, write only */ aml_named_field(stringify(MEMORY_SLOT_SLECTOR), 32)); aml_append(field, /* _OST event code, write only */ - aml_named_field(stringify(MEMORY_SLOT_OST_EVENT), 32)); + aml_named_field(MEMORY_SLOT_OST_EVENT, 32)); aml_append(field, /* _OST status code, write only */ - aml_named_field(stringify(MEMORY_SLOT_OST_STATUS), 32)); + aml_named_field(MEMORY_SLOT_OST_STATUS, 32)); aml_append(ctrl_dev, field); /* present, functioning, decoding, not shown in UI */ @@ -150,6 +153,19 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_append(method, aml_return(a_ret_val)); } aml_append(ctrl_dev, method); + + method = aml_method(MEMORY_SLOT_OST_METHOD, 4); + { + Aml *a_ost_evt = aml_name(MEMORY_SLOT_OST_EVENT); + Aml *a_ost_status = aml_name(MEMORY_SLOT_OST_STATUS); + + aml_append(method, aml_acquire(a_ctrl_lock, 0xFFFF)); + aml_append(method, aml_store(a_slot_arg, a_slot_selector)); + aml_append(method, aml_store(aml_arg(1), a_ost_evt)); + aml_append(method, aml_store(aml_arg(2), a_ost_status)); + aml_append(method, aml_release(a_ctrl_lock)); + } + aml_append(ctrl_dev, method); } aml_append(table, ctrl_dev); @@ -177,7 +193,7 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_append(dev, method); method = aml_method("_OST", 3); - s = BASEPATH stringify(MEMORY_SLOT_OST_METHOD); + s = BASEPATH MEMORY_SLOT_OST_METHOD; aml_append(method, aml_return(aml_call4( s, aml_name("_UID"), aml_arg(0), aml_arg(1), aml_arg(2) ))); diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl b/hw/i386/acpi-dsdt-mem-hotplug.dsl index 02fecf2..8889eca 100644 --- a/hw/i386/acpi-dsdt-mem-hotplug.dsl +++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl @@ -27,8 +27,6 @@ External(MEMORY_SLOT_SIZE_HIGH, FieldUnitObj) // read only External(MEMORY_SLOT_EJECT, FieldUnitObj) // initiates device eject, write only External(MEMORY_SLOT_SLECTOR, FieldUnitObj) // DIMM selector, write only - External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code, write only - External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status code, write only External(MEMORY_SLOT_LOCK, MutexObj) Method(MEMORY_SLOT_CRS_METHOD, 1, Serialized) { @@ -95,14 +93,6 @@ Return(MR64) } - Method(MEMORY_SLOT_OST_METHOD, 4) { - Acquire(MEMORY_SLOT_LOCK, 0xFFFF) - Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM - Store(Arg1, MEMORY_SLOT_OST_EVENT) - Store(Arg2, MEMORY_SLOT_OST_STATUS) - Release(MEMORY_SLOT_LOCK) - } - Method(MEMORY_SLOT_EJECT_METHOD, 2) { Acquire(MEMORY_SLOT_LOCK, 0xFFFF) Store(ToInteger(Arg0), MEMORY_SLOT_SLECTOR) // select DIMM diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h index d7d5ede..203d449 100644 --- a/include/hw/acpi/pc-hotplug.h +++ b/include/hw/acpi/pc-hotplug.h @@ -40,11 +40,8 @@ #define MEMORY_SLOT_SIZE_HIGH MRLH #define MEMORY_SLOT_EJECT MEJ #define MEMORY_SLOT_SLECTOR MSEL -#define MEMORY_SLOT_OST_EVENT MOEV -#define MEMORY_SLOT_OST_STATUS MOSC #define MEMORY_SLOT_LOCK MLCK #define MEMORY_SLOT_CRS_METHOD MCRS -#define MEMORY_SLOT_OST_METHOD MOST #define MEMORY_SLOT_EJECT_METHOD MEJ0 #define MEMORY_SLOT_SCAN_METHOD MSCN -- 1.8.3.1