From patchwork Thu Jan 14 14:50:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 362854 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp567395jap; Thu, 14 Jan 2021 06:52:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlUuVtebM/GViIQli1Hh8hhqltHq5EUppR4zK4rE5Y+Zd4cM5L1/1ZiwKgbSbHz4bAx7oj X-Received: by 2002:a25:c614:: with SMTP id k20mr2182135ybf.371.1610635973000; Thu, 14 Jan 2021 06:52:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610635972; cv=none; d=google.com; s=arc-20160816; b=pXJs+ix/XR46GN/eFmi9y1buZ+3oYAAMMuz99Q8RzziA7hnYBl9lsUKPg7pkbZSSyn nRCBRwfGJiLE8yWKvVDVBpXrc+i9KV646PBEiWRmHjrJYk2obhwdpBw86kiZa+kC7HaY Xtdbqijrzy8nev+HI+nMaPwKt8n1+r66xCquxapU1oZsRGDSgqVWSypVJDMzbv/Q3ypk 8sgLDBUNQ3DBPc6bUQl5w/YcKMttcHe2zJ63l4ofvbyVTjgbSEmHi9gFNdB/DY45jW0Q J9d7vSvS7fM5CkfbW71Ytj7UkU5mlTTq7NxuaFWAB01n2V9ob9+xt9zdsXVM0c7SqrF7 VFUg== 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=62h8W8c/MHOTaJfr80jgkPG/YCUcGgeW9/I/zkhkDxM=; b=0wgRDbESbuhJ8sZMSqJR8bc+ho5dF582oUXBX4BpGrW8hekdDvZV/viYXOjPaB+g0M KgD/gqoaLPbACYL3SD3qpPdYsIe2G0p64RBWc29Cg9wvcSRg1UmibpiT5mTlBxXLhHFD DnCJaWXNmgLqMfalVn7nTThK96HY5mvehnYQMM0OVLHZcy4u4OKRCCENWrkodnCRdUaA AxAfFBiccmTSR3S+/dBJXKTyDBil1/Ok/T2eG8/hNboeeX2HBlc68KLi6Wv2PSAkaotE +fRgV5RKfEqks3ijxu2snsAHUCpmMlgDtSpud6JaOhZKRRJ0teHXmm52xXf9yWmQgJ3Z fMaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aWFf2iQz; 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 e7si6336622ybm.355.2021.01.14.06.52.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jan 2021 06:52:52 -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=aWFf2iQz; 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]:49410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l03zY-0003FY-Fb for patch@linaro.org; Thu, 14 Jan 2021 09:52:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l03xS-0008Gj-BM for qemu-devel@nongnu.org; Thu, 14 Jan 2021 09:50:42 -0500 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]:40486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l03xO-0003wr-TQ for qemu-devel@nongnu.org; Thu, 14 Jan 2021 09:50:42 -0500 Received: by mail-lj1-x236.google.com with SMTP id x23so6715926lji.7 for ; Thu, 14 Jan 2021 06:50:38 -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=62h8W8c/MHOTaJfr80jgkPG/YCUcGgeW9/I/zkhkDxM=; b=aWFf2iQzJCs+xc0d7hFTeo4YRfS2cmVUOP0jiT/hF0wLXXfUjYYa1sX/laeJMMAijH gztrnEXvc1MiPbREP8MEtbApqUcEs4g1yPBL0bLedvt4+MYgyAQQ9zvAwtUoRrFRR1tF mQp2nKut5paW3jrUV4fejsNkttj3E2zn2QlbI7VD3qlGXUxko2UKMNBJUEDcg9F7esFo HQoRjZ+qDhqUJs3zLJdyghejhVW6B2v+6yE4YBEtMll0yFtO8IEaGhu/DoyU36fbiCJD 2JtVBCQTMT/Iii1na2tqy1hOZFunrIuL1xSAKoKQNH67mIVyjsMK5OSUL6zaUluReuPo 4l3Q== 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=62h8W8c/MHOTaJfr80jgkPG/YCUcGgeW9/I/zkhkDxM=; b=hDRuP49vKeiyybUsICMUtoWnSHCF2N0mjwLkyfbWlpCuMQD6+qaauNtxf0tOoNgdiV Mdw7FQfHQYsl60V48um+jHBd6anZKAsz7g4O6txXjDTyI6qEZ8Jxxy2fPZfR4IAyZMmW HS1nmTqAabAg3aJk5q9bcBBd4LtU+Q5FC3xWuyQPgr5n6tAv6RotqTO5ZaQF4Jq/a6R1 p9xP0YXnG4oEdR3VMSekUw85Xn51RroonZCF89fDqhcaB2Vk1aMHT0Vx1ATePk1wYGXv owAuVeDR7eTMGr9mqzNUOwjhL4ax1wQM0lt7ttxpXXOAB6SIWTqUJb+FUzM43izp17aO j6/Q== X-Gm-Message-State: AOAM532boTBXn2Dnc8UpbyW7qxzrSa2AP6BUqsNiqC/bUr7CSgam4ip6 GBIPcH1+3qqW5VgL6vj903QUCw== X-Received: by 2002:a2e:6c03:: with SMTP id h3mr3403054ljc.360.1610635836532; Thu, 14 Jan 2021 06:50:36 -0800 (PST) Received: from localhost.localdomain ([2.92.195.184]) by smtp.gmail.com with ESMTPSA id p5sm567229lfj.295.2021.01.14.06.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 06:50:35 -0800 (PST) From: Maxim Uvarov To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCHv6 1/3] hw: gpio: implement gpio-pwr driver for qemu reset/poweroff Date: Thu, 14 Jan 2021 17:50:30 +0300 Message-Id: <20210114145032.8457-2-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210114145032.8457-1-maxim.uvarov@linaro.org> References: <20210114145032.8457-1-maxim.uvarov@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=maxim.uvarov@linaro.org; helo=mail-lj1-x236.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" Implement gpio-pwr driver to allow reboot and poweroff machine. This is simple driver with just 2 gpios lines. Current use case is to reboot and poweroff virt machine in secure mode. Secure pl066 gpio chip is needed for that. Signed-off-by: Maxim Uvarov Reviewed-by: Hao Wu --- hw/gpio/Kconfig | 3 ++ hw/gpio/gpio_pwr.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ hw/gpio/meson.build | 1 + 3 files changed, 74 insertions(+) create mode 100644 hw/gpio/gpio_pwr.c -- 2.17.1 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..8ed8d5d24f --- /dev/null +++ b/hw/gpio/gpio_pwr.c @@ -0,0 +1,70 @@ +/* + * GPIO qemu power controller + * + * Copyright (c) 2020 Linaro Limited + * + * Author: Maxim Uvarov + * + * 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 + */ + +/* + * QEMU interface: + * two named input GPIO lines: + * 'reset' : when asserted, trigger system reset + * 'shutdown' : when asserted, trigger system shutdown + */ + +#include "qemu/osdep.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; +}; + +static void gpio_pwr_reset(void *opaque, int n, int level) +{ + if (!level) { + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); + } +} + +static void gpio_pwr_shutdown(void *opaque, int n, int level) +{ + if (!level) { + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + } +} + +static void gpio_pwr_init(Object *obj) +{ + DeviceState *dev = DEVICE(obj); + + qdev_init_gpio_in_named(dev, gpio_pwr_reset, "reset", 1); + qdev_init_gpio_in_named(dev, gpio_pwr_shutdown, "shutdown", 1); +} + +static const TypeInfo gpio_pwr_info = { + .name = TYPE_GPIOPWR, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(GPIO_PWR_State), + .instance_init = gpio_pwr_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')) From patchwork Thu Jan 14 14:50:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 362855 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp567414jap; Thu, 14 Jan 2021 06:52:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3NAKAq+QMRbUrAU7pUK1UmIE7+dZvU0MjAeNd+VxOuh1+uMhiLVeArvtNiZgqpfkXN+5+ X-Received: by 2002:a25:4588:: with SMTP id s130mr3842061yba.281.1610635974044; Thu, 14 Jan 2021 06:52:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610635974; cv=none; d=google.com; s=arc-20160816; b=nLCGQFpmkTVv7cdt5NZbaJvbxPB1rhQMt/6C+cyCcok8pJ+55nv9ynV8g31qKOnUzF fvDK9MrXTm6nzePaMchwmcjFziig3dPtwsJNuZ5jrDKUrmvu9HHNQ3Nmk1q8xLj67tV4 3+9S1RJY2jEn0NnmjxbgSRd8MSvL8gJsI8/ffdR7P7DdfgyCqdO5A3PcxYuP54vNPRMZ og401qIVf5ietpFMHrb6A+l13h078feLKFch45s8YLx14nAd0NK06v1wF3dZMCcKkxUl Pk7474zH6iZrgkf54xtXA7F6/TXT5fEQapvkkIonk/RL6YftXGU+5GyRVLizZsSXAj9W 1Wnw== 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=GLJ1M8gnJdgfUFe1l9HibzCxyIIEXe/s/L5DY+OCXTc=; b=B5ZpwcyKw+3i66CC5JmZKOdPHfvmbvR4/8zAtuIAv1R7zOi2R36TPwlbOEKrTR1vVI AzIlDqU3gqnqm9DTEpBCnPIXHpDexZaAgLzpQnNwkHJdLBba+fQMwoAd/mhbK0ocd0xU YyuJVKP9SnLh/CTu/2IT5gKOTMAadtTu/WCTZrXwqa+2HCwJNCZbC5qgb2CPsnbhnoMF xZxIP5wvM4lBoqgButKOe7NZuLyArw0EpB9aPhhIGl6XO3+72x/lDD3wzpioT/0F/wso nKDfbx03iBYeCLRC0TpMM65adPCdWpWclSKOUlHl++cqUIvieOku+F9RxZDqlEsdl6NF bGfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yccVeNTk; 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 t16si6287900ybl.135.2021.01.14.06.52.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jan 2021 06:52:54 -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=yccVeNTk; 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]:49518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l03zZ-0003J2-Im for patch@linaro.org; Thu, 14 Jan 2021 09:52:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l03xT-0008HX-41 for qemu-devel@nongnu.org; Thu, 14 Jan 2021 09:50:43 -0500 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:37119) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l03xP-0003xp-Fy for qemu-devel@nongnu.org; Thu, 14 Jan 2021 09:50:42 -0500 Received: by mail-lf1-x135.google.com with SMTP id o17so8404576lfg.4 for ; Thu, 14 Jan 2021 06:50:39 -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=GLJ1M8gnJdgfUFe1l9HibzCxyIIEXe/s/L5DY+OCXTc=; b=yccVeNTkX7JqO7D2fwGTGVFNEGanxgpg12WMFY3+1xzD+iVzhSVASjIOQ1eAqoS0k1 WVwmrgVuQR1ZcX5BC21tfcN3Yzi2NBPqqppcvr4vURlmJh+7akNe/cCNxGHwiHIBK3bA WXS+dldLB4z+Ps63gSgR5Xpj1K+BPVG5jlrZIUuxXTxPwVnk6VutwzL0I0OxI8hzN1Yn /s8pILaPRJB+CCZVMCucfy7dKSpEYe+lo7Gi9CSj0CXnD2qPNvicC835UUJDNl4HHij+ uwVBowAiDAkIgkHu+bllk1oNr98eWJkhaNgBUAjHgoyu5VyZP33pX4hsfwmviYk0KvkN XBGQ== 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=GLJ1M8gnJdgfUFe1l9HibzCxyIIEXe/s/L5DY+OCXTc=; b=FbN3Hv+c67db+g9ninXQJg3Kjg4zJhlfOw9iFYjyxrm7YxjBy//kXumL3bm31Q0soB BIcYVUnHeJBzqShosdtgmjLZieIFGy6KZxcJVG6I3FzHJ8Ro5LIOpyGxTpey5cfJA1J5 MZoVg9Snzm57sI1XAuK+Q2LbUdIVIXOcM20eLn4+figV6CWxTLTN7Cly9+u7A11CO6zo BcznQFUACsuUYLfZbWjBD0HPkSC/ti2CI47LwNuF+jNYirl+fJnXXcRc2GxYbi7sX0EP h7YjGRgMOCEsfBDjulYpJGE8QA4tswbLQoRgSb+C6ux1I84BKed7hvEyf9bF6qQ+73kX n+TA== X-Gm-Message-State: AOAM530GgJ3LtYc0TQJTGCo9Bvgxstxf2EDpMFgUIJlJdzd98v/kGpfN dlakkvZwlS9S9WMswqssKtPnEw== X-Received: by 2002:a19:6a18:: with SMTP id u24mr3514564lfu.111.1610635837959; Thu, 14 Jan 2021 06:50:37 -0800 (PST) Received: from localhost.localdomain ([2.92.195.184]) by smtp.gmail.com with ESMTPSA id p5sm567229lfj.295.2021.01.14.06.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 06:50:37 -0800 (PST) From: Maxim Uvarov To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCHv6 2/3] arm-virt: add secure pl061 for reset/power down Date: Thu, 14 Jan 2021 17:50:31 +0300 Message-Id: <20210114145032.8457-3-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210114145032.8457-1-maxim.uvarov@linaro.org> References: <20210114145032.8457-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=unavailable 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 --- hw/arm/Kconfig | 1 + hw/arm/virt.c | 34 ++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 2 ++ 3 files changed, 37 insertions(+) -- 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 96985917d3..6f3ec15985 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 }, @@ -864,6 +865,32 @@ static void create_gpio(const VirtMachineState *vms) g_free(nodename); } +#define ATF_GPIO_POWEROFF 3 +#define ATF_GPIO_REBOOT 4 + +static void create_gpio_secure(const VirtMachineState *vms, MemoryRegion *mem) +{ + DeviceState *gpio_pwr_dev; + SysBusDevice *s; + hwaddr base = vms->memmap[VIRT_SECURE_GPIO].base; + DeviceState *pl061_dev; + + /* Secure pl061 */ + pl061_dev = qdev_new("pl061"); + s = SYS_BUS_DEVICE(pl061_dev); + sysbus_realize_and_unref(s, &error_fatal); + memory_region_add_subregion(mem, base, sysbus_mmio_get_region(s, 0)); + + /* gpio-pwr */ + gpio_pwr_dev = sysbus_create_simple("gpio-pwr", -1, NULL); + + /* connect secure pl061 to gpio-pwr */ + qdev_connect_gpio_out(pl061_dev, ATF_GPIO_POWEROFF, + qdev_get_gpio_in_named(gpio_pwr_dev, "reset", 0)); + qdev_connect_gpio_out(pl061_dev, ATF_GPIO_REBOOT, + qdev_get_gpio_in_named(gpio_pwr_dev, "shutdown", 0)); +} + static void create_virtio_devices(const VirtMachineState *vms) { int i; @@ -1993,6 +2020,10 @@ static void machvirt_init(MachineState *machine) create_gpio(vms); } + if (vms->secure && !vmc->no_secure_gpio) { + create_gpio_secure(vms, secure_sysmem); + } + /* connect powerdown request */ vms->powerdown_notifier.notify = virt_powerdown_req; qemu_register_powerdown_notifier(&vms->powerdown_notifier); @@ -2608,8 +2639,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 { From patchwork Thu Jan 14 14:50:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 362856 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp569742jap; Thu, 14 Jan 2021 06:55:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUc29ydXX0mdhXL89blpvqR+NUnoEe2jsoNXSgx6znqzxJeZ+K2Q0j3zoWjjIUsAvYHhvr X-Received: by 2002:a25:26cf:: with SMTP id m198mr11483817ybm.454.1610636147517; Thu, 14 Jan 2021 06:55:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610636147; cv=none; d=google.com; s=arc-20160816; b=m7FEstRVCztVQtRLHWpEF1rhkY/syPXlLm+rh2QCWPzQ2OLA0vBRkiANLLWYI/D0Ru XykqketEvTAMV4QCOFgq9HFKJOf2b1mA7NHQsrBpyo2+bXIbSFIBW8Oyj1de00y+x8gD y2QPDS+ZL4jT/P+IPZCCyzMoh2rwqRSfT+ULVYuQdotnx/5tRiXpSQgBoxbGhuMg0oov DCPeduJA0bHcm2m4rirGR04Qca6Tdm/G1t2XYTZrgCl3OqQx2BXHR/jnjYCs1h2oh0Y6 uEi+CYzhawU9+rslH8QikeDiMXzBOiJpZ+i0lK5bYDtGy9ULlRmUOozd+9YiQ62j1vHs xneg== 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=jGYU+nA0TIHebPXystscyGzvQkB9/q2d05StWBrL4ng=; b=xc1aPae0RGBzmwAgWie7q67MbIjUzYayQW4WY9fBbmNaVqpWXLyZqw5TWyChNsIhxP rDFcrzV/rVs/I2LYZlAyGzZxa14nm3ASe8At9VQrvFWSLLIWJgSuWztdWMSAu+IqTlrk lA8aRNMNATcvV9+2CLg0zXZ4uhtVtn/kH3Th4qisI6dydr/3nIEijKvqho6iAV4U7ciQ Ub8PhUzm4zneZMi5mRwB138tKIWDjr4Ojp+mpwvbMWT22hAI78LwbnyS8zvRhkjYYAI0 89F7vxW+26Db369Hv5/zwLCe3rJrL703BEEzOGOj2pEk5tdyE5dZaorvdHivEgE55eGS 3nvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mn9w+SpG; 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 t29si6426367ybt.474.2021.01.14.06.55.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jan 2021 06:55:47 -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=mn9w+SpG; 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]:56262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l042M-0006AW-UT for patch@linaro.org; Thu, 14 Jan 2021 09:55:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l03xU-0008JF-7C for qemu-devel@nongnu.org; Thu, 14 Jan 2021 09:50:44 -0500 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]:41346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l03xQ-0003zU-Sv for qemu-devel@nongnu.org; Thu, 14 Jan 2021 09:50:43 -0500 Received: by mail-lj1-x234.google.com with SMTP id f11so6719052ljm.8 for ; Thu, 14 Jan 2021 06:50:40 -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=jGYU+nA0TIHebPXystscyGzvQkB9/q2d05StWBrL4ng=; b=mn9w+SpGr4UyLG+K2iCpMgrvgeARmqirlrkbrZrS24DY2pCicitsyFIciR8B4X4lxx szOBMFPjZsxy41jG7vIeMQTSoU09+kBn9HYSDGr5D9HxSTqmE7fLAGfPKVKd7WGpy2cq KWOS3Tdc/vTZh6T9bAs2jDOnCQSUeegCFnuFxxFGowkjns+ZM1JcyE7nxJ/0mrXfWT7F h/z5z13LBdRnd+3O5vc4P5n/KvD/XqWbLYSblZ9MHrK4c7HcVgaiQmxitavNQlHCW+7F VBEhlajElk5iZZxm2kefUupeN2cAwr6n/uzc44pVGLO5IagU3UXDV0Nu6Fpb3j+JZpaV l9dA== 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=jGYU+nA0TIHebPXystscyGzvQkB9/q2d05StWBrL4ng=; b=eDJ91j7MJTO7UnZJ1dnOUAEOz3kmfF4ARQ88WE5mzOBazmzjlhcLFLtdOTjnsTE2Vm 1XsjHYDBKJgeoBcyH7JxjhlCgdVbbnMwVBPfDhxEnNQaCV0lKA/NvM0z3eVTfbre5z34 BgiLG4LboHYyDY3hxjKzPNjOUw1/VIg/Ir7lptpNkdI0a649JnHc/6O2KkI9zUSEsvhu 9DlKvGiI18VHCvlVTYbW90OPUMKDOhnF7TKKpdyLeWgUNZS56EzS1/xR1dRdgIC0VOBy Dp3evWfMWOhIeCU88J5SYZIqYksHOaKXmmjUqv/WZ3TisMVjedS2V/kOtMhPV5xwMJ2W TZCQ== X-Gm-Message-State: AOAM531sr6hJ1zQVMlIDfnxfc8tV522UuZkCSIt08o9HpbSTBygC9cYB fkzWPmh/qvn+9XzStfmC8PD3WA== X-Received: by 2002:a2e:a494:: with SMTP id h20mr3423122lji.145.1610635839367; Thu, 14 Jan 2021 06:50:39 -0800 (PST) Received: from localhost.localdomain ([2.92.195.184]) by smtp.gmail.com with ESMTPSA id p5sm567229lfj.295.2021.01.14.06.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 06:50:38 -0800 (PST) From: Maxim Uvarov To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCHv6 3/3] arm-virt: combine code for secure and non secure pl061 Date: Thu, 14 Jan 2021 17:50:32 +0300 Message-Id: <20210114145032.8457-4-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210114145032.8457-1-maxim.uvarov@linaro.org> References: <20210114145032.8457-1-maxim.uvarov@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=maxim.uvarov@linaro.org; helo=mail-lj1-x234.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" Combine code for secure and non secure pl061 (gpio) with refining fdt creation. Signed-off-by: Maxim Uvarov --- hw/arm/virt.c | 122 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 39 deletions(-) -- 2.17.1 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6f3ec15985..5317f32e3a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -821,35 +821,13 @@ static void virt_powerdown_req(Notifier *n, void *opaque) } } -static void create_gpio(const VirtMachineState *vms) +static void create_gpio_keys(const VirtMachineState *vms, + DeviceState *pl061_dev, + uint32_t phandle) { - char *nodename; - DeviceState *pl061_dev; - hwaddr base = vms->memmap[VIRT_GPIO].base; - hwaddr size = vms->memmap[VIRT_GPIO].size; - int irq = vms->irqmap[VIRT_GPIO]; - const char compat[] = "arm,pl061\0arm,primecell"; - - pl061_dev = sysbus_create_simple("pl061", base, - qdev_get_gpio_in(vms->gic, irq)); - - uint32_t phandle = qemu_fdt_alloc_phandle(vms->fdt); - nodename = g_strdup_printf("/pl061@%" PRIx64, base); - qemu_fdt_add_subnode(vms->fdt, nodename); - qemu_fdt_setprop_sized_cells(vms->fdt, nodename, "reg", - 2, base, 2, size); - qemu_fdt_setprop(vms->fdt, nodename, "compatible", compat, sizeof(compat)); - qemu_fdt_setprop_cell(vms->fdt, nodename, "#gpio-cells", 2); - qemu_fdt_setprop(vms->fdt, nodename, "gpio-controller", NULL, 0); - qemu_fdt_setprop_cells(vms->fdt, nodename, "interrupts", - GIC_FDT_IRQ_TYPE_SPI, irq, - GIC_FDT_IRQ_FLAGS_LEVEL_HI); - qemu_fdt_setprop_cell(vms->fdt, nodename, "clocks", vms->clock_phandle); - qemu_fdt_setprop_string(vms->fdt, nodename, "clock-names", "apb_pclk"); - qemu_fdt_setprop_cell(vms->fdt, nodename, "phandle", phandle); - gpio_key_dev = sysbus_create_simple("gpio-key", -1, qdev_get_gpio_in(pl061_dev, 3)); + qemu_fdt_add_subnode(vms->fdt, "/gpio-keys"); qemu_fdt_setprop_string(vms->fdt, "/gpio-keys", "compatible", "gpio-keys"); qemu_fdt_setprop_cell(vms->fdt, "/gpio-keys", "#size-cells", 0); @@ -862,24 +840,16 @@ static void create_gpio(const VirtMachineState *vms) KEY_POWER); qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff", "gpios", phandle, 3, 0); - g_free(nodename); } #define ATF_GPIO_POWEROFF 3 #define ATF_GPIO_REBOOT 4 -static void create_gpio_secure(const VirtMachineState *vms, MemoryRegion *mem) +static void create_gpio_pwr(const VirtMachineState *vms, + DeviceState *pl061_dev, + uint32_t phandle) { DeviceState *gpio_pwr_dev; - SysBusDevice *s; - hwaddr base = vms->memmap[VIRT_SECURE_GPIO].base; - DeviceState *pl061_dev; - - /* Secure pl061 */ - pl061_dev = qdev_new("pl061"); - s = SYS_BUS_DEVICE(pl061_dev); - sysbus_realize_and_unref(s, &error_fatal); - memory_region_add_subregion(mem, base, sysbus_mmio_get_region(s, 0)); /* gpio-pwr */ gpio_pwr_dev = sysbus_create_simple("gpio-pwr", -1, NULL); @@ -889,8 +859,82 @@ static void create_gpio_secure(const VirtMachineState *vms, MemoryRegion *mem) qdev_get_gpio_in_named(gpio_pwr_dev, "reset", 0)); qdev_connect_gpio_out(pl061_dev, ATF_GPIO_REBOOT, qdev_get_gpio_in_named(gpio_pwr_dev, "shutdown", 0)); + + qemu_fdt_add_subnode(vms->fdt, "/gpio-pwr"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-pwr", "compatible", "gpio-pwr"); + qemu_fdt_setprop_cell(vms->fdt, "/gpio-pwr", "#size-cells", 0); + qemu_fdt_setprop_cell(vms->fdt, "/gpio-pwr", "#address-cells", 1); + + qemu_fdt_add_subnode(vms->fdt, "/gpio-pwr/poweroff"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-pwr/poweroff", + "label", "GPIO PWR Poweroff"); + qemu_fdt_setprop_cell(vms->fdt, "/gpio-pwr/poweroff", "code", + ATF_GPIO_POWEROFF); + qemu_fdt_setprop_cells(vms->fdt, "/gpio-pwr/poweroff", + "gpios", phandle, 3, 0); + + qemu_fdt_add_subnode(vms->fdt, "/gpio-pwr/reboot"); + qemu_fdt_setprop_string(vms->fdt, "/gpio-pwr/reboot", + "label", "GPIO PWR Reboot"); + qemu_fdt_setprop_cell(vms->fdt, "/gpio-pwr/reboot", "code", + ATF_GPIO_REBOOT); + qemu_fdt_setprop_cells(vms->fdt, "/gpio-pwr/reboot", + "gpios", phandle, 3, 0); +} + +static void create_gpio_devices(const VirtMachineState *vms, int gpio, + MemoryRegion *mem) +{ + char *nodename; + DeviceState *pl061_dev; + hwaddr base = vms->memmap[gpio].base; + hwaddr size = vms->memmap[gpio].size; + int irq = vms->irqmap[gpio]; + const char compat[] = "arm,pl061\0arm,primecell"; + SysBusDevice *s; + + pl061_dev = qdev_new("pl061"); + s = SYS_BUS_DEVICE(pl061_dev); + sysbus_realize_and_unref(s, &error_fatal); + memory_region_add_subregion(mem, base, sysbus_mmio_get_region(s, 0)); + sysbus_connect_irq(s, 0, qdev_get_gpio_in(vms->gic, irq)); + + uint32_t phandle = qemu_fdt_alloc_phandle(vms->fdt); + nodename = g_strdup_printf("/pl061@%" PRIx64, base); + qemu_fdt_add_subnode(vms->fdt, nodename); + qemu_fdt_setprop_sized_cells(vms->fdt, nodename, "reg", + 2, base, 2, size); + qemu_fdt_setprop(vms->fdt, nodename, "compatible", compat, sizeof(compat)); + qemu_fdt_setprop_cell(vms->fdt, nodename, "#gpio-cells", 2); + qemu_fdt_setprop(vms->fdt, nodename, "gpio-controller", NULL, 0); + qemu_fdt_setprop_cells(vms->fdt, nodename, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI); + qemu_fdt_setprop_cell(vms->fdt, nodename, "clocks", vms->clock_phandle); + qemu_fdt_setprop_string(vms->fdt, nodename, "clock-names", "apb_pclk"); + qemu_fdt_setprop_cell(vms->fdt, nodename, "phandle", phandle); + + if (gpio == VIRT_GPIO) { + qemu_fdt_setprop_string(vms->fdt, "/chosen", "stdout-path", nodename); + } else { + /* 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"); + + qemu_fdt_setprop_string(vms->fdt, "/secure-chosen", "stdout-path", + nodename); + } + g_free(nodename); + + /* Child gpio devices */ + if (gpio == VIRT_GPIO) { + create_gpio_keys(vms, pl061_dev, phandle); + } else { + create_gpio_pwr(vms, pl061_dev, phandle); + } } + static void create_virtio_devices(const VirtMachineState *vms) { int i; @@ -2017,11 +2061,11 @@ static void machvirt_init(MachineState *machine) if (has_ged && aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)) { vms->acpi_dev = create_acpi_ged(vms); } else { - create_gpio(vms); + create_gpio_devices(vms, VIRT_GPIO, sysmem); } if (vms->secure && !vmc->no_secure_gpio) { - create_gpio_secure(vms, secure_sysmem); + create_gpio_devices(vms, VIRT_SECURE_GPIO, secure_sysmem); } /* connect powerdown request */