From nobody Wed Feb 11 00:56:11 2026 Delivered-To: importer@patchew.org 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; 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=1575415861; cv=none; d=zohomail.com; s=zohoarc; b=BM0r2Dw8lkzcZ+GUkBTLPBOvOAaxfYZ/iS5xeFigI2otwsRFK1kIbfdqalmzIy16mupmn/MbLJv8cX6B4kWLSgMz3JMhY87L/GcV7GMFbJVl6ELcIgLZ1jYHHNvRWbO4AX0WN0BN/Bc4c59jDkgmicpILlC6OpEvxIla10sKsOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575415861; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=yh3Zl0Yfgd5t5mYjFXJ95PB0dxs1Lxcsdr6CBQV1gYs=; b=bZEypN+gQ2wRUfAHMsXM53RnEDBjSkaE4ntNKacMFC2uq3URY+r2D3mr/VFZ80wa02bHmcIdcslQsdxn75//iz2o+mSh98afqX7urFz85CaOeT2y/7oRlQqWTylL2J0fI2as57GxbzPb7JDbjOUAl0FA81t54wW+gmljPKBxEwM= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575415861148535.6489388455875; Tue, 3 Dec 2019 15:31:01 -0800 (PST) Received: from localhost ([::1]:60416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icHdD-0007UX-PQ for importer@patchew.org; Tue, 03 Dec 2019 18:30:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58628) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icH3e-0002wo-U1 for qemu-devel@nongnu.org; Tue, 03 Dec 2019 17:54:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icH3Z-0006vN-AG for qemu-devel@nongnu.org; Tue, 03 Dec 2019 17:54:11 -0500 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:35018) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icH3V-0006bt-UA for qemu-devel@nongnu.org; Tue, 03 Dec 2019 17:54:07 -0500 Received: by mail-pj1-x1041.google.com with SMTP id w23so1032520pjd.2 for ; Tue, 03 Dec 2019 14:53:49 -0800 (PST) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id d22sm3789713pjd.2.2019.12.03.14.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 14:53:47 -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; bh=yh3Zl0Yfgd5t5mYjFXJ95PB0dxs1Lxcsdr6CBQV1gYs=; b=MO5NaQ+fWAcCRw8VDgNrpdsX+WE2S6qwB+PHclgbzfqvmArsAARrtN2c3SHs25Vkmv Cro5Zf6oeiRfhtmRbH6sFrgJGbmu1uSiQ3uVLtMAdVNqVM8aFciYg9CJK0p0vwPMtU07 CGPsy8tp7a3O4pSeIGPk98/FPFdn75Bi/nXOZcizAcP8Gbsv2Ood4iIf/YsmVjM7Z2qa 0tPgcakSmNCO/kbPqE9QfzFc6d8ya7sGR7QB2u29z7gxOktq/atKaG/rM1UYY87aQkhQ Oy5CfGzCUPFeOoWho3HAx3V8JKLDM2vE4Tax0vNiLfbZEOOApSh6u68LfirTR7U5Nvos MYAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yh3Zl0Yfgd5t5mYjFXJ95PB0dxs1Lxcsdr6CBQV1gYs=; b=k61auEUPGg2RJV6KGzMvcQYoUB/v5Ut6efjVgEQiQ0VgGNzI8YuT8Et2lugyPTUPDo qtnum2skrkmjCErB7BJygjxvunKJMV3NxGdSJHfyMNtGTfDl9pt7kmN0ICehQsOcSOA+ DaUSct20ZeLCDIVe106yrNvlTheIAfrEO0Rl1hzApemyLAl4j/zW+l+F2sluWvnLJtbF VQCvYJ65NUIFdV5oC3UkgEEf17ykb1fhs5ODw5/9zJgZzxzqqoY1/qpvqafMNTiMYPXJ C5kxSqmwtfJoxTWulDmxcmEyo1P1mwFH7rao+JO3AdWWyk2mwWfjVceafK7tKCNlyTQx HJxw== X-Gm-Message-State: APjAAAXbsmu/w6M7p3VZ+3rh2ueFhFcSLyb83XI+H8umK6Z0r/xZ440i po8diXefmwp2x5zmCLDGrDibOIiZNWE= X-Google-Smtp-Source: APXvYqwe5gK7CBpQMgu7t8Ovhe+hpyTDwLjOF6zmhJMiNp3XvrZmoLZUniCmcUor65vqN42DuxFghQ== X-Received: by 2002:a17:902:d201:: with SMTP id t1mr367250ply.322.1575413628230; Tue, 03 Dec 2019 14:53:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 10/11] target/arm: Implement ATS1E1 system registers Date: Tue, 3 Dec 2019 14:53:32 -0800 Message-Id: <20191203225333.17055-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203225333.17055-1-richard.henderson@linaro.org> References: <20191203225333.17055-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1041 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a minor enhancement over ARMv8.1-PAN. The *_PAN mmu_idx are used with the existing do_ats_write. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/helper.c | 50 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 043e44d73d..f1eab4fb28 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3360,16 +3360,20 @@ static void ats_write(CPUARMState *env, const ARMCP= RegInfo *ri, uint64_t value) =20 switch (ri->opc2 & 6) { case 0: - /* stage 1 current state PL1: ATS1CPR, ATS1CPW */ + /* stage 1 current state PL1: ATS1CPR, ATS1CPW, ATS1CPRP, ATS1CPWP= */ switch (el) { case 3: mmu_idx =3D ARMMMUIdx_SE3; break; case 2: - mmu_idx =3D ARMMMUIdx_Stage1_E1; - break; + g_assert(!secure); /* TODO: ARMv8.4-SecEL2 */ + /* fall through */ case 1: - mmu_idx =3D secure ? ARMMMUIdx_SE1 : ARMMMUIdx_Stage1_E1; + if (ri->crm =3D=3D 9 && (env->uncached_cpsr & CPSR_PAN)) { + mmu_idx =3D secure ? ARMMMUIdx_SE1_PAN : ARMMMUIdx_Stage1_= E1_PAN; + } else { + mmu_idx =3D secure ? ARMMMUIdx_SE1 : ARMMMUIdx_Stage1_E1; + } break; default: g_assert_not_reached(); @@ -3438,8 +3442,12 @@ static void ats_write64(CPUARMState *env, const ARMC= PRegInfo *ri, switch (ri->opc2 & 6) { case 0: switch (ri->opc1) { - case 0: /* AT S1E1R, AT S1E1W */ - mmu_idx =3D secure ? ARMMMUIdx_SE1 : ARMMMUIdx_Stage1_E1; + case 0: /* AT S1E1R, AT S1E1W, AT S1E1RP, AT S1E1WP */ + if (ri->crm =3D=3D 9 && (env->pstate & PSTATE_PAN)) { + mmu_idx =3D secure ? ARMMMUIdx_SE1_PAN : ARMMMUIdx_Stage1_= E1_PAN; + } else { + mmu_idx =3D secure ? ARMMMUIdx_SE1 : ARMMMUIdx_Stage1_E1; + } break; case 4: /* AT S1E2R, AT S1E2W */ mmu_idx =3D ARMMMUIdx_E2; @@ -7426,6 +7434,36 @@ void register_cp_regs_for_features(ARMCPU *cpu) }; define_arm_cp_regs(cpu, pan_reginfo); } +#ifndef CONFIG_USER_ONLY + if (cpu_isar_feature(aa64_ats1e1, cpu)) { + static const ARMCPRegInfo ats1e1_reginfo[] =3D { + { .name =3D "AT_S1E1R", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 1, .opc1 =3D 0, .crn =3D 7, .crm =3D 9, .opc2 =3D = 0, + .access =3D PL1_W, .type =3D ARM_CP_NO_RAW | ARM_CP_RAISES_E= XC, + .writefn =3D ats_write64 }, + { .name =3D "AT_S1E1W", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 1, .opc1 =3D 0, .crn =3D 7, .crm =3D 9, .opc2 =3D = 1, + .access =3D PL1_W, .type =3D ARM_CP_NO_RAW | ARM_CP_RAISES_E= XC, + .writefn =3D ats_write64 }, + REGINFO_SENTINEL + }; + define_arm_cp_regs(cpu, ats1e1_reginfo); + } + if (cpu_isar_feature(aa32_ats1e1, cpu)) { + static const ARMCPRegInfo ats1cp_reginfo[] =3D { + { .name =3D "ATS1CPRP", + .cp =3D 15, .opc1 =3D 0, .crn =3D 7, .crm =3D 9, .opc2 =3D 0, + .access =3D PL1_W, .type =3D ARM_CP_NO_RAW | ARM_CP_RAISES_E= XC, + .writefn =3D ats_write }, + { .name =3D "ATS1CPWP", + .cp =3D 15, .opc1 =3D 0, .crn =3D 7, .crm =3D 9, .opc2 =3D 1, + .access =3D PL1_W, .type =3D ARM_CP_NO_RAW | ARM_CP_RAISES_E= XC, + .writefn =3D ats_write }, + REGINFO_SENTINEL + }; + define_arm_cp_regs(cpu, ats1cp_reginfo); + } +#endif =20 if (arm_feature(env, ARM_FEATURE_EL2) && cpu_isar_feature(aa64_vh, cpu= )) { static const ARMCPRegInfo vhe_reginfo[] =3D { --=20 2.17.1