[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH-for-4.2 v10 01/11] hw/acpi: Make ACPI IO address s
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-arm] [PATCH-for-4.2 v10 01/11] hw/acpi: Make ACPI IO address space configurable |
Date: |
Wed, 4 Sep 2019 13:27:59 +0200 |
On Wed, 4 Sep 2019 09:56:19 +0100
Shameer Kolothum <address@hidden> wrote:
> This is in preparation for adding support for ARM64 platforms
> where it doesn't use port mapped IO for ACPI IO space. We are
> making changes so that MMIO region can be accommodated
> and board can pass the base address into the aml build function.
>
> Also move few MEMORY_* definitions to header so that other memory
> hotplug event signalling mechanisms (eg. Generic Event Device on
> HW-reduced acpi platforms) can use the same from their respective
> event handler code.
>
> Signed-off-by: Shameer Kolothum <address@hidden>
> Reviewed-by: Eric Auger <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> v9 --> v10
> - Fixed "make check" failure on x86_64.
>
> v8 --> v9
> -base address is an input into build_memory_hotplug_aml()
> -Removed R-by tags from Igor and Eric for now.
> ---
> hw/acpi/memory_hotplug.c | 33 ++++++++++++++------------------
> hw/i386/acpi-build.c | 7 ++++++-
> hw/i386/pc.c | 3 +++
> include/hw/acpi/memory_hotplug.h | 9 +++++++--
> include/hw/i386/pc.h | 3 +++
> 5 files changed, 33 insertions(+), 22 deletions(-)
>
> diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
> index 9483d66e86..9b0b150f4f 100644
> --- a/hw/acpi/memory_hotplug.c
> +++ b/hw/acpi/memory_hotplug.c
> @@ -30,12 +30,7 @@
> #define MEMORY_SLOT_PROXIMITY_METHOD "MPXM"
> #define MEMORY_SLOT_EJECT_METHOD "MEJ0"
> #define MEMORY_SLOT_NOTIFY_METHOD "MTFY"
> -#define MEMORY_SLOT_SCAN_METHOD "MSCN"
> #define MEMORY_HOTPLUG_DEVICE "MHPD"
> -#define MEMORY_HOTPLUG_IO_LEN 24
> -#define MEMORY_DEVICES_CONTAINER "\\_SB.MHPC"
> -
> -static uint16_t memhp_io_base;
>
> static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev)
> {
> @@ -210,7 +205,7 @@ static const MemoryRegionOps acpi_memory_hotplug_ops = {
> };
>
> void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner,
> - MemHotplugState *state, uint16_t io_base)
> + MemHotplugState *state, hwaddr io_base)
> {
> MachineState *machine = MACHINE(qdev_get_machine());
>
> @@ -219,12 +214,10 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object
> *owner,
> return;
> }
>
> - assert(!memhp_io_base);
> - memhp_io_base = io_base;
> state->devs = g_malloc0(sizeof(*state->devs) * state->dev_count);
> memory_region_init_io(&state->io, owner, &acpi_memory_hotplug_ops, state,
> "acpi-mem-hotplug", MEMORY_HOTPLUG_IO_LEN);
> - memory_region_add_subregion(as, memhp_io_base, &state->io);
> + memory_region_add_subregion(as, io_base, &state->io);
> }
>
> /**
> @@ -343,7 +336,8 @@ const VMStateDescription vmstate_memory_hotplug = {
>
> void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
> const char *res_root,
> - const char *event_handler_method)
> + const char *event_handler_method,
> + AmlRegionSpace rs, hwaddr memhp_io_base)
> {
> int i;
> Aml *ifctx;
> @@ -352,10 +346,6 @@ void build_memory_hotplug_aml(Aml *table, uint32_t
> nr_mem,
> Aml *mem_ctrl_dev;
> char *mhp_res_path;
>
> - if (!memhp_io_base) {
> - return;
> - }
> -
> mhp_res_path = g_strdup_printf("%s." MEMORY_HOTPLUG_DEVICE, res_root);
> mem_ctrl_dev = aml_device("%s", mhp_res_path);
> {
> @@ -366,14 +356,19 @@ void build_memory_hotplug_aml(Aml *table, uint32_t
> nr_mem,
> aml_name_decl("_UID", aml_string("Memory hotplug resources")));
>
> crs = aml_resource_template();
> - aml_append(crs,
> - aml_io(AML_DECODE16, memhp_io_base, memhp_io_base, 0,
> - MEMORY_HOTPLUG_IO_LEN)
> - );
> + if (rs == AML_SYSTEM_IO) {
> + aml_append(crs,
> + aml_io(AML_DECODE16, memhp_io_base, memhp_io_base, 0,
> + MEMORY_HOTPLUG_IO_LEN)
> + );
> + } else {
> + aml_append(crs, aml_memory32_fixed(memhp_io_base,
> + MEMORY_HOTPLUG_IO_LEN, AML_READ_WRITE));
> + }
> aml_append(mem_ctrl_dev, aml_name_decl("_CRS", crs));
>
> aml_append(mem_ctrl_dev, aml_operation_region(
> - MEMORY_HOTPLUG_IO_REGION, AML_SYSTEM_IO,
> + MEMORY_HOTPLUG_IO_REGION, rs,
> aml_int(memhp_io_base), MEMORY_HOTPLUG_IO_LEN)
> );
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 034e413fd0..0d97cc701d 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1873,7 +1873,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base,
> "\\_SB.PCI0", "\\_GPE._E02");
> }
> - build_memory_hotplug_aml(dsdt, nr_mem, "\\_SB.PCI0", "\\_GPE._E03");
> +
> + if (pcms->memhp_io_base && nr_mem) {
> + build_memory_hotplug_aml(dsdt, nr_mem, "\\_SB.PCI0",
> + "\\_GPE._E03", AML_SYSTEM_IO,
> + pcms->memhp_io_base);
> + }
>
> scope = aml_scope("_GPE");
> {
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index c14ed86439..b38cd07231 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1951,6 +1951,9 @@ void pc_memory_init(PCMachineState *pcms,
>
> /* Init default IOAPIC address space */
> pcms->ioapic_as = &address_space_memory;
> +
> + /* Init ACPI memory hotplug IO base address */
> + pcms->memhp_io_base = ACPI_MEMORY_HOTPLUG_BASE;
> }
>
> /*
> diff --git a/include/hw/acpi/memory_hotplug.h
> b/include/hw/acpi/memory_hotplug.h
> index 77c65765d6..dfe9cf3fde 100644
> --- a/include/hw/acpi/memory_hotplug.h
> +++ b/include/hw/acpi/memory_hotplug.h
> @@ -5,6 +5,10 @@
> #include "hw/acpi/acpi.h"
> #include "hw/acpi/aml-build.h"
>
> +#define MEMORY_SLOT_SCAN_METHOD "MSCN"
> +#define MEMORY_DEVICES_CONTAINER "\\_SB.MHPC"
> +#define MEMORY_HOTPLUG_IO_LEN 24
> +
> /**
> * MemStatus:
> * @is_removing: the memory device in slot has been requested to be ejected.
> @@ -29,7 +33,7 @@ typedef struct MemHotplugState {
> } MemHotplugState;
>
> void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner,
> - MemHotplugState *state, uint16_t io_base);
> + MemHotplugState *state, hwaddr io_base);
>
> void acpi_memory_plug_cb(HotplugHandler *hotplug_dev, MemHotplugState
> *mem_st,
> DeviceState *dev, Error **errp);
> @@ -48,5 +52,6 @@ void acpi_memory_ospm_status(MemHotplugState *mem_st,
> ACPIOSTInfoList ***list);
>
> void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,
> const char *res_root,
> - const char *event_handler_method);
> + const char *event_handler_method,
> + AmlRegionSpace rs, hwaddr memhp_io_base);
> #endif
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 19a837889d..ac09e42030 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -69,6 +69,9 @@ struct PCMachineState {
> /* Address space used by IOAPIC device. All IOAPIC interrupts
> * will be translated to MSI messages in the address space. */
> AddressSpace *ioapic_as;
> +
> + /* ACPI Memory hotplug IO base address */
> + hwaddr memhp_io_base;
> };
>
> #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"
- [Qemu-arm] [PATCH-for-4.2 v10 00/11] ARM virt: ACPI memory hotplug support, Shameer Kolothum, 2019/09/04
- [Qemu-arm] [PATCH-for-4.2 v10 01/11] hw/acpi: Make ACPI IO address space configurable, Shameer Kolothum, 2019/09/04
- Re: [Qemu-arm] [PATCH-for-4.2 v10 01/11] hw/acpi: Make ACPI IO address space configurable,
Igor Mammedov <=
- [Qemu-arm] [PATCH-for-4.2 v10 02/11] hw/acpi: Do not create memory hotplug method when handler is not defined, Shameer Kolothum, 2019/09/04
- [Qemu-arm] [PATCH-for-4.2 v10 03/11] hw/acpi: Add ACPI Generic Event Device Support, Shameer Kolothum, 2019/09/04
- [Qemu-arm] [PATCH-for-4.2 v10 04/11] hw/arm/virt: Add memory hotplug framework, Shameer Kolothum, 2019/09/04
- [Qemu-arm] [PATCH-for-4.2 v10 06/11] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Shameer Kolothum, 2019/09/04
- [Qemu-arm] [PATCH-for-4.2 v10 05/11] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot, Shameer Kolothum, 2019/09/04