[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via
From: |
Xiao Guangrong |
Subject: |
[Qemu-devel] [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS |
Date: |
Fri, 12 Aug 2016 14:54:08 +0800 |
nvdimm's memory info can not exported via _CRS, instead, it is reported
by NFIT/FIT
This patch let _CRS return zero for both memory address and memory size
if it is a nvdimm device inserted to the slot
Signed-off-by: Xiao Guangrong <address@hidden>
---
hw/acpi/memory_hotplug.c | 16 ++++++++++++----
include/hw/acpi/memory_hotplug.h | 1 +
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index ec4e64b..73fa62d 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -2,6 +2,7 @@
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/pc-hotplug.h"
#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#include "hw/boards.h"
#include "hw/qdev-core.h"
#include "trace.h"
@@ -41,6 +42,7 @@ void acpi_memory_ospm_status(MemHotplugState *mem_st,
ACPIOSTInfoList ***list)
static uint64_t acpi_memory_hotplug_read(void *opaque, hwaddr addr,
unsigned int size)
{
+ uint64_t maddr, msize;
uint32_t val = 0;
MemHotplugState *mem_st = opaque;
MemStatus *mdev;
@@ -53,21 +55,25 @@ static uint64_t acpi_memory_hotplug_read(void *opaque,
hwaddr addr,
mdev = &mem_st->devs[mem_st->selector];
o = OBJECT(mdev->dimm);
+ maddr = o && !mdev->is_nvdimm ? object_property_get_int(o,
+ PC_DIMM_ADDR_PROP, NULL) : 0;
+ msize = o && !mdev->is_nvdimm ? object_property_get_int(o,
+ PC_DIMM_SIZE_PROP, NULL) : 0;
switch (addr) {
case 0x0: /* Lo part of phys address where DIMM is mapped */
- val = o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) : 0;
+ val = maddr;
trace_mhp_acpi_read_addr_lo(mem_st->selector, val);
break;
case 0x4: /* Hi part of phys address where DIMM is mapped */
- val = o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) >> 32 :
0;
+ val = maddr >> 32;
trace_mhp_acpi_read_addr_hi(mem_st->selector, val);
break;
case 0x8: /* Lo part of DIMM size */
- val = o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, NULL) : 0;
+ val = msize;
trace_mhp_acpi_read_size_lo(mem_st->selector, val);
break;
case 0xc: /* Hi part of DIMM size */
- val = o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, NULL) >> 32 :
0;
+ val = msize >> 32;
trace_mhp_acpi_read_size_hi(mem_st->selector, val);
break;
case 0x10: /* node proximity for _PXM method */
@@ -78,6 +84,7 @@ static uint64_t acpi_memory_hotplug_read(void *opaque, hwaddr
addr,
val |= mdev->is_enabled ? 1 : 0;
val |= mdev->is_inserting ? 2 : 0;
val |= mdev->is_removing ? 4 : 0;
+ val |= mdev->is_nvdimm ? 16 : 0;
trace_mhp_acpi_read_flags(mem_st->selector, val);
break;
default:
@@ -245,6 +252,7 @@ void acpi_memory_plug_cb(HotplugHandler *hotplug_dev,
MemHotplugState *mem_st,
mdev->dimm = dev;
mdev->is_enabled = true;
+ mdev->is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
if (dev->hotplugged) {
mdev->is_inserting = true;
acpi_send_event(DEVICE(hotplug_dev), ACPI_MEMORY_HOTPLUG_STATUS);
diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
index d2c7452..69a05df 100644
--- a/include/hw/acpi/memory_hotplug.h
+++ b/include/hw/acpi/memory_hotplug.h
@@ -17,6 +17,7 @@ typedef struct MemStatus {
bool is_enabled;
bool is_inserting;
bool is_removing;
+ bool is_nvdimm;
uint32_t ost_event;
uint32_t ost_status;
} MemStatus;
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/8] nvdimm: hotplug support, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 1/8] acpi nvdimm: fix wrong buffer size returned by DSM method, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS,
Xiao Guangrong <=
- [Qemu-devel] [PATCH v2 5/8] pc-dimm: introduce prepare_unplug() callback, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 3/8] nvdimm acpi: introduce _FIT, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 2/8] nvdimm acpi: prebuild nvdimm devices for available slots, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 7/8] pc: acpi: memhp: nvdimm hotplug support, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 8/8] nvdimm docs: add nvdimm Read FIT function, Xiao Guangrong, 2016/08/12
- [Qemu-devel] [PATCH v2 4/8] nvdimm acpi: implement Read FIT function, Xiao Guangrong, 2016/08/12
- Re: [Qemu-devel] [PATCH v2 0/8] nvdimm: hotplug support, Stefan Hajnoczi, 2016/08/12
- Re: [Qemu-devel] [PATCH v2 0/8] nvdimm: hotplug support, Dan Williams, 2016/08/18