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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 D420AC34026 for ; Tue, 18 Feb 2020 16:48:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 9EA3124649 for ; Tue, 18 Feb 2020 16:48:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="QJSG3rhH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EA3124649 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j462i-0004fr-SS for qemu-devel@archiver.kernel.org; Tue, 18 Feb 2020 11:48:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47680) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j461v-00047J-TP for qemu-devel@nongnu.org; Tue, 18 Feb 2020 11:47:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j461p-0007KW-E8 for qemu-devel@nongnu.org; Tue, 18 Feb 2020 11:47:26 -0500 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:55360) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j461p-0007KB-8N for qemu-devel@nongnu.org; Tue, 18 Feb 2020 11:47:21 -0500 Received: by mail-pj1-x1041.google.com with SMTP id d5so1271536pjz.5 for ; Tue, 18 Feb 2020 08:47:21 -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:mime-version :content-transfer-encoding; bh=sJagifWpn6uhasrVbYbX7C8kWfDQ+S6CVHfZbQrfkHs=; b=QJSG3rhH9S1wrjdjW64CkJvV++hHpPqB+EctHzO0VvbJe6RI9CD6aVoa7G2sWIv2uY Wh1QbumYpgq0slfdLLjrGi+zdiysK3QdI5l2DASxADrgwATNNLClQ4MnUrJcp6btme+D pbLZ0Z1PgyIjsg83kx5J+3Jqvq2ezMomPKPxFP/2r6XFfD8u9u/ZSG2O0rLI7gBqIGhI rnbmCHm1cQcJvtJjJhAHhIRU2Ow7p8TJmjhgU3hxWaUhiRkvi+c4Jnj8kxKifg2tXmW2 58xshMWBlOSEjoDxS1b7uOpmIigPG4ubmI997ZrhYYR+U6VbN9NhOXw1XjHdNKUtp7lF BXSg== 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:mime-version :content-transfer-encoding; bh=sJagifWpn6uhasrVbYbX7C8kWfDQ+S6CVHfZbQrfkHs=; b=tUT6DG1lArk2urXFtnndKT74o7DY/nG+Z0eTehQJa9jxV0eSQ+Iw7uTlHCH2U1kcXL nBbL2nslod+auxEUfXHrvBoou2xAIzaHF0yFkcIH5S27FuXDZU9m5MDtFj9HZlc/W58G W8qGzs51yn7j1Qnb7kAdr4p+1FI740usCyQahGW9qjHNmHIw2vYVhO/5oIkTsZBUL5uv Yxio17A0eV3pIiH7/STeknBMOqhZ4pcWM+zca2gJimhvSBNzfUThqlqf/ocWI57rocZl f3p84GjdymOFAZMfMaa5/gfgm/WdPcvWSzSY7PUpcG2T6drHDvZ1q19I9LMkZNc/Uyzo RAMA== X-Gm-Message-State: APjAAAVImotR17lCObLQZlMo8XA4P/PJ3Sr1OBRO1vj4WLp4Vg67S7LN 4N+zvfeUB/oAeWeQV6AlyZrbEyFQ5IM= X-Google-Smtp-Source: APXvYqwqTdouuOyuBYsfaTRanY2oh2xvJJdK3zhVi5IlXwauNnBVq8uCssYKWDPmHuR/Ev0fkVDFHg== X-Received: by 2002:a17:90a:fa8d:: with SMTP id cu13mr3642788pjb.68.1582044439626; Tue, 18 Feb 2020 08:47:19 -0800 (PST) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id d73sm4858392pfd.109.2020.02.18.08.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2020 08:47:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] target/arm: Honor the HCR_EL2.TSW bit Date: Tue, 18 Feb 2020 08:47:17 -0800 Message-Id: <20200218164717.12842-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These bits trap EL1 access to set/way cache maintenance insns. Buglink: https://bugs.launchpad.net/bugs/1863685 Signed-off-by: Richard Henderson --- Based-on: <20200218152844.29351-1-richard.henderson@linaro.org> ("target/arm: Honor the HCR_EL2.{TVM,TRVM} bits") Not really dependent on the above, but there will be a trivial patch conflict without it. r~ --- target/arm/helper.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 69946a57f8..b87518b97a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -542,6 +542,16 @@ static CPAccessResult access_tvm_trvm(CPUARMState *env, const ARMCPRegInfo *ri, return CP_ACCESS_OK; } +/* Check for traps from EL1 due to HCR_EL2.TSW. */ +static CPAccessResult access_tsw(CPUARMState *env, const ARMCPRegInfo *ri, + bool isread) +{ + if (arm_current_el(env) == 1 && (arm_hcr_el2_eff(env) & HCR_TSW)) { + return CP_ACCESS_TRAP_EL2; + } + return CP_ACCESS_OK; +} + static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { ARMCPU *cpu = env_archcpu(env); @@ -4659,14 +4669,14 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { .access = PL1_W, .type = ARM_CP_NOP }, { .name = "DC_ISW", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 6, .opc2 = 2, - .access = PL1_W, .type = ARM_CP_NOP }, + .access = PL1_W, .accessfn = access_tsw, .type = ARM_CP_NOP }, { .name = "DC_CVAC", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 10, .opc2 = 1, .access = PL0_W, .type = ARM_CP_NOP, .accessfn = aa64_cacheop_access }, { .name = "DC_CSW", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 10, .opc2 = 2, - .access = PL1_W, .type = ARM_CP_NOP }, + .access = PL1_W, .accessfn = access_tsw, .type = ARM_CP_NOP }, { .name = "DC_CVAU", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 11, .opc2 = 1, .access = PL0_W, .type = ARM_CP_NOP, @@ -4677,7 +4687,7 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { .accessfn = aa64_cacheop_access }, { .name = "DC_CISW", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 14, .opc2 = 2, - .access = PL1_W, .type = ARM_CP_NOP }, + .access = PL1_W, .accessfn = access_tsw, .type = ARM_CP_NOP }, /* TLBI operations */ { .name = "TLBI_VMALLE1IS", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 0, @@ -4858,17 +4868,17 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { { .name = "DCIMVAC", .cp = 15, .opc1 = 0, .crn = 7, .crm = 6, .opc2 = 1, .type = ARM_CP_NOP, .access = PL1_W }, { .name = "DCISW", .cp = 15, .opc1 = 0, .crn = 7, .crm = 6, .opc2 = 2, - .type = ARM_CP_NOP, .access = PL1_W }, + .type = ARM_CP_NOP, .access = PL1_W, .accessfn = access_tsw }, { .name = "DCCMVAC", .cp = 15, .opc1 = 0, .crn = 7, .crm = 10, .opc2 = 1, .type = ARM_CP_NOP, .access = PL1_W }, { .name = "DCCSW", .cp = 15, .opc1 = 0, .crn = 7, .crm = 10, .opc2 = 2, - .type = ARM_CP_NOP, .access = PL1_W }, + .type = ARM_CP_NOP, .access = PL1_W, .accessfn = access_tsw }, { .name = "DCCMVAU", .cp = 15, .opc1 = 0, .crn = 7, .crm = 11, .opc2 = 1, .type = ARM_CP_NOP, .access = PL1_W }, { .name = "DCCIMVAC", .cp = 15, .opc1 = 0, .crn = 7, .crm = 14, .opc2 = 1, .type = ARM_CP_NOP, .access = PL1_W }, { .name = "DCCISW", .cp = 15, .opc1 = 0, .crn = 7, .crm = 14, .opc2 = 2, - .type = ARM_CP_NOP, .access = PL1_W }, + .type = ARM_CP_NOP, .access = PL1_W, .accessfn = access_tsw }, /* MMU Domain access control / MPU write buffer control */ { .name = "DACR", .cp = 15, .opc1 = 0, .crn = 3, .crm = 0, .opc2 = 0, .access = PL1_RW, .accessfn = access_tvm_trvm, .resetvalue = 0, -- 2.20.1