From patchwork Tue May 4 05:52:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 430815 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3494755jao; Mon, 3 May 2021 23:07:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBe/FM/pOExzWNhdlzlVQl4r2hJWfMPPRxIMB2Y2IcT0QPZq0HZFhbFxfZiUKtSANWwIQi X-Received: by 2002:ab0:12a:: with SMTP id 39mr18454849uak.19.1620108434760; Mon, 03 May 2021 23:07:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620108434; cv=none; d=google.com; s=arc-20160816; b=pGeSkXw4F8aEnlJjDfBaZ1iu/+oFBLNUDJdaXGMjizJdYmtR4dB6dw6Z26ITPpPKgH 5OpnHCYihLdXAM6TYKjsQeXSK4G9xv9oSA4l1CwIMaSVsFB58knXzEdjo0WOPRzwnt2q xm+8bO60U8ExkKp7HQ7SrUV2NEX525GmToymMKkX87zLeyuTx80nUKLKpOBz/ejjuTOM 5VENiA5OcsLr1ba60bcPZDEzZgrYCloCiLtZh/q21UnYD3lFD26oGt/JM8OtPI9aajvb WQU0LATTk1ax5m2XWKD2XjSHO+05Tm5jDBFRp+QjZa6UcyD18KzmLWQM7WC9bLOBwhxt LJFg== 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=qjt0/C/HKHsPupxveZh+Pau68rtfK+FtSqHagX4Ele8=; b=frJBoyAMXe4odRsBtPlILPh18lwDHYBAZ3oZdNIhBL2sVvuJSi+hi9gjiP0dhUJxSn ptN/JaAKFryi9TLCzsw3p1oynYez7+LyMdB17nL6fbHc/yNo5qr802v3EzL96hbAFw0A XD3En44gn5MJtYRTjmiJKNPPTZZxOUXH7t7UJvHBaevOkDtS48fkxpspDuw2RddFHvS1 r49kYiCA/NKtpKPs0TABRZMRagQQakfMEF4cQqORBsM477RS/Y+tGPRKD/txdDhy0ICA LAF0EzIxbSVsz7/ZitEvfKbaQAPvXNr4A1yagWBo5++KyImKn/aAFnEHCjgagQfZ5FQv A9rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=R3Ifb37U; 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 o2si1257466uat.235.2021.05.03.23.07.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 May 2021 23:07:14 -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=R3Ifb37U; 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]:44612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldoDB-0000LH-G9 for patch@linaro.org; Tue, 04 May 2021 02:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldnzu-0005Az-Jq; Tue, 04 May 2021 01:53:30 -0400 Received: from ozlabs.org ([203.11.71.1]:43605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldnzr-0004fR-Sg; Tue, 04 May 2021 01:53:29 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FZ8CK1C7zz9sWM; Tue, 4 May 2021 15:53:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1620107597; bh=f78B5YbYtAyXCQJDJDaRmnQ7EsORe8dS0KxqvyuLBfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R3Ifb37U8NK2cclA6WdrEjotocnKgNAKpykhY8qla+Gf47AQfzZZrpjHDTDAuijtK kvx2aKZcENs49C8oUJKKNh5Va35UXEpiki2O20ywnDnBULPZEwIkrE5Wc3jpHmO/xA navL+yZGTu1zhbOQQFjkUG2nlowxXDaX2mfftOUs= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 05/46] target/ppc: Do not call hreg_compute_mem_idx after ppc_store_msr Date: Tue, 4 May 2021 15:52:31 +1000 Message-Id: <20210504055312.306823-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210504055312.306823-1-david@gibson.dropbear.id.au> References: <20210504055312.306823-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 , David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson In ppc_store_msr we call hreg_compute_hflags, which itself calls hreg_compute_mem_idx. Rely on ppc_store_msr to update everything required by the msr update. Signed-off-by: Richard Henderson Message-Id: <20210315184615.1985590-5-richard.henderson@linaro.org> Reviewed-by: Cédric Le Goater Signed-off-by: David Gibson --- target/ppc/machine.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.31.1 diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 87d7bffb86..f6eeda9642 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -125,9 +125,6 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB); ppc_store_msr(env, msr); - /* Recompute mmu indices */ - hreg_compute_mem_idx(env); - return 0; } @@ -418,14 +415,12 @@ static int cpu_post_load(void *opaque, int version_id) /* * Invalidate all supported msr bits except MSR_TGPR/MSR_HVB - * before restoring + * before restoring. Note that this recomputes hflags and mem_idx. */ msr = env->msr; env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB); ppc_store_msr(env, msr); - hreg_compute_mem_idx(env); - return 0; }