From patchwork Mon Mar 19 18:34:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132077 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp3055103ljb; Mon, 19 Mar 2018 11:40:20 -0700 (PDT) X-Google-Smtp-Source: AG47ELu32GEJEQJNQUiMrh5KLsoyjZt8FiLgL6Jve41zRNqhV9hU5QJ73k+9gmAVhSkB3Wmi6zgW X-Received: by 10.200.34.245 with SMTP id g50mr18802011qta.93.1521484820633; Mon, 19 Mar 2018 11:40:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521484820; cv=none; d=google.com; s=arc-20160816; b=OLqkXrBcyfYwF+WkPvJAIttvBrP9dToHSv5I0Z/GIIHQAHKd6ChuvovXtwBypU+iZv 17Mba+ib79co3w+JKNmGJ1BBPnXYmGlDPwsXCjqf9NgB3jkwDrk3wrdFm+VhbmA6RMxI PgWCJAOgTDslf68ihq5Aizze9EuKuVS/LOcESWkFrPrLBr83QrydHk+/92/bojQxR8VH shbLmhcNcmOn9VWCXuvVHIhTkbpf/k+nl4dxhK9hAJX+jsj5R3S/O6bKyEBpbX1FkMIy gZZBTUUbcK5e1mmPWUdG2k9V1iOivuxO+iQ8iflOWA9+pUOs0v5/mFxb321ECTSa7WkG zy8g== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=fnW5g5Rf0REJNUjr7BZvgiPHDCdhrXgoBi2Nzda7/WU=; b=NGrVRcLb5TjLDeGT4xS0wpUGjA/rRKyeMDRnPlu5+MVu4TCoXMx40ktHvYYZPfvOXb F4mPekOzAZwpQ1esDMp1muOrEAYVUNbBlpEFerXXGVj1/0/Z7Qadj/kJbHGHQfJmSqtG L6Wu0viOLiAnZRK+N+6ROL+AH83860gt0eQHm5E0kvaJWdG6kGCaaqiA2borFfRcMsaq jOVdIym1j0qj2GPH/gX59evFsm6PZ2S8N2losWvMyMRyZ8h8WJNYeTFcqqqtnwdS8FWc Xnv5sWUwNi4Lvs5RK8SZiL4hhbLxab6yTTKIHF9CY0MyXNZ4YQb6n/4RTa5+fNYrLHTa ocBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 134si642587qki.271.2018.03.19.11.40.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 19 Mar 2018 11:40:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:43379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exzhk-0006B8-1R for patch@linaro.org; Mon, 19 Mar 2018 14:40:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exzc0-0002LI-2Q for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exzbz-0007gg-6q for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:24 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:40458) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exzby-0007eR-Vr for qemu-devel@nongnu.org; Mon, 19 Mar 2018 14:34:23 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1exzbx-00031A-SY for qemu-devel@nongnu.org; Mon, 19 Mar 2018 18:34:21 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 19 Mar 2018 18:34:08 +0000 Message-Id: <20180319183415.1976-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319183415.1976-1-peter.maydell@linaro.org> References: <20180319183415.1976-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 06/13] hw/arm/boot: assert that secure_boot and secure_board_setup are false for AArch64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add some assertions that if we're about to boot an AArch64 kernel, the board code has not mistakenly set either secure_boot or secure_board_setup. It doesn't make sense to set secure_boot, because all AArch64 kernels must be booted in non-secure mode. It might in theory make sense to set secure_board_setup, but we don't currently support that, because only the AArch32 bootloader[] code calls this hook; bootloader_aarch64[] does not. Since we don't have a current need for this functionality, just assert that we don't try to use it. If it's needed we'll add it later. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180313153458.26822-3-peter.maydell@linaro.org --- hw/arm/boot.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.16.2 diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 196c7fb242..e21a92f972 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -720,6 +720,13 @@ static void do_cpu_reset(void *opaque) } else { env->pstate = PSTATE_MODE_EL1h; } + /* AArch64 kernels never boot in secure mode */ + assert(!info->secure_boot); + /* This hook is only supported for AArch32 currently: + * bootloader_aarch64[] will not call the hook, and + * the code above has already dropped us into EL2 or EL1. + */ + assert(!info->secure_board_setup); } /* Set to non-secure if not a secure boot */