diff mbox series

[2/5] nvdimm: Use configurable ACPI IO base and size

Message ID 20191004155302.4632-3-shameerali.kolothum.thodi@huawei.com
State Superseded
Headers show
Series ARM virt: Add NVDIMM support | expand

Commit Message

Shameerali Kolothum Thodi Oct. 4, 2019, 3:52 p.m. UTC 
From: Kwangwoo Lee <kwangwoo.lee@sk.com>


This patch makes IO base and size configurable to create NPIO AML for
ACPI NFIT. Since a different architecture like AArch64 does not use
port-mapped IO, a configurable IO base is required to create correct
mapping of ACPI IO address and size.

Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

---
 hw/acpi/nvdimm.c        | 32 ++++++++++++++++++++++----------
 hw/i386/acpi-build.c    |  6 ++++++
 hw/i386/acpi-build.h    |  3 +++
 hw/i386/pc_piix.c       |  2 ++
 hw/i386/pc_q35.c        |  2 ++
 include/hw/mem/nvdimm.h |  3 +++
 6 files changed, 38 insertions(+), 10 deletions(-)

-- 
2.17.1

Comments

Igor Mammedov Nov. 11, 2019, 2:24 p.m. UTC | #1 
On Fri, 4 Oct 2019 16:52:59 +0100
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> wrote:

> From: Kwangwoo Lee <kwangwoo.lee@sk.com>

> 

> This patch makes IO base and size configurable to create NPIO AML for

> ACPI NFIT. Since a different architecture like AArch64 does not use

> port-mapped IO, a configurable IO base is required to create correct

> mapping of ACPI IO address and size.

> 

> Signed-off-by: Kwangwoo Lee <kwangwoo.lee@sk.com>

> Signed-off-by: Eric Auger <eric.auger@redhat.com>

> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

> ---

>  hw/acpi/nvdimm.c        | 32 ++++++++++++++++++++++----------

>  hw/i386/acpi-build.c    |  6 ++++++

>  hw/i386/acpi-build.h    |  3 +++

>  hw/i386/pc_piix.c       |  2 ++

>  hw/i386/pc_q35.c        |  2 ++

>  include/hw/mem/nvdimm.h |  3 +++

>  6 files changed, 38 insertions(+), 10 deletions(-)

> 

> diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c

> index 9fdad6dc3f..f91eea3802 100644

> --- a/hw/acpi/nvdimm.c

> +++ b/hw/acpi/nvdimm.c

> @@ -926,11 +926,13 @@ void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev)

>  }

>  

>  void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,

> +                            struct AcpiGenericAddress dsm_io,

>                              FWCfgState *fw_cfg, Object *owner)

>  {

> +    state->dsm_io = dsm_io;

>      memory_region_init_io(&state->io_mr, owner, &nvdimm_dsm_ops, state,

> -                          "nvdimm-acpi-io", NVDIMM_ACPI_IO_LEN);

> -    memory_region_add_subregion(io, NVDIMM_ACPI_IO_BASE, &state->io_mr);

> +                          "nvdimm-acpi-io", dsm_io.bit_width >> 3);

> +    memory_region_add_subregion(io, dsm_io.address, &state->io_mr);

>  

>      state->dsm_mem = g_array_new(false, true /* clear */, 1);

>      acpi_data_push(state->dsm_mem, sizeof(NvdimmDsmIn));

> @@ -959,12 +961,14 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,

>  

>  #define NVDIMM_QEMU_RSVD_UUID   "648B9CF2-CDA1-4312-8AD9-49C4AF32BD62"

>  

> -static void nvdimm_build_common_dsm(Aml *dev)

> +static void nvdimm_build_common_dsm(Aml *dev,

> +                                    NVDIMMState *nvdimm_state)

>  {

>      Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *elsectx2;

>      Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid;

>      Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf, *dsm_out_buf_size;

>      uint8_t byte_list[1];

> +    AmlRegionSpace rs;

>  

>      method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);

>      uuid = aml_arg(0);

> @@ -975,9 +979,16 @@ static void nvdimm_build_common_dsm(Aml *dev)

>  

>      aml_append(method, aml_store(aml_name(NVDIMM_ACPI_MEM_ADDR), dsm_mem));

>  

