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, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH 13/16] nvdimm: support NFIT_CMD_IMPLEMENTED function Date: Wed, 1 Jul 2015 22:50:29 +0800 [thread overview] Message-ID: <1435762232-15543-14-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> __DSM is defined in ACPI 6.0: 9.14.1 _DSM (Device Specific Method) Function 0 is a query function. We do not support any function on root device and only 3 functions are support for NVDIMM device, NFIT_CMD_GET_CONFIG_SIZE, NFIT_CMD_GET_CONFIG_DATA and NFIT_CMD_SET_CONFIG_DATA, that means we currently only allow to access device's Label Namespace Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/mem/pc-nvdimm.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index c0965ae..b586bf7 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -29,6 +29,15 @@ #include "exec/address-spaces.h" #include "hw/acpi/aml-build.h" #include "hw/mem/pc-nvdimm.h" +#include "sysemu/sysemu.h" + +//#define NVDIMM_DEBUG + +#ifdef NVDIMM_DEBUG +#define nvdebug(fmt, ...) fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__) +#else +#define nvdebug(...) +#endif #define PAGE_SIZE (1UL << 12) @@ -135,6 +144,22 @@ static void nfit_spa_uuid_pm(void *uuid) memcpy(uuid, &uuid_pm, sizeof(uuid_pm)); } +static bool dsm_is_root_uuid(uint8_t *uuid) +{ + uuid_le uuid_root = UUID_LE(0x2f10e7a4, 0x9e91, 0x11e4, 0x89, + 0xd3, 0x12, 0x3b, 0x93, 0xf7, 0x5c, 0xba); + + return !memcmp(uuid, &uuid_root, sizeof(uuid_root)); +} + +static bool dsm_is_dimm_uuid(uint8_t *uuid) +{ + uuid_le uuid_dimm = UUID_LE(0x4309ac30, 0x0d11, 0x11e4, 0x91, + 0x91, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66); + + return !memcmp(uuid, &uuid_dimm, sizeof(uuid_dimm)); +} + enum { NFIT_TABLE_SPA = 0, NFIT_TABLE_MEM = 1, @@ -349,6 +374,23 @@ enum { NFIT_CMD_VENDOR = 9, }; +enum { + NFIT_STATUS_SUCCESS = 0, + NFIT_STATUS_NOT_SUPPORTED = 1, + NFIT_STATUS_NON_EXISTING_MEM_DEV = 2, + NFIT_STATUS_INVALID_PARAS = 3, + NFIT_STATUS_VENDOR_SPECIFIC_ERROR = 4, +}; + +#define DSM_REVISION (1) + +/* do not support any command except NFIT_CMD_ARS_CAP on root. */ +#define ROOT_SUPPORT_CMD (1 << NFIT_CMD_ARS_CAP) +#define DIMM_SUPPORT_CMD ((1 << NFIT_CMD_IMPLEMENTED) \ + | (1 << NFIT_CMD_GET_CONFIG_SIZE) \ + | (1 << NFIT_CMD_GET_CONFIG_DATA) \ + | (1 << NFIT_CMD_SET_CONFIG_DATA)) + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -366,6 +408,18 @@ struct dsm_buffer { }; }; +struct cmd_out_implemented { + uint64_t cmd_list; +}; + +struct dsm_out { + union { + uint32_t status; + struct cmd_out_implemented cmd_implemented; + uint8_t data[PAGE_SIZE]; + }; +}; + static uint64_t dsm_read(void *opaque, hwaddr addr, unsigned size) { @@ -374,10 +428,82 @@ static uint64_t dsm_read(void *opaque, hwaddr addr, return 0; } +static void dsm_write_root(struct dsm_buffer *in, struct dsm_out *out) +{ + uint32_t function = in->arg2; + + if (function == NFIT_CMD_IMPLEMENTED) { + out->cmd_implemented.cmd_list = ROOT_SUPPORT_CMD; + return; + } + + out->status = NFIT_STATUS_NOT_SUPPORTED; + nvdebug("Return status %#x.\n", out->status); +} + +static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) +{ + uint32_t function = in->arg2; + uint32_t status; + + switch (function) { + case NFIT_CMD_IMPLEMENTED: + out->cmd_implemented.cmd_list = DIMM_SUPPORT_CMD; + return; + default: + status = NFIT_STATUS_NOT_SUPPORTED; + }; + + nvdebug("Return status %#x.\n", status); + out->status = status; +} + static void dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + struct MemoryRegion *dsm_ram_mr = opaque; + struct dsm_buffer *dsm; + struct dsm_out *out; + void *buf; + assert(val == NOTIFY_VALUE); + + buf = memory_region_get_ram_ptr(dsm_ram_mr); + dsm = buf; + out = buf; + + nvdebug("Arg0 " UUID_FMT ".\n", dsm->arg0[0], dsm->arg0[1], dsm->arg0[2], + dsm->arg0[3], dsm->arg0[4], dsm->arg0[5], dsm->arg0[6], + dsm->arg0[7], dsm->arg0[8], dsm->arg0[9], dsm->arg0[10], + dsm->arg0[11], dsm->arg0[12], dsm->arg0[13], dsm->arg0[14], + dsm->arg0[15]); + nvdebug("Handler %#x, Arg1 %#x, Arg2 %#x.\n", dsm->handle, dsm->arg1, + dsm->arg2); + + if (dsm->arg1 != DSM_REVISION) { + nvdebug("Revision %#x is not supported, expect %#x.\n", + dsm->arg1, DSM_REVISION); + goto exit; + } + + if (!dsm->handle) { + if (!dsm_is_root_uuid(dsm->arg0)) { + nvdebug("Root UUID does not match.\n"); + goto exit; + } + + return dsm_write_root(dsm, out); + } + + if (!dsm_is_dimm_uuid(dsm->arg0)) { + nvdebug("DIMM UUID does not match.\n"); + goto exit; + } + + return dsm_write_nvdimm(dsm, out); + +exit: + out->status = NFIT_STATUS_NOT_SUPPORTED; } static const MemoryRegionOps dsm_ops = { -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>, ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 13/16] nvdimm: support NFIT_CMD_IMPLEMENTED function Date: Wed, 1 Jul 2015 22:50:29 +0800 [thread overview] Message-ID: <1435762232-15543-14-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> __DSM is defined in ACPI 6.0: 9.14.1 _DSM (Device Specific Method) Function 0 is a query function. We do not support any function on root device and only 3 functions are support for NVDIMM device, NFIT_CMD_GET_CONFIG_SIZE, NFIT_CMD_GET_CONFIG_DATA and NFIT_CMD_SET_CONFIG_DATA, that means we currently only allow to access device's Label Namespace Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/mem/pc-nvdimm.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index c0965ae..b586bf7 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -29,6 +29,15 @@ #include "exec/address-spaces.h" #include "hw/acpi/aml-build.h" #include "hw/mem/pc-nvdimm.h" +#include "sysemu/sysemu.h" + +//#define NVDIMM_DEBUG + +#ifdef NVDIMM_DEBUG +#define nvdebug(fmt, ...) fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__) +#else +#define nvdebug(...) +#endif #define PAGE_SIZE (1UL << 12) @@ -135,6 +144,22 @@ static void nfit_spa_uuid_pm(void *uuid) memcpy(uuid, &uuid_pm, sizeof(uuid_pm)); } +static bool dsm_is_root_uuid(uint8_t *uuid) +{ + uuid_le uuid_root = UUID_LE(0x2f10e7a4, 0x9e91, 0x11e4, 0x89, + 0xd3, 0x12, 0x3b, 0x93, 0xf7, 0x5c, 0xba); + + return !memcmp(uuid, &uuid_root, sizeof(uuid_root)); +} + +static bool dsm_is_dimm_uuid(uint8_t *uuid) +{ + uuid_le uuid_dimm = UUID_LE(0x4309ac30, 0x0d11, 0x11e4, 0x91, + 0x91, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66); + + return !memcmp(uuid, &uuid_dimm, sizeof(uuid_dimm)); +} + enum { NFIT_TABLE_SPA = 0, NFIT_TABLE_MEM = 1, @@ -349,6 +374,23 @@ enum { NFIT_CMD_VENDOR = 9, }; +enum { + NFIT_STATUS_SUCCESS = 0, + NFIT_STATUS_NOT_SUPPORTED = 1, + NFIT_STATUS_NON_EXISTING_MEM_DEV = 2, + NFIT_STATUS_INVALID_PARAS = 3, + NFIT_STATUS_VENDOR_SPECIFIC_ERROR = 4, +}; + +#define DSM_REVISION (1) + +/* do not support any command except NFIT_CMD_ARS_CAP on root. */ +#define ROOT_SUPPORT_CMD (1 << NFIT_CMD_ARS_CAP) +#define DIMM_SUPPORT_CMD ((1 << NFIT_CMD_IMPLEMENTED) \ + | (1 << NFIT_CMD_GET_CONFIG_SIZE) \ + | (1 << NFIT_CMD_GET_CONFIG_DATA) \ + | (1 << NFIT_CMD_SET_CONFIG_DATA)) + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -366,6 +408,18 @@ struct dsm_buffer { }; }; +struct cmd_out_implemented { + uint64_t cmd_list; +}; + +struct dsm_out { + union { + uint32_t status; + struct cmd_out_implemented cmd_implemented; + uint8_t data[PAGE_SIZE]; + }; +}; + static uint64_t dsm_read(void *opaque, hwaddr addr, unsigned size) { @@ -374,10 +428,82 @@ static uint64_t dsm_read(void *opaque, hwaddr addr, return 0; } +static void dsm_write_root(struct dsm_buffer *in, struct dsm_out *out) +{ + uint32_t function = in->arg2; + + if (function == NFIT_CMD_IMPLEMENTED) { + out->cmd_implemented.cmd_list = ROOT_SUPPORT_CMD; + return; + } + + out->status = NFIT_STATUS_NOT_SUPPORTED; + nvdebug("Return status %#x.\n", out->status); +} + +static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out) +{ + uint32_t function = in->arg2; + uint32_t status; + + switch (function) { + case NFIT_CMD_IMPLEMENTED: + out->cmd_implemented.cmd_list = DIMM_SUPPORT_CMD; + return; + default: + status = NFIT_STATUS_NOT_SUPPORTED; + }; + + nvdebug("Return status %#x.\n", status); + out->status = status; +} + static void dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + struct MemoryRegion *dsm_ram_mr = opaque; + struct dsm_buffer *dsm; + struct dsm_out *out; + void *buf; + assert(val == NOTIFY_VALUE); + + buf = memory_region_get_ram_ptr(dsm_ram_mr); + dsm = buf; + out = buf; + + nvdebug("Arg0 " UUID_FMT ".\n", dsm->arg0[0], dsm->arg0[1], dsm->arg0[2], + dsm->arg0[3], dsm->arg0[4], dsm->arg0[5], dsm->arg0[6], + dsm->arg0[7], dsm->arg0[8], dsm->arg0[9], dsm->arg0[10], + dsm->arg0[11], dsm->arg0[12], dsm->arg0[13], dsm->arg0[14], + dsm->arg0[15]); + nvdebug("Handler %#x, Arg1 %#x, Arg2 %#x.\n", dsm->handle, dsm->arg1, + dsm->arg2); + + if (dsm->arg1 != DSM_REVISION) { + nvdebug("Revision %#x is not supported, expect %#x.\n", + dsm->arg1, DSM_REVISION); + goto exit; + } + + if (!dsm->handle) { + if (!dsm_is_root_uuid(dsm->arg0)) { + nvdebug("Root UUID does not match.\n"); + goto exit; + } + + return dsm_write_root(dsm, out); + } + + if (!dsm_is_dimm_uuid(dsm->arg0)) { + nvdebug("DIMM UUID does not match.\n"); + goto exit; + } + + return dsm_write_nvdimm(dsm, out); + +exit: + out->status = NFIT_STATUS_NOT_SUPPORTED; } static const MemoryRegionOps dsm_ops = { -- 2.1.0
next prev parent reply other threads:[~2015-07-01 14:55 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-01 14:50 [PATCH 00/16] implement vNVDIMM Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 01/16] acpi: allow aml_operation_region() working on 64 bit offset Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 02/16] i386/acpi-build: allow SSDT to operate on 64 bit Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 03/16] acpi: add aml_derefof Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 04/16] acpi: add aml_sizeof Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 05/16] acpi: add aml_create_field Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 06/16] pc: implement NVDIMM device abstract Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 07/16] nvdimm: reserve address range for NVDIMM Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 08/16] nvdimm: init backend memory mapping and config data area Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 09/16] nvdimm: build ACPI NFIT table Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 10/16] nvdimm: init the address region used by _DSM method Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 11/16] nvdimm: build ACPI nvdimm devices Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 12/16] nvdimm: save arg3 for NVDIMM device _DSM method Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` Xiao Guangrong [this message] 2015-07-01 14:50 ` [Qemu-devel] [PATCH 13/16] nvdimm: support NFIT_CMD_IMPLEMENTED function Xiao Guangrong 2015-07-01 14:50 ` [PATCH 14/16] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 9:23 ` Stefan Hajnoczi 2015-07-02 9:23 ` [Qemu-devel] " Stefan Hajnoczi 2015-07-02 18:02 ` Xiao Guangrong 2015-07-02 18:02 ` Xiao Guangrong 2015-07-01 14:50 ` [PATCH 15/16] nvdimm: support NFIT_CMD_GET_CONFIG_DATA Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 16/16] nvdimm: support NFIT_CMD_SET_CONFIG_DATA Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 6:17 ` [PATCH 00/16] implement vNVDIMM Michael S. Tsirkin 2015-07-02 6:17 ` [Qemu-devel] " Michael S. Tsirkin 2015-07-02 6:34 ` Xiao Guangrong 2015-07-02 6:34 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 8:31 ` Stefan Hajnoczi 2015-07-02 8:31 ` Stefan Hajnoczi 2015-07-02 8:35 ` Michael S. Tsirkin 2015-07-02 8:35 ` Michael S. Tsirkin 2015-07-02 9:20 ` Stefan Hajnoczi 2015-07-02 9:20 ` Stefan Hajnoczi 2015-07-02 9:52 ` Paolo Bonzini 2015-07-02 9:52 ` Paolo Bonzini 2015-07-02 18:01 ` Xiao Guangrong 2015-07-02 18:01 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 18:11 ` Paolo Bonzini 2015-07-02 18:11 ` Paolo Bonzini 2015-07-29 8:41 ` 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=1435762232-15543-14-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.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.