From patchwork Fri Jan 22 21:52:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 368675 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1876478jam; Fri, 22 Jan 2021 13:54:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzJH3mPZlcIZPb2w2qsmW8+pNthy7r+CqrJ49K7S+WrjDKDjs0C2l7p39r9absYMakRDCI X-Received: by 2002:a25:d450:: with SMTP id m77mr9339736ybf.234.1611352493472; Fri, 22 Jan 2021 13:54:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611352493; cv=none; d=google.com; s=arc-20160816; b=dzPrYf/dCL042PhrOvHv2vpOQY+XrGPIcU9JKjGmQ7i3ITqgEA4+4a0VKo/+m+YXar b2DjVm7f4HbuBYxWD2GqHmOPWHc/2lVJWiveZW/8v7tB0k3jbnE+PrMRZ4UIuX+LKVwT k8E13zaqYB7YE1IOGTvcY9TqR22evH3H3CaT6MpvvrvvDHy5aHh2yI900KA++4xm8LG1 4p3vZXFD2USk3cE+QbAfQufjHlXMhZxWccbnGgHWg+PGrqAmEqicVHDR4h7kqUWBO3h/ xLySflCGcgqRUmouGCugY4eznyOqieFXow623TVb2uDJkQ1OAV1rzVIKVGugYx3Gxvjw ENow== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=y83FKmfAevaqL/bT3eQ9Kizu2g5zyv6mjKfgMLLGBsI=; b=L1TaYjfiPMZvQhzDJFZ0bmKrO7PlxXflqeuM8sm0lkOz6fzsl2rvlmVYUESCAsa1ig g54VkakhitCyPJLx2ZtF/+wmfIgPqJMgPMdvDOjPsFeDaigjwzgA60nvepSUaoFjyvmX JANqzuQBYZzUcTAeWBZJNEnkg3MZlkqccuFfPXpkDhp07QBsiH1y+9NrpyC3CZYf8NQQ qKgPECAFxM6T0QPDf2mqjLKPE8hFjOTSXQyiH7aAlBu2kfkamzN6Hsmpi3UZCQAoZ9qu JFnqwwBE+yQrAdUgr0Yg/MiODZOo3z3YiHYYcGhlWZK1j0lXW/6VS+xOIqs2XKiCPv8q yoeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ynW0Cd96; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s36si10102281ybi.85.2021.01.22.13.54.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 13:54:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ynW0Cd96; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l34OK-0002cW-U4 for patch@linaro.org; Fri, 22 Jan 2021 16:54:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l34MB-0000VV-2R for qemu-devel@nongnu.org; Fri, 22 Jan 2021 16:52:40 -0500 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:43027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l34M7-0007K0-Rx for qemu-devel@nongnu.org; Fri, 22 Jan 2021 16:52:38 -0500 Received: by mail-lf1-x135.google.com with SMTP id q8so9567894lfm.10 for ; Fri, 22 Jan 2021 13:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y83FKmfAevaqL/bT3eQ9Kizu2g5zyv6mjKfgMLLGBsI=; b=ynW0Cd96y7x+l/7G7ZuvhAafDiywFudoEgVor06Sbo/qmOBuKg/6ceoAFXrOwzn0qq YNgxDGKTsUZf78rksym/K7CqI+0ZpQQ8Mm/gJWPFridnL0edomEEm0NB5o6ZYJ3CFfHD cwjaBmKbCnlo+0Swi8RrWCfijstUAeL8S4HjD6Oq/IzLLNPrx7OT6b7O++/44ewVBgwM q+G/O8Ax/y81/eAQq3rtjPy4te+wU0QGeBNjfkyiVIM01wKqnUJg2iSw8m5jr/jfZ/pf tD9KGz5QBbdBxj+14fPECvwjKNdpNmYAn/y16kQw4VhvNIf4iIMch6Ogaoy77KxlZPP0 kmdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y83FKmfAevaqL/bT3eQ9Kizu2g5zyv6mjKfgMLLGBsI=; b=fbe+NPX4MRJUZuEJc8tUOAEDLtM+Au9JJzSNo+7GARPkZWml4ExaZSzXBCDXRxQ5eh PcG1XJ37rSSgCmCOZBvyAiOhW0+IbVi9I3byOZGbij7VOdtVBbmn2A1/sMLkmF4dQtRo B2WgXAFPtnqBq9H7X/unNlfyIoFTJ3eDdldBXON+aP2mf7nsVHaKDbgdCvHoihP7IXlq xtJgJPfPeylBxcqdY2RVihT4c/mHxVvlNYJNtBq6G0qfCfG9SBpUfDRjnv/q6Gt0yPIT Hy6ZTHSYqE4ei7RMhTLk4lSB7/piupxEZo8Z7cTiY2oMeF6yx1MVa60U/Bvv18Xaxu6z crEA== X-Gm-Message-State: AOAM533ePUm5ixzu5nPQZGKdvjEsvIUOZw9S7yUZnJYjukhItARX76/E wa+BjYqSzGhpdpHjbsLNxB0XPw== X-Received: by 2002:a05:6512:2248:: with SMTP id i8mr3005375lfu.632.1611352354311; Fri, 22 Jan 2021 13:52:34 -0800 (PST) Received: from localhost.localdomain ([176.59.42.245]) by smtp.gmail.com with ESMTPSA id a11sm1019890lfl.22.2021.01.22.13.52.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 13:52:33 -0800 (PST) From: Maxim Uvarov To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCHv9 3/3] arm-virt: add secure pl061 for reset/power down Date: Sat, 23 Jan 2021 00:52:22 +0300 Message-Id: <20210122215222.8320-4-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210122215222.8320-1-maxim.uvarov@linaro.org> References: <20210122215222.8320-1-maxim.uvarov@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=maxim.uvarov@linaro.org; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, drjones@redhat.com, Maxim Uvarov , Jose.Marinho@arm.com, f4bug@amsat.org, tf-a@lists.trustedfirmware.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add secure pl061 for reset/power down machine from the secure world (Arm Trusted Firmware). Connect it with gpio-pwr driver. Signed-off-by: Maxim Uvarov Reviewed-by: Andrew Jones --- hw/arm/Kconfig | 1 + hw/arm/virt.c | 56 ++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 2 ++ 3 files changed, 58 insertions(+), 1 deletion(-) -- 2.17.1 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 a135316741..bc99b5419d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -153,6 +153,7 @@ static const MemMapEntry base_memmap[] = { [VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_EVT_SEL_LEN }, [VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN}, [VIRT_PVTIME] = { 0x090a0000, 0x00010000 }, + [VIRT_SECURE_GPIO] = { 0x090b0000, 0x00001000 }, [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 }, @@ -841,6 +842,43 @@ static void create_gpio_keys(const VirtMachineState *vms, "gpios", phandle, 3, 0); } +#define SECURE_GPIO_POWEROFF 0 +#define SECURE_GPIO_RESET 1 + +static void create_secure_gpio_pwr(const VirtMachineState *vms, + DeviceState *pl061_dev, + uint32_t phandle) +{ + DeviceState *gpio_pwr_dev; + + /* gpio-pwr */ + gpio_pwr_dev = sysbus_create_simple("gpio-pwr", -1, NULL); + + /* connect secure pl061 to gpio-pwr */ + qdev_connect_gpio_out(pl061_dev, SECURE_GPIO_RESET, + qdev_get_gpio_in_named(gpio_pwr_dev, "reset", 0)); + qdev_connect_gpio_out(pl061_dev, SECURE_GPIO_POWEROFF, + qdev_get_gpio_in_named(gpio_pwr_dev, "shutdown", 0)); + + qemu_fdt_add_subnode(vms->fdt, "/gpio-poweroff"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-poweroff", "compatible", + "gpio-poweroff"); + qemu_fdt_setprop_cells(vms->fdt, "/gpio-poweroff", + "gpios", phandle, SECURE_GPIO_POWEROFF, 0); + qemu_fdt_setprop_string(vms->fdt, "/gpio-poweroff", "status", "disabled"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-poweroff", "secure-status", + "okay"); + + qemu_fdt_add_subnode(vms->fdt, "/gpio-restart"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-restart", "compatible", + "gpio-restart"); + qemu_fdt_setprop_cells(vms->fdt, "/gpio-restart", + "gpios", phandle, SECURE_GPIO_RESET, 0); + qemu_fdt_setprop_string(vms->fdt, "/gpio-restart", "status", "disabled"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-restart", "secure-status", + "okay"); +} + static void create_gpio_devices(const VirtMachineState *vms, int gpio, MemoryRegion *mem) { @@ -873,10 +911,19 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio, qemu_fdt_setprop_string(vms->fdt, nodename, "clock-names", "apb_pclk"); qemu_fdt_setprop_cell(vms->fdt, nodename, "phandle", phandle); + if (gpio != VIRT_GPIO) { + /* Mark as not usable by the normal world */ + qemu_fdt_setprop_string(vms->fdt, nodename, "status", "disabled"); + qemu_fdt_setprop_string(vms->fdt, nodename, "secure-status", "okay"); + } g_free(nodename); /* Child gpio devices */ - create_gpio_keys(vms, pl061_dev, phandle); + if (gpio == VIRT_GPIO) { + create_gpio_keys(vms, pl061_dev, phandle); + } else { + create_secure_gpio_pwr(vms, pl061_dev, phandle); + } } static void create_virtio_devices(const VirtMachineState *vms) @@ -2008,6 +2055,10 @@ static void machvirt_init(MachineState *machine) create_gpio_devices(vms, VIRT_GPIO, sysmem); } + if (vms->secure && !vmc->no_secure_gpio) { + create_gpio_devices(vms, VIRT_SECURE_GPIO, secure_sysmem); + } + /* connect powerdown request */ vms->powerdown_notifier.notify = virt_powerdown_req; qemu_register_powerdown_notifier(&vms->powerdown_notifier); @@ -2623,8 +2674,11 @@ DEFINE_VIRT_MACHINE_AS_LATEST(6, 0) static void virt_machine_5_2_options(MachineClass *mc) { + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + virt_machine_6_0_options(mc); compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); + vmc->no_secure_gpio = true; } DEFINE_VIRT_MACHINE(5, 2) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index abf54fab49..6f6c85ffcf 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, @@ -127,6 +128,7 @@ struct VirtMachineClass { bool kvm_no_adjvtime; bool no_kvm_steal_time; bool acpi_expose_flash; + bool no_secure_gpio; }; struct VirtMachineState {