From nobody Fri Nov 7 20:05:10 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; 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 1548669859387578.0806560389611; Mon, 28 Jan 2019 02:04:19 -0800 (PST) Received: from localhost ([127.0.0.1]:57054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go3m5-0000ja-Sv for importer@patchew.org; Mon, 28 Jan 2019 05:04:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go3Vi-0005Qu-5F for qemu-devel@nongnu.org; Mon, 28 Jan 2019 04:47:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go3Vg-0003LB-8n for qemu-devel@nongnu.org; Mon, 28 Jan 2019 04:47:22 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:58488 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1go3Ve-0002wA-V5 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 04:47:19 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0S9htTR054911 for ; Mon, 28 Jan 2019 04:46:55 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2q9xb4jv6x-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 28 Jan 2019 04:46:55 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Jan 2019 09:46:53 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 28 Jan 2019 09:46:51 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0S9kou121889192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 28 Jan 2019 09:46:50 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1C15911C054; Mon, 28 Jan 2019 09:46:50 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 017F511C05B; Mon, 28 Jan 2019 09:46:50 +0000 (GMT) Received: from smtp.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.1]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 28 Jan 2019 09:46:49 +0000 (GMT) Received: from zorba.kaod.org.com (sig-9-145-15-166.uk.ibm.com [9.145.15.166]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 53B90220309; Mon, 28 Jan 2019 10:46:49 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Mon, 28 Jan 2019 10:46:17 +0100 X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128094625.4428-1-clg@kaod.org> References: <20190128094625.4428-1-clg@kaod.org> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19012809-0020-0000-0000-0000030C5002 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19012809-0021-0000-0000-0000215D9C9A Message-Id: <20190128094625.4428-12-clg@kaod.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-01-28_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=902 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901280080 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id x0S9htTR054911 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 11/19] 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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 97503193ef43..489a54f51b90 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