From: Xiao Guangrong <guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> Subject: [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS Date: Fri, 12 Aug 2016 14:54:08 +0800 [thread overview] Message-ID: <1470984850-66891-7-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> 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 [thread overview] Message-ID: <1470984850-66891-7-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> --- 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
next prev parent reply other threads:[~2016-08-12 7:10 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-12 6:54 [PATCH v2 0/8] nvdimm: hotplug support Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` [PATCH v2 1/8] acpi nvdimm: fix wrong buffer size returned by DSM method Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-09-20 14:07 ` Igor Mammedov 2016-09-20 14:07 ` [Qemu-devel] " Igor Mammedov 2016-09-20 15:14 ` Michael S. Tsirkin 2016-09-20 15:14 ` [Qemu-devel] " Michael S. Tsirkin 2016-09-20 16:23 ` Igor Mammedov 2016-09-21 5:30 ` Xiao Guangrong 2016-09-21 5:30 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` [PATCH v2 2/8] nvdimm acpi: prebuild nvdimm devices for available slots Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-09-21 11:48 ` Igor Mammedov 2016-09-21 11:48 ` [Qemu-devel] " Igor Mammedov 2016-09-22 2:43 ` Xiao Guangrong 2016-09-22 2:43 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` [PATCH v2 3/8] nvdimm acpi: introduce _FIT Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-09-30 13:14 ` Igor Mammedov 2016-09-30 13:14 ` [Qemu-devel] " Igor Mammedov 2016-10-08 7:17 ` Xiao Guangrong 2016-10-08 7:17 ` [Qemu-devel] " Xiao Guangrong 2016-10-10 12:51 ` Igor Mammedov 2016-10-10 12:51 ` [Qemu-devel] " Igor Mammedov 2016-10-10 13:09 ` Xiao Guangrong 2016-10-10 13:09 ` [Qemu-devel] " Xiao Guangrong 2016-10-11 11:49 ` Igor Mammedov 2016-10-11 11:49 ` [Qemu-devel] " Igor Mammedov 2016-10-12 8:20 ` Xiao Guangrong 2016-10-12 8:20 ` [Qemu-devel] " Xiao Guangrong 2016-10-13 13:33 ` Igor Mammedov 2016-10-14 7:43 ` Xiao Guangrong 2016-10-14 11:59 ` Igor Mammedov 2016-08-12 6:54 ` [PATCH v2 4/8] nvdimm acpi: implement Read FIT function Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-09-30 13:17 ` Igor Mammedov 2016-09-30 13:17 ` [Qemu-devel] " Igor Mammedov 2016-10-08 7:17 ` Xiao Guangrong 2016-10-08 7:17 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` [PATCH v2 5/8] pc-dimm: introduce prepare_unplug() callback Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-10-03 9:45 ` Igor Mammedov 2016-10-03 9:45 ` [Qemu-devel] " Igor Mammedov 2016-10-08 7:20 ` Xiao Guangrong 2016-10-08 7:20 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` Xiao Guangrong [this message] 2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS Xiao Guangrong 2016-10-03 13:21 ` Igor Mammedov 2016-10-03 13:21 ` [Qemu-devel] " Igor Mammedov 2016-10-08 7:42 ` Xiao Guangrong 2016-10-08 7:42 ` [Qemu-devel] " Xiao Guangrong 2016-10-10 12:47 ` Igor Mammedov 2016-10-10 12:47 ` [Qemu-devel] " Igor Mammedov 2016-10-10 13:10 ` Xiao Guangrong 2016-10-10 13:10 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` [PATCH v2 7/8] pc: acpi: memhp: nvdimm hotplug support Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 6:54 ` [PATCH v2 8/8] nvdimm docs: add nvdimm Read FIT function Xiao Guangrong 2016-08-12 6:54 ` [Qemu-devel] " Xiao Guangrong 2016-09-30 14:03 ` Igor Mammedov 2016-09-30 14:03 ` [Qemu-devel] " Igor Mammedov 2016-10-08 7:18 ` Xiao Guangrong 2016-10-08 7:18 ` [Qemu-devel] " Xiao Guangrong 2016-08-12 8:35 ` [PATCH v2 0/8] nvdimm: hotplug support Stefan Hajnoczi 2016-08-12 8:35 ` [Qemu-devel] " Stefan Hajnoczi 2016-08-12 15:13 ` Igor Mammedov 2016-08-12 15:13 ` [Qemu-devel] " Igor Mammedov 2016-09-12 7:33 ` Xiao Guangrong 2016-09-12 7:33 ` [Qemu-devel] " Xiao Guangrong 2016-09-12 12:22 ` Igor Mammedov 2016-08-18 17:47 ` Dan Williams 2016-08-18 17:47 ` [Qemu-devel] " Dan Williams 2016-08-18 18:54 ` Vishal Verma 2016-08-18 18:54 ` [Qemu-devel] " Vishal Verma 2016-08-19 3:40 ` Xiao Guangrong 2016-08-19 3:40 ` [Qemu-devel] " Xiao Guangrong 2016-08-19 3:46 ` Xiao Guangrong 2016-08-19 3:46 ` [Qemu-devel] " Xiao Guangrong 2016-08-19 5:14 ` Dan Williams 2016-08-19 5:14 ` [Qemu-devel] " Dan Williams 2016-10-03 13:48 ` Igor Mammedov 2016-10-08 8:34 ` Xiao Guangrong 2016-10-10 12:59 ` Igor Mammedov 2016-10-10 13:57 ` Xiao Guangrong 2016-10-11 12:32 ` Igor Mammedov 2016-10-12 10:19 ` Xiao Guangrong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1470984850-66891-7-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.intel.com \ --cc=dan.j.williams@intel.com \ --cc=ehabkost@redhat.com \ --cc=gleb@kernel.org \ --cc=imammedo@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.