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 5ADDAC79FA3 for ; Mon, 5 Jan 2026 16:11:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vcn3R-0005fq-25; Mon, 05 Jan 2026 11:03:38 -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 1vcn2A-00052J-1a; Mon, 05 Jan 2026 11:02:31 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vcn22-0001Ik-KK; Mon, 05 Jan 2026 11:02:13 -0500 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 605CRs8l029415; Mon, 5 Jan 2026 16:02:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=hJ51RG39gGgoaCYgj 0262/k/3ZkvDgSNgVSxBUs/jak=; b=nocWy1+WXtDrZiuIL3RPJ9KEXXcokJ/u+ 9wtE+aNLBVHWrutWHsDYfMXLDHEXfxZE11AoAYhYpi3BakLNR3CrftYVxlNr/GuV qDTrL76GX45c2Nw4bPEghSVixRWzCMkW6F3StwfA24swEQzEnjNGyCBZB5IAgN0a DBI55ZrI8sKrYrshSzf/yneeVp2h5rt8sq6CuZvR1BbKTXd6s9EsxJFlNZYB84OU 7xTKvrW/UsJPSqv4sjg0BcOV2pR7Qkrz3WyZ1F7iIaHZmF+TAUYUhg84+qQh502R C3D5Ddv6WbObzRWBBLs/67+GBb21Xsq9EmmXM6imxEodCVsvv0LwQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4besheqgyk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Jan 2026 16:02:01 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 605Fx7h3021785; Mon, 5 Jan 2026 16:02:00 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 4besheqgyf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Jan 2026 16:02:00 +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 605F1Dpr012536; Mon, 5 Jan 2026 16:01:59 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([172.16.1.7]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4bffnj6evg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 05 Jan 2026 16:01:59 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 605G1wqk49938922 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 5 Jan 2026 16:01:59 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B5EAF5805A; Mon, 5 Jan 2026 16:01:58 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D703058054; Mon, 5 Jan 2026 16:01:57 +0000 (GMT) Received: from gfwr532.rchland.ibm.com (unknown [9.10.239.133]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 5 Jan 2026 16:01:57 +0000 (GMT) From: Caleb Schlossin To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, npiggin@gmail.com, adityag@linux.ibm.com, milesg@linux.ibm.com, alistair@alistair23.me, chalapathi.v@linux.ibm.com, kowal@linux.ibm.com, angeloj@linux.ibm.com, harshpb@linux.ibm.com, calebs@linux.ibm.com Subject: [PATCH v4 6/7] hw/ppc: pnv_chiptod.c add vmstate support Date: Mon, 5 Jan 2026 10:01:37 -0600 Message-ID: <20260105160138.3242709-7-calebs@linux.ibm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260105160138.3242709-1-calebs@linux.ibm.com> References: <20260105160138.3242709-1-calebs@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTA1MDEzOCBTYWx0ZWRfX7DDy6IxXDjWF eYyrTlnakCLHlyZ0+InEB9nVG9fEkzkdf054FUa7I0gnr2vRRfx/cnJk3BtEhg5putlqabUjcTm hjjQ42/u4YshT7+ei3O5yoeKYTimcnNB4xSOdhMj8iB29GSDAV5MIQ7y6mFie6n+/eR9Gi/Ukir Jhe1qYvKmJJxBgk743ANLCA0MspBqSCs7b7Do7/VYJQCbbtFsmgnF2h1KObGPP9lp9i25uE6jwY VGdzmxw4ubByRc6HokeSNMGLns4xkEdnls2iF3dNCw9ueqvlScFG4FRWRuTfIO6HZuQ9SmBKvaG 9GkKtod9ZFoZO8e7T8mRbaZf0vOSBJr6236Zp6/+958ZAcFX60lIqnc0r2I7YdPqQK+CgpOm3Yp Fr9G/yf2XiyqMujBUU39/hJA4QyNQlo7o3zaPezN14G1bRM99NKZnZHxOf05aWfgjEmRCu9SpoY erbQuT/N8Tq9EjVypuw== X-Proofpoint-GUID: LeggJpSJdxntsojQvL7lInPQa8Sq6Bhz X-Proofpoint-ORIG-GUID: aojQD99FGA4akIRzi3vYfwzPh7gjUelB X-Authority-Analysis: v=2.4 cv=AOkvhdoa c=1 sm=1 tr=0 ts=695be079 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=aOXUxLJ6JlOQ0ORGhkoA:9 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=2026-01-05_01,2026-01-05_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 impostorscore=0 clxscore=1015 suspectscore=0 bulkscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2512120000 definitions=main-2601050138 Received-SPF: pass client-ip=148.163.158.5; envelope-from=calebs@linux.ibm.com; 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, 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 - Added pre_save and post_load methods to handle slave_pc_target and tod_state Signed-off-by: Angelo Jaramillo Reviewed-by: Michael Kowal Signed-off-by: Caleb Schlossin --- hw/ppc/pnv_chiptod.c | 38 ++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv_chiptod.h | 2 ++ 2 files changed, 40 insertions(+) diff --git a/hw/ppc/pnv_chiptod.c b/hw/ppc/pnv_chiptod.c index 09a5a52ac7..bcf9b615a4 100644 --- a/hw/ppc/pnv_chiptod.c +++ b/hw/ppc/pnv_chiptod.c @@ -37,6 +37,7 @@ #include "hw/ppc/pnv_core.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_chiptod.h" +#include "migration/vmstate.h" #include "trace.h" #include @@ -341,6 +342,8 @@ static void pnv_chiptod_xscom_write(void *opaque, hwaddr addr, " TOD_TX_TTYPE_CTRL_REG val 0x%" PRIx64 " invalid slave address\n", val); } + /* Write slave_pc_target to a uint64_t variable for vmstate support. */ + chiptod->tx_ttype_ctrl = val; break; case TOD_ERROR_REG: chiptod->tod_error &= ~val; @@ -613,6 +616,40 @@ static void pnv_chiptod_unrealize(DeviceState *dev) qemu_unregister_reset(pnv_chiptod_reset, chiptod); } +static int vmstate_pnv_chiptod_pre_save(void *opaque) +{ + PnvChipTOD *chiptod = PNV_CHIPTOD(opaque); + chiptod->tod_state_val = (uint8_t)chiptod->tod_state; + return 0; +} + +static int vmstate_pnv_chiptod_post_load(void *opaque) +{ + PnvChipTOD *chiptod = PNV_CHIPTOD(opaque); + if (chiptod->tx_ttype_ctrl != 0) { + pnv_chiptod_xscom_write(chiptod, TOD_TX_TTYPE_CTRL_REG << 3, + chiptod->tx_ttype_ctrl, 8); + } + chiptod->tod_state = (enum tod_state)chiptod->tod_state_val; + return 0; +} + +static const VMStateDescription pnv_chiptod_vmstate = { + .name = TYPE_PNV_CHIPTOD, + .version_id = 1, + .pre_save = vmstate_pnv_chiptod_pre_save, + .pre_load = vmstate_pnv_chiptod_post_load, + .fields = (const VMStateField[]) { + VMSTATE_BOOL(primary, PnvChipTOD), + VMSTATE_BOOL(secondary, PnvChipTOD), + VMSTATE_UINT64(tod_error, PnvChipTOD), + VMSTATE_UINT64(pss_mss_ctrl_reg, PnvChipTOD), + VMSTATE_UINT64(tx_ttype_ctrl, PnvChipTOD), + VMSTATE_UINT8(tod_state_val, PnvChipTOD), + VMSTATE_END_OF_LIST(), + }, +}; + static void pnv_chiptod_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -621,6 +658,7 @@ static void pnv_chiptod_class_init(ObjectClass *klass, const void *data) dc->unrealize = pnv_chiptod_unrealize; dc->desc = "PowerNV ChipTOD Controller"; dc->user_creatable = false; + dc->vmsd = &pnv_chiptod_vmstate; } static const TypeInfo pnv_chiptod_type_info = { diff --git a/include/hw/ppc/pnv_chiptod.h b/include/hw/ppc/pnv_chiptod.h index 466b06560a..3e5e3b02b2 100644 --- a/include/hw/ppc/pnv_chiptod.h +++ b/include/hw/ppc/pnv_chiptod.h @@ -41,6 +41,8 @@ struct PnvChipTOD { uint64_t tod_error; uint64_t pss_mss_ctrl_reg; PnvCore *slave_pc_target; + uint64_t tx_ttype_ctrl; + uint8_t tod_state_val; }; struct PnvChipTODClass { -- 2.47.3