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=-8.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=no 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 C8DA1C63697 for ; Mon, 16 Nov 2020 17:56:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6EE5D223BF for ; Mon, 16 Nov 2020 17:56:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sdIhKOXd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388063AbgKPR4k (ORCPT ); Mon, 16 Nov 2020 12:56:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387513AbgKPR4j (ORCPT ); Mon, 16 Nov 2020 12:56:39 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A95E8C0613CF for ; Mon, 16 Nov 2020 09:56:39 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id d142so113098wmd.4 for ; Mon, 16 Nov 2020 09:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xaNTxNoQPnXnoUb4r3iV3mkFKbHJuRiufvKdd63kC7I=; b=sdIhKOXdzOYUd+0zNv8c0adHbCQpoXeesxkjDLAWcVsQPMNDpfluCLKkFw4WfVYV2U T4Lz4ZqbN1XalTec7vHfSnyzVHrGMdF7wclbYRmO3LLQfhJopfg2xSZxPgYaf+i2tjPY V2TKzLtaYd0cs8iOJ3X1mjjRUUpt+mng4ZKIpkfQ+qHCFS29msT7SFYYx4p7lHs9wOl5 fv1KQionDArngXPYQxG9i/TfiCd3A2uIbWu9nzce8vKzKcgc9mPpxL8avcoVPIZDkLL7 QC/2UIKH/WrfxI3/ZMXY/zKHjO5bVHqehzf6TdSeb0koVcSwzq+7la8pSEjEQ6PlwYUr DiKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xaNTxNoQPnXnoUb4r3iV3mkFKbHJuRiufvKdd63kC7I=; b=mjZ4vZXSyan0YBgVoZ73ZPRCyMFhkxFEUiSwUYeekEH9gaH3mzACOQeAKQSnyu36dK Mq901uE0cDrXF1fiQumvyMVSWKQn1XSwFPmqoRoWfINOip4Hd4LzZM0yI0gNvTS4vIDM fe5dmOPHPPO/bIz24rg4EQNcVSIQQg5nSFW/rhiwV4BgFSUSyp88ZXRg1QH38TF2nARa 5gXnRP+JFyYgTdY/5wJ3vshbOCzyFzKfmmE+g0M4peXAJkJdrRqeQKLI8jE6W5CTU8J0 4WfwatjSGV42pft8peQDaYK45IbWGU14vO1X6UJ8xuF69ItgLqkpluHt/6Hgxr5tAPmI BDDQ== X-Gm-Message-State: AOAM531eures9pwIhwc23dKQvUJUJJhrogwhllYrHo+a5BmVZk7c+zbb YFpC0PXtO4EUFkv7DNdVqa2r3Q== X-Google-Smtp-Source: ABdhPJzq+YhoQ9FGcQcT1hEJKNYAgJc8ZImY4yxRsCLZhalfs1c7PQkN19eo6JoF/FMRMs7CfUQDxw== X-Received: by 2002:a05:600c:2202:: with SMTP id z2mr43648wml.115.1605549398247; Mon, 16 Nov 2020 09:56:38 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:58a8:7836:6672:a072]) by smtp.gmail.com with ESMTPSA id z189sm69814wme.23.2020.11.16.09.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:56:37 -0800 (PST) Date: Mon, 16 Nov 2020 17:56:36 +0000 From: David Brazdil To: Marc Zyngier Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, James Morse , Julien Thierry , Suzuki K Poulose , Catalin Marinas , Will Deacon , Dennis Zhou , Tejun Heo , Christoph Lameter , Mark Rutland , Lorenzo Pieralisi , Quentin Perret , Andrew Scull , Andrew Walbran , kernel-team@android.com Subject: Re: [PATCH v1 10/24] kvm: arm64: Extract parts of el2_setup into a macro Message-ID: <20201116175636.qmp5iws6gq7a7syi@google.com> References: <20201109113233.9012-1-dbrazdil@google.com> <20201109113233.9012-11-dbrazdil@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Marc, > > + * Check for VHE being present. x2 being non-zero indicates that we > > + * do have VHE, and that the kernel is intended to run at EL2. > > */ > > mrs x2, id_aa64mmfr1_el1 > > ubfx x2, x2, #ID_AA64MMFR1_VHE_SHIFT, #4 > > -#else > > - mov x2, xzr > > -#endif > > + cbz x2, el2_setup_nvhe > > What initialises x2 to zero when CONFIG_VHE is disabled? There is no need for x2 anymore, the nVHE code just falls through. Basically: el2_setup: < check CurrentEL > b.eq 1f ret 1: #ifdef CONFIG_VHE < check has VHE > cbz el2_setup_nvhe < VHE setup > ret #endif el2_setup_nvhe: < nVHE setup > eret -David 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=-0.4 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 ED3CCC2D0A3 for ; Mon, 16 Nov 2020 17:56:43 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id DDEE520B80 for ; Mon, 16 Nov 2020 17:56:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="sdIhKOXd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DDEE520B80 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 1E93B4B9A3; Mon, 16 Nov 2020 12:56:42 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ct4FZqQizHmL; Mon, 16 Nov 2020 12:56:41 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3662C4B9B5; Mon, 16 Nov 2020 12:56:41 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 608584B99C for ; Mon, 16 Nov 2020 12:56:40 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wbHABbcd8ows for ; Mon, 16 Nov 2020 12:56:39 -0500 (EST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 620AE4B98A for ; Mon, 16 Nov 2020 12:56:39 -0500 (EST) Received: by mail-wm1-f67.google.com with SMTP id c9so109434wml.5 for ; Mon, 16 Nov 2020 09:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xaNTxNoQPnXnoUb4r3iV3mkFKbHJuRiufvKdd63kC7I=; b=sdIhKOXdzOYUd+0zNv8c0adHbCQpoXeesxkjDLAWcVsQPMNDpfluCLKkFw4WfVYV2U T4Lz4ZqbN1XalTec7vHfSnyzVHrGMdF7wclbYRmO3LLQfhJopfg2xSZxPgYaf+i2tjPY V2TKzLtaYd0cs8iOJ3X1mjjRUUpt+mng4ZKIpkfQ+qHCFS29msT7SFYYx4p7lHs9wOl5 fv1KQionDArngXPYQxG9i/TfiCd3A2uIbWu9nzce8vKzKcgc9mPpxL8avcoVPIZDkLL7 QC/2UIKH/WrfxI3/ZMXY/zKHjO5bVHqehzf6TdSeb0koVcSwzq+7la8pSEjEQ6PlwYUr DiKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xaNTxNoQPnXnoUb4r3iV3mkFKbHJuRiufvKdd63kC7I=; b=TiEHLmA++u2tmqLfVhsz69lCtAWcA3IOPwloG7yewMqm+ZqRZMx5ZzlkGJ7cgbePmO a8zfaLTWt8J/wuK/a0j7DC5B74oHDLzgtquXFQlEz9O5FEOjoE5q3kjGN/9eYwfWAzeT eyk0U53QLOdHU6q9s3NRM8O4w43k+sKX06qW/hliZclJcT9Z9pR919c9hz+esyQ6XI4+ UU64+xkuYRT+V8sy1FJEC2uqYRka3cyQdBFIrvRpwjShWs09I2IiBhy1WkcEck14OVAa 2gjf2oguA5veRDmeY5t8aJmA0r+D2W+AELWAZVrahG+qG6mqBB5t42cHHrFugbgSGVpj nnGg== X-Gm-Message-State: AOAM533YBDvxCvmUbd8U9jLEmCcv9eDXUJ8QrQ+KanKnpNjneGjAD4b2 i9iuKAMd1L8B1JrAzmBoZc21yA== X-Google-Smtp-Source: ABdhPJzq+YhoQ9FGcQcT1hEJKNYAgJc8ZImY4yxRsCLZhalfs1c7PQkN19eo6JoF/FMRMs7CfUQDxw== X-Received: by 2002:a05:600c:2202:: with SMTP id z2mr43648wml.115.1605549398247; Mon, 16 Nov 2020 09:56:38 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:58a8:7836:6672:a072]) by smtp.gmail.com with ESMTPSA id z189sm69814wme.23.2020.11.16.09.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:56:37 -0800 (PST) Date: Mon, 16 Nov 2020 17:56:36 +0000 From: David Brazdil To: Marc Zyngier Subject: Re: [PATCH v1 10/24] kvm: arm64: Extract parts of el2_setup into a macro Message-ID: <20201116175636.qmp5iws6gq7a7syi@google.com> References: <20201109113233.9012-1-dbrazdil@google.com> <20201109113233.9012-11-dbrazdil@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Cc: kernel-team@android.com, Lorenzo Pieralisi , Andrew Walbran , Catalin Marinas , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tejun Heo , Dennis Zhou , Christoph Lameter , Will Deacon , kvmarm@lists.cs.columbia.edu X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Marc, > > + * Check for VHE being present. x2 being non-zero indicates that we > > + * do have VHE, and that the kernel is intended to run at EL2. > > */ > > mrs x2, id_aa64mmfr1_el1 > > ubfx x2, x2, #ID_AA64MMFR1_VHE_SHIFT, #4 > > -#else > > - mov x2, xzr > > -#endif > > + cbz x2, el2_setup_nvhe > > What initialises x2 to zero when CONFIG_VHE is disabled? There is no need for x2 anymore, the nVHE code just falls through. Basically: el2_setup: < check CurrentEL > b.eq 1f ret 1: #ifdef CONFIG_VHE < check has VHE > cbz el2_setup_nvhe < VHE setup > ret #endif el2_setup_nvhe: < nVHE setup > eret -David _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-0.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FSL_HELO_FAKE, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no 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 B6863C61DD8 for ; Mon, 16 Nov 2020 17:57:55 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 4901620B80 for ; Mon, 16 Nov 2020 17:57:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="I3fProCw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="sdIhKOXd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4901620B80 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZgDglNyZWGTgUfeq7RNMKHytKAMCfN/2jk+09krzBhs=; b=I3fProCwtzYaTDF6u5nxa5mGy PxvP+vW6vLsAZ8VN+0Vyonc9TWpvyzQyVSQE/MT6XRfXl0lJvxqdk0HnekjXQd8285P+ZWDBgfc+5 vPLJzNO98Pkv0ksEWhhnS+Go6YnRz1HAXnj1DHHD/iI25mh6WI8O3CiBI2mz/XHFRGmIoQ+qvlTuT P0e9iMsPh97hbf786w4CrmILM2T2ScDvy4hRck5OO6mAE1C4bf2rnGtJ3XsSH8GnAvbKlXlwUXC4y Zg4HEL/TIZQQkGybvY0SUbh5yK3aHrZdLu3xDOvAg/uxaLuZfg7N7pH6xKiGV+daCEh3AYsfCTpMI ED8YvFeiw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1keik6-0003Ba-Vx; Mon, 16 Nov 2020 17:56:43 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keik4-0003A9-9i for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 17:56:41 +0000 Received: by mail-wm1-x344.google.com with SMTP id p22so118130wmg.3 for ; Mon, 16 Nov 2020 09:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xaNTxNoQPnXnoUb4r3iV3mkFKbHJuRiufvKdd63kC7I=; b=sdIhKOXdzOYUd+0zNv8c0adHbCQpoXeesxkjDLAWcVsQPMNDpfluCLKkFw4WfVYV2U T4Lz4ZqbN1XalTec7vHfSnyzVHrGMdF7wclbYRmO3LLQfhJopfg2xSZxPgYaf+i2tjPY V2TKzLtaYd0cs8iOJ3X1mjjRUUpt+mng4ZKIpkfQ+qHCFS29msT7SFYYx4p7lHs9wOl5 fv1KQionDArngXPYQxG9i/TfiCd3A2uIbWu9nzce8vKzKcgc9mPpxL8avcoVPIZDkLL7 QC/2UIKH/WrfxI3/ZMXY/zKHjO5bVHqehzf6TdSeb0koVcSwzq+7la8pSEjEQ6PlwYUr DiKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xaNTxNoQPnXnoUb4r3iV3mkFKbHJuRiufvKdd63kC7I=; b=Aeo4cMZeCqSeNRwTQCdgLTPBIp+6iyoZlEsW4oSOeX1Bfx4MNUXkIfw6hgwixyMlaB 6rZsYO+Uk5Uoex5byTRuGQZDPTMqFp3IQJAkKC57nVETn7qgwkPqHRD2Wk/U4COo3NpC +0eOtWTmW7eEZB3jAnON+uevfrruthVBfUyqZqnN4U1s2MFcOUEL9G5p3inlYbsoETin w/ZZwWeA/cmlAvyZxcn+yNJwwdrrLZPaDKKY7qNKJthSVQXR+OcCeayRFXo2C0Zt9kgm xpv+bLIzQhgou+KZcyY90azc+rD1tIfVMe0hZn2dFwOkPmto9h4fI/i+E4SKxI3iBLY1 Tinw== X-Gm-Message-State: AOAM530RDuWu9N26h2pVxeMjB/O343A6v8q29BBRVTcaYTobJT4e66zG ILxOY1JkA15d76wfK3+ytWeAD1ApKC1/aI567Kk= X-Google-Smtp-Source: ABdhPJzq+YhoQ9FGcQcT1hEJKNYAgJc8ZImY4yxRsCLZhalfs1c7PQkN19eo6JoF/FMRMs7CfUQDxw== X-Received: by 2002:a05:600c:2202:: with SMTP id z2mr43648wml.115.1605549398247; Mon, 16 Nov 2020 09:56:38 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:58a8:7836:6672:a072]) by smtp.gmail.com with ESMTPSA id z189sm69814wme.23.2020.11.16.09.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 09:56:37 -0800 (PST) Date: Mon, 16 Nov 2020 17:56:36 +0000 From: David Brazdil To: Marc Zyngier Subject: Re: [PATCH v1 10/24] kvm: arm64: Extract parts of el2_setup into a macro Message-ID: <20201116175636.qmp5iws6gq7a7syi@google.com> References: <20201109113233.9012-1-dbrazdil@google.com> <20201109113233.9012-11-dbrazdil@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_125640_449398_7001ED3C X-CRM114-Status: GOOD ( 11.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , kernel-team@android.com, Lorenzo Pieralisi , Andrew Walbran , Suzuki K Poulose , Catalin Marinas , Quentin Perret , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org, Tejun Heo , Dennis Zhou , Christoph Lameter , Will Deacon , kvmarm@lists.cs.columbia.edu, Julien Thierry , Andrew Scull Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Marc, > > + * Check for VHE being present. x2 being non-zero indicates that we > > + * do have VHE, and that the kernel is intended to run at EL2. > > */ > > mrs x2, id_aa64mmfr1_el1 > > ubfx x2, x2, #ID_AA64MMFR1_VHE_SHIFT, #4 > > -#else > > - mov x2, xzr > > -#endif > > + cbz x2, el2_setup_nvhe > > What initialises x2 to zero when CONFIG_VHE is disabled? There is no need for x2 anymore, the nVHE code just falls through. Basically: el2_setup: < check CurrentEL > b.eq 1f ret 1: #ifdef CONFIG_VHE < check has VHE > cbz el2_setup_nvhe < VHE setup > ret #endif el2_setup_nvhe: < nVHE setup > eret -David _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel