From patchwork Fri Mar 4 20:03:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 548128 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp350934mag; Fri, 4 Mar 2022 12:07:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQRN30JUH2FGixmuIAh7XMnATrxgzd/mqvP3dA0dqDDaewOWa+7asTGagEnOMygpIshUN+ X-Received: by 2002:a5b:242:0:b0:61d:b9c9:5431 with SMTP id g2-20020a5b0242000000b0061db9c95431mr168120ybp.82.1646424463491; Fri, 04 Mar 2022 12:07:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646424463; cv=none; d=google.com; s=arc-20160816; b=HWic+7G4962RHfWLfa3uALW+zq4uu6zqkP4GyUANqKDq/bANlgRGYC7J7zBWrSTIpU vz5fSajd9EJrV2o7DJuEHeY0rzr+Z3e/W5AU9y/r6+V1j8HptuWrGTucxVdPDQpIhP2/ HIyT2tOInnod5g2o8aNhdLZ94gy2nDFlBN4LB858wXMqpo2E/oE4YvBxodvl/cgSf0zF TjUJmwS9VR4+1O+il86rh29SsFWWOnWRS1mJhWm2Vt8uGn58nGsU3i+4t26SoLmXyzvW FtdSlk7ouuhsMx3bsAZtNO5m/9OegJiWfX9A9VLckY1zhsk0gIxDnFNvozVRB5xG5CsC gvXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=Yi+EL9Y616xgLruwinXIVDzc3CuIbCMiF0BTJMc+UOg=; b=wOtPuJalwU9JXTKdZR09SzsYzCj0ebHzSIDEcWVyBsatUeQofV7KrVJdHSMTk1yD1Q n2K/WJ9w3pk9Feqf+vOAjO7qUkVfdhqgAJ5ZcoFSu+CPD6WdzYx/xdZhKYlIdwkbE7hz CsP5NAXc+282eMbAGCSB2ei8MDghOlbwggy0FIulAiTvJo/r6bjBf47B/wG+y5UAJClS ljk+2nxloSzE/TjOos2r3YBCPKDywV85hc0B8WgNsYJBkoGNckYppr9gV+cgViC1DiCW QsSg8Z9S7Mr72QNWu0nhX+CN+cwWqMIVKj4vFcHikdQ8Q477YhqL6IYZqODkmdVg946J 3SBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KGZm/T7R"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l133-20020a81258b000000b002dc19d54519si4471242ywl.431.2022.03.04.12.07.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Mar 2022 12:07:43 -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=fail header.i=@linaro.org header.s=google header.b="KGZm/T7R"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQEDG-0002oD-NC for patch@linaro.org; Fri, 04 Mar 2022 15:07:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQE8r-00051U-Gj for qemu-devel@nongnu.org; Fri, 04 Mar 2022 15:03:14 -0500 Received: from [2607:f8b0:4864:20::633] (port=36377 helo=mail-pl1-x633.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQE8p-0005yF-U4 for qemu-devel@nongnu.org; Fri, 04 Mar 2022 15:03:09 -0500 Received: by mail-pl1-x633.google.com with SMTP id e13so8706558plh.3 for ; Fri, 04 Mar 2022 12:03:07 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Yi+EL9Y616xgLruwinXIVDzc3CuIbCMiF0BTJMc+UOg=; b=KGZm/T7R3DSVgO5Ml373UVOvKgzN2cad6Aj7WkfSGgFYtMFX8/IaO5uDD3HHFMzDUC NzV34No+jwCRbWqioZLE1KOpO+pqEvcCnMiNa3EdpyPosh0bYSWJYnQVRuth4J2do2v5 Ndvd1Oo1gYEGRKlVEESmLjRHuoORLbSoOJRlX19ln57bD21QccBMgQB5W0sQHu5EZIr2 noAzwey9B+Q0wdcW8bPob7oCmdfkObXDH60T3/kN5IUIsSb64N3erC2ZAT9WflEgabFO mUyTqfketqSIu3L5cWA9o5kyd3KbeE0GdM4YiA300i5Axn65c9O86yZGKVc3/doxCYk1 +dqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yi+EL9Y616xgLruwinXIVDzc3CuIbCMiF0BTJMc+UOg=; b=Lj97G08u5KY7jiswJvOb2Fd+vEaOzlL5Jc3RWHg2+kozw2puqyQMBagQ4kVICOfKyE DUXe+7a3xv+mOEtsZwLG9qyE/TmRHf/K4C72qbLM3z6OIOmr3VK6B8efxs3aavb/WNNX FvZkfI9hcsD1LaCUYNwtMlGgR5FKpBm+VoxZiycYa48b/5Y7jheppHlebrlucWl8LuM/ x+HYywplPsV5ygiaCXMUNzLvfeT1JtoKMFXVcLyJR+QhyLgDZ9Qv4C7xHk50Rr8ThPSV xiMLgJCx6Zh+x7h6DJBY6s6XVlgsmU5B7mGa+i+jb148QpeLjCuujZZ5ULJMoeacjpZK akVA== X-Gm-Message-State: AOAM533R7A/LzhniQiBGPIZXKefzX8MQ+ZnXr+AiwgcbbUcKTtXwEtct 89gdRp6/wxwTYaOViMZ1oNcE9lH6tTFWHQ== X-Received: by 2002:a17:90b:1b0e:b0:1bf:1c4f:2bc4 with SMTP id nu14-20020a17090b1b0e00b001bf1c4f2bc4mr317616pjb.200.1646424186636; Fri, 04 Mar 2022 12:03:06 -0800 (PST) Received: from localhost.localdomain (2603-800c-1201-c600-f24b-57b2-da7c-e304.res6.spectrum.com. [2603:800c:1201:c600:f24b:57b2:da7c:e304]) by smtp.gmail.com with ESMTPSA id hk2-20020a17090b224200b001bf0a7d9da3sm5716744pjb.9.2022.03.04.12.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Mar 2022 12:03:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 2/2] hw/core: Disable LPA2 for -machine virt-6.2 Date: Fri, 4 Mar 2022 10:03:01 -1000 Message-Id: <20220304200301.524525-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220304200301.524525-1-richard.henderson@linaro.org> References: <20220304200301.524525-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::633 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.659, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There is a Linux kernel bug present until v5.12 that prevents booting with FEAT_LPA2 enabled. As a workaround for TCG, disable this feature for machine versions prior to 7.0. Signed-off-by: Richard Henderson --- hw/core/machine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index d856485cb4..f3c410fe58 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -37,7 +37,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" -GlobalProperty hw_compat_6_2[] = {}; +GlobalProperty hw_compat_6_2[] = { + { "max-arm-cpu", "lpa2", "off" }, +}; const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); GlobalProperty hw_compat_6_1[] = {