From: Auger Eric <eric.auger@redhat.com>
To: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>,
qemu-devel@nongnu.org, qemu-arm@nongnu.org, imammedo@redhat.com
Cc: peter.maydell@linaro.org, sameo@linux.intel.com,
ard.biesheuvel@linaro.org, linuxarm@huawei.com,
xuwei5@hisilicon.com, shannon.zhaosl@gmail.com,
sebastien.boeuf@intel.com, lersek@redhat.com
Subject: Re: [Qemu-devel] [PATCH-for-4.2 v9 09/12] hw/arm: Use GED for system_powerdown event
Date: Mon, 2 Sep 2019 09:37:39 +0200 [thread overview]
Message-ID: <2c7eb5f4-3cb3-07db-5abb-b006b4854fa4@redhat.com> (raw)
In-Reply-To: <20190813210539.31164-10-shameerali.kolothum.thodi@huawei.com>
Hi Shameer,
On 8/13/19 11:05 PM, Shameer Kolothum wrote:
> For machines 4.2 or higher with ACPI boot use GED for system_powerdown
> event instead of GPIO. Guest boot with DT still uses GPIO.
>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Eric
> ---
> v8 --> v9
> -Re-arranged patches 8 & 9 from v8 based on Igor's comments.
>
> v7 --> v8
> -Retained gpio based system_powerdown support for machines < 4.2.
> -Reuse of virt_powerdown_req() for ACPI GED use.
> -Dropped Eric's R-by for now because of above.
>
> ---
> hw/acpi/generic_event_device.c | 8 ++++++++
> hw/arm/virt-acpi-build.c | 6 +++---
> hw/arm/virt.c | 16 +++++++++++-----
> include/hw/acpi/acpi_dev_interface.h | 1 +
> include/hw/acpi/generic_event_device.h | 3 +++
> 5 files changed, 26 insertions(+), 8 deletions(-)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index f4c23470c2..d6d7b28cfd 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -19,6 +19,7 @@
>
> static const uint32_t ged_supported_events[] = {
> ACPI_GED_MEM_HOTPLUG_EVT,
> + ACPI_GED_PWR_DOWN_EVT,
> };
>
> /*
> @@ -103,6 +104,11 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev,
> aml_append(if_ctx, aml_call0(MEMORY_DEVICES_CONTAINER "."
> MEMORY_SLOT_SCAN_METHOD));
> break;
> + case ACPI_GED_PWR_DOWN_EVT:
> + aml_append(if_ctx,
> + aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE),
> + aml_int(0x80)));
> + break;
> default:
> /*
> * Please make sure all the events in ged_supported_events[]
> @@ -189,6 +195,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
>
> if (ev & ACPI_MEMORY_HOTPLUG_STATUS) {
> sel = ACPI_GED_MEM_HOTPLUG_EVT;
> + } else if (ev & ACPI_POWER_DOWN_STATUS) {
> + sel = ACPI_GED_PWR_DOWN_EVT;
> } else {
> /* Unknown event. Return without generating interrupt. */
> warn_report("GED: Unsupported event %d. No irq injected", ev);
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 6d697af2df..61b399dc58 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -49,7 +49,6 @@
> #include "kvm_arm.h"
>
> #define ARM_SPI_BASE 32
> -#define ACPI_POWER_BUTTON_DEVICE "PWRB"
>
> static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
> {
> @@ -739,13 +738,14 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);
> acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
> vms->highmem, vms->highmem_ecam);
> - acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
> - (irqmap[VIRT_GPIO] + ARM_SPI_BASE));
> if (vms->acpi_dev) {
> build_ged_aml(scope, "\\_SB."GED_DEVICE,
> HOTPLUG_HANDLER(vms->acpi_dev),
> irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, AML_SYSTEM_MEMORY,
> memmap[VIRT_ACPI_GED].base);
> + } else {
> + acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],
> + (irqmap[VIRT_GPIO] + ARM_SPI_BASE));
> }
>
> if (vms->acpi_dev && ms->ram_slots) {
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 0e75213b44..d49e1a583c 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -528,7 +528,7 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms, qemu_irq *pic)
> {
> DeviceState *dev;
> int irq = vms->irqmap[VIRT_ACPI_GED];
> - uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT;
> + uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT | ACPI_GED_PWR_DOWN_EVT;
>
> dev = qdev_create(NULL, TYPE_ACPI_GED);
> qdev_prop_set_uint32(dev, "ged-event", event);
> @@ -783,8 +783,14 @@ static void create_rtc(const VirtMachineState *vms, qemu_irq *pic)
> static DeviceState *gpio_key_dev;
> static void virt_powerdown_req(Notifier *n, void *opaque)
> {
> - /* use gpio Pin 3 for power button event */
> - qemu_set_irq(qdev_get_gpio_in(gpio_key_dev, 0), 1);
> + VirtMachineState *s = container_of(n, VirtMachineState, powerdown_notifier);
> +
> + if (s->acpi_dev) {
> + acpi_send_event(s->acpi_dev, ACPI_POWER_DOWN_STATUS);
> + } else {
> + /* use gpio Pin 3 for power button event */
> + qemu_set_irq(qdev_get_gpio_in(gpio_key_dev, 0), 1);
> + }
> }
>
> static void create_gpio(const VirtMachineState *vms, qemu_irq *pic)
> @@ -1712,10 +1718,10 @@ static void machvirt_init(MachineState *machine)
>
> create_pcie(vms, pic);
>
> - create_gpio(vms, pic);
> -
> if (has_ged && aarch64 && firmware_loaded && acpi_enabled) {
> vms->acpi_dev = create_acpi_ged(vms, pic);
> + } else {
> + create_gpio(vms, pic);
> }
>
> /* connect powerdown request */
> diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
> index 43ff119179..adcb3a816c 100644
> --- a/include/hw/acpi/acpi_dev_interface.h
> +++ b/include/hw/acpi/acpi_dev_interface.h
> @@ -11,6 +11,7 @@ typedef enum {
> ACPI_MEMORY_HOTPLUG_STATUS = 8,
> ACPI_NVDIMM_HOTPLUG_STATUS = 16,
> ACPI_VMGENID_CHANGE_STATUS = 32,
> + ACPI_POWER_DOWN_STATUS = 64,
> } AcpiEventStatusBits;
>
> #define TYPE_ACPI_DEVICE_IF "acpi-device-interface"
> diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
> index 2049e8d873..d157eac088 100644
> --- a/include/hw/acpi/generic_event_device.h
> +++ b/include/hw/acpi/generic_event_device.h
> @@ -62,6 +62,8 @@
> #include "hw/sysbus.h"
> #include "hw/acpi/memory_hotplug.h"
>
> +#define ACPI_POWER_BUTTON_DEVICE "PWRB"
> +
> #define TYPE_ACPI_GED "acpi-ged"
> #define ACPI_GED(obj) \
> OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED)
> @@ -79,6 +81,7 @@
> * through GED.
> */
> #define ACPI_GED_MEM_HOTPLUG_EVT 0x1
> +#define ACPI_GED_PWR_DOWN_EVT 0x2
>
> typedef struct GEDState {
> MemoryRegion io;
>
next prev parent reply other threads:[~2019-09-02 7:39 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 21:05 [Qemu-devel] [PATCH-for-4.2 v9 00/12] ARM virt: ACPI memory hotplug support Shameer Kolothum
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 01/12] hw/acpi: Make ACPI IO address space configurable Shameer Kolothum
2019-08-15 8:42 ` Shameerali Kolothum Thodi
2019-08-29 8:45 ` Igor Mammedov
2019-08-29 11:04 ` Shameerali Kolothum Thodi
2019-08-29 12:38 ` Igor Mammedov
2019-08-29 13:45 ` Shameerali Kolothum Thodi
2019-09-01 11:17 ` Auger Eric
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 02/12] hw/acpi: Do not create memory hotplug method when handler is not defined Shameer Kolothum
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 03/12] hw/acpi: Add ACPI Generic Event Device Support Shameer Kolothum
2019-09-01 11:17 ` Auger Eric
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 04/12] hw/arm/virt: Add memory hotplug framework Shameer Kolothum
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 05/12] hw/arm/virt: Add 4.2 machine type Shameer Kolothum
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 06/12] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot Shameer Kolothum
2019-09-01 11:18 ` Auger Eric
2019-09-01 11:22 ` Auger Eric
2019-09-02 9:34 ` Shameerali Kolothum Thodi
2019-09-02 9:21 ` Shameerali Kolothum Thodi
2019-09-02 9:32 ` Auger Eric
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 07/12] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT Shameer Kolothum
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 08/12] hw/arm: Factor out powerdown notifier from GPIO Shameer Kolothum
2019-09-02 7:37 ` Auger Eric
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 09/12] hw/arm: Use GED for system_powerdown event Shameer Kolothum
2019-09-02 7:37 ` Auger Eric [this message]
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 10/12] docs/specs: Add ACPI GED documentation Shameer Kolothum
2019-09-01 11:20 ` Auger Eric
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 11/12] tests: add dummy ACPI tables for arm/virt board Shameer Kolothum
2019-08-13 21:05 ` [Qemu-devel] [PATCH-for-4.2 v9 12/12] tests: Add bios tests to arm/virt Shameer Kolothum
2019-08-14 6:46 ` [Qemu-devel] [PATCH-for-4.2 v9 00/12] ARM virt: ACPI memory hotplug support no-reply
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=2c7eb5f4-3cb3-07db-5abb-b006b4854fa4@redhat.com \
--to=eric.auger@redhat.com \
--cc=ard.biesheuvel@linaro.org \
--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=shameerali.kolothum.thodi@huawei.com \
--cc=shannon.zhaosl@gmail.com \
--cc=xuwei5@hisilicon.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: link
Be 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.