From nobody Wed Feb 11 02:12:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553165589663848.4500405387853; Thu, 21 Mar 2019 03:53:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:34714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6vJf-0005fJ-1d for importer@patchew.org; Thu, 21 Mar 2019 06:52:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6vHR-0004Og-Dr for qemu-devel@nongnu.org; Thu, 21 Mar 2019 06:50:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6vGE-0003cV-Q9 for qemu-devel@nongnu.org; Thu, 21 Mar 2019 06:49:24 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2198 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6vGC-0003RE-9s; Thu, 21 Mar 2019 06:49:21 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id DF16CF2C21D2748F327F; Thu, 21 Mar 2019 18:49:17 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.408.0; Thu, 21 Mar 2019 18:49:10 +0800 From: Shameer Kolothum To: , , , , , , , Date: Thu, 21 Mar 2019 10:47:45 +0000 Message-ID: <20190321104745.28068-11-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190321104745.28068-1-shameerali.kolothum.thodi@huawei.com> References: <20190321104745.28068-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.190 Subject: [Qemu-devel] [PATCH v3 10/10] hw/arm/virt: Init GED device and enable memory hotplug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxarm@huawei.com, xuwei5@hisilicon.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Memory hotplug should now work. Signed-off-by: Shameer Kolothum --- hw/acpi/generic_event_device.c | 18 ++++++++++++++++++ hw/arm/virt-acpi-build.c | 9 +++++++++ hw/arm/virt.c | 30 +++++++++++++++++++++++++----- include/hw/arm/virt.h | 2 ++ 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index 9deaa33..02d5e66 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -200,6 +200,23 @@ static void acpi_ged_event(GEDState *ged_st, uint32_t = ged_irq_sel) qemu_irq_pulse(ged_st->gsi[ged_st->irq]); } =20 +static void acpi_ged_init(MemoryRegion *as, DeviceState *dev, GEDState *ge= d_st) +{ + VirtAcpiState *s =3D VIRT_ACPI(dev); + + assert(!ged_io_base && !ged_events && !ged_events_size); + + ged_io_base =3D s->ged_base; + ged_events =3D s->ged_events; + ged_events_size =3D s->ged_events_size; + ged_st->irq =3D s->ged_irq; + ged_st->gsi =3D s->gsi; + qemu_mutex_init(&ged_st->lock); + memory_region_init_io(&ged_st->io, OBJECT(dev), &ged_ops, ged_st, + "acpi-ged-event", ACPI_GED_REG_LEN); + memory_region_add_subregion(as, ged_io_base, &ged_st->io); +} + static void virt_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -242,6 +259,7 @@ static void virt_device_realize(DeviceState *dev, Error= **errp) acpi_memory_hotplug_init(get_system_memory(), OBJECT(dev), &s->memhp_state, s->memhp_base); + acpi_ged_init(get_system_memory(), dev, &s->ged_state); } } =20 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 1887531..116e9c9 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -41,6 +41,7 @@ #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" @@ -50,6 +51,13 @@ #define ARM_SPI_BASE 32 #define ACPI_POWER_BUTTON_DEVICE "PWRB" =20 +static void acpi_dsdt_add_ged(Aml *scope, VirtMachineState *vms) +{ + int irq =3D vms->irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE; + + build_ged_aml(scope, "\\_SB."GED_DEVICE, irq, AML_SYSTEM_MEMORY); +} + static void acpi_dsdt_add_memory_hotplug(Aml *scope, MachineState *ms) { uint32_t nr_mem =3D ms->ram_slots; @@ -758,6 +766,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) */ scope =3D aml_scope("\\_SB"); acpi_dsdt_add_memory_hotplug(scope, MACHINE(vms)); + acpi_dsdt_add_ged(scope, vms); acpi_dsdt_add_cpus(scope, vms->smp_cpus); acpi_dsdt_add_uart(scope, &memmap[VIRT_UART], (irqmap[VIRT_UART] + ARM_SPI_BASE)); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b602151..e3f8aa7 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" =20 #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ @@ -134,6 +135,7 @@ static const MemMapEntry base_memmap[] =3D { [VIRT_SECURE_UART] =3D { 0x09040000, 0x00001000 }, [VIRT_SMMU] =3D { 0x09050000, 0x00020000 }, [VIRT_PCDIMM_ACPI] =3D { 0x09070000, 0x00010000 }, + [VIRT_ACPI_GED] =3D { 0x09080000, 0x00010000 }, [VIRT_MMIO] =3D { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that siz= e */ [VIRT_PLATFORM_BUS] =3D { 0x0c000000, 0x02000000 }, @@ -169,6 +171,7 @@ static const int a15irqmap[] =3D { [VIRT_PCIE] =3D 3, /* ... to 6 */ [VIRT_GPIO] =3D 7, [VIRT_SECURE_UART] =3D 8, + [VIRT_ACPI_GED] =3D 9, [VIRT_MMIO] =3D 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ [VIRT_GIC_V2M] =3D 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ [VIRT_SMMU] =3D 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ @@ -184,6 +187,13 @@ static const char *valid_cpus[] =3D { ARM_CPU_TYPE_NAME("max"), }; =20 +static GedEvent ged_events[] =3D { + { + .selector =3D ACPI_GED_IRQ_SEL_MEM, + .event =3D GED_MEMORY_HOTPLUG, + }, +}; + static bool cpu_type_valid(const char *cpu) { int i; @@ -524,6 +534,11 @@ static DeviceState *create_virt_acpi(VirtMachineState = *vms) dev =3D qdev_create(NULL, "virt-acpi"); 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]); + qdev_prop_set_ptr(dev, "ged_events", ged_events); + qdev_prop_set_uint32(dev, "ged_events_size", ARRAY_SIZE(ged_events)); qdev_init_nofail(dev); =20 return dev; @@ -568,6 +583,12 @@ static void create_v2m(VirtMachineState *vms, qemu_irq= *pic) fdt_add_v2m_gic_node(vms); } =20 +static void virt_gsi_handler(void *opaque, int n, int level) +{ + qemu_irq *gic_irq =3D opaque; + qemu_set_irq(gic_irq[n], level); +} + static void create_gic(VirtMachineState *vms, qemu_irq *pic) { /* We create a standalone GIC */ @@ -683,6 +704,8 @@ static void create_gic(VirtMachineState *vms, qemu_irq = *pic) pic[i] =3D qdev_get_gpio_in(gicdev, i); } =20 + vms->gsi =3D qemu_allocate_irqs(virt_gsi_handler, pic, NUM_IRQS); + fdt_add_gic_node(vms); =20 if (type =3D=3D 3 && vms->its) { @@ -1431,7 +1454,7 @@ static void machvirt_init(MachineState *machine) VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(machine); MachineClass *mc =3D MACHINE_GET_CLASS(machine); const CPUArchIdList *possible_cpus; - qemu_irq pic[NUM_IRQS]; + qemu_irq *pic; MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *secure_sysmem =3D NULL; int n, virt_max_cpus; @@ -1627,6 +1650,7 @@ static void machvirt_init(MachineState *machine) =20 create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); =20 + pic =3D g_new0(qemu_irq, NUM_IRQS); create_gic(vms, pic); =20 fdt_add_pmu_nodes(vms); @@ -1842,10 +1866,6 @@ static void virt_memory_pre_plug(HotplugHandler *hot= plug_dev, DeviceState *dev, { const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); =20 - if (dev->hotplugged) { - error_setg(errp, "memory hotplug is not supported"); - } - if (is_nvdimm) { error_setg(errp, "nvdimm is not yet supported"); return; diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 14b2e0a..850296a 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -78,6 +78,7 @@ enum { VIRT_SECURE_UART, VIRT_SECURE_MEM, VIRT_PCDIMM_ACPI, + VIRT_ACPI_GED, VIRT_LOWMEMMAP_LAST, }; =20 @@ -135,6 +136,7 @@ typedef struct { int psci_conduit; hwaddr highest_gpa; DeviceState *acpi; + qemu_irq *gsi; } VirtMachineState; =20 #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) --=20 2.7.4