From patchwork Wed May 19 12:51:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 442429 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1329581jac; Wed, 19 May 2021 06:34:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh3lqRO+oYXyPt+I8aOrm44PTN/qlKNoMGsJRbk4anSX6TW6XNa+7bv23154SqqyWx++2B X-Received: by 2002:a05:6602:718:: with SMTP id f24mr9247587iox.59.1621431251634; Wed, 19 May 2021 06:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621431251; cv=none; d=google.com; s=arc-20160816; b=S4HxOdKHKRXntaLS5XUgjcLBUSPrHszh05TyKwcqgT5Z64kxtv4YLFe+jH57a8CQbp wWKAiFuFe4coDwqg/TbACZiI9TDtuw3ON41vlkLfIDfM2yMJIa7k/2rGsXAZkWqJ9eqt pNoh/uBayW9qCgJ7BzvvJj2Ls+bqp2KdO4Ctjw9Ha8hePuBpUfB3FTzsTCPzawwKfbGD aUOyahNxHOG27ESKeWS/pMOknPxNqvv+bk0ixJqFg0NEY5xwirJ8LOXL5un4vP1So9kE 1HBT2Yhbt1hvcrjbKewEF5AoH5HAeBbjNLXB5S7HYlddaFGiyTKipko9e1qSptpLL1e3 6N6A== 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=njtnm8Iwj3dlWcn5zcifWXHovGffNT0Ch/Plh8RRecs=; b=K+y+t3jr5IjkNX44aNKcKwNZ0wZYyuiPIG2ERVqPEcLmgFEIth7AxhFqzfG0Bym/t6 2R28F5Teox5oon/0Ie9vbCamAWMvWmxaqM+qe3FDfZIeHlRBxQHEMgJoY1ZA6xeZQhbL 45uFC/W/PQ+/FHgEc4iZO2PfehKM4KeKTzPe4pBEVhU6CaIEcK7/F8txDYVLgicWVFcL qKJEJZLNcYOOhgngvGbjNHn8h3CNhv3GdlUqmyujqwiAOAIxrz3KZjoB1lwyeuiUoHgI 3N5cyLBJwpXgjdqq3otYKQ1oVTNOj3qjZ57VMQts7z68Qrm1/VV0NZauLIU4O8jiohhi th0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=VjXOUHae; 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 x18si1111474ilj.7.2021.05.19.06.34.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 06:34:11 -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=VjXOUHae; 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]:36110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljMKx-0001Ye-4E for patch@linaro.org; Wed, 19 May 2021 09:34:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLhr-0002cK-RJ; Wed, 19 May 2021 08:53:47 -0400 Received: from ozlabs.org ([203.11.71.1]:41239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljLhq-0001dC-0U; Wed, 19 May 2021 08:53:47 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FlXnr2bndz9s1l; Wed, 19 May 2021 22:52:15 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1621428736; bh=HvzS/W9peBFoqRQMJFUOSjaaY1iY7OVTY37oKn+DsfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VjXOUHaeck5kPa6GfIghQUtC6wZ9CCbz66C/SVvnhZ0ZyAEXd+TrJI3TuBT0+rnZ/ mvV3YowDsqa/QNU6I8uMGS9vJ+Ck5Kv7axhgMUfsvjn7Z5sSIwZRDO6PV5H4iDVQYG Y9IGi4vMVY9xGFhRztrOXLLoUpCk64pzQk/tu/BQ= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 43/48] target/ppc: Remove type argument from get_bat_6xx_tlb Date: Wed, 19 May 2021 22:51:43 +1000 Message-Id: <20210519125148.27720-44-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=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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We can now use MMU_INST_FETCH from access_type for this. Signed-off-by: Richard Henderson Message-Id: <20210518201146.794854-11-richard.henderson@linaro.org> Signed-off-by: David Gibson --- target/ppc/mmu_helper.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) -- 2.31.1 diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 2f00955b80..0eba8302ee 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -379,25 +379,22 @@ static inline void bat_size_prot(CPUPPCState *env, target_ulong *blp, } static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx, - target_ulong virtual, MMUAccessType access_type, - int type) + target_ulong virtual, MMUAccessType access_type) { target_ulong *BATlt, *BATut, *BATu, *BATl; target_ulong BEPIl, BEPIu, bl; int i, valid, prot; int ret = -1; + bool ifetch = access_type == MMU_INST_FETCH; LOG_BATS("%s: %cBAT v " TARGET_FMT_lx "\n", __func__, - type == ACCESS_CODE ? 'I' : 'D', virtual); - switch (type) { - case ACCESS_CODE: + ifetch ? 'I' : 'D', virtual); + if (ifetch) { BATlt = env->IBAT[1]; BATut = env->IBAT[0]; - break; - default: + } else { BATlt = env->DBAT[1]; BATut = env->DBAT[0]; - break; } for (i = 0; i < env->nb_BATs; i++) { BATu = &BATut[i]; @@ -407,7 +404,7 @@ static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx, bat_size_prot(env, &bl, &valid, &prot, BATu, BATl); LOG_BATS("%s: %cBAT%d v " TARGET_FMT_lx " BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n", __func__, - type == ACCESS_CODE ? 'I' : 'D', i, virtual, *BATu, *BATl); + ifetch ? 'I' : 'D', i, virtual, *BATu, *BATl); if ((virtual & 0xF0000000) == BEPIu && ((virtual & 0x0FFE0000) & ~bl) == BEPIl) { /* BAT matches */ @@ -441,7 +438,7 @@ static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx, LOG_BATS("%s: %cBAT%d v " TARGET_FMT_lx " BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n\t" TARGET_FMT_lx " " TARGET_FMT_lx " " TARGET_FMT_lx "\n", - __func__, type == ACCESS_CODE ? 'I' : 'D', i, virtual, + __func__, ifetch ? 'I' : 'D', i, virtual, *BATu, *BATl, BEPIu, BEPIl, bl); } } @@ -1415,7 +1412,7 @@ static int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx, } else { /* Try to find a BAT */ if (env->nb_BATs != 0) { - ret = get_bat_6xx_tlb(env, ctx, eaddr, access_type, type); + ret = get_bat_6xx_tlb(env, ctx, eaddr, access_type); } if (ret < 0) { /* We didn't match any BAT entry or don't have BATs */