From patchwork Mon Jul 11 13:45:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 646952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rp6Nz4RVhz9sBc for ; Tue, 12 Jul 2016 00:07:31 +1000 (AEST) Received: from localhost ([::1]:33889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMbrt-0000W3-7f for incoming@patchwork.ozlabs.org; Mon, 11 Jul 2016 10:07:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMbhs-0005OX-9K for qemu-devel@nongnu.org; Mon, 11 Jul 2016 09:57:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMbhq-0006XS-AW for qemu-devel@nongnu.org; Mon, 11 Jul 2016 09:57:07 -0400 Received: from mga02.intel.com ([134.134.136.20]:30874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMbhp-0006US-WE for qemu-devel@nongnu.org; Mon, 11 Jul 2016 09:57:06 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 11 Jul 2016 06:57:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,346,1464678000"; d="scan'208"; a="1014572135" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.133]) by orsmga002.jf.intel.com with ESMTP; 11 Jul 2016 06:57:04 -0700 From: Xiao Guangrong To: pbonzini@redhat.com, imammedo@redhat.com Date: Mon, 11 Jul 2016 21:45:16 +0800 Message-Id: <1468244718-3731-7-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1468244718-3731-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1468244718-3731-1-git-send-email-guangrong.xiao@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 6/8] pc: memhp: do not export nvdimm's memory via _CRS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiao Guangrong , ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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;