Skip to contentSkip to conversation

nvdimm: clean up

PATCH Superseded Wei Yang 2 participants 10 messages Feb 27, 2019 – Mar 7, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

cover nvdimm: clean up

Here are 4 cleanup patches for nvdimm.

The first three are trivial clean on argument/variable. The last one move setup place of the FIT table.

Wei Yang (4):
nvdimm: fix typo in nvdimm_build_nvdimm_devices argument
nvdimm: use *function* directly instead of allocating it again
nvdimm: use NVDIMM_ACPI_IO_LEN for the proper IO size
nvdimm: build FIT in nvdimm_build_acpi

 hw/acpi/nvdimm.c        | 14 +++++---------
 hw/i386/pc.c            |  5 -----
 include/hw/mem/nvdimm.h |  1 -
 3 files changed, 5 insertions(+), 15 deletions(-)
Signature · 1 line
2.19.1
author
#1 lore raw

PATCH 1/4 nvdimm: fix typo in nvdimm_build_nvdimm_devices argument

Quoted 1 line

From dsm_dma_arrea to dsm_dma_area.

---
 hw/acpi/nvdimm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/nvdimm.c +2 -2
index e53b2cb681..39af8cdba8 100644
@@ -1260,7 +1260,7 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)
 }
 
 static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
-                              BIOSLinker *linker, GArray *dsm_dma_arrea,
+                              BIOSLinker *linker, GArray *dsm_dma_area,
                               uint32_t ram_slots)
 {
     Aml *ssdt, *sb_scope, *dev;
@@ -1307,7 +1307,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
                                                NVDIMM_ACPI_MEM_ADDR);
 
     bios_linker_loader_alloc(linker,
-                             NVDIMM_DSM_MEM_FILE, dsm_dma_arrea,
+                             NVDIMM_DSM_MEM_FILE, dsm_dma_area,
                              sizeof(NvdimmDsmIn), false /* high memory */);
     bios_linker_loader_add_pointer(linker,
         ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),
Signature · 1 line
2.19.1
author
#3 lore raw

PATCH 2/4 nvdimm: use *function* directly instead of allocating it again

In reply to Wei Yang

At the beginning or nvdimm_build_common_dsm(), variable *function* is already allocated for Arg2.

This patch reuse variable *function* instead of allocating it again.

---
 hw/acpi/nvdimm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/nvdimm.c +1 -1
index 39af8cdba8..e63a1ef15d 100644
@@ -1086,7 +1086,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
      */
     aml_append(method, aml_store(handle, aml_name(NVDIMM_DSM_HANDLE)));
     aml_append(method, aml_store(aml_arg(1), aml_name(NVDIMM_DSM_REVISION)));
