From nobody Mon Feb 9 23:03:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1621431094; cv=none; d=zohomail.com; s=zohoarc; b=DxeT6mT3/1Ea/xYEmB4bAiVX1lNhwOGUxu80Y5Sax9c2oUGEPmtUEM0rUbDMLTlZsneX6rjDNVSy7LUbER0TpcQ00zJpwpMOivwxq4jcqpeqTX7m18PsKFW57u3EHRry9l/YdfW8+tGiyXDnqTaqma1SRRn6FYdb/fjGQAvHabY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621431094; 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=4fqYAoCz7quar3hSf+SfjDAcCI1khQy1Qeb64sb5IIs=; b=eMypi6NKd3xOLA4Ygu+3oruhQ9lUODOsOWZp6QorW8QYE2SXQx6q3Qt/73q1PZ33pc2/EnvbbY+G4igARJzBoRB/r4qsPr+bJyrvC7gD2fhnDQTad3Baun5BcD68U7iBT9LHcsPuRsbbtmw5OLdmIlOWsTdKMRiKedS/X+Xt+2A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621431094966683.5602958434848; Wed, 19 May 2021 06:31:34 -0700 (PDT) Received: from localhost ([::1]:56692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljMIM-0004gQ-28 for importer@patchew.org; Wed, 19 May 2021 09:31:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLiA-0003rX-Rf; Wed, 19 May 2021 08:54:07 -0400 Received: from ozlabs.org ([203.11.71.1]:35721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLi7-0001lZ-OE; Wed, 19 May 2021 08:54:06 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXnv3vbfz9sWp; Wed, 19 May 2021 22:52:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428739; bh=umesooVcUeFH4XPX81RM+rIlHRDgiF1YwCRIpSTNnjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IhSX28fSoIUYsS4Gw6MB5NvLp14+yMQ+kBUCmjm8Q/KDdQbkmydpDsyFYPrcjppvW EbfUW1hDJLCSNMOd0Ndb9fnMy2+yfIC4pawY5NeG/hmVMbSRXfZmsVQXFmVoalfTBJ LbLO0s220j2Ha99UbIyn699YBHSaqUZbmBCNLrL4= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 47/48] target/ppc: Remove type argument from mmubooke206_check_tlb Date: Wed, 19 May 2021 22:51:47 +1000 Message-Id: <20210519125148.27720-48-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210519125148.27720-1-david@gibson.dropbear.id.au> References: <20210519125148.27720-1-david@gibson.dropbear.id.au> 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: richard.henderson@linaro.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Richard Henderson We can now use MMU_INST_FETCH from access_type for this. Unify the I/D code paths, making use of prot_for_access_type. Signed-off-by: Richard Henderson Message-Id: <20210518201146.794854-15-richard.henderson@linaro.org> Signed-off-by: David Gibson --- target/ppc/mmu_helper.c | 46 ++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 7535a1aa7d..144a14abd9 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -944,10 +944,8 @@ static bool mmubooke206_get_as(CPUPPCState *env, static int mmubooke206_check_tlb(CPUPPCState *env, ppcmas_tlb_t *tlb, hwaddr *raddr, int *prot, target_ulong address, - MMUAccessType access_type, - int type, int mmu_idx) + MMUAccessType access_type, int mmu_idx) { - int ret; int prot2 =3D 0; uint32_t epid; bool as, pr; @@ -1004,39 +1002,25 @@ found_tlb: } =20 /* Check the address space and permissions */ - if (type =3D=3D ACCESS_CODE) { + if (access_type =3D=3D MMU_INST_FETCH) { /* There is no way to fetch code using epid load */ assert(!use_epid); - if (msr_ir !=3D ((tlb->mas1 & MAS1_TS) >> MAS1_TS_SHIFT)) { - LOG_SWTLB("%s: AS doesn't match\n", __func__); - return -1; - } - - *prot =3D prot2; - if (prot2 & PAGE_EXEC) { - LOG_SWTLB("%s: good TLB!\n", __func__); - return 0; - } - - LOG_SWTLB("%s: no PAGE_EXEC: %x\n", __func__, prot2); - ret =3D -3; - } else { - if (as !=3D ((tlb->mas1 & MAS1_TS) >> MAS1_TS_SHIFT)) { - LOG_SWTLB("%s: AS doesn't match\n", __func__); - return -1; - } + as =3D msr_ir; + } =20 - *prot =3D prot2; - if (prot2 & (access_type =3D=3D MMU_DATA_LOAD ? PAGE_READ : PAGE_W= RITE)) { - LOG_SWTLB("%s: found TLB!\n", __func__); - return 0; - } + if (as !=3D ((tlb->mas1 & MAS1_TS) >> MAS1_TS_SHIFT)) { + LOG_SWTLB("%s: AS doesn't match\n", __func__); + return -1; + } =20 - LOG_SWTLB("%s: PAGE_READ/WRITE doesn't match: %x\n", __func__, pro= t2); - ret =3D -2; + *prot =3D prot2; + if (prot2 & prot_for_access_type(access_type)) { + LOG_SWTLB("%s: good TLB!\n", __func__); + return 0; } =20 - return ret; + LOG_SWTLB("%s: no prot match: %x\n", __func__, prot2); + return access_type =3D=3D MMU_INST_FETCH ? -3 : -2; } =20 static int mmubooke206_get_physical_address(CPUPPCState *env, mmu_ctx_t *c= tx, @@ -1060,7 +1044,7 @@ static int mmubooke206_get_physical_address(CPUPPCSta= te *env, mmu_ctx_t *ctx, continue; } ret =3D mmubooke206_check_tlb(env, tlb, &raddr, &ctx->prot, ad= dress, - access_type, type, mmu_idx); + access_type, mmu_idx); if (ret !=3D -1) { goto found_tlb; } --=20 2.31.1