From: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com> To: Auger Eric <eric.auger@redhat.com>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "qemu-arm@nongnu.org" <qemu-arm@nongnu.org>, "imammedo@redhat.com" <imammedo@redhat.com> Cc: "peter.maydell@linaro.org" <peter.maydell@linaro.org>, "shannon.zhaosl@gmail.com" <shannon.zhaosl@gmail.com>, "sameo@linux.intel.com" <sameo@linux.intel.com>, "sebastien.boeuf@intel.com" <sebastien.boeuf@intel.com>, "xuwei (O)" <xuwei5@huawei.com>, "lersek@redhat.com" <lersek@redhat.com>, "ard.biesheuvel@linaro.org" <ard.biesheuvel@linaro.org>, Linuxarm <linuxarm@huawei.com> Subject: Re: [Qemu-devel] [PATCH v4 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Date: Wed, 1 May 2019 10:49:42 +0000 [thread overview] Message-ID: <5FC3163CFD30C246ABAA99954A238FA83F137596@lhreml524-mbs.china.huawei.com> (raw) In-Reply-To: <74cfc52e-715b-31d6-1e6e-03987b5814d5@redhat.com> Hi Eric, > -----Original Message----- > From: Auger Eric [mailto:eric.auger@redhat.com] > Sent: 30 April 2019 17:34 > To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>; > qemu-devel@nongnu.org; qemu-arm@nongnu.org; imammedo@redhat.com > Cc: peter.maydell@linaro.org; shannon.zhaosl@gmail.com; > sameo@linux.intel.com; sebastien.boeuf@intel.com; xuwei (O) > <xuwei5@huawei.com>; lersek@redhat.com; ard.biesheuvel@linaro.org; > Linuxarm <linuxarm@huawei.com> > Subject: Re: [PATCH v4 5/8] hw/arm/virt: Enable device memory cold/hot plug > with ACPI boot > > Hi Shameer, > > On 4/9/19 12:29 PM, Shameer Kolothum wrote: > > This initializes the GED device with base memory and irq, configures > > ged memory hotplug event and builds the corresponding aml code. GED > > irq routing to Guest is also enabled. With this, both hot and cold > > plug of device memory is enabled now for Guest with ACPI boot. > > > > Memory cold plug support with Guest DT boot is not yet supported. > > > > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> > Individual history logs may be helpful to follow the changes (change in > MMIO reggion size, ...) Ok. Noted. > > --- > > default-configs/arm-softmmu.mak | 2 ++ > > hw/arm/virt-acpi-build.c | 9 ++++++ > > hw/arm/virt.c | 61 > +++++++++++++++++++++++++++++++++++++++-- > > include/hw/arm/virt.h | 4 +++ > > 4 files changed, 73 insertions(+), 3 deletions(-) > > > > diff --git a/default-configs/arm-softmmu.mak > b/default-configs/arm-softmmu.mak > > index 9f4b803..c9a9b34 100644 > > --- a/default-configs/arm-softmmu.mak > > +++ b/default-configs/arm-softmmu.mak > > @@ -163,3 +163,5 @@ CONFIG_LSI_SCSI_PCI=y > > > > CONFIG_MEM_DEVICE=y > > CONFIG_DIMM=y > > +CONFIG_ACPI_MEMORY_HOTPLUG=y > > +CONFIG_ACPI_HW_REDUCED=y > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > > index bf9c0bc..1ad394b 100644 > > --- a/hw/arm/virt-acpi-build.c > > +++ b/hw/arm/virt-acpi-build.c > > @@ -40,6 +40,8 @@ > > #include "hw/loader.h" > > #include "hw/hw.h" > > #include "hw/acpi/aml-build.h" > > +#include "hw/acpi/memory_hotplug.h" > > +#include "hw/acpi/generic_event_device.h" > > #include "hw/pci/pcie_host.h" > > #include "hw/pci/pci.h" > > #include "hw/arm/virt.h" > > @@ -727,6 +729,7 @@ static void > > build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > > { > > Aml *scope, *dsdt; > > + MachineState *ms = MACHINE(vms); > > const MemMapEntry *memmap = vms->memmap; > > const int *irqmap = vms->irqmap; > > > > @@ -753,6 +756,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > VirtMachineState *vms) > > (irqmap[VIRT_GPIO] + ARM_SPI_BASE)); > > acpi_dsdt_add_power_button(scope); > > > > + build_ged_aml(scope, "\\_SB."GED_DEVICE, > HOTPLUG_HANDLER(vms->acpi_dev), > > + irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, > AML_SYSTEM_MEMORY); > > + > > + build_memory_hotplug_aml(scope, ms->ram_slots, "\\_SB", NULL, > > + AML_SYSTEM_MEMORY); > > + > > aml_append(dsdt, scope); > > > > /* copy AML table into ACPI tables blob and patch header there */ > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index da516b3..8179b3e 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -63,6 +63,7 @@ > > #include "target/arm/internals.h" > > #include "hw/mem/pc-dimm.h" > > #include "hw/mem/nvdimm.h" > > +#include "hw/acpi/generic_event_device.h" > > > > #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ > > static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ > > @@ -133,6 +134,8 @@ static const MemMapEntry base_memmap[] = { > > [VIRT_GPIO] = { 0x09030000, 0x00001000 }, > > [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, > > [VIRT_SMMU] = { 0x09050000, 0x00020000 }, > > + [VIRT_PCDIMM_ACPI] = { 0x09070000, > MEMORY_HOTPLUG_IO_LEN }, > > + [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_REG_LEN },> > [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, > > /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that > size */ > > [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, > > @@ -168,6 +171,7 @@ static const int a15irqmap[] = { > > [VIRT_PCIE] = 3, /* ... to 6 */ > > [VIRT_GPIO] = 7, > > [VIRT_SECURE_UART] = 8, > > + [VIRT_ACPI_GED] = 9, > > [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ > > [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ > > [VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ > > @@ -183,6 +187,13 @@ static const char *valid_cpus[] = { > > ARM_CPU_TYPE_NAME("max"), > > }; > > > > +static GedEvent ged_events[] = { > > + { > > + .selector = ACPI_GED_IRQ_SEL_MEM, > > + .event = GED_MEMORY_HOTPLUG, > > + }, > > +}; > > + > > static bool cpu_type_valid(const char *cpu) > > { > > int i; > > @@ -516,6 +527,26 @@ static void fdt_add_pmu_nodes(const > VirtMachineState *vms) > > } > > } > > > > +static inline DeviceState *create_acpi_ged(VirtMachineState *vms) > > +{ > > + DeviceState *dev; > > + > > + dev = DEVICE(object_new(TYPE_ACPI_GED)); > > + qdev_prop_set_uint64(dev, "memhp-base", > > + vms->memmap[VIRT_PCDIMM_ACPI].base); > > + qdev_prop_set_ptr(dev, "gsi", vms->gsi); > > + qdev_prop_set_uint64(dev, "ged-base", > vms->memmap[VIRT_ACPI_GED].base); > > + qdev_prop_set_uint32(dev, "ged-irq", vms->irqmap[VIRT_ACPI_GED]); > so as commented earlier I wonder why we can directly pass the right gsi. Ok. > > + qdev_prop_set_ptr(dev, "ged-events", ged_events); > > + qdev_prop_set_uint32(dev, "ged-events-size", > ARRAY_SIZE(ged_events)); > > + > > + object_property_add_child(qdev_get_machine(), "acpi-ged", > > + OBJECT(dev), NULL); > > + qdev_init_nofail(dev); > > + > > + return dev; > > +} > > + > > static void create_its(VirtMachineState *vms, DeviceState *gicdev) > > { > > const char *itsclass = its_class_name(); > > @@ -555,6 +586,12 @@ static void create_v2m(VirtMachineState *vms, > qemu_irq *pic) > > fdt_add_v2m_gic_node(vms); > > } > > > > +static void virt_gsi_handler(void *opaque, int n, int level) > > +{ > > + qemu_irq *gic_irq = opaque; > > + qemu_set_irq(gic_irq[n], level); > In https://patchwork.kernel.org/patch/10863285/, I asked why this gsi > routing was necessary. Please forgive me if I missed your answer but I > still don't get why it is necessary. Yes, you did. As I commented in 3/8, I missed this for v4. I don’t think we need this routing If we pass the right qemu_irq directly. I will change this in next revision. Thanks, Shameer > > +} > > + > > static void create_gic(VirtMachineState *vms, qemu_irq *pic) > > { > > /* We create a standalone GIC */ > > @@ -670,6 +707,8 @@ static void create_gic(VirtMachineState *vms, > qemu_irq *pic) > > pic[i] = qdev_get_gpio_in(gicdev, i); > > } > > > > + vms->gsi = qemu_allocate_irqs(virt_gsi_handler, pic, NUM_IRQS); > > + > > fdt_add_gic_node(vms); > > > > if (type == 3 && vms->its) { > > @@ -1418,7 +1457,7 @@ static void machvirt_init(MachineState *machine) > > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(machine); > > MachineClass *mc = MACHINE_GET_CLASS(machine); > > const CPUArchIdList *possible_cpus; > > - qemu_irq pic[NUM_IRQS]; > > + qemu_irq *pic; > > MemoryRegion *sysmem = get_system_memory(); > > MemoryRegion *secure_sysmem = NULL; > > int n, virt_max_cpus; > > @@ -1614,6 +1653,7 @@ static void machvirt_init(MachineState *machine) > > > > create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : > sysmem); > > > > + pic = g_new0(qemu_irq, NUM_IRQS); > > create_gic(vms, pic); > > > > fdt_add_pmu_nodes(vms); > > @@ -1644,6 +1684,8 @@ static void machvirt_init(MachineState *machine) > > > > create_platform_bus(vms, pic); > > > > + vms->acpi_dev = create_acpi_ged(vms); > > + > > vms->bootinfo.ram_size = machine->ram_size; > > vms->bootinfo.kernel_filename = machine->kernel_filename; > > vms->bootinfo.kernel_cmdline = machine->kernel_cmdline; > > @@ -1811,21 +1853,34 @@ static const CPUArchIdList > *virt_possible_cpu_arch_ids(MachineState *ms) > > static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, > DeviceState *dev, > > Error **errp) > > { > > - if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > > - error_setg(errp, "memory cold/hot plug is not yet supported"); > > + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev); > > + const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), > TYPE_NVDIMM); > > + > > + if (is_nvdimm) { > > + error_setg(errp, "nvdimm is not yet supported"); > > return; > > } > > > > + if (!vms->acpi_dev) { > > + error_setg(errp, "memory hotplug is not enabled: missing acpi > device"); > > + return; > > + } > > + > > + hotplug_handler_pre_plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, > errp); > > + > > pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, > errp); > > } > > > > static void virt_memory_plug(HotplugHandler *hotplug_dev, > > DeviceState *dev, Error **errp) > > { > > + HotplugHandlerClass *hhc; > > VirtMachineState *vms = VIRT_MACHINE(hotplug_dev); > > > > pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL); > > > > + hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev); > > + hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, NULL); > > } > > > > static void virt_machine_device_pre_plug_cb(HotplugHandler > *hotplug_dev, > > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > > index 507517c..9c6b0b1 100644 > > --- a/include/hw/arm/virt.h > > +++ b/include/hw/arm/virt.h > > @@ -77,6 +77,8 @@ enum { > > VIRT_GPIO, > > VIRT_SECURE_UART, > > VIRT_SECURE_MEM, > > + VIRT_PCDIMM_ACPI, > > + VIRT_ACPI_GED, > > VIRT_LOWMEMMAP_LAST, > > }; > > > > @@ -132,6 +134,8 @@ typedef struct { > > uint32_t iommu_phandle; > > int psci_conduit; > > hwaddr highest_gpa; > > + DeviceState *acpi_dev; > > + qemu_irq *gsi; > > } VirtMachineState; > > > > #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : > VIRT_PCIE_ECAM) > Thanks > > Eric > >
WARNING: multiple messages have this Message-ID (diff)
From: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com> To: Auger Eric <eric.auger@redhat.com>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "qemu-arm@nongnu.org" <qemu-arm@nongnu.org>, "imammedo@redhat.com" <imammedo@redhat.com> Cc: "peter.maydell@linaro.org" <peter.maydell@linaro.org>, "sameo@linux.intel.com" <sameo@linux.intel.com>, "ard.biesheuvel@linaro.org" <ard.biesheuvel@linaro.org>, Linuxarm <linuxarm@huawei.com>, "shannon.zhaosl@gmail.com" <shannon.zhaosl@gmail.com>, "sebastien.boeuf@intel.com" <sebastien.boeuf@intel.com>, "xuwei \(O\)" <xuwei5@huawei.com>, "lersek@redhat.com" <lersek@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Date: Wed, 1 May 2019 10:49:42 +0000 [thread overview] Message-ID: <5FC3163CFD30C246ABAA99954A238FA83F137596@lhreml524-mbs.china.huawei.com> (raw) Message-ID: <20190501104942.nztbXffX_Ws0teT7yQOd__v9izHKc2MzLmus0KgRfpU@z> (raw) In-Reply-To: <74cfc52e-715b-31d6-1e6e-03987b5814d5@redhat.com> Hi Eric, > -----Original Message----- > From: Auger Eric [mailto:eric.auger@redhat.com] > Sent: 30 April 2019 17:34 > To: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>; > qemu-devel@nongnu.org; qemu-arm@nongnu.org; imammedo@redhat.com > Cc: peter.maydell@linaro.org; shannon.zhaosl@gmail.com; > sameo@linux.intel.com; sebastien.boeuf@intel.com; xuwei (O) > <xuwei5@huawei.com>; lersek@redhat.com; ard.biesheuvel@linaro.org; > Linuxarm <linuxarm@huawei.com> > Subject: Re: [PATCH v4 5/8] hw/arm/virt: Enable device memory cold/hot plug > with ACPI boot > > Hi Shameer, > > On 4/9/19 12:29 PM, Shameer Kolothum wrote: > > This initializes the GED device with base memory and irq, configures > > ged memory hotplug event and builds the corresponding aml code. GED > > irq routing to Guest is also enabled. With this, both hot and cold > > plug of device memory is enabled now for Guest with ACPI boot. > > > > Memory cold plug support with Guest DT boot is not yet supported. > > > > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com> > Individual history logs may be helpful to follow the changes (change in > MMIO reggion size, ...) Ok. Noted. > > --- > > default-configs/arm-softmmu.mak | 2 ++ > > hw/arm/virt-acpi-build.c | 9 ++++++ > > hw/arm/virt.c | 61 > +++++++++++++++++++++++++++++++++++++++-- > > include/hw/arm/virt.h | 4 +++ > > 4 files changed, 73 insertions(+), 3 deletions(-) > > > > diff --git a/default-configs/arm-softmmu.mak > b/default-configs/arm-softmmu.mak > > index 9f4b803..c9a9b34 100644 > > --- a/default-configs/arm-softmmu.mak > > +++ b/default-configs/arm-softmmu.mak > > @@ -163,3 +163,5 @@ CONFIG_LSI_SCSI_PCI=y > > > > CONFIG_MEM_DEVICE=y > > CONFIG_DIMM=y > > +CONFIG_ACPI_MEMORY_HOTPLUG=y > > +CONFIG_ACPI_HW_REDUCED=y > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > > index bf9c0bc..1ad394b 100644 > > --- a/hw/arm/virt-acpi-build.c > > +++ b/hw/arm/virt-acpi-build.c > > @@ -40,6 +40,8 @@ > > #include "hw/loader.h" > > #include "hw/hw.h" > > #include "hw/acpi/aml-build.h" > > +#include "hw/acpi/memory_hotplug.h" > > +#include "hw/acpi/generic_event_device.h" > > #include "hw/pci/pcie_host.h" > > #include "hw/pci/pci.h" > > #include "hw/arm/virt.h" > > @@ -727,6 +729,7 @@ static void > > build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > > { > > Aml *scope, *dsdt; > > + MachineState *ms = MACHINE(vms); > > const MemMapEntry *memmap = vms->memmap; > > const int *irqmap = vms->irqmap; > > > > @@ -753,6 +756,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > VirtMachineState *vms) > > (irqmap[VIRT_GPIO] + ARM_SPI_BASE)); > > acpi_dsdt_add_power_button(scope); > > > > + build_ged_aml(scope, "\\_SB."GED_DEVICE, > HOTPLUG_HANDLER(vms->acpi_dev), > > + irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, > AML_SYSTEM_MEMORY); > > + > > + build_memory_hotplug_aml(scope, ms->ram_slots, "\\_SB", NULL, > > + AML_SYSTEM_MEMORY); > > + > > aml_append(dsdt, scope); > > > > /* copy AML table into ACPI tables blob and patch header there */ > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index da516b3..8179b3e 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -63,6 +63,7 @@ > > #include "target/arm/internals.h" > > #include "hw/mem/pc-dimm.h" > > #include "hw/mem/nvdimm.h" > > +#include "hw/acpi/generic_event_device.h" > > > > #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ > > static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ > > @@ -133,6 +134,8 @@ static const MemMapEntry base_memmap[] = { > > [VIRT_GPIO] = { 0x09030000, 0x00001000 }, > > [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, > > [VIRT_SMMU] = { 0x09050000, 0x00020000 }, > > + [VIRT_PCDIMM_ACPI] = { 0x09070000, > MEMORY_HOTPLUG_IO_LEN }, > > + [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_REG_LEN },> > [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, > > /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that > size */ > > [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, > > @@ -168,6 +171,7 @@ static const int a15irqmap[] = { > > [VIRT_PCIE] = 3, /* ... to 6 */ > > [VIRT_GPIO] = 7, > > [VIRT_SECURE_UART] = 8, > > + [VIRT_ACPI_GED] = 9, > > [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ > > [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ > > [VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ > > @@ -183,6 +187,13 @@ static const char *valid_cpus[] = { > > ARM_CPU_TYPE_NAME("max"), > > }; > > > > +static GedEvent ged_events[] = { > > + { > > + .selector = ACPI_GED_IRQ_SEL_MEM, > > + .event = GED_MEMORY_HOTPLUG, > > + }, > > +}; > > + > > static bool cpu_type_valid(const char *cpu) > > { > > int i; > > @@ -516,6 +527,26 @@ static void fdt_add_pmu_nodes(const > VirtMachineState *vms) > > } > > } > > > > +static inline DeviceState *create_acpi_ged(VirtMachineState *vms) > > +{ > > + DeviceState *dev; > > + > > + dev = DEVICE(object_new(TYPE_ACPI_GED)); > > + qdev_prop_set_uint64(dev, "memhp-base", > > + vms->memmap[VIRT_PCDIMM_ACPI].base); > > + qdev_prop_set_ptr(dev, "gsi", vms->gsi); > > + qdev_prop_set_uint64(dev, "ged-base", > vms->memmap[VIRT_ACPI_GED].base); > > + qdev_prop_set_uint32(dev, "ged-irq", vms->irqmap[VIRT_ACPI_GED]); > so as commented earlier I wonder why we can directly pass the right gsi. Ok. > > + qdev_prop_set_ptr(dev, "ged-events", ged_events); > > + qdev_prop_set_uint32(dev, "ged-events-size", > ARRAY_SIZE(ged_events)); > > + > > + object_property_add_child(qdev_get_machine(), "acpi-ged", > > + OBJECT(dev), NULL); > > + qdev_init_nofail(dev); > > + > > + return dev; > > +} > > + > > static void create_its(VirtMachineState *vms, DeviceState *gicdev) > > { > > const char *itsclass = its_class_name(); > > @@ -555,6 +586,12 @@ static void create_v2m(VirtMachineState *vms, > qemu_irq *pic) > > fdt_add_v2m_gic_node(vms); > > } > > > > +static void virt_gsi_handler(void *opaque, int n, int level) > > +{ > > + qemu_irq *gic_irq = opaque; > > + qemu_set_irq(gic_irq[n], level); > In https://patchwork.kernel.org/patch/10863285/, I asked why this gsi > routing was necessary. Please forgive me if I missed your answer but I > still don't get why it is necessary. Yes, you did. As I commented in 3/8, I missed this for v4. I don’t think we need this routing If we pass the right qemu_irq directly. I will change this in next revision. Thanks, Shameer > > +} > > + > > static void create_gic(VirtMachineState *vms, qemu_irq *pic) > > { > > /* We create a standalone GIC */ > > @@ -670,6 +707,8 @@ static void create_gic(VirtMachineState *vms, > qemu_irq *pic) > > pic[i] = qdev_get_gpio_in(gicdev, i); > > } > > > > + vms->gsi = qemu_allocate_irqs(virt_gsi_handler, pic, NUM_IRQS); > > + > > fdt_add_gic_node(vms); > > > > if (type == 3 && vms->its) { > > @@ -1418,7 +1457,7 @@ static void machvirt_init(MachineState *machine) > > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(machine); > > MachineClass *mc = MACHINE_GET_CLASS(machine); > > const CPUArchIdList *possible_cpus; > > - qemu_irq pic[NUM_IRQS]; > > + qemu_irq *pic; > > MemoryRegion *sysmem = get_system_memory(); > > MemoryRegion *secure_sysmem = NULL; > > int n, virt_max_cpus; > > @@ -1614,6 +1653,7 @@ static void machvirt_init(MachineState *machine) > > > > create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : > sysmem); > > > > + pic = g_new0(qemu_irq, NUM_IRQS); > > create_gic(vms, pic); > > > > fdt_add_pmu_nodes(vms); > > @@ -1644,6 +1684,8 @@ static void machvirt_init(MachineState *machine) > > > > create_platform_bus(vms, pic); > > > > + vms->acpi_dev = create_acpi_ged(vms); > > + > > vms->bootinfo.ram_size = machine->ram_size; > > vms->bootinfo.kernel_filename = machine->kernel_filename; > > vms->bootinfo.kernel_cmdline = machine->kernel_cmdline; > > @@ -1811,21 +1853,34 @@ static const CPUArchIdList > *virt_possible_cpu_arch_ids(MachineState *ms) > > static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, > DeviceState *dev, > > Error **errp) > > { > > - if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > > - error_setg(errp, "memory cold/hot plug is not yet supported"); > > + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev); > > + const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), > TYPE_NVDIMM); > > + > > + if (is_nvdimm) { > > + error_setg(errp, "nvdimm is not yet supported"); > > return; > > } > > > > + if (!vms->acpi_dev) { > > + error_setg(errp, "memory hotplug is not enabled: missing acpi > device"); > > + return; > > + } > > + > > + hotplug_handler_pre_plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, > errp); > > + > > pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, > errp); > > } > > > > static void virt_memory_plug(HotplugHandler *hotplug_dev, > > DeviceState *dev, Error **errp) > > { > > + HotplugHandlerClass *hhc; > > VirtMachineState *vms = VIRT_MACHINE(hotplug_dev); > > > > pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL); > > > > + hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev); > > + hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, NULL); > > } > > > > static void virt_machine_device_pre_plug_cb(HotplugHandler > *hotplug_dev, > > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > > index 507517c..9c6b0b1 100644 > > --- a/include/hw/arm/virt.h > > +++ b/include/hw/arm/virt.h > > @@ -77,6 +77,8 @@ enum { > > VIRT_GPIO, > > VIRT_SECURE_UART, > > VIRT_SECURE_MEM, > > + VIRT_PCDIMM_ACPI, > > + VIRT_ACPI_GED, > > VIRT_LOWMEMMAP_LAST, > > }; > > > > @@ -132,6 +134,8 @@ typedef struct { > > uint32_t iommu_phandle; > > int psci_conduit; > > hwaddr highest_gpa; > > + DeviceState *acpi_dev; > > + qemu_irq *gsi; > > } VirtMachineState; > > > > #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : > VIRT_PCIE_ECAM) > Thanks > > Eric > >
next prev parent reply other threads:[~2019-05-01 10:50 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-09 10:29 [Qemu-devel] [PATCH v4 0/8] ARM virt: ACPI memory hotplug support Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 1/8] hw/acpi: Make ACPI IO address space configurable Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 2/8] hw/acpi: Do not create memory hotplug method when handler is not defined Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 3/8] hw/acpi: Add ACPI Generic Event Device Support Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-30 15:49 ` Auger Eric 2019-04-30 15:49 ` Auger Eric 2019-05-01 10:40 ` Shameerali Kolothum Thodi 2019-05-01 10:40 ` Shameerali Kolothum Thodi 2019-05-02 7:10 ` Auger Eric 2019-05-02 7:10 ` Auger Eric 2019-05-01 11:10 ` Ard Biesheuvel 2019-05-01 11:10 ` Ard Biesheuvel 2019-05-01 11:25 ` Shameerali Kolothum Thodi 2019-05-01 11:25 ` Shameerali Kolothum Thodi 2019-05-02 7:22 ` Ard Biesheuvel 2019-05-02 7:22 ` Ard Biesheuvel 2019-05-02 15:24 ` Igor Mammedov 2019-05-02 15:24 ` Igor Mammedov 2019-05-02 16:12 ` Igor Mammedov 2019-05-02 16:12 ` Igor Mammedov 2019-05-03 12:45 ` Shameerali Kolothum Thodi 2019-05-03 12:45 ` Shameerali Kolothum Thodi 2019-05-03 15:10 ` Igor Mammedov 2019-05-03 15:10 ` Igor Mammedov 2019-05-07 9:01 ` Shameerali Kolothum Thodi 2019-05-09 14:50 ` Igor Mammedov 2019-05-13 11:53 ` Shameerali Kolothum Thodi 2019-05-13 17:00 ` Shameerali Kolothum Thodi 2019-05-17 8:41 ` Igor Mammedov 2019-05-17 10:31 ` Shameerali Kolothum Thodi 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 4/8] hw/arm/virt: Add memory hotplug framework Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-05-02 16:19 ` Igor Mammedov 2019-05-02 16:19 ` Igor Mammedov 2019-05-03 12:47 ` Shameerali Kolothum Thodi 2019-05-03 12:47 ` Shameerali Kolothum Thodi 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 5/8] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-30 16:34 ` Auger Eric 2019-04-30 16:34 ` Auger Eric 2019-05-01 10:49 ` Shameerali Kolothum Thodi [this message] 2019-05-01 10:49 ` Shameerali Kolothum Thodi 2019-05-09 15:20 ` Igor Mammedov 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 6/8] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 7/8] hw/arm/boot: Add "hotpluggable" property to DT memory node Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-09 10:29 ` [Qemu-devel] [PATCH v4 8/8] hw/arm/boot: Expose the PC-DIMM nodes in the DT Shameer Kolothum 2019-04-09 10:29 ` Shameer Kolothum 2019-04-09 15:08 ` Laszlo Ersek 2019-04-09 15:08 ` Laszlo Ersek 2019-04-10 8:49 ` Shameerali Kolothum Thodi 2019-04-10 8:49 ` Shameerali Kolothum Thodi 2019-05-03 13:35 ` Shameerali Kolothum Thodi 2019-05-03 13:35 ` Shameerali Kolothum Thodi 2019-05-03 14:13 ` Laszlo Ersek 2019-05-03 14:13 ` Laszlo Ersek 2019-05-08 10:30 ` Shameerali Kolothum Thodi
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=5FC3163CFD30C246ABAA99954A238FA83F137596@lhreml524-mbs.china.huawei.com \ --to=shameerali.kolothum.thodi@huawei.com \ --cc=ard.biesheuvel@linaro.org \ --cc=eric.auger@redhat.com \ --cc=imammedo@redhat.com \ --cc=lersek@redhat.com \ --cc=linuxarm@huawei.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=sameo@linux.intel.com \ --cc=sebastien.boeuf@intel.com \ --cc=shannon.zhaosl@gmail.com \ --cc=xuwei5@huawei.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.