From nobody Mon Feb 9 17:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1655597862; cv=none; d=zohomail.com; s=zohoarc; b=cOlnNcnwjfh7kF3nE6302M8UwoVMczKOwOmRm6lqCDEUg1yOi0KNmon//KlQxCK2aAlbHoSqfsj930YJyG5pjC2jnpc/ZmursWctNfwsWBlm4dqLUE9XWqbvyVDUYb7AV8Z7/1ES6SULlYtK2IzCG8BTe+r0IXtd/G5WtWQKUUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655597862; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3fyCK09yDw/jVGyY/tTStAMtSUFUHJ5jHv1xqBw5ZNE=; b=JalTFjBZHKOv26178lKH99KUMVviC2DciHQrmHmK8jvJiJ76kiYLyEUiprKNIiEjIt6Df78wqbiQ+8gfbnhrlI1zo3fioY8tChVEBcVW0EsOjqxipf/5hu2gcl5c8JDkrJxdHcx8S0O14uQ5qvU9lHpuOXREz92YP7JGFwBzerw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655597862914971.560524819761; Sat, 18 Jun 2022 17:17:42 -0700 (PDT) Received: from localhost ([::1]:40438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2idI-0001Pe-9w for importer@patchew.org; Sat, 18 Jun 2022 20:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2ibf-0007XU-Jg for qemu-devel@nongnu.org; Sat, 18 Jun 2022 20:15:59 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:33294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2ibR-0001ww-Eg for qemu-devel@nongnu.org; Sat, 18 Jun 2022 20:15:58 -0400 Received: by mail-pl1-x632.google.com with SMTP id y6so6827228plg.0 for ; Sat, 18 Jun 2022 17:15:44 -0700 (PDT) Received: from stoup.. ([2602:47:d49e:3c01:848a:b814:8a9c:88d6]) by smtp.gmail.com with ESMTPSA id s17-20020a17090a5d1100b001e0d4169365sm7790724pji.17.2022.06.18.17.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 17:15:43 -0700 (PDT) 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=3fyCK09yDw/jVGyY/tTStAMtSUFUHJ5jHv1xqBw5ZNE=; b=pAvlLLNGFb5QnYjnb04QXZDcyvTRYb5lW33oaEZcAbQP4A9PONhICVf/Kis0TU+Jnp j6MXA64SUHXT2P+7wb0AySvY+N8R2Cbc5GMch6fLAiVEXRIckcf+b8yUMJPWxx+nNRiY FZR/8Idt5kZSOSzw0oNU4vNhPMy+knGOCyaG/EdCiAncYBbx5x1mewwW5eFQLLe6+LsC yzKGNnYn1LP0zavOTXfOr42uGKofJkMwg6Ektt1bAkP6RKhnLfME9RbH78oLdHnj/LMv 85C80/uS02MWaGnSy1UgXM/M9XBv6x9BiaFxTCAC38L4I9BYUXRw3LPgnB+FdTw4ZFbg Lv0Q== 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=3fyCK09yDw/jVGyY/tTStAMtSUFUHJ5jHv1xqBw5ZNE=; b=ZOZFvBSMBmDGSK47QPeiQ8xFDH52VIQsg5ewynduCl+z4aLpQ1xb9sv+KeJwSNWxjV 4teAYJPRP37KvzxQiEFuJLlWPF1AY6jS4MYoqroQ3hoMT7LiSypzegQ/wlSd+8yI51vT Hpx/1PNHlgcEv+v26Jm++k/cbXhcQFVAR0sTQIqBMLKRQuDDO7cTTWyLUo167oOwI7hE 2Sy+cqhTpfSwUACxu1qXF89K6A47wGNPo/XPlJH7OBXauM7bZgbFTDlUFOo3A3grEaMC xk9v0HnQA6B/Wfi8j1wEA+UUNZEU2F5a8j72WvWL1OzL8RLiJvGVHyGKk4SxgVXc6kxg hCwA== X-Gm-Message-State: AJIora/bnKFujkeVJSgO4HLTGv4lzhI/Rb0wgSNJRW4BTy5fGra/615C Csz0b3ic9nm663Wy8fRr4PxdX23SmiGoSQ== X-Google-Smtp-Source: AGRyM1vcnzDtBZ+8enJk0x85u8/A72s53wujv7YFrEHbn38qKV5obj9Uig1nspCjIb2n+EQeFNjYXA== X-Received: by 2002:a17:902:edd1:b0:158:8318:b51e with SMTP id q17-20020a170902edd100b001588318b51emr16969311plk.89.1655597743660; Sat, 18 Jun 2022 17:15:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 1/2] target/arm: Extend arm_pamax to more than aarch64 Date: Sat, 18 Jun 2022 17:15:40 -0700 Message-Id: <20220619001541.131672-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220619001541.131672-1-richard.henderson@linaro.org> References: <20220619001541.131672-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1655597863212100001 Content-Type: text/plain; charset="utf-8" Move the code from hw/arm/virt.c that is supposed to handle v7 into the one function. Signed-off-by: Richard Henderson Reported-by: He Zhe Reviewed-by: Peter Maydell --- hw/arm/virt.c | 10 +--------- target/arm/ptw.c | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 097238faa7..5502aa60c8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2010,15 +2010,7 @@ static void machvirt_init(MachineState *machine) cpuobj =3D object_new(possible_cpus->cpus[0].type); armcpu =3D ARM_CPU(cpuobj); =20 - if (object_property_get_bool(cpuobj, "aarch64", NULL)) { - pa_bits =3D arm_pamax(armcpu); - } else if (arm_feature(&armcpu->env, ARM_FEATURE_LPAE)) { - /* v7 with LPAE */ - pa_bits =3D 40; - } else { - /* Anything else */ - pa_bits =3D 32; - } + pa_bits =3D arm_pamax(armcpu); =20 object_unref(cpuobj); =20 diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 4d97a24808..07f7a21861 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -36,15 +36,23 @@ static const uint8_t pamax_map[] =3D { /* The cpu-specific constant value of PAMax; also used by hw/arm/virt. */ unsigned int arm_pamax(ARMCPU *cpu) { - unsigned int parange =3D - FIELD_EX64(cpu->isar.id_aa64mmfr0, ID_AA64MMFR0, PARANGE); + if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { + unsigned int parange =3D + FIELD_EX64(cpu->isar.id_aa64mmfr0, ID_AA64MMFR0, PARANGE); =20 - /* - * id_aa64mmfr0 is a read-only register so values outside of the - * supported mappings can be considered an implementation error. - */ - assert(parange < ARRAY_SIZE(pamax_map)); - return pamax_map[parange]; + /* + * id_aa64mmfr0 is a read-only register so values outside of the + * supported mappings can be considered an implementation error. + */ + assert(parange < ARRAY_SIZE(pamax_map)); + return pamax_map[parange]; + } + if (arm_feature(&cpu->env, ARM_FEATURE_LPAE)) { + /* v7 with LPAE */ + return 40; + } + /* Anything else */ + return 32; } =20 /* --=20 2.34.1 From nobody Mon Feb 9 17:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1655597872; cv=none; d=zohomail.com; s=zohoarc; b=e5mpXnJQFdd1bTrSDpcHfkdGcT2OiZRJJGrfUaFzSmSPL3J7sLw/mjS9HGhVinctyusL5CClTt/qkl/ud+pFsAofLJZBLFewIIYHA52GS/ACMneydcuVbb1FhvLavOl3J3cxNA34B2Q0wSyUzUmyuUfS949CwElKn+VlARuyhL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655597872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cQ3LSmMq/PEbxO4xqtFc8lNO19/pPJ0Q5K0mnc2j/gw=; b=H625TWbF3+gNEJHeP1Xj3hLiF73pTx4GPmGxZ4742jDVcGHcfFpl8Gf2Lh8vZAjP/SJWpSlDpFdovY1IS+iqEHgOYP/ovkF/AUOIrIDKTDoIp+jFRNYYP1U3a/cOl9dAts5pOKuIadJq6k7CmwqDPwp9/fixi4lFxaFF0CBgZbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655597872365570.200168787501; Sat, 18 Jun 2022 17:17:52 -0700 (PDT) Received: from localhost ([::1]:41358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2idT-00020k-Be for importer@patchew.org; Sat, 18 Jun 2022 20:17:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2ibf-0007XM-Id for qemu-devel@nongnu.org; Sat, 18 Jun 2022 20:15:59 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:34483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2ibR-0001xB-SK for qemu-devel@nongnu.org; Sat, 18 Jun 2022 20:15:58 -0400 Received: by mail-pl1-x62a.google.com with SMTP id i15so6807982plr.1 for ; Sat, 18 Jun 2022 17:15:45 -0700 (PDT) Received: from stoup.. ([2602:47:d49e:3c01:848a:b814:8a9c:88d6]) by smtp.gmail.com with ESMTPSA id s17-20020a17090a5d1100b001e0d4169365sm7790724pji.17.2022.06.18.17.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 17:15:44 -0700 (PDT) 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=cQ3LSmMq/PEbxO4xqtFc8lNO19/pPJ0Q5K0mnc2j/gw=; b=aSH7Eh6dEq3QXFoaoAqNIvWxq4x/l7/ouqdQhkaZG1eTwCkFzEG4kVXo4OIjTuI9Xz gGT7qY7bKNMCoa3o4dDr7/kpQeH//7yvNLkgVz5bpCZyp9G8KEEbLWy3BjwKWYZ/UNZV z6IVo7Yh8JFFsSa1jN5o1olOXdbVOL/hkJg21a5kiHNHBTf0S41SuSFc3NXkai/zQlrx WK/ptP1/GMp3Qzl5FoicebpFBdTQmXauyFdvyo3b/y11a+6Xb2atlVkBflprOPfa4vtb BtHfgjrBmfAM48XGZj5So5rHw6cbwcllDwwIxrsEwjFzLlXRQegE10HWv1JSWcGCcBKv G2nw== 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=cQ3LSmMq/PEbxO4xqtFc8lNO19/pPJ0Q5K0mnc2j/gw=; b=ErBlkI7Djg4aUYOvOYHwZXvdX2D1Cevgx3u28uALSFVdoD2mOnkyVNWxByJJ60KJyO 6JPQO3XhgMJTbpxuEW8dmi4hescHD7GS2DgXnU8yw8sZMWXFP/My8JF7fUw60+M7fMsm avJxLaxd54MGdt4VgZQS4nrAFUDZ11bvuU+Vp8ypCPN1yq9NqeRvdyOjEjvq9oMsNtJ2 Ros2dGbwkzJiP7zKVgNPK0AJW2Ka4xfF6ToFYzkUOXUobmwLH6a7ZMJHrj3uTHuXAoRF +70c/VvDHQeBPvWomQp+nAlPId7M1OffC9YTPi8Z/ldxS0RAUmdRynmtqGVzbpoh88/R UwLw== X-Gm-Message-State: AJIora9ALYW5y8/PYXgJy/zu4U6HONne4uLf1GTo+lgzL41qYYlVuPFG ke+OLLBBeuOSK9fhECVo59wYKs1L1FWgXQ== X-Google-Smtp-Source: AGRyM1s/4BD1QSOP8ucJ9t9LFWqNkvgo8Xa8UKdnDC4POOBoH+DnsGR8RrJp2VJMca4T7cK0W8GQ6A== X-Received: by 2002:a17:90b:4ac1:b0:1e6:7c82:9aee with SMTP id mh1-20020a17090b4ac100b001e67c829aeemr29260148pjb.234.1655597744476; Sat, 18 Jun 2022 17:15:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 2/2] target/arm: Check V7VE as well as LPAE in arm_pamax Date: Sat, 18 Jun 2022 17:15:41 -0700 Message-Id: <20220619001541.131672-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220619001541.131672-1-richard.henderson@linaro.org> References: <20220619001541.131672-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1655597873509100005 Content-Type: text/plain; charset="utf-8" In machvirt_init we create a cpu but do not fully initialize it. Thus the propagation of V7VE to LPAE has not been done, and we compute the wrong value for some v7 cpus, e.g. cortex-a15. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1078 Signed-off-by: Richard Henderson Reported-by: He Zhe Reviewed-by: Peter Maydell --- target/arm/ptw.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 07f7a21861..da478104f0 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -47,7 +47,13 @@ unsigned int arm_pamax(ARMCPU *cpu) assert(parange < ARRAY_SIZE(pamax_map)); return pamax_map[parange]; } - if (arm_feature(&cpu->env, ARM_FEATURE_LPAE)) { + + /* + * In machvirt_init, we call arm_pamax on a cpu that is not fully + * initialized, so we can't rely on the propagation done in realize. + */ + if (arm_feature(&cpu->env, ARM_FEATURE_LPAE) || + arm_feature(&cpu->env, ARM_FEATURE_V7VE)) { /* v7 with LPAE */ return 40; } --=20 2.34.1