[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure
From: |
Igor Mammedov |
Subject: |
Re: [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure |
Date: |
Mon, 23 Mar 2020 16:22:43 +0100 |
On Wed, 11 Mar 2020 17:20:10 +0000
Shameer Kolothum <address@hidden> wrote:
> From: Kwangwoo Lee <address@hidden>
>
> This adds support to init nvdimm acpi state and build nvdimm acpi tables.
> Please note nvdimm_support is not yet enabled.
>
> Signed-off-by: Kwangwoo Lee <address@hidden>
> Signed-off-by: Eric Auger <address@hidden>
> Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> v2 -> v3
> -Modified commit log.
> ---
> hw/arm/Kconfig | 1 +
> hw/arm/virt-acpi-build.c | 6 ++++++
> hw/arm/virt.c | 19 +++++++++++++++++++
> hw/mem/Kconfig | 2 +-
> include/hw/arm/virt.h | 1 +
> 5 files changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index bc54fd61f9..b023c0ecd5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -25,6 +25,7 @@ config ARM_VIRT
> select DIMM
> select ACPI_MEMORY_HOTPLUG
> select ACPI_HW_REDUCED
> + select ACPI_NVDIMM
>
> config CHEETAH
> bool
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index c13710b727..b7d666b7a4 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -44,6 +44,7 @@
> #include "hw/pci/pcie_host.h"
> #include "hw/pci/pci.h"
> #include "hw/arm/virt.h"
> +#include "hw/mem/nvdimm.h"
> #include "sysemu/numa.h"
> #include "sysemu/reset.h"
> #include "kvm_arm.h"
> @@ -826,6 +827,11 @@ void virt_acpi_build(VirtMachineState *vms,
> AcpiBuildTables *tables)
> }
> }
>
> + if (ms->nvdimms_state->is_enabled) {
> + nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
> + ms->nvdimms_state, ms->ram_slots);
> + }
> +
> if (its_class_name() && !vmc->no_its) {
> acpi_add_table(table_offsets, tables_blob);
> build_iort(tables_blob, tables->linker, vms);
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 32d865a488..18178553fa 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -148,6 +148,7 @@ static const MemMapEntry base_memmap[] = {
> [VIRT_SMMU] = { 0x09050000, 0x00020000 },
> [VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
> [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_EVT_SEL_LEN },
> + [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN},
> [VIRT_MMIO] = { 0x0a000000, 0x00000200 },
> /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size
> */
> [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
> @@ -1784,6 +1785,18 @@ static void machvirt_init(MachineState *machine)
>
> create_platform_bus(vms);
>
> + if (machine->nvdimms_state->is_enabled) {
> + const struct AcpiGenericAddress arm_virt_nvdimm_acpi_dsmio = {
> + .space_id = AML_AS_SYSTEM_MEMORY,
> + .address = vms->memmap[VIRT_NVDIMM_ACPI].base,
> + .bit_width = NVDIMM_ACPI_IO_LEN << 3
> + };
> +
> + nvdimm_init_acpi_state(machine->nvdimms_state, sysmem,
> + arm_virt_nvdimm_acpi_dsmio,
> + vms->fw_cfg, OBJECT(vms));
> + }
> +
> vms->bootinfo.ram_size = machine->ram_size;
> vms->bootinfo.nb_cpus = smp_cpus;
> vms->bootinfo.board_id = -1;
> @@ -1970,6 +1983,8 @@ static void virt_memory_plug(HotplugHandler
> *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> + MachineState *ms = MACHINE(hotplug_dev);
> + bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
> Error *local_err = NULL;
>
> pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
> @@ -1977,6 +1992,10 @@ static void virt_memory_plug(HotplugHandler
> *hotplug_dev,
> goto out;
> }
>
> + if (is_nvdimm) {
> + nvdimm_plug(ms->nvdimms_state);
> + }
> +
> hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
> dev, &error_abort);
>
> diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
> index 2ad052a536..c27844900d 100644
> --- a/hw/mem/Kconfig
> +++ b/hw/mem/Kconfig
> @@ -8,4 +8,4 @@ config MEM_DEVICE
> config NVDIMM
> bool
> default y
> - depends on (PC || PSERIES)
> + depends on (PC || PSERIES || ARM_VIRT)
> diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> index 02f500cb8e..59588d18db 100644
> --- a/include/hw/arm/virt.h
> +++ b/include/hw/arm/virt.h
> @@ -79,6 +79,7 @@ enum {
> VIRT_SECURE_MEM,
> VIRT_PCDIMM_ACPI,
> VIRT_ACPI_GED,
> + VIRT_NVDIMM_ACPI,
> VIRT_LOWMEMMAP_LAST,
> };
>
- Re: [PATCH v3 02/10] fw_cfg: Migrate ACPI table mr sizes separately, (continued)
- [PATCH v3 04/10] hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length, Shameer Kolothum, 2020/03/11
- [PATCH v3 03/10] exec: Fix for qemu_ram_resize() callback, Shameer Kolothum, 2020/03/11
- [PATCH v3 05/10] nvdimm: Use configurable ACPI IO base and size, Shameer Kolothum, 2020/03/11
- [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure, Shameer Kolothum, 2020/03/11
- Re: [PATCH v3 06/10] hw/arm/virt: Add nvdimm hot-plug infrastructure,
Igor Mammedov <=
- [PATCH v3 08/10] tests: Update ACPI tables list for upcoming arm/virt test changes, Shameer Kolothum, 2020/03/11
- [PATCH v3 07/10] hw/arm/virt: Add nvdimm hotplug support, Shameer Kolothum, 2020/03/11
- [PATCH v3 09/10] tests/bios-tables-test: Update arm/virt memhp test, Shameer Kolothum, 2020/03/11
- [PATCH v3 10/10] tests/acpi: add expected tables for bios-tables-test, Shameer Kolothum, 2020/03/11
- Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support, no-reply, 2020/03/11
- Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support, no-reply, 2020/03/11
- Re: [PATCH v3 00/10] ARM virt: Add NVDIMM support, Michael S. Tsirkin, 2020/03/29