SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pc: acpi: memhp: move \_GPE._E03 into SSDT

Browse Source 
in addition remove no longer needed acpi-dsdt-mem-hotplug.dsl.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2015-12-28 18:02:20 +01:00 committed by Michael S. Tsirkin
parent f177d40ae2
commit 7f4495e1c1
6 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/i386/acpi-build.c
View File

@ -1083,6 +1083,12 @@ build_ssdt(GArray *table_data, GArray *linker,
build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base, build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base,
pm->mem_hp_io_len); pm->mem_hp_io_len);
scope = aml_scope("\\_GPE");
method = aml_method("_E03", 0, AML_NOTSERIALIZED);
aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
aml_append(scope, method);
aml_append(ssdt, scope);
bus = PC_MACHINE(machine)->bus; bus = PC_MACHINE(machine)->bus;
if (bus) { if (bus) {
QLIST_FOREACH(bus, &bus->child, sibling) { QLIST_FOREACH(bus, &bus->child, sibling) {

16
hw/i386/acpi-dsdt-mem-hotplug.dsl
View File

@ -1,16 +0,0 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
External(\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD, MethodObj)

5
hw/i386/acpi-dsdt.dsl
View File

@ -250,7 +250,6 @@ DefinitionBlock (
#include "hw/acpi/pc-hotplug.h" #include "hw/acpi/pc-hotplug.h"
#define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE #define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl" #include "acpi-dsdt-cpu-hotplug.dsl"
#include "acpi-dsdt-mem-hotplug.dsl"
/**************************************************************** /****************************************************************
@ -271,10 +270,6 @@ DefinitionBlock (
// CPU hotplug event // CPU hotplug event
\_SB.PRSC() \_SB.PRSC()
} }
Method(_E03) {
// Memory hotplug event
\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD()
}
Method(_L04) { Method(_L04) {
} }
Method(_L05) { Method(_L05) {

5
hw/i386/q35-acpi-dsdt.dsl
View File

@ -387,7 +387,6 @@ DefinitionBlock (
#include "hw/acpi/pc-hotplug.h" #include "hw/acpi/pc-hotplug.h"
#define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE #define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl" #include "acpi-dsdt-cpu-hotplug.dsl"
#include "acpi-dsdt-mem-hotplug.dsl"
/**************************************************************** /****************************************************************
@ -404,10 +403,6 @@ DefinitionBlock (
// CPU hotplug event // CPU hotplug event
\_SB.PRSC() \_SB.PRSC()
} }
Method(_E03) {
// Memory hotplug event
\_SB.PCI0.MEMORY_HOTPLUG_DEVICE.MEMORY_SLOT_SCAN_METHOD()
}
Method(_L04) { Method(_L04) {
} }
Method(_L05) { Method(_L05) {

5
include/hw/acpi/memory_hotplug.h
View File

@ -47,6 +47,11 @@ extern const VMStateDescription vmstate_memory_hotplug;
void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list); void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list);
#define MEMORY_HOTPLUG_DEVICE MHPD
#define MEMORY_SLOT_SCAN_METHOD MSCN
#define MEMORY_HOTPLUG_HANDLER_PATH "\\_SB.PCI0." \
stringify(MEMORY_HOTPLUG_DEVICE) "." stringify(MEMORY_SLOT_SCAN_METHOD)
void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem, void build_memory_hotplug_aml(Aml *ctx, uint32_t nr_mem,
uint16_t io_base, uint16_t io_len); uint16_t io_base, uint16_t io_len);
#endif #endif

2
include/hw/acpi/pc-hotplug.h
View File

@ -32,7 +32,6 @@
#define ACPI_MEMORY_HOTPLUG_IO_LEN 24 #define ACPI_MEMORY_HOTPLUG_IO_LEN 24
#define ACPI_MEMORY_HOTPLUG_BASE 0x0a00 #define ACPI_MEMORY_HOTPLUG_BASE 0x0a00
#define MEMORY_HOTPLUG_DEVICE MHPD
#define MEMORY_SLOTS_NUMBER MDNR #define MEMORY_SLOTS_NUMBER MDNR
#define MEMORY_HOTPLUG_IO_REGION HPMR #define MEMORY_HOTPLUG_IO_REGION HPMR
#define MEMORY_SLOT_ADDR_LOW MRBL #define MEMORY_SLOT_ADDR_LOW MRBL
@ -54,6 +53,5 @@
#define MEMORY_SLOT_PROXIMITY_METHOD MPXM #define MEMORY_SLOT_PROXIMITY_METHOD MPXM
#define MEMORY_SLOT_EJECT_METHOD MEJ0 #define MEMORY_SLOT_EJECT_METHOD MEJ0
#define MEMORY_SLOT_NOTIFY_METHOD MTFY #define MEMORY_SLOT_NOTIFY_METHOD MTFY
#define MEMORY_SLOT_SCAN_METHOD MSCN
#endif #endif