From patchwork Wed Aug 14 09:04:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 819102 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp612073wrm; Wed, 14 Aug 2024 02:06:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWcvsJo8N/pFW48CielvRdSibmlFAMGXR3/F1Zyak/2FR02h/TWD06fmpJQfHzu6pnABhNLHQ==@linaro.org X-Google-Smtp-Source: AGHT+IEUwBd0DFZHVw9iGhfyVsv1ZQMB7Vq2O6iSXtPe7ji13TW8P1mtCGKCEGlYdvpDapeUbiZ2 X-Received: by 2002:a05:622a:4d88:b0:447:e808:ab24 with SMTP id d75a77b69052e-4535bb967cfmr24925681cf.50.1723626408915; Wed, 14 Aug 2024 02:06:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723626408; cv=none; d=google.com; s=arc-20160816; b=nnvGD+IKOAn5+hqGkRdsPdT7YvjxieWW+xjPmvzhasIpoe4/79j9Hg0sRapDcrFNZQ mmQyoblQAyVsZW0OjWrtAA0R4DB1at4pqbZPtwWEl3KT7LDJW7txKApOh6F8NbnoPFIg vJPzAoM97/nbzqXr9B6bhxNQq3FKKH/68ZXVBXJpa/UQjL8xyj0RBlWd7nJ8M6tb8LU8 +wJFYtKINc4A4uiBy70zXQK+2u+208JbyuqhayqYzRuN9ZhyDJ5VawaBK3wI+xvH3S3m bGReh7Z6uii/+UQD9VKv9amyJe5s4Yc1yZYaP8yepODSJte653ptQKk08v6xQTPrKhBM mpNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=2c0XRHjU0y3cm6Z6eyIislTDkEC9zABvUTWrSeWCGjw=; fh=KbgWYUS9OqO/4JTC9tmS48IRNwt9Cke8+NcPyuT3iko=; b=LaoQWtBVzbkevY3uV18v4jN9Bq2hg+9r3OpYcY7LFpSjmVoZVvXVqKCfj6yPRe88tk MBIaLy1BRXk8DkAc8okFeSHvt/XIR2KCEAGdVuSuNO5+zBJ7ezznsfNURCbxtBUXmHxQ UfSUYpPQLOcFggB+idndxk7Cz0QToicHATt+XRQeFw7b+Iz2DmpXS0RLQR+7Fy7UYt7K OUzVDUSIdZNmKfBbpKirlPr6YswiS1U84ykUIhe3nhoVD74SrbzTkRIytug7gxjWt0QW K2wX8Ikkm/QZxA+6YzpmbXplsGE7FNB7kD7SDrfQxRfYxI1iDfV/9cPZriGMdoEHMReX +JVA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eVh4jqt/"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-453561b0059si25488431cf.157.2024.08.14.02.06.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Aug 2024 02:06:48 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b="eVh4jqt/"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1se9xr-0006mI-Lj; Wed, 14 Aug 2024 05:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1se9xn-0006Ng-Gk for qemu-devel@nongnu.org; Wed, 14 Aug 2024 05:06:41 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1se9xl-0000rl-Lj for qemu-devel@nongnu.org; Wed, 14 Aug 2024 05:06:39 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a7a8e73b29cso598502266b.3 for ; Wed, 14 Aug 2024 02:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723626395; x=1724231195; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2c0XRHjU0y3cm6Z6eyIislTDkEC9zABvUTWrSeWCGjw=; b=eVh4jqt/xFRlje2e6kzP2sUjTyUyn0IY/5FuUkG50Aa3PJks691O8RUBVgn93ELb1J 0PnVCg7nd7Rwtxm0/KV92zbmE7IvSERXxRylojn3dy2OASbyXKqcGAqOkkpo784Nd++l 7dcftOGeLGbe3F9+OLh7hhyL4zjZVHUp06MQlb6m7dW8zKWWTawuVB2tmivYPVUeJtGA +Lm1zIPEQNOfFl40F8Yez43MmgJuVHufNCu7N0RyAzOE2lkGTRJvFq200tahQ+EZEtWw j8d7C9Up6vIwndF/E7HnckMor7Siq//yKZ1D9yqmqEOQ1i7KyWITeVW2LU0wYn0OZ8eY Zt2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723626395; x=1724231195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2c0XRHjU0y3cm6Z6eyIislTDkEC9zABvUTWrSeWCGjw=; b=pPC8HnrCbXh3azS7TfS2jwfcE/vd9t6mGUSpQmbh7SLfxui4bWhB3GSa7anS9JtQE2 VOyQa0yrAznv2SICP36HIJzYyuBP6ybOfbh1qAQ5Q72B8VQsHWdqYd5sUiJKYS1jEJsX i5freVydxTFc6IoWX135F+opf/zecbauqbmRDxhuj7sg7h1GdI1ZbDa42eux+2vX5M1S wTpuK2tjC5JjKcm6q1Oqfvp29HSRgy/nBRbvtkDzUQQz0Pz0n3lZc51/tzThzR8QzSDD Zmi+jM5EBHbxJBDt7rArWJICicO1OTy1PLVVIr2smU7XUeFnX+luC7uHxl2ZGS4ESeFi h0AA== X-Gm-Message-State: AOJu0Yzml+Q056CLAGbTeB5ltxxyxPnuVdGnXjZpVCM/ovx0kmk44WcP U/xKr3AU1otLkP9Sv4JWqGYHGFMa3Pd6YnN+D036F6r+Ei61O+hoL7Gu6ejx+z7sgrxiAgssHaj FAYw= X-Received: by 2002:a17:907:3ea6:b0:a72:8a62:65e7 with SMTP id a640c23a62f3a-a8367047e66mr142634666b.57.1723626395466; Wed, 14 Aug 2024 02:06:35 -0700 (PDT) Received: from localhost.localdomain (124.170.88.92.rev.sfr.net. [92.88.170.124]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f414e561sm145162166b.169.2024.08.14.02.06.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 02:06:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson , Thomas Petazzoni , Waldemar Brodkorb , Aleksandar Rikalo , Jiaxun Yang Subject: [PATCH-for-9.1 v4 3/3] target/mips: Load PTE as DATA Date: Wed, 14 Aug 2024 11:04:52 +0200 Message-ID: <20240814090452.2591-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814090452.2591-1-philmd@linaro.org> References: <20240814090452.2591-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.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, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org PTE is not CODE so load it as normal DATA access. Fixes: 074cfcb4da ("Implement hardware page table walker for MIPS32") Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/sysemu/tlb_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/tlb_helper.c index 0e94e00a5f..3836137750 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -603,9 +603,9 @@ static bool get_pte(CPUMIPSState *env, uint64_t vaddr, MemOp op, oi = make_memop_idx(op | MO_TE, ptw_mmu_idx); if (op == MO_64) { - *pte = cpu_ldq_code_mmu(env, vaddr, oi, 0); + *pte = cpu_ldq_mmu(env, vaddr, oi, 0); } else { - *pte = cpu_ldl_code_mmu(env, vaddr, oi, 0); + *pte = cpu_ldl_mmu(env, vaddr, oi, 0); } return true;