From nobody Sun Nov 9 16:22:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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 1551157124108988.9762943546551; Mon, 25 Feb 2019 20:58:44 -0800 (PST) Received: from localhost ([127.0.0.1]:48806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUpD-0008Nk-U9 for importer@patchew.org; Mon, 25 Feb 2019 23:58:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUkE-0004Sq-4t for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:53:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyUjz-0000fh-8N for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:53:19 -0500 Received: from ozlabs.org ([203.11.71.1]:39131) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyUjx-0000Zf-Dx; Mon, 25 Feb 2019 23:53:14 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 447mfF4ch5z9s9L; Tue, 26 Feb 2019 15:53:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1551156789; bh=KVvse4WgBQGsGZ+VOi4LQyVZXhJncB97OXIbaSxgyFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NeB3TZL80qQcyxVsSMEV9HVCGNxR3HgogNIPSzRJw5Y+Oq9mKJlGG/6ohhWbKYQdK mAWg/cqkOHiRyC2jZJIc7TcoHBDPViuN0+EXgKgvWqDmR3tpMR6i510YToNdtaJSIy UltOkRswVmNBYfTkPrrAVOeeJQ1Ky4rcQ95IjWrQ= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 26 Feb 2019 15:52:18 +1100 Message-Id: <20190226045304.25618-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226045304.25618-1-david@gibson.dropbear.id.au> References: <20190226045304.25618-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 04/50] target/ppc: Move "wakeup reset" code to a separate function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, gkurz@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, clg@kaod.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: Benjamin Herrenschmidt This moves the code to handle waking up from the 0x100 vector from powerpc_excp() to a separate function, as the former is already way too big as it is. No functional change. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: David Gibson Message-Id: <20190215161648.9600-5-clg@kaod.org> Signed-off-by: David Gibson --- target/ppc/excp_helper.c | 75 ++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 97503193ef..489a54f51b 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -65,6 +65,46 @@ static inline void dump_syscall(CPUPPCState *env) ppc_dump_gpr(env, 6), env->nip); } =20 +static int powerpc_reset_wakeup(CPUState *cs, CPUPPCState *env, int excp, + target_ulong *msr) +{ + /* We no longer are in a PM state */ + env->in_pm_state =3D false; + + /* Pretend to be returning from doze always as we don't lose state */ + *msr |=3D (0x1ull << (63 - 47)); + + /* Machine checks are sent normally */ + if (excp =3D=3D POWERPC_EXCP_MCHECK) { + return excp; + } + switch (excp) { + case POWERPC_EXCP_RESET: + *msr |=3D 0x4ull << (63 - 45); + break; + case POWERPC_EXCP_EXTERNAL: + *msr |=3D 0x8ull << (63 - 45); + break; + case POWERPC_EXCP_DECR: + *msr |=3D 0x6ull << (63 - 45); + break; + case POWERPC_EXCP_SDOOR: + *msr |=3D 0x5ull << (63 - 45); + break; + case POWERPC_EXCP_SDOOR_HV: + *msr |=3D 0x3ull << (63 - 45); + break; + case POWERPC_EXCP_HV_MAINT: + *msr |=3D 0xaull << (63 - 45); + break; + default: + cpu_abort(cs, "Unsupported exception %d in Power Save mode\n", + excp); + } + return POWERPC_EXCP_RESET; +} + + /* Note that this function should be greatly optimized * when called with a constant excp, from ppc_hw_interrupt */ @@ -102,40 +142,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int e= xcp_model, int excp) * P7/P8/P9 */ if (env->in_pm_state) { - env->in_pm_state =3D false; - - /* Pretend to be returning from doze always as we don't lose state= */ - msr |=3D (0x1ull << (63 - 47)); - - /* Non-machine check are routed to 0x100 with a wakeup cause - * encoded in SRR1 - */ - if (excp !=3D POWERPC_EXCP_MCHECK) { - switch (excp) { - case POWERPC_EXCP_RESET: - msr |=3D 0x4ull << (63 - 45); - break; - case POWERPC_EXCP_EXTERNAL: - msr |=3D 0x8ull << (63 - 45); - break; - case POWERPC_EXCP_DECR: - msr |=3D 0x6ull << (63 - 45); - break; - case POWERPC_EXCP_SDOOR: - msr |=3D 0x5ull << (63 - 45); - break; - case POWERPC_EXCP_SDOOR_HV: - msr |=3D 0x3ull << (63 - 45); - break; - case POWERPC_EXCP_HV_MAINT: - msr |=3D 0xaull << (63 - 45); - break; - default: - cpu_abort(cs, "Unsupported exception %d in Power Save mode= \n", - excp); - } - excp =3D POWERPC_EXCP_RESET; - } + excp =3D powerpc_reset_wakeup(cs, env, excp, &msr); } =20 /* Exception targetting modifiers --=20 2.20.1