From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:4850:0:0:0:0:0 with SMTP id n16csp2090007wrs; Thu, 29 Aug 2019 05:38:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVCzyv7NBwDWoo6DUrYQ0IYM8fEJdMg6poFVRhrbGOnhayKK65hJED18+uYGGLzTae3aeJ X-Received: by 2002:a17:906:a98f:: with SMTP id jr15mr7906293ejb.26.1567082319300; Thu, 29 Aug 2019 05:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567082319; cv=none; d=google.com; s=arc-20160816; b=TCz5f85mS+FDuAv/2G3+KhGeWTB9yj4pw+ZhK8okff2uOaiinVZFviYb0bVmc+91ui SyJiviJAnPVZNwyL9/YJ6TTj9D53T83Q0HcZB0DraRetZ6sMYndpr9HpB5tpxIfdNztK FWZF4sXBQFE2S6DmPTIcyUbuHMk5qbEu7oygBsO/DSlCZ6H0woyCXkM6FMhefp7EhaEK 5WppytJo0yQrFMH4EV6Bt5V4eptXfYJAjh6Qk6V8mqnHAQlwOqiixIcDHz4AyiE9MF0V Up2Q32beChCvRcEipo4n5VWClWhSxtAZ/WNvI7A7eTHKv5g6Cypjakfe+cb4RmqnTFJD y+yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:to:from:date; bh=vqGCvxpPpUt+MpB9Ah/UvHx26qkFzr0YEiuXW97ySJU=; b=BO0Oxo2COxKOM1BN4VVhG6hqSLvb828xHHvguE1VgDv5JkmtqbkkjOSIQlTw8qeiog KzuQacrBQWZ1USAi3k7aUO18ydUzt5hjj+vT4waE66ubBd0Spf0YtNbZ0ouzq94N5Ekl 7SxtC0Qk9Exjo8rcOOqmoi8E0ihJwPkHN0XdwsKL9TI42O89mrC1ssASJmz/0n5mXo7O y9hkZgEuE/pA8NQD0CPQDgySHaV6SSkovzIEgjsZplYuDA1qF40bqsYWML0Om/M8oiuM JUdVhN7ZhuL9y2lA1lYw1mnVfKq0V599m3AGBx0Al+j9z1DSHVvVCIa0wOBuGL4YqoKa Yrng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c7si1185581edk.170.2019.08.29.05.38.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Aug 2019 05:38:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:49444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3JhG-0002Ji-1T for alex.bennee@linaro.org; Thu, 29 Aug 2019 08:38:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43338) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Jh0-0002F2-D5 for qemu-arm@nongnu.org; Thu, 29 Aug 2019 08:38:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3Jgw-00072t-KK for qemu-arm@nongnu.org; Thu, 29 Aug 2019 08:38:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i3Jgw-00071w-AV; Thu, 29 Aug 2019 08:38:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C842C300DA2E; Thu, 29 Aug 2019 12:38:16 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 105035C1D6; Thu, 29 Aug 2019 12:38:11 +0000 (UTC) Date: Thu, 29 Aug 2019 14:38:10 +0200 From: Igor Mammedov To: Shameerali Kolothum Thodi Message-ID: <20190829143810.1dc33818@redhat.com> In-Reply-To: <5FC3163CFD30C246ABAA99954A238FA83F3A2027@lhreml524-mbs.china.huawei.com> References: <20190813210539.31164-1-shameerali.kolothum.thodi@huawei.com> <20190813210539.31164-2-shameerali.kolothum.thodi@huawei.com> <5FC3163CFD30C246ABAA99954A238FA83F36E598@lhreml524-mbs.china.huawei.com> <20190829104518.0995e7c5@redhat.com> <5FC3163CFD30C246ABAA99954A238FA83F3A2027@lhreml524-mbs.china.huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 29 Aug 2019 12:38:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-arm] [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space configurable X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "peter.maydell@linaro.org" , "sameo@linux.intel.com" , "ard.biesheuvel@linaro.org" , "shannon.zhaosl@gmail.com" , "qemu-devel@nongnu.org" , Linuxarm , "eric.auger@redhat.com" , "qemu-arm@nongnu.org" , "sebastien.boeuf@intel.com" , "lersek@redhat.com" Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 17krTzlqDxD6 On Thu, 29 Aug 2019 11:04:27 +0000 Shameerali Kolothum Thodi wrote: > Hi Igor, > > > -----Original Message----- > > From: Igor Mammedov [mailto:imammedo@redhat.com] > > Sent: 29 August 2019 09:45 > > To: Shameerali Kolothum Thodi > > Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org; > > eric.auger@redhat.com; peter.maydell@linaro.org; sameo@linux.intel.com; > > ard.biesheuvel@linaro.org; Linuxarm ; > > shannon.zhaosl@gmail.com; sebastien.boeuf@intel.com; lersek@redhat.com > > Subject: Re: [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space > > configurable > > > > On Thu, 15 Aug 2019 08:42:48 +0000 > > Shameerali Kolothum Thodi wrote: > > > > > > -----Original Message----- > > > > From: Linuxarm [mailto:linuxarm-bounces@huawei.com] On Behalf Of > > Shameer > > > > Kolothum > > > > Sent: 13 August 2019 22:05 > > > > To: qemu-devel@nongnu.org; qemu-arm@nongnu.org; > > > > eric.auger@redhat.com; imammedo@redhat.com > > > > Cc: peter.maydell@linaro.org; sameo@linux.intel.com; > > > > ard.biesheuvel@linaro.org; Linuxarm ; > > > > shannon.zhaosl@gmail.com; sebastien.boeuf@intel.com; > > lersek@redhat.com > > > > Subject: [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space > > > > configurable > > > > > > > > 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. > > > > > > Looks like, this now breaks the "make check" on x86_64 and needs > > > updating bios-tables-test-allowed-diff.h with DSDT entries. But I am > > > not sure what changed now compared to v8(and older ones) that makes > > > it to complain now!. > > > > you could see diff of what's changed but running test manually with > > V=1 env var if you have 'iasl' installed > > > > V=1 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 > > tests/bios-tables-test > > Thanks for that tip and please find below output. > > /x86_64/acpi/piix4: Could not access KVM kernel module: No such file or directory > qemu-system-x86_64: failed to initialize KVM: No such file or directory > qemu-system-x86_64: Back to tcg accelerator > acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-RGE76Z], Expected [aml:tests/data/acpi/pc/DSDT]. > acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-TAE76Z.dsl, aml:/tmp/aml-RGE76Z], Expected [asl:/tmp/asl-O6B76Z.dsl, aml:tests/data/acpi/pc/DSDT]. > > diff --git a/tmp/asl-O6B76Z.dsl b/tmp/asl-TAE76Z.dsl > index 823ff002ec..4de5bd3221 100644 > --- a/tmp/asl-O6B76Z.dsl > +++ b/tmp/asl-TAE76Z.dsl > @@ -5,13 +5,13 @@ > * > * Disassembling to symbolic ASL+ operators > * > - * Disassembly of tests/data/acpi/pc/DSDT, Thu Aug 29 10:40:40 2019 > + * Disassembly of /tmp/aml-RGE76Z, Thu Aug 29 10:40:40 2019 > * > * Original Table Header: > * Signature "DSDT" > - * Length 0x0000140B (5131) > + * Length 0x000017E4 (6116) > * Revision 0x01 **** 32-bit table (V1), no 64-bit math support > - * Checksum 0xB1 > + * Checksum 0x8B > * OEM ID "BOCHS " > * OEM Table ID "BXPCDSDT" > * OEM Revision 0x00000001 (1) > @@ -787,6 +787,206 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001) > \_SB.CPUS.CSCN () > } > > + Device (\_SB.PCI0.MHPD) > + { > + Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID > + Name (_UID, "Memory hotplug resources") // _UID: Unique ID > + Name (_CRS, Reso > > I think what happens is since we are now passing the memhp_io_base directly into the > build_memory_hotplug_aml() and removed the "static uint16_t memhp_io_base", on > x86, memory hotplug aml code is always built by default irrespective of whether > acpi_memory_hotplug_init() is invoked or not. > > I could either reintroduce a check in build_memory_hotplug_aml() to make sure > acpi_memory_hotplug_init() is called, or could do something like below, fix looks fine to me, see minor comment below > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 3995f9a40f..17756c2191 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1873,9 +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", AML_SYSTEM_IO, > - pcms->memhp_io_base); > + > + if (acpi_enabled && pcms->acpi_dev && nr_mem) { double-check call path and see if acpi_enabled && pcms->acpi_dev is really necessary > + build_memory_hotplug_aml(dsdt, nr_mem, "\\_SB.PCI0", > + "\\_GPE._E03", AML_SYSTEM_IO, > + pcms->memhp_io_base); > + } > > > I prefer the latter if there are no other issues with that. Please let me know. > > Thanks, > Shameer > > > > > > Patchew URL: > > https://patchew.org/QEMU/20190813210539.31164-1-shameerali.kolothum.t > > hodi@huawei.com/ > > > > > > ERROR:/tmp/qemu-test/src/tests/bios-tables-test.c:447:test_acpi_asl: > > assertion failed: (all_tables_match) > > > > > > Thanks, > > > Shameer > > > > > > > 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 > > > > > > --- > > > > 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 | 29 ++++++++++++++--------------- > > > > hw/i386/acpi-build.c | 4 +++- > > > > hw/i386/pc.c | 3 +++ > > > > include/hw/acpi/memory_hotplug.h | 9 +++++++-- > > > > include/hw/i386/pc.h | 3 +++ > > > > 5 files changed, 30 insertions(+), 18 deletions(-) > > > > > > > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > > > > index 297812d5f7..1734d4b44f 100644 > > > > --- a/hw/acpi/memory_hotplug.c > > > > +++ b/hw/acpi/memory_hotplug.c > > > > @@ -29,12 +29,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) > > > > { > > > > @@ -209,7 +204,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()); > > > > > > > > @@ -218,12 +213,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); > > > > } > > > > > > > > /** > > > > @@ -342,7 +335,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; > > > > @@ -365,14 +359,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 f3fdfefcd5..e76d6631ea 100644 > > > > --- a/hw/i386/acpi-build.c > > > > +++ b/hw/i386/acpi-build.c > > > > @@ -1871,7 +1871,9 @@ 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"); > > > > + 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 549c437050..be973cea99 100644 > > > > --- a/hw/i386/pc.c > > > > +++ b/hw/i386/pc.c > > > > @@ -1936,6 +1936,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 859b64c51d..49b47535cf 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" > > > > -- > > > > 2.17.1 > > > > > > > > > > > > _______________________________________________ > > > > Linuxarm mailing list > > > > Linuxarm@huawei.com > > > > http://hulk.huawei.com/mailman/listinfo/linuxarm > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA80EC3A59F for ; Thu, 29 Aug 2019 12:40:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90B252339E for ; Thu, 29 Aug 2019 12:40:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90B252339E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Jia-0003RD-Lz for qemu-devel@archiver.kernel.org; Thu, 29 Aug 2019 08:40:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43377) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Jh5-0002Kx-8Q for qemu-devel@nongnu.org; Thu, 29 Aug 2019 08:38:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3Jh2-00079a-Os for qemu-devel@nongnu.org; Thu, 29 Aug 2019 08:38:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i3Jgw-00071w-AV; Thu, 29 Aug 2019 08:38:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C842C300DA2E; Thu, 29 Aug 2019 12:38:16 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 105035C1D6; Thu, 29 Aug 2019 12:38:11 +0000 (UTC) Date: Thu, 29 Aug 2019 14:38:10 +0200 From: Igor Mammedov To: Shameerali Kolothum Thodi Message-ID: <20190829143810.1dc33818@redhat.com> In-Reply-To: <5FC3163CFD30C246ABAA99954A238FA83F3A2027@lhreml524-mbs.china.huawei.com> References: <20190813210539.31164-1-shameerali.kolothum.thodi@huawei.com> <20190813210539.31164-2-shameerali.kolothum.thodi@huawei.com> <5FC3163CFD30C246ABAA99954A238FA83F36E598@lhreml524-mbs.china.huawei.com> <20190829104518.0995e7c5@redhat.com> <5FC3163CFD30C246ABAA99954A238FA83F3A2027@lhreml524-mbs.china.huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 29 Aug 2019 12:38:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space configurable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "peter.maydell@linaro.org" , "sameo@linux.intel.com" , "ard.biesheuvel@linaro.org" , "shannon.zhaosl@gmail.com" , "qemu-devel@nongnu.org" , Linuxarm , "eric.auger@redhat.com" , "qemu-arm@nongnu.org" , "sebastien.boeuf@intel.com" , "lersek@redhat.com" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 29 Aug 2019 11:04:27 +0000 Shameerali Kolothum Thodi wrote: > Hi Igor, > > > -----Original Message----- > > From: Igor Mammedov [mailto:imammedo@redhat.com] > > Sent: 29 August 2019 09:45 > > To: Shameerali Kolothum Thodi > > Cc: qemu-devel@nongnu.org; qemu-arm@nongnu.org; > > eric.auger@redhat.com; peter.maydell@linaro.org; sameo@linux.intel.com; > > ard.biesheuvel@linaro.org; Linuxarm ; > > shannon.zhaosl@gmail.com; sebastien.boeuf@intel.com; lersek@redhat.com > > Subject: Re: [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space > > configurable > > > > On Thu, 15 Aug 2019 08:42:48 +0000 > > Shameerali Kolothum Thodi wrote: > > > > > > -----Original Message----- > > > > From: Linuxarm [mailto:linuxarm-bounces@huawei.com] On Behalf Of > > Shameer > > > > Kolothum > > > > Sent: 13 August 2019 22:05 > > > > To: qemu-devel@nongnu.org; qemu-arm@nongnu.org; > > > > eric.auger@redhat.com; imammedo@redhat.com > > > > Cc: peter.maydell@linaro.org; sameo@linux.intel.com; > > > > ard.biesheuvel@linaro.org; Linuxarm ; > > > > shannon.zhaosl@gmail.com; sebastien.boeuf@intel.com; > > lersek@redhat.com > > > > Subject: [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space > > > > configurable > > > > > > > > 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. > > > > > > Looks like, this now breaks the "make check" on x86_64 and needs > > > updating bios-tables-test-allowed-diff.h with DSDT entries. But I am > > > not sure what changed now compared to v8(and older ones) that makes > > > it to complain now!. > > > > you could see diff of what's changed but running test manually with > > V=1 env var if you have 'iasl' installed > > > > V=1 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 > > tests/bios-tables-test > > Thanks for that tip and please find below output. > > /x86_64/acpi/piix4: Could not access KVM kernel module: No such file or directory > qemu-system-x86_64: failed to initialize KVM: No such file or directory > qemu-system-x86_64: Back to tcg accelerator > acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-RGE76Z], Expected [aml:tests/data/acpi/pc/DSDT]. > acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-TAE76Z.dsl, aml:/tmp/aml-RGE76Z], Expected [asl:/tmp/asl-O6B76Z.dsl, aml:tests/data/acpi/pc/DSDT]. > > diff --git a/tmp/asl-O6B76Z.dsl b/tmp/asl-TAE76Z.dsl > index 823ff002ec..4de5bd3221 100644 > --- a/tmp/asl-O6B76Z.dsl > +++ b/tmp/asl-TAE76Z.dsl > @@ -5,13 +5,13 @@ > * > * Disassembling to symbolic ASL+ operators > * > - * Disassembly of tests/data/acpi/pc/DSDT, Thu Aug 29 10:40:40 2019 > + * Disassembly of /tmp/aml-RGE76Z, Thu Aug 29 10:40:40 2019 > * > * Original Table Header: > * Signature "DSDT" > - * Length 0x0000140B (5131) > + * Length 0x000017E4 (6116) > * Revision 0x01 **** 32-bit table (V1), no 64-bit math support > - * Checksum 0xB1 > + * Checksum 0x8B > * OEM ID "BOCHS " > * OEM Table ID "BXPCDSDT" > * OEM Revision 0x00000001 (1) > @@ -787,6 +787,206 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001) > \_SB.CPUS.CSCN () > } > > + Device (\_SB.PCI0.MHPD) > + { > + Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID > + Name (_UID, "Memory hotplug resources") // _UID: Unique ID > + Name (_CRS, Reso > > I think what happens is since we are now passing the memhp_io_base directly into the > build_memory_hotplug_aml() and removed the "static uint16_t memhp_io_base", on > x86, memory hotplug aml code is always built by default irrespective of whether > acpi_memory_hotplug_init() is invoked or not. > > I could either reintroduce a check in build_memory_hotplug_aml() to make sure > acpi_memory_hotplug_init() is called, or could do something like below, fix looks fine to me, see minor comment below > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 3995f9a40f..17756c2191 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1873,9 +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", AML_SYSTEM_IO, > - pcms->memhp_io_base); > + > + if (acpi_enabled && pcms->acpi_dev && nr_mem) { double-check call path and see if acpi_enabled && pcms->acpi_dev is really necessary > + build_memory_hotplug_aml(dsdt, nr_mem, "\\_SB.PCI0", > + "\\_GPE._E03", AML_SYSTEM_IO, > + pcms->memhp_io_base); > + } > > > I prefer the latter if there are no other issues with that. Please let me know. > > Thanks, > Shameer > > > > > > Patchew URL: > > https://patchew.org/QEMU/20190813210539.31164-1-shameerali.kolothum.t > > hodi@huawei.com/ > > > > > > ERROR:/tmp/qemu-test/src/tests/bios-tables-test.c:447:test_acpi_asl: > > assertion failed: (all_tables_match) > > > > > > Thanks, > > > Shameer > > > > > > > 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 > > > > > > --- > > > > 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 | 29 ++++++++++++++--------------- > > > > hw/i386/acpi-build.c | 4 +++- > > > > hw/i386/pc.c | 3 +++ > > > > include/hw/acpi/memory_hotplug.h | 9 +++++++-- > > > > include/hw/i386/pc.h | 3 +++ > > > > 5 files changed, 30 insertions(+), 18 deletions(-) > > > > > > > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > > > > index 297812d5f7..1734d4b44f 100644 > > > > --- a/hw/acpi/memory_hotplug.c > > > > +++ b/hw/acpi/memory_hotplug.c > > > > @@ -29,12 +29,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) > > > > { > > > > @@ -209,7 +204,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()); > > > > > > > > @@ -218,12 +213,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); > > > > } > > > > > > > > /** > > > > @@ -342,7 +335,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; > > > > @@ -365,14 +359,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 f3fdfefcd5..e76d6631ea 100644 > > > > --- a/hw/i386/acpi-build.c > > > > +++ b/hw/i386/acpi-build.c > > > > @@ -1871,7 +1871,9 @@ 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"); > > > > + 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 549c437050..be973cea99 100644 > > > > --- a/hw/i386/pc.c > > > > +++ b/hw/i386/pc.c > > > > @@ -1936,6 +1936,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 859b64c51d..49b47535cf 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" > > > > -- > > > > 2.17.1 > > > > > > > > > > > > _______________________________________________ > > > > Linuxarm mailing list > > > > Linuxarm@huawei.com > > > > http://hulk.huawei.com/mailman/listinfo/linuxarm >