From patchwork Thu Jan 7 19:14:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 12004695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D30DFC433DB for ; Thu, 7 Jan 2021 19:19:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5303023441 for ; Thu, 7 Jan 2021 19:19:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5303023441 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxaoR-00085V-Ai for qemu-devel@archiver.kernel.org; Thu, 07 Jan 2021 14:19:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxajg-0005YB-RN; Thu, 07 Jan 2021 14:14:16 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:37473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxaje-000517-EJ; Thu, 07 Jan 2021 14:14:16 -0500 Received: by mail-lf1-x131.google.com with SMTP id o17so17203104lfg.4; Thu, 07 Jan 2021 11:14:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:reply-to:from:date:message-id:subject:to; bh=LxWSjQwSCtTOrhjVFzV1KWoB9MXhmsVFQk7YBEnHuiU=; b=Ss+vcUqH9PFBrISKWitv+jkljkQgvJiml7L1Rp8dIhMiknDdX64ZLy1nmZfDwIYuVq kZEShePQFCtDd9J1GGYdQWmhon3glJ+6RIQcIcl390hnT18y38InJlh1AmM5wpwHcAIO o4CPin1rekvXf9j7v/J9acXJSorZZLYIiECA+N9iIeBJ2VY1osigUIc21kPpWyCGaDg/ o7fSEHrTI8q3B/L7zf7VGA6fJanKVEtlyesEWADxKfLJ2JFUcnUuj71usbXGNV5AH+m/ V1mDluHO/o3QQefo+Mlnpl4vmdV+3XtIigzCBc9Je1hgh2IK0BjVSWCQz3pukE6zzS84 7MBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:from:date:message-id :subject:to; bh=LxWSjQwSCtTOrhjVFzV1KWoB9MXhmsVFQk7YBEnHuiU=; b=c+kQhgAyCNKvmAqk+MuT0uybNnRowUhuQUKpmMlW9pMeyTyORmWJ05+XqSvxkjMWbO T8XR9pO8OGzklRc8vcst3X0b5t57WRRLs/lY5aKEYkTE5AMG+g4hi4L//LACMrsQSVdj UJOanI0xQf3nMudXTQj9La7B3qal4X66p7mYMOGddh3mZ+pG9aCaSmYAlPWrqHQdZDbU 2T8minzLVzqTQkRad9AEdCs7tz7+2G6JRXa5iMPkKk7aCPU2sHMGdp91WdBtYb6nSwC8 CMTgbrM3sr/vzG99x4unj8WI+J+BAdZ03ReCDPAWI5dq5cmDv44ZcgRJDp7lUxW0tJui v8oQ== X-Gm-Message-State: AOAM533cg6GFvQQgU4zzBrK+IDBE33b58NhSk5GbZZGbBLQWy7pSxNNu KiAhOtydNU9tvF6s0q7bWokRbLDtOIv6HPLneTjQba28VpaQ1A== X-Google-Smtp-Source: ABdhPJzN6LAtk11UeRQZG2q1AHl1RSMtV8K+692nND1vbGjdrwGTUaI4bKa5aLFM8kvwDN+8KSkVmNEvjvH3PZruYU8= X-Received: by 2002:a2e:9214:: with SMTP id k20mr4870230ljg.45.1610046851862; Thu, 07 Jan 2021 11:14:11 -0800 (PST) MIME-Version: 1.0 From: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= Date: Thu, 7 Jan 2021 11:14:00 -0800 Message-ID: Subject: What's the correct way to implement rfi and related instruction. To: qemu-level , qemu-ppc@nongnu.org, David Gibson , Thomas Monjalon , agraf@suse.de, Aurelien Jarno Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=luoyonggang@gmail.com; helo=mail-lf1-x131.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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-To: luoyonggang@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is the first patch,: It's store MSR bits differntly for different rfi instructions: [Qemu-devel] [PATCH] target-ppc: fix RFI by clearing some bits of MSR https://lists.gnu.org/archive/html/qemu-devel/2010-05/msg02999.html Comes from target-ppc: fix RFI by clearing some bits of MSR SHA-1: c3d420ead1aee9fcfd12be11cbdf6b1620134773 target-ppc/op_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ``` #endif /* XXX: beware: this is false if VLE is supported */ env->nip = nip & ~((target_ulong)0x00000003); @@ -959,26 +954,24 @@ static inline void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr, void helper_rfi(CPUPPCState *env) { - if (env->excp_model == POWERPC_EXCP_BOOKE) { - do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1], - ~((target_ulong)0), 0); - } else { - do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1], - ~((target_ulong)0x783F0000), 1); - } + do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1] & 0xfffffffful); } +#define MSR_BOOK3S_MASK #if defined(TARGET_PPC64) void helper_rfid(CPUPPCState *env) { - do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1], - ~((target_ulong)0x783F0000), 0); + /* The architeture defines a number of rules for which bits + * can change but in practice, we handle this in hreg_store_msr() + * which will be called by do_rfi(), so there is no need to filter + * here + */ + do_rfi(env, env->spr[SPR_SRR0], env->spr[SPR_SRR1]); } void helper_hrfid(CPUPPCState *env) { - do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1], - ~((target_ulong)0x783F0000), 0); + do_rfi(env, env->spr[SPR_HSRR0], env->spr[SPR_HSRR1]); } #endif @@ -986,28 +979,24 @@ void helper_hrfid(CPUPPCState *env) /* Embedded PowerPC specific helpers */ void helper_40x_rfci(CPUPPCState *env) { - do_rfi(env, env->spr[SPR_40x_SRR2], env->spr[SPR_40x_SRR3], - ~((target_ulong)0xFFFF0000), 0); + do_rfi(env, env->spr[SPR_40x_SRR2], env->spr[SPR_40x_SRR3]); } void helper_rfci(CPUPPCState *env) { - do_rfi(env, env->spr[SPR_BOOKE_CSRR0], env->spr[SPR_BOOKE_CSRR1], - ~((target_ulong)0), 0); + do_rfi(env, env->spr[SPR_BOOKE_CSRR0], env->spr[SPR_BOOKE_CSRR1]); } void helper_rfdi(CPUPPCState *env) { /* FIXME: choose CSRR1 or DSRR1 based on cpu type */ - do_rfi(env, env->spr[SPR_BOOKE_DSRR0], env->spr[SPR_BOOKE_DSRR1], - ~((target_ulong)0), 0); + do_rfi(env, env->spr[SPR_BOOKE_DSRR0], env->spr[SPR_BOOKE_DSRR1]); } void helper_rfmci(CPUPPCState *env) { /* FIXME: choose CSRR1 or MCSRR1 based on cpu type */ - do_rfi(env, env->spr[SPR_BOOKE_MCSRR0], env->spr[SPR_BOOKE_MCSRR1], - ~((target_ulong)0), 0); + do_rfi(env, env->spr[SPR_BOOKE_MCSRR0], env->spr[SPR_BOOKE_MCSRR1]); } #endif @@ -1045,7 +1034,7 @@ void helper_td(CPUPPCState *env, target_ulong arg1, target_ulong arg2, void helper_rfsvc(CPUPPCState *env) { - do_rfi(env, env->lr, env->ctr, 0x0000FFFF, 0); + do_rfi(env, env->lr, env->ctr & 0x0000FFFF); } /* Embedded.Processor Control */ ``` And of cause, the second patch fixes some problem, but also cause new problem, how to implement these instruction properly? Signed-off-by: Yonggang Luo --- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 8f2ee986bb..3c3aa60bc3 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -1646,20 +1646,20 @@ static inline void do_rfi(target_ulong nip, target_ulong msr, void helper_rfi (void) { do_rfi(env->spr[SPR_SRR0], env->spr[SPR_SRR1], - ~((target_ulong)0x0), 1); + ~((target_ulong)0x783F0000), 1); } #if defined(TARGET_PPC64) void helper_rfid (void) { do_rfi(env->spr[SPR_SRR0], env->spr[SPR_SRR1], - ~((target_ulong)0x0), 0); + ~((target_ulong)0x783F0000), 0); } void helper_hrfid (void) { do_rfi(env->spr[SPR_HSRR0], env->spr[SPR_HSRR1], - ~((target_ulong)0x0), 0); + ~((target_ulong)0x783F0000), 0); } #endif #endif ``` This is the second patch,: it's remove the parameter `target_ulong msrm, int keep_msrh` Comes from ppc: Fix rfi/rfid/hrfi/... emulation SHA-1: a2e71b28e832346409efc795ecd1f0a2bcb705a3 ``` target-ppc/excp_helper.c | 51 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c index 30e960e30b..aa0b63f4b0 100644 --- a/target-ppc/excp_helper.c +++ b/target-ppc/excp_helper.c @@ -922,25 +922,20 @@ void helper_store_msr(CPUPPCState *env, target_ulong val) } } -static inline void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr, - target_ulong msrm, int keep_msrh) +static inline void do_rfi(CPUPPCState *env, target_ulong nip, target_ulong msr) { CPUState *cs = CPU(ppc_env_get_cpu(env)); + /* MSR:POW cannot be set by any form of rfi */ + msr &= ~(1ULL << MSR_POW); + #if defined(TARGET_PPC64) - if (msr_is_64bit(env, msr)) { - nip = (uint64_t)nip; - msr &= (uint64_t)msrm; - } else { + /* Switching to 32-bit ? Crop the nip */ + if (!msr_is_64bit(env, msr)) { nip = (uint32_t)nip; - msr = (uint32_t)(msr & msrm); - if (keep_msrh) { - msr |= env->msr & ~((uint64_t)0xFFFFFFFF); - } } #else nip = (uint32_t)nip; - msr &= (uint32_t)msrm;