From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B5852D5B84D for ; Mon, 15 Dec 2025 17:22:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVCGc-0006v9-RO; Mon, 15 Dec 2025 12:21:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVCGL-0006ld-TT; Mon, 15 Dec 2025 12:21:40 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVCGK-0003vy-1n; Mon, 15 Dec 2025 12:21:33 -0500 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5BFC7aIp011152; Mon, 15 Dec 2025 17:21:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=/ftLAy I6CyN+34TyaNK5bk6/1D8ZtJ4pQSLcPl4JsCk=; b=hXPN1CnnibUDr1BgQqV/M0 jixqEb2FlTVGUIPrQ6jujL6owXoei9Oy7l4s+BsPG+J0N539zkY7zNX4Fbew+y/W jdJekHH5zTcyOJYrCoC+2chzLSuk6swLsr8n7ZRtLhhqMf/ee95mBkKLPUA2lFzV eKcpYUtmeDeztjUoj++pLuvJoYWy3stg+tX93II1Tk/+N7JveiJ+XufHtVrR0v5z 9e5Eys1oRPUaUIB5IezqNva6l8+jVY/a+l7YSgUmYHcGkorAOb0xSd0KZEWDuHXr tStQNHqqi1G1B00n0QWv6pdQ7cc1/5kWxbGnvNY73Bhpjj4SW0ADLUrd8hElMfzA == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4b0yn8b6g3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 15 Dec 2025 17:21:30 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 5BFHLT4R030391; Mon, 15 Dec 2025 17:21:29 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4b0yn8b6g1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 15 Dec 2025 17:21:29 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5BFG67uk014344; Mon, 15 Dec 2025 17:21:28 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4b1mpjqcus-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 15 Dec 2025 17:21:28 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5BFHLRcp30212774 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 15 Dec 2025 17:21:28 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E0BE658059; Mon, 15 Dec 2025 17:21:27 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9542D58058; Mon, 15 Dec 2025 17:21:27 +0000 (GMT) Received: from [9.10.80.79] (unknown [9.10.80.79]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 15 Dec 2025 17:21:27 +0000 (GMT) Message-ID: <8f99989c-7922-4e7c-81e0-1704d72de8a3@linux.ibm.com> Date: Mon, 15 Dec 2025 11:21:27 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] pnv/psi: Add VMSTATE information to PnvPsi To: milesg@linux.ibm.com, qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, adityag@linux.ibm.com, npiggin@gmail.com, kowal@linux.ibm.com References: <20251211170012.2220477-1-calebs@linux.ibm.com> <7f76d2e8b1a1d6fda09806882bd2ad354840271a.camel@linux.ibm.com> Content-Language: en-US From: Caleb Schlossin In-Reply-To: <7f76d2e8b1a1d6fda09806882bd2ad354840271a.camel@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjEzMDAxOCBTYWx0ZWRfX5RTQ6kJLAohv ntV8I7U+U0QfxQXVW0r01afwai9pkvXUaOlSTCG/BDHPpzG+FYA4SLwJd1fyGSimT+fx/Ll6Ht3 WC3AcFRHpnxBsltl2E1O8C/eh81Z4oK4h7yxTHdMbGDML8wnNxFFo5gUkn4xMozIHL7rOwNcEdN cMH8pi75gGfOUC9J4Ke6j1SZdub+4Cskes0thIcHBvnawwsIEvexIlbi2U0KLYBy24ZNkTWJc/5 WX1EmXsDP8KPr0pkwi4KZb3eJ7D+OnMZGPV3EREgHtcOWe1E+ADpbbM5/Wya+01Oqya8fEHo4rc gSUkS4WUOa7fd6i7uBEZEg+U9cXIGXNOoSdh0nAMUfawBOzgqcWXB+ZsK2OdIprglGVYIO+V3br pGg1fW+UEImYbWODgswDWrrktodqNQ== X-Proofpoint-GUID: ma-kQH_hA48oBQwjl1Y3KZtLDeVMzAi0 X-Proofpoint-ORIG-GUID: pFD8Yiv6P4WuiemHol4SY1XwMgk40zqM X-Authority-Analysis: v=2.4 cv=LbYxKzfi c=1 sm=1 tr=0 ts=6940439a cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=eDkLXcaQSEDiTH1ZAsEA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-15_04,2025-12-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2512130018 Received-SPF: pass client-ip=148.163.156.1; envelope-from=calebs@linux.ibm.com; helo=mx0a-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, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 12/12/25 11:05 AM, Miles Glenn wrote: > Caleb, why not add this commit to your other submission of patches > titled "Snapshot support for several ppc devices"? > > -Glenn PSI vmstate support commit now included with the second patch set here: https://lore.kernel.org/qemu-devel/20251215171813.1670241-1-calebs@linux.ibm.com/T/#t > > On Thu, 2025-12-11 at 11:00 -0600, Caleb Schlossin wrote: >> PnvPsi needs to be able to save/load snapshots. Add VMSTATE information >> to the device class and a post_load() method to restore dynamic data items and >> memory region mappings. >> >> Signed-off-by: Michael Kowal >> Signed-off-by: Caleb Schlossin >> --- >> hw/ppc/pnv_psi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- >> 1 file changed, 44 insertions(+), 2 deletions(-) >> >> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c >> index 5d947d8b52..88d5f1d45d 100644 >> --- a/hw/ppc/pnv_psi.c >> +++ b/hw/ppc/pnv_psi.c >> @@ -25,6 +25,7 @@ >> #include "qemu/module.h" >> #include "system/reset.h" >> #include "qapi/error.h" >> +#include "migration/vmstate.h" >> >> >> #include "hw/ppc/fdt.h" >> @@ -35,6 +36,8 @@ >> >> #include >> >> +#undef PSI_DEBUG >> + >> #define PSIHB_XSCOM_FIR_RW 0x00 >> #define PSIHB_XSCOM_FIR_AND 0x01 >> #define PSIHB_XSCOM_FIR_OR 0x02 >> @@ -130,12 +133,11 @@ static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar) >> { >> PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi); >> MemoryRegion *sysmem = get_system_memory(); >> - uint64_t old = psi->regs[PSIHB_XSCOM_BAR]; >> >> psi->regs[PSIHB_XSCOM_BAR] = bar & (ppc->bar_mask | PSIHB_BAR_EN); >> >> /* Update MR, always remove it first */ >> - if (old & PSIHB_BAR_EN) { >> + if (memory_region_is_mapped(&psi->regs_mr)) { >> memory_region_del_subregion(sysmem, &psi->regs_mr); >> } >> >> @@ -975,6 +977,40 @@ static void pnv_psi_register_types(void) >> >> type_init(pnv_psi_register_types); >> >> +#ifdef PSI_DEBUG >> +static void psi_regs_pic_print_info(uint64_t *regs, uint32_t nr_regs, >> + GString *buf) { >> + uint i, prev_idx = -1; >> + uint64_t reg1, prev_reg1 = -1; >> + uint64_t reg2, prev_reg2 = -1; >> + uint64_t reg3, prev_reg3 = -1; >> + uint64_t reg4, prev_reg4 = -1; >> + for (i = 0; i < nr_regs; i = i + 4) { >> + /* Don't print if values do not change, but print last*/ >> + reg1 = regs[i]; >> + reg2 = regs[i + 1]; >> + reg3 = regs[i + 2]; >> + reg4 = regs[i + 3]; >> + if (reg1 == prev_reg1 && reg2 == prev_reg2 && >> + reg3 == prev_reg3 && reg4 == prev_reg4 && >> + i < (nr_regs - 4)) { >> + if (i == (prev_idx + 4)) { >> + g_string_append_printf(buf, " . . .\n"); >> + } >> + continue; >> + } >> + >> + g_string_append_printf(buf, " [%03X] 0x%016lX %016lX %016lX %016lX\n", >> + i, reg1, reg2, reg3, reg4); >> + prev_idx = i; >> + prev_reg1 = reg1; >> + prev_reg2 = reg2; >> + prev_reg3 = reg3; >> + prev_reg4 = reg4; >> + } >> +} >> +#endif >> + >> void pnv_psi_pic_print_info(Pnv9Psi *psi9, GString *buf) >> { >> PnvPsi *psi = PNV_PSI(psi9); >> @@ -985,4 +1021,10 @@ void pnv_psi_pic_print_info(Pnv9Psi *psi9, GString *buf) >> g_string_append_printf(buf, "PSIHB Source %08x .. %08x\n", >> offset, offset + psi9->source.nr_irqs - 1); >> xive_source_pic_print_info(&psi9->source, offset, buf); >> +#ifdef PSI_DEBUG >> + /* Print PSI registers */ >> + g_string_append_printf(buf, "\nPSI Regs[0x0..%X]\n", >> + PSIHB_XSCOM_MAX); >> + psi_regs_pic_print_info(psi->regs, PSIHB_XSCOM_MAX, buf); >> +#endif >> } >