[14/16] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function

Commit Message

Xiao Guangrong July 1, 2015, 2:50 p.m. UTC

Function 4 is used to get Namespace lable size

Signed-off-by: Xiao Guangrong <[e-mail]>
---
 hw/mem/pc-nvdimm.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

Comments

Stefan Hajnoczi July 2, 2015, 9:23 a.m. UTC | #1

On Wed, Jul 01, 2015 at 10:50:30PM +0800, Xiao Guangrong wrote:
> +static uint32_t dsm_cmd_config_size(struct dsm_buffer *in, struct dsm_out *out)
> +{
> +    GSList *list = get_nvdimm_built_list();
> +    PCNVDIMMDevice *nvdimm = get_nvdimm_device_by_handle(list, in->handle);
> +    uint32_t status = NFIT_STATUS_NON_EXISTING_MEM_DEV;
> +
> +    if (!nvdimm) {
> +        goto exit;
> +    }
> +
> +    status = NFIT_STATUS_SUCCESS;
> +    out->cmd_config_size.config_size = nvdimm->config_data_size;
> +    out->cmd_config_size.max_xfer = max_xfer_config_size();

cpu_to_*() missing?

It should be possible to emulate NVDIMMs for a x86_64 guest on a
big-endian host, for example.

Xiao Guangrong July 2, 2015, 6:02 p.m. UTC | #2

On 07/02/2015 05:23 PM, Stefan Hajnoczi wrote:
> On Wed, Jul 01, 2015 at 10:50:30PM +0800, Xiao Guangrong wrote:
>> +static uint32_t dsm_cmd_config_size(struct dsm_buffer *in, struct dsm_out *out)
>> +{
>> +    GSList *list = get_nvdimm_built_list();
>> +    PCNVDIMMDevice *nvdimm = get_nvdimm_device_by_handle(list, in->handle);
>> +    uint32_t status = NFIT_STATUS_NON_EXISTING_MEM_DEV;
>> +
>> +    if (!nvdimm) {
>> +        goto exit;
>> +    }
>> +
>> +    status = NFIT_STATUS_SUCCESS;
>> +    out->cmd_config_size.config_size = nvdimm->config_data_size;
>> +    out->cmd_config_size.max_xfer = max_xfer_config_size();
>
> cpu_to_*() missing?
>
> It should be possible to emulate NVDIMMs for a x86_64 guest on a
> big-endian host, for example.

Indeed, will fix it in the next version, thank you for pointing it out.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c
index b586bf7..7e5446c 100644
--- a/hw/mem/pc-nvdimm.c
+++ b/hw/mem/pc-nvdimm.c
@@ -127,6 +127,20 @@  static uint32_t nvdimm_index_to_handle(int index)
     return index + 1;
 }
 
+static PCNVDIMMDevice
+*get_nvdimm_device_by_handle(GSList *list, uint32_t handle)
+{
+    for (; list; list = list->next) {
+        PCNVDIMMDevice *nvdimm = list->data;
+
+        if (nvdimm_index_to_handle(nvdimm->device_index) == handle) {
+            return nvdimm;
+        }
+    }
+
+    return NULL;
+}
+
 typedef struct {
     uint8_t b[16];
 } uuid_le;
@@ -391,6 +405,17 @@  enum {
                            | (1 << NFIT_CMD_GET_CONFIG_DATA)    \
                            | (1 << NFIT_CMD_SET_CONFIG_DATA))
 
+struct cmd_in_get_config_data {
+    uint32_t offset;
+    uint32_t length;
+} QEMU_PACKED;
+
+struct cmd_in_set_config_data {
+    uint32_t offset;
+    uint32_t length;
+    uint8_t in_buf[0];
+} QEMU_PACKED;
+
 struct dsm_buffer {
     /* RAM page. */
     uint32_t handle;
@@ -398,6 +423,7 @@  struct dsm_buffer {
     uint32_t arg1;
     uint32_t arg2;
     union {
+        struct cmd_in_set_config_data cmd_config_set;
         char arg3[PAGE_SIZE - 3 * sizeof(uint32_t) - 16 * sizeof(uint8_t)];
     };
 
@@ -412,10 +438,23 @@  struct cmd_out_implemented {
     uint64_t cmd_list;
 };
 
+struct cmd_out_get_config_size {
+    uint32_t status;
+    uint32_t config_size;
+    uint32_t max_xfer;
+} QEMU_PACKED;
+
+struct cmd_out_get_config_data {
+    uint32_t status;
+    uint8_t out_buf[0];
+} QEMU_PACKED;
+
 struct dsm_out {
     union {
         uint32_t status;
         struct cmd_out_implemented cmd_implemented;
+        struct cmd_out_get_config_size cmd_config_size;
+        struct cmd_out_get_config_data cmd_config_get;
         uint8_t data[PAGE_SIZE];
     };
 };
@@ -441,6 +480,51 @@  static void dsm_write_root(struct dsm_buffer *in, struct dsm_out *out)
     nvdebug("Return status %#x.\n", out->status);
 }
 
+/*
+ * the max transfer size is the max size transfered by both a
+ * NFIT_CMD_GET_CONFIG_DATA and a NFIT_CMD_SET_CONFIG_DATA
+ * command.
+ */
+static uint32_t max_xfer_config_size(void)
+{
+    struct dsm_buffer *in;
+    struct dsm_out *out;
+    uint32_t max_get_size, max_set_size;
+
+    /*
+     * the max data ACPI can read one time which is transfered by
+     * the response of NFIT_CMD_GET_CONFIG_DATA.
+     */
+    max_get_size = sizeof(out->data) - sizeof(out->cmd_config_get);
+
+    /*
+     * the max data ACPI can write one time which is transfered by
+     * NFIT_CMD_SET_CONFIG_DATA
+     */
+    max_set_size = sizeof(in->arg3) - sizeof(in->cmd_config_set);
+    return MIN(max_get_size, max_set_size);
+}
+
+static uint32_t dsm_cmd_config_size(struct dsm_buffer *in, struct dsm_out *out)
+{
+    GSList *list = get_nvdimm_built_list();
+    PCNVDIMMDevice *nvdimm = get_nvdimm_device_by_handle(list, in->handle);
+    uint32_t status = NFIT_STATUS_NON_EXISTING_MEM_DEV;
+
+    if (!nvdimm) {
+        goto exit;
+    }
+
+    status = NFIT_STATUS_SUCCESS;
+    out->cmd_config_size.config_size = nvdimm->config_data_size;
+    out->cmd_config_size.max_xfer = max_xfer_config_size();
+    nvdebug("%s config_size %#x, max_xfer %#x.\n", __func__,
+            out->cmd_config_size.config_size, out->cmd_config_size.max_xfer);
+exit:
+    g_slist_free(list);
+    return status;
+}
+
 static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out)
 {
     uint32_t function = in->arg2;
@@ -450,6 +534,9 @@  static void dsm_write_nvdimm(struct dsm_buffer *in, struct dsm_out *out)
     case NFIT_CMD_IMPLEMENTED:
         out->cmd_implemented.cmd_list = DIMM_SUPPORT_CMD;
         return;
+    case NFIT_CMD_GET_CONFIG_SIZE:
+        status = dsm_cmd_config_size(in, out);
+        break;
     default:
         status = NFIT_STATUS_NOT_SUPPORTED;
     };