Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2230462/?format=api
{ "id": 2230462, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2230462/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429183310.12455-6-harshpb@linux.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260429183310.12455-6-harshpb@linux.ibm.com>", "date": "2026-04-29T18:32:55", "name": "[PULL,05/13] pnv/mpipl: Preserve CPU registers after crash", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "3e190726bf01cdba5471fdd843608b9a9692e146", "submitter": { "id": 85411, "url": "http://patchwork.ozlabs.org/api/1.1/people/85411/?format=api", "name": "Harsh Prateek Bora", "email": "harshpb@linux.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260429183310.12455-6-harshpb@linux.ibm.com/mbox/", "series": [ { "id": 502132, "url": "http://patchwork.ozlabs.org/api/1.1/series/502132/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502132", "date": "2026-04-29T18:32:53", "name": "[PULL,01/13] ppc/pnv: Move SBE host doorbell function to top of file", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/502132/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2230462/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2230462/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=cdTguC6G;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5Qv60njfz1yHX\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 30 Apr 2026 04:34:26 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wI9jO-0007ex-H7; Wed, 29 Apr 2026 14:33:54 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <harshpb@linux.ibm.com>)\n id 1wI9jJ-0007ad-Vf\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 14:33:49 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <harshpb@linux.ibm.com>)\n id 1wI9jH-00078y-Hu\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 14:33:49 -0400", "from pps.filterd (m0356516.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 63TF8Ph91090728\n for <qemu-devel@nongnu.org>; Wed, 29 Apr 2026 18:33:46 GMT", "from ppma21.wdc07v.mail.ibm.com\n (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4drk1jtrgs-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT)\n for <qemu-devel@nongnu.org>; Wed, 29 Apr 2026 18:33:46 +0000 (GMT)", "from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1])\n by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id\n 63TINl52009655\n for <qemu-devel@nongnu.org>; Wed, 29 Apr 2026 18:33:45 GMT", "from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227])\n by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4ds8xk7k5y-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT)\n for <qemu-devel@nongnu.org>; Wed, 29 Apr 2026 18:33:45 +0000 (GMT)", "from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com\n [10.20.54.105])\n by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 63TIXfBN48627982\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Wed, 29 Apr 2026 18:33:41 GMT", "from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 37B9320049;\n Wed, 29 Apr 2026 18:33:41 +0000 (GMT)", "from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 5052F20040;\n Wed, 29 Apr 2026 18:33:39 +0000 (GMT)", "from localhost.localdomain (unknown [9.39.31.77])\n by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP;\n Wed, 29 Apr 2026 18:33:38 +0000 (GMT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc\n :content-transfer-encoding:date:from:in-reply-to:message-id\n :mime-version:references:subject:to; s=pp1; bh=E2kYb0COOGaaQt09E\n 7oz/wt7B5Va/uIoO50QvMiZ9W0=; b=cdTguC6G5wooOYLIjYgSMv09PMt4V+ywf\n sgk8HFHXMPSUpHm/zvDp+WmHzaL9mStQOCTzJM5UBZ5JIwdFTeHDfTne+gWaL6Ep\n iASYuA6SLMBPOseOFXXORfYtPkmRHHs1ouBpkKgxRROTTNdNlUJssx9vAhUg7mas\n TeTxMumAaYhSS5QXm2gDILO2g06iC79SeOxs3tpUG7H1oQYh+NDCKnqYThqGULaA\n WcsGC2MHxTvz4iAtW5/ffPfx7Y9Q1/pSj9T7Qb7SET0bjVrei+ZQ7Xr/fGIUtW8I\n pmECaK5mEusgdAMLgFCAwsAd/XVjMG84njkeKxcqAGigbu8XDKAQw==", "From": "Harsh Prateek Bora <harshpb@linux.ibm.com>", "To": "qemu-devel@nongnu.org", "Cc": "Aditya Gupta <adityag@linux.ibm.com>,\n Hari Bathini <hbathini@linux.ibm.com>,\n Sourabh Jain <sourabhjain@linux.ibm.com>,\n Shivang Upadhyay <shivangu@linux.ibm.com>", "Subject": "[PULL 05/13] pnv/mpipl: Preserve CPU registers after crash", "Date": "Thu, 30 Apr 2026 00:02:55 +0530", "Message-ID": "<20260429183310.12455-6-harshpb@linux.ibm.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260429183310.12455-1-harshpb@linux.ibm.com>", "References": "<20260429183310.12455-1-harshpb@linux.ibm.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-TM-AS-GCONF": "00", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwNDI5MDE4NCBTYWx0ZWRfX6Oa8NWzDQvSS\n FopDKFo8noDmtCseUozec96FUHmM67RM3S/s2KHf8/ZGhcuyfxonnuBVHbR67vYnIlymhqwNzF+\n cGxNQDacXj+Cu0QbRLXS0CmRTZPg7YZCCxskxk3jijZ3X9QanpbsP5TtzjEM8rbE5r13tqUMyqo\n XA804iqwlQXMmrf9tC5akJtz/21qflfzEindRD+0g/z/MJHMldpTCZvO1H1o61JSLNwt2Frlmn0\n 1kAtbj1ROxoQ5OUCeyl9gS+Ab3UkLYL7rxOe4bUscNzQktj7bHijla5uU8uubXJ2k4C9b/rzUhb\n G1vRPYIOcm5fjVBFxPTYYk3CS28tHcgWGdOmGXAAL8A1SZ+vqQfbDw4evJ1dM7kFm5hb/toBfPF\n zoBhLUdNHNcPgN2zYrtyichFdCBJOdbfuSgnMMAMFjM4pYldxorwt5ZayL/zPaJLMQza3f4KeMQ\n CII8H4z6xQ6q7DSWc/Q==", "X-Proofpoint-GUID": "bjY2Lys3uhjxB1sRSOjIiQsz5bDPFg6W", "X-Proofpoint-ORIG-GUID": "bjY2Lys3uhjxB1sRSOjIiQsz5bDPFg6W", "X-Authority-Analysis": "v=2.4 cv=MohiLWae c=1 sm=1 tr=0 ts=69f24f0a cx=c_pps\n a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17\n a=A5OVakUREuEA:10 a=f7IdgyKtn90A:10 a=VkNPw1HP01LnGYTKEx00:22\n a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VwQbUJbxAAAA:8\n a=VnNF1IyMAAAA:8 a=758Tq7CB64zFO0BBSKcA:9", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-29_01,2026-04-28_01,2025-10-01_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n phishscore=0 adultscore=0 suspectscore=0 bulkscore=0 spamscore=0\n priorityscore=1501 malwarescore=0 clxscore=1015 lowpriorityscore=0\n impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc=\n route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000\n definitions=main-2604290184", "Received-SPF": "pass client-ip=148.163.158.5;\n envelope-from=harshpb@linux.ibm.com;\n helo=mx0b-001b2d01.pphosted.com", "X-Spam_score_int": "-26", "X-Spam_score": "-2.7", "X-Spam_bar": "--", "X-Spam_report": "(-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\n RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,\n 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.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Aditya Gupta <adityag@linux.ibm.com>\n\nKernel expects the platform to provide CPU registers after pausing\nexecution of the CPUs.\n\nCurrently only exporting the registers, used by Linux, for generating\nthe /proc/vmcore\n\nReviewed-by: Hari Bathini <hbathini@linux.ibm.com>\nReviewed-by: Sourabh Jain <sourabhjain@linux.ibm.com>\nSigned-off-by: Aditya Gupta <adityag@linux.ibm.com>\nTested-by: Shivang Upadhyay <shivangu@linux.ibm.com>\nLink: https://lore.kernel.org/qemu-devel/20260424083837.214947-6-adityag@linux.ibm.com\nSigned-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>\n---\n include/hw/ppc/pnv_mpipl.h | 60 +++++++++++++++\n hw/ppc/pnv_mpipl.c | 154 +++++++++++++++++++++++++++++++++++++\n 2 files changed, 214 insertions(+)", "diff": "diff --git a/include/hw/ppc/pnv_mpipl.h b/include/hw/ppc/pnv_mpipl.h\nindex b3d980dfef..aa2936caa7 100644\n--- a/include/hw/ppc/pnv_mpipl.h\n+++ b/include/hw/ppc/pnv_mpipl.h\n@@ -17,6 +17,10 @@\n typedef struct MdstTableEntry MdstTableEntry;\n typedef struct MdrtTableEntry MdrtTableEntry;\n typedef struct MpiplPreservedState MpiplPreservedState;\n+typedef struct MpiplRegDataHdr MpiplRegDataHdr;\n+typedef struct MpiplRegEntry MpiplRegEntry;\n+typedef struct MpiplProcDumpArea MpiplProcDumpArea;\n+typedef struct MpiplPreservedCPUState MpiplPreservedCPUState;\n \n /*\n * Following offsets are copied from skiboot source code.\n@@ -49,6 +53,8 @@ typedef struct MpiplPreservedState MpiplPreservedState;\n /* HRMOR_BIT copied from skiboot */\n #define HRMOR_BIT (1ull << 63)\n \n+#define NUM_REGS_PER_CPU 66 /*(32 GPRs, 34 SPRs)*/\n+\n /*\n * Memory Dump Source Table (MDST)\n *\n@@ -95,6 +101,55 @@ static_assert(MDST_MAX_ENTRIES == MDDT_MAX_ENTRIES,\n static_assert(MDRT_MAX_ENTRIES >= MDST_MAX_ENTRIES,\n \"MDRT should support atleast having number of entries as in MDST\");\n \n+/*\n+ * Processor Dump Area\n+ *\n+ * This contains the information needed for having processor\n+ * state captured during a platform dump.\n+ *\n+ * As mentioned in HDAT, following the P9 specific format\n+ */\n+struct MpiplProcDumpArea {\n+ uint32_t thread_size; /* Size of each thread register entry */\n+#define PROC_DUMP_AREA_VERSION_P9 0x1 /* P9 format */\n+ uint8_t version;\n+ uint8_t reserved[11];\n+ uint64_t alloc_addr; /* Destination memory to place register data */\n+ uint32_t reserved2;\n+ uint32_t alloc_size; /* Allocated size */\n+ uint64_t dest_addr; /* Destination address */\n+ uint32_t reserved3;\n+ uint32_t act_size; /* Actual data size */\n+} QEMU_PACKED;\n+\n+/*\n+ * \"Architected Register Data\" in the HDAT spec\n+ *\n+ * Acts as a header to the register entries for a particular thread\n+ */\n+struct MpiplRegDataHdr {\n+ uint32_t pir; /* PIR of thread */\n+ uint8_t core_state; /* Stop state of the overall core */\n+ uint8_t reserved[3];\n+ uint32_t off_regentries; /* Offset to Register Entries Array */\n+ uint32_t num_regentries; /* Number of Register Entries in Array */\n+ uint32_t alloc_size; /* Allocated size for each Register Entry */\n+ uint32_t act_size; /* Actual size for each Register Entry */\n+} QEMU_PACKED;\n+\n+struct MpiplRegEntry {\n+ uint32_t reg_type;\n+ uint32_t reg_num;\n+ uint64_t reg_val;\n+} QEMU_PACKED;\n+\n+struct MpiplPreservedCPUState {\n+ MpiplRegDataHdr hdr;\n+\n+ /* Length of 'reg_entries' is hdr.num_regentries */\n+ MpiplRegEntry reg_entries[NUM_REGS_PER_CPU];\n+};\n+\n /* Preserved state to be saved in PnvMachineState */\n struct MpiplPreservedState {\n /* skiboot_base will be valid only after OPAL sends relocated base to SBE */\n@@ -103,6 +158,11 @@ struct MpiplPreservedState {\n \n MdrtTableEntry *mdrt_table;\n uint32_t num_mdrt_entries;\n+\n+ MpiplProcDumpArea proc_area;\n+\n+ MpiplPreservedCPUState *cpu_states;\n+ uint32_t num_cpu_states;\n };\n \n #endif\ndiff --git a/hw/ppc/pnv_mpipl.c b/hw/ppc/pnv_mpipl.c\nindex cef1fe2c40..308948b829 100644\n--- a/hw/ppc/pnv_mpipl.c\n+++ b/hw/ppc/pnv_mpipl.c\n@@ -8,6 +8,9 @@\n #include \"qemu/log.h\"\n #include \"qemu/units.h\"\n #include \"system/address-spaces.h\"\n+#include \"system/cpus.h\"\n+#include \"system/hw_accel.h\"\n+#include \"system/memory.h\"\n #include \"system/runstate.h\"\n #include \"hw/ppc/pnv.h\"\n #include \"hw/ppc/pnv_mpipl.h\"\n@@ -17,6 +20,8 @@\n (pnv->mpipl_state.skiboot_base + MDST_TABLE_OFF)\n #define MDDT_TABLE_RELOCATED \\\n (pnv->mpipl_state.skiboot_base + MDDT_TABLE_OFF)\n+#define PROC_DUMP_RELOCATED \\\n+ (pnv->mpipl_state.skiboot_base + PROC_DUMP_AREA_OFF)\n \n /*\n * Preserve the memory regions as pointed by MDST table\n@@ -169,9 +174,158 @@ static bool pnv_mpipl_preserve_mem(PnvMachineState *pnv)\n return true;\n }\n \n+static void do_store_cpu_regs(CPUState *cpu, MpiplPreservedCPUState *state)\n+{\n+ CPUPPCState *env = cpu_env(cpu);\n+ MpiplRegDataHdr *regs_hdr = &state->hdr;\n+ MpiplRegEntry *reg_entries = state->reg_entries;\n+ MpiplRegEntry *curr_reg_entry;\n+ uint32_t num_saved_regs = 0;\n+\n+ cpu_synchronize_state(cpu);\n+\n+ regs_hdr->pir = cpu_to_be32(env->spr[SPR_PIR]);\n+\n+ /* QEMU CPUs are not in Power Saving Mode */\n+ regs_hdr->core_state = 0xff;\n+\n+ regs_hdr->off_regentries = 0;\n+ regs_hdr->num_regentries = cpu_to_be32(NUM_REGS_PER_CPU);\n+\n+ regs_hdr->alloc_size = cpu_to_be32(sizeof(MpiplRegEntry));\n+ regs_hdr->act_size = cpu_to_be32(sizeof(MpiplRegEntry));\n+\n+#define REG_TYPE_GPR 0x1\n+#define REG_TYPE_SPR 0x2\n+#define REG_TYPE_TIMA 0x3\n+\n+/*\n+ * ID numbers used by f/w while populating certain registers\n+ *\n+ * Copied these defines from the linux kernel\n+ */\n+#define REG_ID_NIP 0x7D0\n+#define REG_ID_MSR 0x7D1\n+#define REG_ID_CCR 0x7D2\n+\n+ curr_reg_entry = reg_entries;\n+\n+#define REG_ENTRY(type, num, val) \\\n+ do { \\\n+ curr_reg_entry->reg_type = cpu_to_be32(type); \\\n+ curr_reg_entry->reg_num = cpu_to_be32(num); \\\n+ curr_reg_entry->reg_val = cpu_to_be64(val); \\\n+ ++curr_reg_entry; \\\n+ ++num_saved_regs; \\\n+ } while (0)\n+\n+ /* Save the GPRs */\n+ for (int gpr_id = 0; gpr_id < 32; ++gpr_id) {\n+ REG_ENTRY(REG_TYPE_GPR, gpr_id, env->gpr[gpr_id]);\n+ }\n+\n+ REG_ENTRY(REG_TYPE_SPR, SPR_ACOP, env->spr[SPR_ACOP]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_AMR, env->spr[SPR_AMR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_BESCR, env->spr[SPR_BESCR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_CFAR, env->spr[SPR_CFAR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_CIABR, env->spr[SPR_CIABR]);\n+\n+ REG_ENTRY(REG_TYPE_SPR, SPR_CTR, env->spr[SPR_CTR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_CTRL, env->spr[SPR_CTRL]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DABR, env->spr[SPR_DABR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DABRX, env->spr[SPR_DABRX]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DAR, env->spr[SPR_DAR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DAWR0, env->spr[SPR_DAWR0]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DAWR1, env->spr[SPR_DAWR1]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DAWRX0, env->spr[SPR_DAWRX0]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DAWRX1, env->spr[SPR_DAWRX1]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DPDES, env->spr[SPR_DPDES]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DSCR, env->spr[SPR_DSCR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DSISR, env->spr[SPR_DSISR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_EBBHR, env->spr[SPR_EBBHR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_EBBRR, env->spr[SPR_EBBRR]);\n+\n+ REG_ENTRY(REG_TYPE_SPR, SPR_FSCR, env->spr[SPR_FSCR]);\n+\n+ REG_ENTRY(REG_TYPE_SPR, SPR_CTR, env->ctr);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DAR, env->spr[SPR_DAR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_DSISR, env->spr[SPR_DSISR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_LR, env->lr);\n+ REG_ENTRY(REG_TYPE_SPR, REG_ID_MSR, env->msr);\n+ REG_ENTRY(REG_TYPE_SPR, REG_ID_NIP, env->nip);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_XER, env->xer);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_SRR0, env->spr[SPR_SRR0]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_SRR1, env->spr[SPR_SRR1]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_HSRR0, env->spr[SPR_HSRR0]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_HSRR1, env->spr[SPR_HSRR1]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_CFAR, env->spr[SPR_CFAR]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_HMER, env->spr[SPR_HMER]);\n+ REG_ENTRY(REG_TYPE_SPR, SPR_HMEER, env->spr[SPR_HMEER]);\n+\n+ /*\n+ * Ensure the number of registers saved match the number of\n+ * registers per cpu\n+ *\n+ * This will help catch an error if in future a new register entry\n+ * is added/removed while not modifying NUM_PER_CPU_REGS\n+ */\n+ assert(num_saved_regs == NUM_REGS_PER_CPU);\n+}\n+\n+static bool pnv_mpipl_preserve_cpu_state(PnvMachineState *pnv)\n+{\n+ MachineState *machine = MACHINE(pnv);\n+ uint32_t num_cpus = machine->smp.cpus;\n+ MpiplPreservedCPUState *state;\n+ CPUState *cpu;\n+ AddressSpace *default_as = &address_space_memory;\n+ MemTxResult io_result;\n+ MemTxAttrs attrs;\n+\n+ /* Mark the memory transactions as privileged memory access */\n+ attrs.user = 0;\n+ attrs.memory = 1;\n+\n+ if (pnv->mpipl_state.cpu_states) {\n+ /*\n+ * CPU States might have been allocated from some past crash, free the\n+ * memory to preven memory leak\n+ */\n+ g_free(pnv->mpipl_state.cpu_states);\n+ pnv->mpipl_state.num_cpu_states = 0;\n+ }\n+\n+ pnv->mpipl_state.cpu_states = g_malloc_n(num_cpus,\n+ sizeof(MpiplPreservedCPUState));\n+ pnv->mpipl_state.num_cpu_states = num_cpus;\n+\n+ state = pnv->mpipl_state.cpu_states;\n+\n+ /* Preserve the Processor Dump Area */\n+ io_result = address_space_read(default_as, PROC_DUMP_RELOCATED, attrs,\n+ &pnv->mpipl_state.proc_area, sizeof(MpiplProcDumpArea));\n+ if (io_result != MEMTX_OK) {\n+ qemu_log_mask(LOG_GUEST_ERROR,\n+ \"MPIPL: Failed to read Proc Dump Area at: 0x\" TARGET_FMT_lx \"\\n\",\n+ PROC_DUMP_RELOCATED);\n+\n+ return false;\n+ }\n+\n+ CPU_FOREACH(cpu) {\n+ do_store_cpu_regs(cpu, state);\n+ ++state;\n+ }\n+\n+ return true;\n+}\n+\n void do_mpipl_preserve(PnvMachineState *pnv)\n {\n+ pause_all_vcpus();\n+\n pnv_mpipl_preserve_mem(pnv);\n+ pnv_mpipl_preserve_cpu_state(pnv);\n \n /* Mark next boot as Memory-preserving boot */\n pnv->mpipl_state.is_next_boot_mpipl = true;\n", "prefixes": [ "PULL", "05/13" ] }