> +    if (nvdimm_state->dsm_io.space_id == AML_AS_SYSTEM_IO) {

> +        rs = AML_SYSTEM_IO;

> +    } else {

> +        rs = AML_SYSTEM_MEMORY;

> +    }

> +

>      /* map DSM memory and IO into ACPI namespace. */

> -    aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, AML_SYSTEM_IO,

> -               aml_int(NVDIMM_ACPI_IO_BASE), NVDIMM_ACPI_IO_LEN));

> +    aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, rs,

> +               aml_int(nvdimm_state->dsm_io.address),

> +               nvdimm_state->dsm_io.bit_width >> 3));

>      aml_append(method, aml_operation_region(NVDIMM_DSM_MEMORY,

>                 AML_SYSTEM_MEMORY, dsm_mem, sizeof(NvdimmDsmIn)));

>  

> @@ -992,7 +1003,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,

> -               NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE));

> +              (nvdimm_state->dsm_io.bit_width >> 3) * BITS_PER_BYTE));

Why are you converting bits to bytes and then back to bits, here?


>      aml_append(method, field);

>  

>      /*

> @@ -1260,7 +1271,8 @@ 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_area,

> +                              BIOSLinker *linker,

> +                              NVDIMMState *nvdimm_state,

>                                uint32_t ram_slots)

>  {

>      Aml *ssdt, *sb_scope, *dev;

> @@ -1288,7 +1300,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,

>       */

>      aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0012")));

>  

> -    nvdimm_build_common_dsm(dev);

> +    nvdimm_build_common_dsm(dev, nvdimm_state);

>  

>      /* 0 is reserved for root device. */

>      nvdimm_build_device_dsm(dev, 0);

> @@ -1307,7 +1319,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_area,

> +                             NVDIMM_DSM_MEM_FILE, nvdimm_state->dsm_mem,

>                               sizeof(NvdimmDsmIn), false /* high memory */);

>      bios_linker_loader_add_pointer(linker,

>          ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),

> @@ -1329,7 +1341,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,

>          return;

>      }

>  

> -    nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,

> +    nvdimm_build_ssdt(table_offsets, table_data, linker, state,

>                        ram_slots);

>  

>      device_list = nvdimm_get_device_list();

> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c

> index 1d077a7cb7..b5170912a8 100644

> --- a/hw/i386/acpi-build.c

> +++ b/hw/i386/acpi-build.c

> @@ -126,6 +126,12 @@ typedef struct FwCfgTPMConfig {

>  

>  static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg);

>  

> +const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = {

> +    .space_id = AML_AS_SYSTEM_IO,

> +    .address = NVDIMM_ACPI_IO_BASE,

> +    .bit_width = NVDIMM_ACPI_IO_LEN << 3

> +};

> +

>  static void init_common_fadt_data(MachineState *ms, Object *o,

>                                    AcpiFadtData *data)

>  {

> diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h

> index 007332e51c..74df5fc612 100644

> --- a/hw/i386/acpi-build.h

> +++ b/hw/i386/acpi-build.h

> @@ -1,6 +1,9 @@

>  

>  #ifndef HW_I386_ACPI_BUILD_H

>  #define HW_I386_ACPI_BUILD_H

> +#include "hw/acpi/acpi-defs.h"

> +

> +extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;

>  

>  void acpi_setup(void);

>  

> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c

> index 6824b72124..78521cf017 100644

> --- a/hw/i386/pc_piix.c

> +++ b/hw/i386/pc_piix.c

> @@ -58,6 +58,7 @@

>  #include "migration/misc.h"

>  #include "kvm_i386.h"

>  #include "sysemu/numa.h"

> +#include "hw/i386/acpi-build.h"

>  

>  #define MAX_IDE_BUS 2

>  

> @@ -303,6 +304,7 @@ else {

>  

>      if (machine->nvdimms_state->is_enabled) {

>          nvdimm_init_acpi_state(machine->nvdimms_state, system_io,

> +                               x86_nvdimm_acpi_dsmio,

>                                 pcms->fw_cfg, OBJECT(pcms));

>      }

>  }

> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c

> index 8fad20f314..d53ee8de84 100644

> --- a/hw/i386/pc_q35.c

> +++ b/hw/i386/pc_q35.c

> @@ -53,6 +53,7 @@

>  #include "qapi/error.h"

>  #include "qemu/error-report.h"

>  #include "sysemu/numa.h"

> +#include "hw/i386/acpi-build.h"

>  

>  /* ICH9 AHCI has 6 ports */

>  #define MAX_SATA_PORTS     6

> @@ -330,6 +331,7 @@ static void pc_q35_init(MachineState *machine)

>  

>      if (machine->nvdimms_state->is_enabled) {

>          nvdimm_init_acpi_state(machine->nvdimms_state, system_io,

> +                               x86_nvdimm_acpi_dsmio,

>                                 pcms->fw_cfg, OBJECT(pcms));

>      }

>  }

> diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h

> index 523a9b3d4a..5fe440861e 100644

> --- a/include/hw/mem/nvdimm.h

> +++ b/include/hw/mem/nvdimm.h

> @@ -25,6 +25,7 @@

>  

>  #include "hw/mem/pc-dimm.h"

>  #include "hw/acpi/bios-linker-loader.h"

> +#include "hw/acpi/aml-build.h"

>  

>  #define NVDIMM_DEBUG 0

>  #define nvdimm_debug(fmt, ...)                                \

> @@ -140,10 +141,12 @@ struct NVDIMMState {

>       */

>      int32_t persistence;

>      char    *persistence_string;

> +    struct AcpiGenericAddress dsm_io;

>  };

>  typedef struct NVDIMMState NVDIMMState;

>  

>  void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,

> +                            struct AcpiGenericAddress dsm_io,

>                              FWCfgState *fw_cfg, Object *owner);

>  void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,

>                         BIOSLinker *linker, NVDIMMState *state,
diff mbox series

Patch

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 9fdad6dc3f..f91eea3802 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -926,11 +926,13 @@  void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev)
 }
 
 void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
+                            struct AcpiGenericAddress dsm_io,
                             FWCfgState *fw_cfg, Object *owner)
 {
+    state->dsm_io = dsm_io;
     memory_region_init_io(&state->io_mr, owner, &nvdimm_dsm_ops, state,
-                          "nvdimm-acpi-io", NVDIMM_ACPI_IO_LEN);
-    memory_region_add_subregion(io, NVDIMM_ACPI_IO_BASE, &state->io_mr);
+                          "nvdimm-acpi-io", dsm_io.bit_width >> 3);
+    memory_region_add_subregion(io, dsm_io.address, &state->io_mr);
 
     state->dsm_mem = g_array_new(false, true /* clear */, 1);
     acpi_data_push(state->dsm_mem, sizeof(NvdimmDsmIn));
@@ -959,12 +961,14 @@  void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
 
 #define NVDIMM_QEMU_RSVD_UUID   "648B9CF2-CDA1-4312-8AD9-49C4AF32BD62"
 
-static void nvdimm_build_common_dsm(Aml *dev)
+static void nvdimm_build_common_dsm(Aml *dev,
+                                    NVDIMMState *nvdimm_state)
 {
     Aml *method, *ifctx, *function, *handle, *uuid, *dsm_mem, *elsectx2;
     Aml *elsectx, *unsupport, *unpatched, *expected_uuid, *uuid_invalid;
     Aml *pckg, *pckg_index, *pckg_buf, *field, *dsm_out_buf, *dsm_out_buf_size;
     uint8_t byte_list[1];
+    AmlRegionSpace rs;
 
     method = aml_method(NVDIMM_COMMON_DSM, 5, AML_SERIALIZED);
     uuid = aml_arg(0);
@@ -975,9 +979,16 @@  static void nvdimm_build_common_dsm(Aml *dev)
 
     aml_append(method, aml_store(aml_name(NVDIMM_ACPI_MEM_ADDR), dsm_mem));
 
+    if (nvdimm_state->dsm_io.space_id == AML_AS_SYSTEM_IO) {
+        rs = AML_SYSTEM_IO;
+    } else {
+        rs = AML_SYSTEM_MEMORY;
+    }
+
     /* map DSM memory and IO into ACPI namespace. */
-    aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, AML_SYSTEM_IO,
-               aml_int(NVDIMM_ACPI_IO_BASE), NVDIMM_ACPI_IO_LEN));
+    aml_append(method, aml_operation_region(NVDIMM_DSM_IOPORT, rs,
+               aml_int(nvdimm_state->dsm_io.address),
+               nvdimm_state->dsm_io.bit_width >> 3));
     aml_append(method, aml_operation_region(NVDIMM_DSM_MEMORY,
                AML_SYSTEM_MEMORY, dsm_mem, sizeof(NvdimmDsmIn)));
 
