| Message ID | 5edeebb881f5bc842c57b85d546b5f95f073ebe8.1424912878.git.zhugh.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 26, 2015 at 09:16:51AM +0800, Zhu Guihua wrote: > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> so you add an extern method, but it's not implemented until the next patch. anyone bisecting between these patches will get ospm crashes. Please just squash this all together. Also, need to rebase this on my pci branch - ssdt-mem is gone there. > --- > hw/i386/ssdt-mem.dsl | 5 +++++ > include/hw/acpi/pc-hotplug.h | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/hw/i386/ssdt-mem.dsl b/hw/i386/ssdt-mem.dsl > index 22ff5dd..f0a56de 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..ae30ff1 100644 > --- a/include/hw/acpi/pc-hotplug.h > +++ b/include/hw/acpi/pc-hotplug.h > @@ -50,6 +50,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 > > -- > 1.9.3
diff --git a/hw/i386/ssdt-mem.dsl b/hw/i386/ssdt-mem.dsl index 22ff5dd..f0a56de 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..ae30ff1 100644 --- a/include/hw/acpi/pc-hotplug.h +++ b/include/hw/acpi/pc-hotplug.h @@ -50,6 +50,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
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> --- hw/i386/ssdt-mem.dsl | 5 +++++ include/hw/acpi/pc-hotplug.h | 1 + 2 files changed, 6 insertions(+)