From patchwork Fri Jun 25 11:18:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 12344851 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 4F391C2B9F4 for ; Fri, 25 Jun 2021 11:20:25 +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 DCD4161465 for ; Fri, 25 Jun 2021 11:20:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCD4161465 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwjsm-0001MB-1A for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 07:20:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwjrR-0007en-9G for qemu-devel@nongnu.org; Fri, 25 Jun 2021 07:19:01 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:36483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwjrN-0004W2-O4 for qemu-devel@nongnu.org; Fri, 25 Jun 2021 07:19:01 -0400 Received: by mail-lj1-x233.google.com with SMTP id a16so12024105ljq.3 for ; Fri, 25 Jun 2021 04:18:57 -0700 (PDT) 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=72EAHzjgI7n9esbIxOKx7xfZpD41wmTxY05X8fNraEE=; b=BS0i51QGphBB7lAKKvSacnw0beS4Yp1wepo2Ec0vsYwt013aBIs93AOUQY76eP2tlI Z3rysiwTV8Nz0630W5GcwrlaXf0xRwYNumdMgYr+/O5lTVJjCFRVnGY11gfa0x5x9QoL UUyM4kUGcjMLHcYeCyhyNYScoFvqSWy9Amn+zaDDGMUgSN9D5x7VUm4pCqE8Bv/9iS/G DbbH7YycLmxdYyc2RsS1pTOarJtrtz4HAzImGS7bYwL9NCROzGgIdyvyHxQQe9IVoujr j6lL01abans+LpGkfqyrk4Pd5pqiUvnYZeg/TY8aRE6JtWW2vQyPZQSQ86778Qt8goPp +w0w== 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=72EAHzjgI7n9esbIxOKx7xfZpD41wmTxY05X8fNraEE=; b=hvf9xo/3TtzAoj2E1Zi9JB739p1YTf04w+Wp6sD5a7MY+JfeLd0LK2ncrwHPFJwi7d XczRFZJPaggM8BMVSkRZdO7/sEtY+LQMoGH82F1JppfTkoREdQv2TG96phm6Lk+bSQX2 mWwtmSbepHJxab/X3eleN7DJKvSU1SQOiE9AvVNOXPo4n/nvPo8YPMNq7gXK+TMlXqS8 bLcJec92kxl1LjFUQ9XONie9bdYuF01pS7b3R4npy9eSitPQMHA49MuI2gs3sBwh3ktN kDbTcTVMHCKGTA8KZKqAOZ4d16plvC5xwn+a/05xzMeacG4Isk1K6sYUlLhQzUKK6QVC OVEw== X-Gm-Message-State: AOAM530FZ0Zm+BDSDrSKzH2wMbf36uGdq1GSYbakBtWWssNwzXJ3apM+ z2SpG7Apg/u3laFUyD8w+4ULN0oF17iuYA== X-Google-Smtp-Source: ABdhPJxrGgtWCsuGBq4rNRi/IXKohT2eDx/kRclC9lO4JQf999r6oNRaDX1uLsAJmr5O2m4W8srxcA== X-Received: by 2002:a2e:3619:: with SMTP id d25mr7614924lja.439.1624619935974; Fri, 25 Jun 2021 04:18:55 -0700 (PDT) Received: from localhost.localdomain ([91.193.178.173]) by smtp.gmail.com with ESMTPSA id p19sm536354lfd.70.2021.06.25.04.18.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 04:18:55 -0700 (PDT) From: Maxim Uvarov To: qemu-devel@nongnu.org Subject: [PATCH 1/2] arm/virt: fix irq mapping for gpio_pwr Date: Fri, 25 Jun 2021 14:18:41 +0300 Message-Id: <20210625111842.3790-2-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210625111842.3790-1-maxim.uvarov@linaro.org> References: <20210625111842.3790-1-maxim.uvarov@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=maxim.uvarov@linaro.org; helo=mail-lj1-x233.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, qemu-arm@nongnu.org, Maxim Uvarov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Fix irq mapping for virt machine reboot and shutdown interrupts triggered from ATF code. Signed-off-by: Maxim Uvarov --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4b96f06014..d83f4ebdd3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -846,8 +846,8 @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev, "gpios", phandle, 3, 0); } -#define SECURE_GPIO_POWEROFF 0 -#define SECURE_GPIO_RESET 1 +#define SECURE_GPIO_POWEROFF 1 +#define SECURE_GPIO_RESET 2 static void create_secure_gpio_pwr(char *fdt, DeviceState *pl061_dev, uint32_t phandle) From patchwork Fri Jun 25 11:18:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 12344855 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 3655AC2B9F4 for ; Fri, 25 Jun 2021 11:21:15 +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 F39E761466 for ; Fri, 25 Jun 2021 11:21:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F39E761466 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwjta-0002Tn-67 for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 07:21:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwjrR-0007eT-3x for qemu-devel@nongnu.org; Fri, 25 Jun 2021 07:19:01 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:41582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwjrP-0004XD-7d for qemu-devel@nongnu.org; Fri, 25 Jun 2021 07:19:00 -0400 Received: by mail-lj1-x233.google.com with SMTP id z22so12000825ljh.8 for ; Fri, 25 Jun 2021 04:18:58 -0700 (PDT) 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=U8+L0pfEA+Z4ZeIBlM5nqpsz15izDVESlVEK+IwSfIk=; b=OnyXBT2U0+l9H+w23kt6XivRAnbG60JM0jhY/RvlDiaksGrDcQv+wYaRMqNvGJkoL3 hg7RGQV/VU+KBCQF+ypgEgvl63TkAta9iWNA5rg+cH4LbAF2R0hl2lqpfrW0Os8ZbvAF teYgeG1+5jkhPNLSLQ8QZuV7R6gAYRtBD9fAkxuS47j9c7KOR9fLCzfuIRBKqr8RgFei 3zyLxrTF8ocUugS0R4wpv8TfA5NqmXI/BnSLfEwuY7/hCJVuyDo5dlNP8SxUhsPFmQLn zUgc84OUZc6WBLgoLOlV3Y/d2r2BBDq/tnrIJFLUVly82Pr5nJKep53t5SuH4IFzQ0Dz YK8A== 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=U8+L0pfEA+Z4ZeIBlM5nqpsz15izDVESlVEK+IwSfIk=; b=V3GlAqc2PN89b3m3KzUN9oP02TltGNGVBCvTpTVeH4NQqARb7QFIJ/xpbCFz+5gtuQ B3RDPVnJ/jla5Nt6XXqEUIv1w65te/1KeI0SAkxnGFO5x4mcyzdPx1qmXOiIGW4v3YGe 18NLPqZ6+k5nG/YSPKmb42x/TCRLkGDkeHyWaI1XT9xAokc7IwfXAouJuNOA8EfL2yP1 PITGDcDyksNGaNkA0g25tB3LC6CcaH/uXx9AsSwntSwEJ5kf7VvKzdA3gojNBFw3Lj6n D5QIt22m/wl2Q7Tkp4/7AG6EPvjlJSjeB494lSaj949ZtsG9dSg76tia3XubB/eQtSAf ZU9Q== X-Gm-Message-State: AOAM530fcm24uQey3WkBBGht04D0oL7QZ9iVZNVGPeMiICzgcjM3fmkc az5JBKW2+vjs9A87i19wc0qpUrhklpz7pA== X-Google-Smtp-Source: ABdhPJwwoxDNpAIP3VActacGrNqLP7nP0ZYaqhRZY0eFJHPpUtkxbzEaIFXpHB1JmTZwh4+vGHxc2A== X-Received: by 2002:a2e:22c6:: with SMTP id i189mr8075185lji.97.1624619937523; Fri, 25 Jun 2021 04:18:57 -0700 (PDT) Received: from localhost.localdomain ([91.193.178.173]) by smtp.gmail.com with ESMTPSA id p19sm536354lfd.70.2021.06.25.04.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 04:18:56 -0700 (PDT) From: Maxim Uvarov To: qemu-devel@nongnu.org Subject: [PATCH 2/2] gpio_pwr: use shutdown function for reboot Date: Fri, 25 Jun 2021 14:18:42 +0300 Message-Id: <20210625111842.3790-3-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210625111842.3790-1-maxim.uvarov@linaro.org> References: <20210625111842.3790-1-maxim.uvarov@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=maxim.uvarov@linaro.org; helo=mail-lj1-x233.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, qemu-arm@nongnu.org, Maxim Uvarov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" qemu has 2 type of functions: shutdown and reboot. Shutdown function has to be used for machine shutdown. Signed-off-by: Maxim Uvarov Reviewed-by: Peter Maydell --- hw/gpio/gpio_pwr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/gpio/gpio_pwr.c b/hw/gpio/gpio_pwr.c index 7714fa0dc4..dbaf1c70c8 100644 --- a/hw/gpio/gpio_pwr.c +++ b/hw/gpio/gpio_pwr.c @@ -43,7 +43,7 @@ static void gpio_pwr_reset(void *opaque, int n, int level) static void gpio_pwr_shutdown(void *opaque, int n, int level) { if (level) { - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } }