From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGp9w-0007WM-6Y for qemu-devel@nongnu.org; Thu, 29 Jan 2015 08:29:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGp9t-0006og-0g for qemu-devel@nongnu.org; Thu, 29 Jan 2015 08:29:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGp9s-0006oL-Qa for qemu-devel@nongnu.org; Thu, 29 Jan 2015 08:29:20 -0500 Date: Thu, 29 Jan 2015 14:29:11 +0100 From: Igor Mammedov Message-ID: <20150129142911.53cd93c8@nial.brq.redhat.com> In-Reply-To: <1420679180-14883-14-git-send-email-tangchen@cn.fujitsu.com> References: <1420679180-14883-1-git-send-email-tangchen@cn.fujitsu.com> <1420679180-14883-14-git-send-email-tangchen@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RESEND PATCH v1 13/13] pc, acpi bios: Add memory hot unplug interface. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tang Chen Cc: zhugh.fnst@cn.fujitsu.com, mst@redhat.com, hutao@cn.fujitsu.com, qemu-devel@nongnu.org, isimatu.yasuaki@jp.fujitsu.com, guz.fnst@cn.fujitsu.com, pbonzini@redhat.com On Thu, 8 Jan 2015 09:06:20 +0800 Tang Chen wrote: > From: Hu Tao > > This patch implements MEMORY_SLOT_EJECT_METHOD according to ACPI spec. squash this patch in previous one > > Signed-off-by: Hu Tao > Signed-off-by: Tang Chen > --- > hw/i386/acpi-dsdt-mem-hotplug.dsl | 11 ++++++++++- > hw/i386/ssdt-mem.dsl | 5 +++++ > include/hw/acpi/pc-hotplug.h | 2 ++ > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl b/hw/i386/acpi-dsdt-mem-hotplug.dsl > index 2a36c47..2a35534 100644 > --- a/hw/i386/acpi-dsdt-mem-hotplug.dsl > +++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl > @@ -50,6 +50,7 @@ > Offset(20), > MEMORY_SLOT_ENABLED, 1, // 1 if enabled, read only > MEMORY_SLOT_INSERT_EVENT, 1, // (read) 1 if has a insert event. (write) 1 to clear event > + MEMORY_SLOT_REMOVE_EVENT, 1, // 1 if DIMM has a remove request, read only it's not just remove event, you write into it to make eject, so update it to match MEMORY_SLOT_INSERT_EVENT description with what happens on write. > } > > Mutex (MEMORY_SLOT_LOCK, 0) > @@ -71,8 +72,9 @@ > If (LEqual(MEMORY_SLOT_INSERT_EVENT, One)) { // Memory device needs check > MEMORY_SLOT_NOTIFY_METHOD(Local0, 1) > Store(1, MEMORY_SLOT_INSERT_EVENT) > + } Elseif (LEqual(MEMORY_SLOT_REMOVE_EVENT, One)) { // Ejection request > + MEMORY_SLOT_NOTIFY_METHOD(Local0, 3) > } > - // TODO: handle memory eject request > Add(Local0, One, Local0) // goto next DIMM > } > Release(MEMORY_SLOT_LOCK) > @@ -172,5 +174,12 @@ > 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 > + Store(One, MEMORY_SLOT_REMOVE_EVENT) > + Release(MEMORY_SLOT_LOCK) > + } > } // Device() > } // Scope() > diff --git a/hw/i386/ssdt-mem.dsl b/hw/i386/ssdt-mem.dsl > index 22ff5dd..1416639 100644 > --- a/hw/i386/ssdt-mem.dsl > +++ b/hw/i386/ssdt-mem.dsl > @@ -43,6 +43,7 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) > External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_STATUS_METHOD, MethodObj) > External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_OST_METHOD, MethodObj) > External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_PROXIMITY_METHOD, MethodObj) > + External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_EJECT_METHOD, MethodObj) > > Scope(\_SB) { > /* v------------------ DO NOT EDIT ------------------v */ > @@ -72,6 +73,10 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) > Method(_OST, 3) { > \_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_OST_METHOD(_UID, Arg0, Arg1, Arg2) > } > + > + Method(_EJ0, 1) { > + \_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_EJECT_METHOD(_UID, Arg0) > + } > } > } > } > diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h > index b9db295..b61b6ea 100644 > --- a/include/hw/acpi/pc-hotplug.h > +++ b/include/hw/acpi/pc-hotplug.h > @@ -42,6 +42,7 @@ > #define MEMORY_SLOT_PROXIMITY MPX > #define MEMORY_SLOT_ENABLED MES > #define MEMORY_SLOT_INSERT_EVENT MINS > +#define MEMORY_SLOT_REMOVE_EVENT MRMV > #define MEMORY_SLOT_SLECTOR MSEL > #define MEMORY_SLOT_OST_EVENT MOEV > #define MEMORY_SLOT_OST_STATUS MOSC > @@ -50,6 +51,7 @@ > #define MEMORY_SLOT_CRS_METHOD MCRS > #define MEMORY_SLOT_OST_METHOD MOST > #define MEMORY_SLOT_PROXIMITY_METHOD MPXM > +#define MEMORY_SLOT_EJECT_METHOD MEJ0 > #define MEMORY_SLOT_NOTIFY_METHOD MTFY > #define MEMORY_SLOT_SCAN_METHOD MSCN >