From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiao Guangrong Subject: [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS Date: Fri, 12 Aug 2016 14:54:08 +0800 Message-ID: <1470984850-66891-7-git-send-email-guangrong.xiao@linux.intel.com> References: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com> Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong To: pbonzini@redhat.com, imammedo@redhat.com Return-path: Received: from mga09.intel.com ([134.134.136.24]:8906 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751865AbcHLHKg (ORCPT ); Fri, 12 Aug 2016 03:10:36 -0400 In-Reply-To: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDKc-0004Zk-VH for qemu-devel@nongnu.org; Fri, 12 Aug 2016 10:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYDKR-0001jB-J1 for qemu-devel@nongnu.org; Fri, 12 Aug 2016 10:21:06 -0400 Received: from mga04.intel.com ([192.55.52.120]:16173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYDKR-0001hn-9t for qemu-devel@nongnu.org; Fri, 12 Aug 2016 10:20:55 -0400 From: Xiao Guangrong Date: Fri, 12 Aug 2016 14:54:08 +0800 Message-Id: <1470984850-66891-7-git-send-email-guangrong.xiao@linux.intel.com> In-Reply-To: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong 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 --- 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