@@ -992,7 +1003,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,
-               NVDIMM_ACPI_IO_LEN * BITS_PER_BYTE));
+              (nvdimm_state->dsm_io.bit_width >> 3) * BITS_PER_BYTE));
     aml_append(method, field);
 
     /*
@@ -1260,7 +1271,8 @@  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_area,
+                              BIOSLinker *linker,
+                              NVDIMMState *nvdimm_state,
                               uint32_t ram_slots)
 {
     Aml *ssdt, *sb_scope, *dev;
@@ -1288,7 +1300,7 @@  static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
      */
     aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0012")));
 
-    nvdimm_build_common_dsm(dev);
+    nvdimm_build_common_dsm(dev, nvdimm_state);
 
     /* 0 is reserved for root device. */
     nvdimm_build_device_dsm(dev, 0);
@@ -1307,7 +1319,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_area,
+                             NVDIMM_DSM_MEM_FILE, nvdimm_state->dsm_mem,
                              sizeof(NvdimmDsmIn), false /* high memory */);
     bios_linker_loader_add_pointer(linker,
         ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),
@@ -1329,7 +1341,7 @@  void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
         return;
     }
 
-    nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
+    nvdimm_build_ssdt(table_offsets, table_data, linker, state,
                       ram_slots);
 
     device_list = nvdimm_get_device_list();
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1d077a7cb7..b5170912a8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -126,6 +126,12 @@  typedef struct FwCfgTPMConfig {
 
 static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg);
 
+const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = {
+    .space_id = AML_AS_SYSTEM_IO,
+    .address = NVDIMM_ACPI_IO_BASE,
+    .bit_width = NVDIMM_ACPI_IO_LEN << 3
+};
+
 static void init_common_fadt_data(MachineState *ms, Object *o,
                                   AcpiFadtData *data)
 {
diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h
index 007332e51c..74df5fc612 100644
--- a/hw/i386/acpi-build.h
+++ b/hw/i386/acpi-build.h
@@ -1,6 +1,9 @@ 
 
 #ifndef HW_I386_ACPI_BUILD_H
 #define HW_I386_ACPI_BUILD_H
+#include "hw/acpi/acpi-defs.h"
+
+extern const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio;
 
 void acpi_setup(void);
 
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 6824b72124..78521cf017 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -58,6 +58,7 @@ 
 #include "migration/misc.h"
 #include "kvm_i386.h"
 #include "sysemu/numa.h"
+#include "hw/i386/acpi-build.h"
 
 #define MAX_IDE_BUS 2
 
@@ -303,6 +304,7 @@  else {
 
     if (machine->nvdimms_state->is_enabled) {
         nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
+                               x86_nvdimm_acpi_dsmio,
                                pcms->fw_cfg, OBJECT(pcms));
     }
 }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 8fad20f314..d53ee8de84 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -53,6 +53,7 @@ 
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/numa.h"
+#include "hw/i386/acpi-build.h"
 
 /* ICH9 AHCI has 6 ports */
 #define MAX_SATA_PORTS     6
@@ -330,6 +331,7 @@  static void pc_q35_init(MachineState *machine)
 
     if (machine->nvdimms_state->is_enabled) {
         nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
+                               x86_nvdimm_acpi_dsmio,
                                pcms->fw_cfg, OBJECT(pcms));
     }
 }
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index 523a9b3d4a..5fe440861e 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -25,6 +25,7 @@ 
 
 #include "hw/mem/pc-dimm.h"
 #include "hw/acpi/bios-linker-loader.h"
+#include "hw/acpi/aml-build.h"
 
 #define NVDIMM_DEBUG 0
 #define nvdimm_debug(fmt, ...)                                \
@@ -140,10 +141,12 @@  struct NVDIMMState {
      */
     int32_t persistence;
     char    *persistence_string;
+    struct AcpiGenericAddress dsm_io;
 };
 typedef struct NVDIMMState NVDIMMState;
 
 void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,
+                            struct AcpiGenericAddress dsm_io,
                             FWCfgState *fw_cfg, Object *owner);
 void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
                        BIOSLinker *linker, NVDIMMState *state,