Message ID | 20220208113948.3217356-18-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | dc888dd43bea83b1ccc3d0554d5044179554a5f1 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp501706imo; Tue, 8 Feb 2022 05:46:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwo2hIGAUdu0WV3lYIHmJ7EV+0lZSWApabduHOb6sJrL2x8P3afWXhL6fDz93JzUzyYPBbC X-Received: by 2002:a25:c483:: with SMTP id u125mr4772987ybf.302.1644328014146; Tue, 08 Feb 2022 05:46:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644328014; cv=none; d=google.com; s=arc-20160816; b=HuvWkN+mTycVoyE0aChUGuJddQdWPU4Cps9XRT7xRkNNykl2O8OZtPRBwK0aiUu2qu fFAgaX+soI5F0+P07hBJSmqTtSfF2Izwn4ZJQSyEX7M47PPodDkL7f4DScJm7WF8dK5d 653+iGRyR/zbPcb4u32XlzBrhB4XhD/GggvuMPmI/FszKROfZwIe+rV3S4BHRPHD91Xl 789MCtpY4MmoKYRpgQcELRYMkpTTmhlfwvRJQ5VQv71aZr9vSbyFIgB/qdM1CQOxNVda 9422Jtx+WAWlXNShCTYz89lVvb6Q3WWniO88qRaQEmXLDSLY0eT+BfSNjnJ1QG+aP45Y 4bnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=17laaPJRMH9FCMUGpQ5IzmJ4dX79Qam+3Hyao1VjYHY=; b=r8AENewf+oAyfuqUmGxelAy6Umq6RRIQePlouVeCmY/4bIBs+KOFZh++iB2qcAeLYj bHIvZV63bPNNLKGtGcRiJYp2hAe7h7/vqGJIhaARuTc3BacIqaex0kDMOlx8/ihI1jz1 teg4uH//PECi23qpO5YgdPep7Zz8+gDDBDO+2j26/AxuU66qXuJ2ttUesD7Ve2FasccC tDAS+yi4WhgRRETt9FpPeFUViSwDWJyyzLAocqpTz0IkMOOZTJUCfGJ411NCEVV16npx XkNXThl/7Z7vvnF7fHlqXqPU5GUkC4FiBaFRycrV/nQHaM9OgCpPtxC8C1ii+oq4PyMp 4ftA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H/ycfy3+"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e68si3834782ywa.382.2022.02.08.05.46.54 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Feb 2022 05:46: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=pass header.i=@linaro.org header.s=google header.b="H/ycfy3+"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1nHQpZ-0002zz-JK for patch@linaro.org; Tue, 08 Feb 2022 08:46:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1nHOqt-0000l9-PF for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:40:08 -0500 Received: from [2a00:1450:4864:20::432] (port=45055 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1nHOqo-00026n-Ht for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:40:04 -0500 Received: by mail-wr1-x432.google.com with SMTP id k18so30169617wrg.11 for <qemu-devel@nongnu.org>; Tue, 08 Feb 2022 03:40:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=17laaPJRMH9FCMUGpQ5IzmJ4dX79Qam+3Hyao1VjYHY=; b=H/ycfy3+lPaqcbWJlZrKN0UBsqjewpjA6CZ00aaYncOawnU9ZAvLFi//B3DfMEBExR u1n+vHB1ET8c3+ewnh79tGEdnSNCso7wUGB8DaVv3bwKPyKxHbP5xVo9rczExbp4gkGG w5MZLR5kH4KLy1yS1G/G7Se1ulqD7ZxDKj+tbtvuPWj6jgV8MWN8d4ZrtnCY24EUvLPm 2ozpiKw/gch4oz+i1G5WziUj4hTdehPMwB8GLH7OWv6YjBIDugBJqg6fvLqNpT+pYLgr Cvo5KpWuvxGh8r5hqqKqw4vstJ6HErkCN8Ly16OuxxqXJttbDWeT1KgFIMMEGAKv0CSb rbbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=17laaPJRMH9FCMUGpQ5IzmJ4dX79Qam+3Hyao1VjYHY=; b=cVdqEWFDjdXFy1YSJlAT3nxOuf93fPZ+CcJXB9PcdAiZ1XjWmsxCdukFlqAF94naFR M8zl/xQgLrXFFh4u69/OjCJNESsLUjFfUX1+VbWraUAs4QV0TBY3Mi6MN7IlCQkS3kgG jEmZ2Vl+52Za86ms0peFyodKsEcP3o5Lvjh8rVg2zo3R0HHFpGy3PC19DfAtUzdiwpMg VecanlQf0hCvnzeUBeHSyj02c9KkakK6lhCUqvx2QtNuwNbWZfm7LnAZSuNCJLGpOhoO 6sJvLXYqnT0STvmfimSEF/2yGPceg/xy74axq4+ZdJtZh8MnMFASwTLpfKeLdCZkgz26 J4Pw== X-Gm-Message-State: AOAM533GF9wABBqpDA02hQCOhjF2TCi0WzlZCushYN7GCiwWdoUHtMte UFGb2aHx5f7N4kFzIGlWl78fxruYJra5kQ== X-Received: by 2002:a5d:4706:: with SMTP id y6mr3246539wrq.331.1644320401126; Tue, 08 Feb 2022 03:40:01 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id r11sm4245199wrt.28.2022.02.08.03.40.00 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 03:40:00 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 17/39] hw/arm/boot: Prevent setting both psci_conduit and secure_board_setup Date: Tue, 8 Feb 2022 11:39:26 +0000 Message-Id: <20220208113948.3217356-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208113948.3217356-1-peter.maydell@linaro.org> References: <20220208113948.3217356-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
[PULL,01/39] target/arm: Fix sve_zcr_len_for_el for VHE mode running
|
expand
|
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 327e449f831..0424c178305 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -1339,6 +1339,16 @@ void arm_load_kernel(ARMCPU *cpu, MachineState *ms, struct arm_boot_info *info) * supported exception level or in a lower one. */ + /* + * If PSCI is enabled, then SMC calls all go to the PSCI handler and + * are never emulated to trap into guest code. It therefore does not + * make sense for the board to have a setup code fragment that runs + * in Secure, because this will probably need to itself issue an SMC of some + * kind as part of its operation. + */ + assert(info->psci_conduit == QEMU_PSCI_CONDUIT_DISABLED || + !info->secure_board_setup); + /* Boot into highest supported EL ... */ if (arm_feature(env, ARM_FEATURE_EL3)) { boot_el = 3;