From patchwork Wed May 19 12:51:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 442424 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1322782jac; Wed, 19 May 2021 06:27:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuzy+kfRh8pzfCRsiOm5E26NdFcTI8C7Gql8tAYDLL+QUi5RuSrgJIIEh0M7sZZndAhyyF X-Received: by 2002:a92:d6c2:: with SMTP id z2mr11487714ilp.246.1621430852929; Wed, 19 May 2021 06:27:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621430852; cv=none; d=google.com; s=arc-20160816; b=udA+73z4GE1LffROBYMKIywtbkM8eaR3/j6MSciQIQfZLlQOH3r/oY/g1zB5whdP4m HTQNpoyiVVFWcodtxlwZbhoOPLn80X0is2I+aylTW1SZ8D58aY8Oho47852r0F3j/kLy p2bj+X3XuIcQkCRLU+IC6VWtiYegwndVlcygsKN8fVop8j6NQemAh/A6OMCLLMpmpmDw q02YehOy+31NHpVLUblCUyAmrDaPFtP6Jn72pdcHA86ET50kV2SesCmnxTKtnu/wUKdT GqKzPcwTZJ7hBv17a4reSoXEOmth0vYGkzihT7Y37SqvGz589jrKBECnu6FLi+dxTxhx U95g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=yYN0Z/xOHSzkM3jLEbYCnBCbwL+bBmOVYOnlHZC8wvU=; b=LufGBNWxvfrLMDVeQ0qchWIWzqcOelKWtMfY689Oz1ibN907t+m7G88See+dydlWze aj8P8Xg0vWpJwYyo0meCm7xFPfGZERj4o5RZKU2Oa0GApQQ2XXO+cooocGiAUfTxQyro 8Bdg9d2Vf9Gs547qpa0yFbwY2gl1dGqNSIcgauK6biNpu5kfBn7Bn4YqSOj8o3H4yk8+ iDtaTyVBsZo1RZfYpwRc3KkdXHP/fGLPFZyUtz9ku91b/QCVTC/gaq3EfWLSmH8OpmdC 42/yCuqf7rc21gVCe7Ytiky4Yd0Hmuln7sex8XpdKOlMbj0MykI4apcRTJUKraCty8/o buxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=FacMkJ3R; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t128si30796613iof.16.2021.05.19.06.27.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 06:27:32 -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=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=FacMkJ3R; 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" Received: from localhost ([::1]:45526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljMEW-0005Oj-AU for patch@linaro.org; Wed, 19 May 2021 09:27:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLho-0002Ow-TG; Wed, 19 May 2021 08:53:44 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:49581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLhl-0001kP-Rw; Wed, 19 May 2021 08:53:44 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXnt1gTgz9sPf; Wed, 19 May 2021 22:52:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428738; bh=sipivPMIlLrzXZG/dcDLE4GTPmzZmFYDG/cqAob/gEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FacMkJ3Rgoa6b8AAR2Pz2c7vlQDswNtxeiDHx2v3xHSfVSRbsD3dGB0coG0X2wGW0 5jxAkrspfsYhbFgKP7WwC6+fSL0Yr8Jmg5xoNaD7rFnQ1wqmFV777wP8OjjazRgCtr HNPIAXT/n2YQoc+du3pfhUOxIwK46m4d+in+qVIA= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 45/48] target/ppc: Remove type argument from mmubooke_check_tlb Date: Wed, 19 May 2021 22:51:45 +1000 Message-Id: <20210519125148.27720-46-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 Received-SPF: pass client-ip=2401:3900:2:1::2; 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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-13-richard.henderson@linaro.org> Signed-off-by: David Gibson --- target/ppc/mmu_helper.c | 44 ++++++++++++----------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) -- 2.31.1 diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 1426973b4d..4e5cc11b44 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -738,9 +738,9 @@ void store_40x_sler(CPUPPCState *env, uint32_t val) static int mmubooke_check_tlb(CPUPPCState *env, ppcemb_tlb_t *tlb, hwaddr *raddr, int *prot, target_ulong address, - MMUAccessType access_type, int type, int i) + MMUAccessType access_type, int i) { - int ret, prot2; + int prot2; if (ppcemb_tlb_check(env, tlb, raddr, address, env->spr[SPR_BOOKE_PID], @@ -772,37 +772,19 @@ found_tlb: } /* Check the address space */ - if (type == ACCESS_CODE) { - if (msr_ir != (tlb->attr & 1)) { - LOG_SWTLB("%s: AS doesn't match\n", __func__); - return -1; - } - - *prot = 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 = -3; - } else { - if (msr_dr != (tlb->attr & 1)) { - LOG_SWTLB("%s: AS doesn't match\n", __func__); - return -1; - } - - *prot = prot2; - if (prot2 & (access_type == MMU_DATA_LOAD ? PAGE_READ : PAGE_WRITE)) { - LOG_SWTLB("%s: found TLB!\n", __func__); - return 0; - } + if ((access_type == MMU_INST_FETCH ? msr_ir : msr_dr) != (tlb->attr & 1)) { + LOG_SWTLB("%s: AS doesn't match\n", __func__); + return -1; + } - LOG_SWTLB("%s: PAGE_READ/WRITE doesn't match: %x\n", __func__, prot2); - ret = -2; + *prot = prot2; + if (prot2 & prot_for_access_type(access_type)) { + LOG_SWTLB("%s: good TLB!\n", __func__); + return 0; } - return ret; + LOG_SWTLB("%s: no prot match: %x\n", __func__, prot2); + return access_type == MMU_INST_FETCH ? -3 : -2; } static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, @@ -819,7 +801,7 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, for (i = 0; i < env->nb_tlb; i++) { tlb = &env->tlb.tlbe[i]; ret = mmubooke_check_tlb(env, tlb, &raddr, &ctx->prot, address, - access_type, type, i); + access_type, i); if (ret != -1) { break; }