-    aml_append(method, aml_store(aml_arg(2), aml_name(NVDIMM_DSM_FUNCTION)));
+    aml_append(method, aml_store(function, aml_name(NVDIMM_DSM_FUNCTION)));
 
     /*
      * The fourth parameter (Arg3) of _DSM is a package which contains
Signature · 1 line
2.19.1
author
#5 lore raw

PATCH 3/4 nvdimm: use NVDIMM_ACPI_IO_LEN for the proper IO size

In reply to Wei Yang

The IO range is defined to 4 bytes with NVDIMM_ACPI_IO_LEN, so it is more proper to use this macro instead of calculating it by sizeof.

---
 hw/acpi/nvdimm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/nvdimm.c +1 -1
index e63a1ef15d..2457c1aa44 100644
@@ -992,7 +992,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
     field = aml_field(NVDIMM_DSM_IOPORT, AML_DWORD_ACC, AML_NOLOCK,
                       AML_PRESERVE);
     aml_append(field, aml_named_field(NVDIMM_DSM_NOTIFY,
-               sizeof(uint32_t) * BITS_PER_BYTE));
+               NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE));
     aml_append(method, field);
 
     /*
Signature · 1 line
2.19.1
author
#7 lore raw

PATCH 4/4 nvdimm: build FIT in nvdimm_build_acpi

In reply to Wei Yang

Currently we initialize nvdimm device like below:

    device_set_realized
        dc->realize
	nvdimm_plug
	    nvdimm_build_fit_buffer
    acpi_build
        nvdimm_build_acpi

This shows nvdimm's acpi stuff is prepared in two places:

* device plug stage
* acpi_build stage

It would be more proper to build fit buffer in nvdimm_build_acpi, which consolidate all acpi related initialization together.

This patch moves FIT build in nvdimm_build_acpi.

---
 hw/acpi/nvdimm.c        | 6 +-----
 hw/i386/pc.c            | 5 -----
 include/hw/mem/nvdimm.h | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
hw/acpi/nvdimm.c +1 -5
index 2457c1aa44..6fc0c65ee0 100644
@@ -425,11 +425,6 @@ static void nvdimm_build_fit_buffer(AcpiNVDIMMState *state)
     fit_buf->dirty = true;
 }
 
-void nvdimm_plug(AcpiNVDIMMState *state)
-{
-    nvdimm_build_fit_buffer(state);
-}
-
 static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets,
                               GArray *table_data, BIOSLinker *linker)
 {
@@ -1338,6 +1333,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
         return;
     }
 
+    nvdimm_build_fit_buffer(state);
     nvdimm_build_nfit(state, table_offsets, table_data, linker);
     g_slist_free(device_list);
 }
hw/i386/pc.c +0 -5
index 64d9e756fa..686b610c50 100644
@@ -2099,17 +2099,12 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev,
 {
     Error *local_err = NULL;
     PCMachineState *pcms = PC_MACHINE(hotplug_dev);
-    bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
 
     pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
     if (local_err) {
         goto out;
     }
 
-    if (is_nvdimm) {
-        nvdimm_plug(&pcms->acpi_nvdimm_state);
-    }
-
     hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort);
 out:
     error_propagate(errp, local_err);
include/hw/mem/nvdimm.h +0 -1
index c5c9b3c7f8..30869b4834 100644
@@ -148,6 +148,5 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io,
 void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
                        BIOSLinker *linker, AcpiNVDIMMState *state,
                        uint32_t ram_slots);
-void nvdimm_plug(AcpiNVDIMMState *state);
 void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev);
 #endif
Signature · 1 line
2.19.1
Reviewed-by on v1 1/4
#2 lore raw

Re: [Qemu-devel] [PATCH 1/4] nvdimm: fix typo in nvdimm_build_nvdimm_devices argument

In reply to Wei Yang
Quoted 3 lines · On Wed, 27 Feb 2019 15:50:58 +0800 Wei Yang <[email protected]>…

From dsm_dma_arrea to dsm_dma_area.

Quoted 26 lines
---
 hw/acpi/nvdimm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/nvdimm.c +2 -2
index e53b2cb681..39af8cdba8 100644
@@ -1260,7 +1260,7 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)
 }
 
 static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
-                              BIOSLinker *linker, GArray *dsm_dma_arrea,
+                              BIOSLinker *linker, GArray *dsm_dma_area,
                               uint32_t ram_slots)
 {
     Aml *ssdt, *sb_scope, *dev;
@@ -1307,7 +1307,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
                                                NVDIMM_ACPI_MEM_ADDR);
 
     bios_linker_loader_alloc(linker,
-                             NVDIMM_DSM_MEM_FILE, dsm_dma_arrea,
+                             NVDIMM_DSM_MEM_FILE, dsm_dma_area,
                              sizeof(NvdimmDsmIn), false /* high memory */);
     bios_linker_loader_add_pointer(linker,
         ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),
Reviewed-by on v1 2/4
#4 lore raw

Re: [Qemu-devel] [PATCH 2/4] nvdimm: use *function* directly instead of allocating it again

In reply to Wei Yang
Quoted 4 lines · On Wed, 27 Feb 2019 15:50:59 +0800 Wei Yang <[email protected]>…

At the beginning or nvdimm_build_common_dsm(), variable *function* is already allocated for Arg2.

This patch reuse variable *function* instead of allocating it again.

Quoted 19 lines
---
 hw/acpi/nvdimm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/nvdimm.c +1 -1
index 39af8cdba8..e63a1ef15d 100644
@@ -1086,7 +1086,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
      */
     aml_append(method, aml_store(handle, aml_name(NVDIMM_DSM_HANDLE)));
     aml_append(method, aml_store(aml_arg(1), aml_name(NVDIMM_DSM_REVISION)));
