From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 196A5C43214 for ; Thu, 12 Aug 2021 19:06:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 CCFCB603E7 for ; Thu, 12 Aug 2021 19:06:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CCFCB603E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vGGUhdRjtULHkC0piChnxntYzFy2snAF+BaoHWbMgS0=; b=c8VUHdye6gpAMK hocSCtkAq20ldNSenMtpiXPghxuDotNkZgtgO7FDlIp7LAkdCMbwAVylCs3/pErAKaXqdFl/Fack4 3ZBgx6ZrLccAYbDoJ1v5IE7+hk3iyLi4tj5jRPgJhQ+Fo6trtN0+y3XFTxFcZ0DDy0P+q5XQquCmo AM3EyVV4PivgzKxw9OgMMocF/iT1XX3BQxK83ESFNzpPZE8L66hMU0fzxfjE/bnKza9yBXOLc/L4R LSW0SIfEueDXEhO1bAlGV7m1V18DfuqbtEIhNIGJLyiMwMF7eKAouRoO/aF5XDmkMD0Y9vsNAQVfP 8JvErHqwEBivnbBE7hVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEFzL-00AxpH-Rz; Thu, 12 Aug 2021 19:03:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mEFyM-00AxYc-OH for linux-arm-kernel@lists.infradead.org; Thu, 12 Aug 2021 19:02:39 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79232610A7; Thu, 12 Aug 2021 19:02:34 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mEFyK-004c9r-SQ; Thu, 12 Aug 2021 20:02:32 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Will Deacon , Catalin Marinas , Mark Rutland , Ard Biesheuvel , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, kernel-team@android.com Subject: [PATCH 3/5] arm64: Detect disabled HVC early Date: Thu, 12 Aug 2021 20:02:11 +0100 Message-Id: <20210812190213.2601506-4-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210812190213.2601506-1-maz@kernel.org> References: <20210812190213.2601506-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, zajec5@gmail.com, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, ardb@kernel.org, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210812_120234_873934_B0B0D308 X-CRM114-Status: GOOD ( 15.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SGF2aW5nIEhWQyBkaXNhYmxlZCBmcm9tIEVMMyB3aGlsZSB0aGUga2VybmVsIGlzIGVudGVyZWQg YXQgRUwyCmlzIGEgY29tcGxldGUgbmlnaHRtYXJlLgoKV2UgZW5kLXVwIHRha2luZyBhbiBVTkRF RiBhdCB0aGUgd29yc2UgcG9zc2libGUgbW9tZW50IChjaGVja2luZwpmb3IgVkhFKSBhbmQgZXZl biBpZiB3ZSBkaWRuJ3QsIGhhdmluZyBLVk0gZW5hYmxlZCB3b3VsZCBzaWduaWZ5CnRoZSBwcmVt YXR1cmUgZW5kIG9mIHRoZSBrZXJuZWwuCgpJbnN0ZWFkLCB0cnkgYW5kIGRldGVjdCB0aGlzIHN0 dXBpZCBjYXNlIGJ5IGlzc3VpbmcgYSBIVkMKZm9yIEhWQ19SRVNFVF9WRUNUT1JTLCB3aGljaCBk b2VzIG5vdGhpbmcgd2hlbiB0aGUgc3R1YnMKYXJlIGxpdmUuIElmIHdlIGdldCBIVkNfU1RVQl9F UlIgYmFjaywgdGhhdCdzIGJlY2F1c2UgdGhlClVOREVGIGhhbmRsZXIgaGFzIGtpY2tlZCBpbi4K CkluIHRoaXMgc2l0dWF0aW9uLCBjbG9zZSB5b3VyIGV5ZXMsIGJsb2NrIHlvdXIgbm9zZSwgYW5k IGdyYWNlZnVsbHkKcHJldGVuZCB3ZSBoYXZlIGJvb3RlZCBhdCBFTDEuCgpSZXBvcnRlZC1ieTog UmFmYcWCIE1pxYJlY2tpIDx6YWplYzVAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXJjIFp5 bmdpZXIgPG1hekBrZXJuZWwub3JnPgotLS0KIGFyY2gvYXJtNjQva2VybmVsL2hlYWQuUyB8IDIy ICsrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCsp CgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9rZXJuZWwvaGVhZC5TIGIvYXJjaC9hcm02NC9rZXJu ZWwvaGVhZC5TCmluZGV4IDlkNWFhNTZhOThjYy4uZDZiMmIwNWY1ZDNhIDEwMDY0NAotLS0gYS9h cmNoL2FybTY0L2tlcm5lbC9oZWFkLlMKKysrIGIvYXJjaC9hcm02NC9rZXJuZWwvaGVhZC5TCkBA IC01MTksNiArNTE5LDI4IEBAIFNZTV9JTk5FUl9MQUJFTChpbml0X2VsMiwgU1lNX0xfTE9DQUwp CiAJbXNyCXZiYXJfZWwyLCB4MAogCWlzYgogCisJLy8gQ2hlY2sgdGhhdCBIVkMgYWN0dWFsbHkg d29ya3MuLi4KKwltb3YJeDAsICNIVkNfUkVTRVRfVkVDVE9SUworCWh2YwkjMAorCisJbW92X3EJ eDEsIEhWQ19TVFVCX0VSUgorCWNtcAl4MCwgeDEKKwliLm5lCTBmCisKKwkvKgorCSAqIEhWQyBp cyB1bnVzYWJsZSwgc28gcHJldGVuZCB3ZSBhY3R1YWxseSBib290ZWQgYXQgRUwxLgorCSAqIE9u Y2Ugd2UgaGF2ZSBsZWZ0IEVMMiwgdGhlcmUgd2lsbCBiZSBubyBnb2luZyBiYWNrLgorCSAqLwor CW1vdl9xCXgwLCBJTklUX1NDVExSX0VMMV9NTVVfT0ZGCisJbXNyCXNjdGxyX2VsMSwgeDAKKwor CW1vdl9xCXgwLCBJTklUX1BTVEFURV9FTDEKKwltc3IJc3Bzcl9lbDIsIHgwCisJbXNyCWVscl9l bDIsIGxyCisJbW92X3EJdzAsIEJPT1RfQ1BVX01PREVfRUwxCisJZXJldAorCiswOgogCS8qCiAJ ICogRnJ1aXR5IENQVXMgc2VlbSB0byBoYXZlIEhDUl9FTDIuRTJIIHNldCB0byBSRVMxLAogCSAq IG1ha2luZyBpdCBpbXBvc3NpYmxlIHRvIHN0YXJ0IGluIG5WSEUgbW9kZS4gSXMgdGhhdAotLSAK Mi4zMC4yCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K bGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZy YWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGlu dXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 0D122C4338F for ; Thu, 12 Aug 2021 19:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEE15610CC for ; Thu, 12 Aug 2021 19:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234360AbhHLTDJ (ORCPT ); Thu, 12 Aug 2021 15:03:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:59332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234916AbhHLTC7 (ORCPT ); Thu, 12 Aug 2021 15:02:59 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79232610A7; Thu, 12 Aug 2021 19:02:34 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mEFyK-004c9r-SQ; Thu, 12 Aug 2021 20:02:32 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Will Deacon , Catalin Marinas , Mark Rutland , Ard Biesheuvel , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, kernel-team@android.com Subject: [PATCH 3/5] arm64: Detect disabled HVC early Date: Thu, 12 Aug 2021 20:02:11 +0100 Message-Id: <20210812190213.2601506-4-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210812190213.2601506-1-maz@kernel.org> References: <20210812190213.2601506-1-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, zajec5@gmail.com, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, ardb@kernel.org, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Having HVC disabled from EL3 while the kernel is entered at EL2 is a complete nightmare. We end-up taking an UNDEF at the worse possible moment (checking for VHE) and even if we didn't, having KVM enabled would signify the premature end of the kernel. Instead, try and detect this stupid case by issuing a HVC for HVC_RESET_VECTORS, which does nothing when the stubs are live. If we get HVC_STUB_ERR back, that's because the UNDEF handler has kicked in. In this situation, close your eyes, block your nose, and gracefully pretend we have booted at EL1. Reported-by: Rafał Miłecki Signed-off-by: Marc Zyngier --- arch/arm64/kernel/head.S | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 9d5aa56a98cc..d6b2b05f5d3a 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -519,6 +519,28 @@ SYM_INNER_LABEL(init_el2, SYM_L_LOCAL) msr vbar_el2, x0 isb + // Check that HVC actually works... + mov x0, #HVC_RESET_VECTORS + hvc #0 + + mov_q x1, HVC_STUB_ERR + cmp x0, x1 + b.ne 0f + + /* + * HVC is unusable, so pretend we actually booted at EL1. + * Once we have left EL2, there will be no going back. + */ + mov_q x0, INIT_SCTLR_EL1_MMU_OFF + msr sctlr_el1, x0 + + mov_q x0, INIT_PSTATE_EL1 + msr spsr_el2, x0 + msr elr_el2, lr + mov_q w0, BOOT_CPU_MODE_EL1 + eret + +0: /* * Fruity CPUs seem to have HCR_EL2.E2H set to RES1, * making it impossible to start in nVHE mode. Is that -- 2.30.2