Re: [TF-A] [PATCHv3] arm-virt: add secure pl061 for reset/power down

Please skip v2 and use v3. I had to check that one line change code compiles. qemu_log() requires include header for that function.

Best regards, Maxim.

On Wed, 6 Jan 2021 at 19:34, Maxim Uvarov maxim.uvarov@linaro.org wrote:

Add secure pl061 for reset/power down machine from the secure world (Arm Trusted Firmware). Use the same gpio 3 and gpio 4 which were used by non acpi variant of linux power control gpios.

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

v3: added missed include qemu/log.h for qemu_log(.. v2: replace printf with qemu_log (Philippe Mathieu-Daudé)

hw/arm/Kconfig | 1 + hw/arm/virt.c | 24 ++++++++++++ hw/gpio/Kconfig | 3 ++ hw/gpio/gpio_pwr.c | 85 +++++++++++++++++++++++++++++++++++++++++++ hw/gpio/meson.build | 1 + include/hw/arm/virt.h | 1 + 6 files changed, 115 insertions(+) create mode 100644 hw/gpio/gpio_pwr.c

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0a242e4c5d..13cc42dcc8 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -17,6 +17,7 @@ config ARM_VIRT select PL011 # UART select PL031 # RTC select PL061 # GPIO

• select GPIO_PWR select PLATFORM_BUS select SMBIOS select VIRTIO_MMIO

diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 96985917d3..eff0345303 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -147,6 +147,7 @@ static const MemMapEntry base_memmap[] = { [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x00000018 }, [VIRT_GPIO] = { 0x09030000, 0x00001000 },

• [VIRT_SECURE_GPIO] = { 0x09031000, 0x00001000 }, [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, [VIRT_SMMU] = { 0x09050000, 0x00020000 }, [VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },

@@ -189,6 +190,7 @@ static const int a15irqmap[] = { [VIRT_GPIO] = 7, [VIRT_SECURE_UART] = 8, [VIRT_ACPI_GED] = 9,

• [VIRT_SECURE_GPIO] = 10, [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 */

@@ -864,6 +866,24 @@ static void create_gpio(const VirtMachineState *vms) g_free(nodename); }

+static void create_gpio_secure(const VirtMachineState *vms) +{

• DeviceState *pl061_dev;
• static DeviceState *gpio_pwr_dev;
• hwaddr base = vms->memmap[VIRT_SECURE_GPIO].base;
• int irq = vms->irqmap[VIRT_SECURE_GPIO];
• pl061_dev = sysbus_create_simple("pl061", base,

•                                 qdev_get_gpio_in(vms->gic, irq));
  

• gpio_pwr_dev = sysbus_create_simple("gpio-pwr", -1,

•                                    qdev_get_gpio_in(pl061_dev, 3));
  

• qdev_connect_gpio_out(pl061_dev, 3, qdev_get_gpio_in(gpio_pwr_dev, 3));
• qdev_connect_gpio_out(pl061_dev, 4, qdev_get_gpio_in(gpio_pwr_dev, 4));

+}

static void create_virtio_devices(const VirtMachineState *vms) { int i; @@ -1993,6 +2013,10 @@ static void machvirt_init(MachineState *machine) create_gpio(vms); }

• if (vms->secure) {

•    create_gpio_secure(vms);
  

• }

• /* connect powerdown request */
  vms->powerdown_notifier.notify = virt_powerdown_req;
  qemu_register_powerdown_notifier(&vms->powerdown_notifier);
  

diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig index b6fdaa2586..f0e7405f6e 100644 --- a/hw/gpio/Kconfig +++ b/hw/gpio/Kconfig @@ -8,5 +8,8 @@ config PL061 config GPIO_KEY bool

+config GPIO_PWR

• bool

config SIFIVE_GPIO bool diff --git a/hw/gpio/gpio_pwr.c b/hw/gpio/gpio_pwr.c new file mode 100644 index 0000000000..0d0680c9f7 --- /dev/null +++ b/hw/gpio/gpio_pwr.c @@ -0,0 +1,85 @@ +/*

• • GPIO qemu power controller
• • Copyright (c) 2020 Linaro Limited
• • Author: Maxim Uvarov maxim.uvarov@linaro.org
• • Virtual gpio driver which can be used on top of pl061
• • to reboot and shutdown qemu virtual machine. One of use
• • case is gpio driver for secure world application (ARM
• • Trusted Firmware.).
• • This work is licensed under the terms of the GNU GPL, version 2 or later.
• • See the COPYING file in the top-level directory.
• • SPDX-License-Identifier: GPL-2.0-or-later
• */

+#include "qemu/osdep.h" +#include "qemu/log.h" +#include "hw/irq.h" +#include "hw/sysbus.h" +#include "sysemu/runstate.h"

+#define TYPE_GPIOPWR "gpio-pwr" +OBJECT_DECLARE_SIMPLE_TYPE(GPIO_PWR_State, GPIOPWR)

+struct GPIO_PWR_State {

• SysBusDevice parent_obj;
• qemu_irq irq;

+};

+static void gpio_pwr_set_irq(void *opaque, int irq, int level) +{

• GPIO_PWR_State *s = (GPIO_PWR_State *)opaque;
• qemu_set_irq(s->irq, 1);
• if (level) {

•    return;
  

• }
• switch (irq) {
• case 3:

•    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
  

•    break;
  

• case 4:

•    qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
  

•    break;
  

• default:

•    qemu_log_mask(LOG_GUEST_ERROR,
  

•                  "qemu; gpio_pwr: unknown interrupt %d lvl %d\n",
  

•                  irq, level);
  

• }

+}

+static void gpio_pwr_realize(DeviceState *dev, Error **errp) +{

• GPIO_PWR_State *s = GPIOPWR(dev);
• SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
• sysbus_init_irq(sbd, &s->irq);
• qdev_init_gpio_in(dev, gpio_pwr_set_irq, 8);

+}

+static void gpio_pwr_class_init(ObjectClass *klass, void *data) +{

• DeviceClass *dc = DEVICE_CLASS(klass);
• dc->realize = gpio_pwr_realize;

+}

+static const TypeInfo gpio_pwr_info = {

• .name = TYPE_GPIOPWR,
• .parent = TYPE_SYS_BUS_DEVICE,
• .instance_size = sizeof(GPIO_PWR_State),
• .class_init = gpio_pwr_class_init,

+};

+static void gpio_pwr_register_types(void) +{

• type_register_static(&gpio_pwr_info);

+}

+type_init(gpio_pwr_register_types) diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build index 5c0a7d7b95..79568f00ce 100644 --- a/hw/gpio/meson.build +++ b/hw/gpio/meson.build @@ -1,5 +1,6 @@ softmmu_ss.add(when: 'CONFIG_E500', if_true: files('mpc8xxx.c')) softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c')) +softmmu_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c')) softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c')) softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c')) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index abf54fab49..77a4523cc7 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -81,6 +81,7 @@ enum { VIRT_GPIO, VIRT_SECURE_UART, VIRT_SECURE_MEM,

• VIRT_SECURE_GPIO, VIRT_PCDIMM_ACPI, VIRT_ACPI_GED, VIRT_NVDIMM_ACPI,

-- 2.17.1