-    aml_append(method, aml_store(aml_arg(2), aml_name(NVDIMM_DSM_FUNCTION)));
+    aml_append(method, aml_store(function, aml_name(NVDIMM_DSM_FUNCTION)));
 
     /*
      * The fourth parameter (Arg3) of _DSM is a package which contains
Reviewed-by on v1 3/4
#6 lore raw

Re: [Qemu-devel] [PATCH 3/4] nvdimm: use NVDIMM_ACPI_IO_LEN for the proper IO size

In reply to Wei Yang
Quoted 4 lines · On Wed, 27 Feb 2019 15:51:00 +0800 Wei Yang <[email protected]>…

The IO range is defined to 4 bytes with NVDIMM_ACPI_IO_LEN, so it is more proper to use this macro instead of calculating it by sizeof.

Quoted 17 lines
---
 hw/acpi/nvdimm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/acpi/nvdimm.c +1 -1
index e63a1ef15d..2457c1aa44 100644
@@ -992,7 +992,7 @@ static void nvdimm_build_common_dsm(Aml *dev)
     field = aml_field(NVDIMM_DSM_IOPORT, AML_DWORD_ACC, AML_NOLOCK,
                       AML_PRESERVE);
     aml_append(field, aml_named_field(NVDIMM_DSM_NOTIFY,
-               sizeof(uint32_t) * BITS_PER_BYTE));
+               NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE));
     aml_append(method, field);
 
     /*
#8 lore raw

Re: [Qemu-devel] [PATCH 4/4] nvdimm: build FIT in nvdimm_build_acpi

In reply to Wei Yang
Quoted 11 lines · On Wed, 27 Feb 2019 15:51:01 +0800 Wei Yang <[email protected]>…

Currently we initialize nvdimm device like below:

    device_set_realized
        dc->realize
	nvdimm_plug
	    nvdimm_build_fit_buffer
    acpi_build
        nvdimm_build_acpi

This shows nvdimm's acpi stuff is prepared in two places:

Quoted 7 lines

* device plug stage
* acpi_build stage

It would be more proper to build fit buffer in nvdimm_build_acpi, which consolidate all acpi related initialization together.

This patch moves FIT build in nvdimm_build_acpi.

Does hotplug work after this change?

Quoted 65 lines
---
 hw/acpi/nvdimm.c        | 6 +-----
 hw/i386/pc.c            | 5 -----
 include/hw/mem/nvdimm.h | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
hw/acpi/nvdimm.c +1 -5
index 2457c1aa44..6fc0c65ee0 100644
@@ -425,11 +425,6 @@ static void nvdimm_build_fit_buffer(AcpiNVDIMMState *state)
     fit_buf->dirty = true;
 }
 
-void nvdimm_plug(AcpiNVDIMMState *state)
-{
-    nvdimm_build_fit_buffer(state);
-}
-
 static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets,
                               GArray *table_data, BIOSLinker *linker)
 {
@@ -1338,6 +1333,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
         return;
     }
 
+    nvdimm_build_fit_buffer(state);
     nvdimm_build_nfit(state, table_offsets, table_data, linker);
     g_slist_free(device_list);
 }
hw/i386/pc.c +0 -5
index 64d9e756fa..686b610c50 100644
@@ -2099,17 +2099,12 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev,
 {
     Error *local_err = NULL;
     PCMachineState *pcms = PC_MACHINE(hotplug_dev);
-    bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
 
     pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
     if (local_err) {
         goto out;
     }
 
-    if (is_nvdimm) {
-        nvdimm_plug(&pcms->acpi_nvdimm_state);
-    }
-
     hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort);
 out:
     error_propagate(errp, local_err);
include/hw/mem/nvdimm.h +0 -1
index c5c9b3c7f8..30869b4834 100644
@@ -148,6 +148,5 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io,
 void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
                        BIOSLinker *linker, AcpiNVDIMMState *state,
                        uint32_t ram_slots);
-void nvdimm_plug(AcpiNVDIMMState *state);
 void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev);
 #endif
author
#9 lore raw

Re: [Qemu-devel] [PATCH 4/4] nvdimm: build FIT in nvdimm_build_acpi

Quoted 17 lines · Igor Mammedov
Quoted 14 lines · On Wed, 27 Feb 2019 15:51:01 +0800 Wei Yang <[email protected]>…

Currently we initialize nvdimm device like below:

    device_set_realized
        dc->realize
	nvdimm_plug
	    nvdimm_build_fit_buffer
    acpi_build
        nvdimm_build_acpi

This shows nvdimm's acpi stuff is prepared in two places:

* device plug stage
* acpi_build stage

Quoted 7 lines
Quoted 4 lines

It would be more proper to build fit buffer in nvdimm_build_acpi, which consolidate all acpi related initialization together.

This patch moves FIT build in nvdimm_build_acpi.

Does hotplug work after this change?

Looks no. I missed to test this case.

Quoted 65 lines
Quoted 65 lines
---
 hw/acpi/nvdimm.c        | 6 +-----
 hw/i386/pc.c            | 5 -----
 include/hw/mem/nvdimm.h | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
hw/acpi/nvdimm.c +1 -5
index 2457c1aa44..6fc0c65ee0 100644
@@ -425,11 +425,6 @@ static void nvdimm_build_fit_buffer(AcpiNVDIMMState *state)
     fit_buf->dirty = true;
 }
 
-void nvdimm_plug(AcpiNVDIMMState *state)
-{
-    nvdimm_build_fit_buffer(state);
-}
-
 static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets,
                               GArray *table_data, BIOSLinker *linker)
 {
@@ -1338,6 +1333,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
         return;
     }
 
+    nvdimm_build_fit_buffer(state);
     nvdimm_build_nfit(state, table_offsets, table_data, linker);
     g_slist_free(device_list);
 }
hw/i386/pc.c +0 -5
index 64d9e756fa..686b610c50 100644
@@ -2099,17 +2099,12 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev,
 {
     Error *local_err = NULL;
     PCMachineState *pcms = PC_MACHINE(hotplug_dev);
-    bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
 
     pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
     if (local_err) {
         goto out;
     }
 
-    if (is_nvdimm) {
-        nvdimm_plug(&pcms->acpi_nvdimm_state);
-    }
-
     hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort);
 out:
     error_propagate(errp, local_err);
include/hw/mem/nvdimm.h +0 -1
index c5c9b3c7f8..30869b4834 100644
@@ -148,6 +148,5 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io,
 void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
                        BIOSLinker *linker, AcpiNVDIMMState *state,
                        uint32_t ram_slots);
-void nvdimm_plug(AcpiNVDIMMState *state);
 void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev);
 #endif
Signature · 2 lines
Wei Yang
Help you, Help me