From nobody Mon Feb 9 10:21:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619215249; cv=none; d=zohomail.com; s=zohoarc; b=ScbDRlcqXv4wvWaj4Uxn0whn5/zITL3L/K9mv3JffJI7sOEwjij+E4GMWjvgOmQcObtiAUefn9VNIfpo7akGPbIKcXq6ZaDSPOi8qL4x3AoTIGND+xp880MygB3k2r3Ic5AdcjSK37dzI/ofVYvfY0gWLYYOSRKW/irmnXNmbI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619215249; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=Fyn3KNII6Egm37YRmwnOsVfd4X2acBHqZaOhuueFACk=; b=Jc3hAxpWqnTUo79AVHq1cYrK3S/2KhGlzAXvVE8uIxeC+jPG25eZNvjoTpR8yRql+QtprW1wEQ8N7L7kTAVYlLHp5U+KemIwygdPZYVqzjqpPHgn5+qeAhnCmtRfMiGMBhgd7TQMiVz/o2HvfiXNuKxYCa372WKGbkhYpTq7A3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1619215249241849.1348245241754; Fri, 23 Apr 2021 15:00:49 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id p6so43046641wrn.9 for ; Fri, 23 Apr 2021 15:00:48 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id q18sm10491667wrs.25.2021.04.23.15.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 15:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Fyn3KNII6Egm37YRmwnOsVfd4X2acBHqZaOhuueFACk=; b=ikTqYjmHMxm7gmt3WfSIDkvwl04c00jVYf/niOG0i55mjKnQhQNhhqyImPqdeJZGHs fokYZBHI93JSnEJlFU6AW4HxCJbuwc2LWhRKpcWH710kKQUxQvwNn2R12ZsUIv6MrvyL dyCisGUw7KT5DWqqsMfSSwHLmnvh8s4jY2NU4wafcYEPDdn3XHrSV17W3ZR8eSwjssD1 C7yFunO0sdbrknevUuS8Z7HN08XM5wdC8ToNO1zmQQSvQfCA+5gE2duphJ3NhG0ncjXC CtJh5oSlM2Zo8k2yjtRGo+YKiQHbAAsI271WF4KFJn3uc5l7dNd51IMrBMoeoWm07JS1 +n+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Fyn3KNII6Egm37YRmwnOsVfd4X2acBHqZaOhuueFACk=; b=LnSpkHtH8qxWVUOoLZNdtg1y05FGXSyJ8p+1kaNLDMoz4SOcH7RsNpuIFPbQOu8Lui Cm24sTzx+n9TTqYuvYQEnz1vsGrHcs4+oX0UwHesfgL9GDu7Y9XAji/gWL2rlnGewuF2 RAQZRnTnJ63Z7+8Lx3yCu6KOo/rRCMdrq3dcXVaSXprKu0QNaIBpZ6x2Y9wKUJSDdTJu LhJH4kqqyQV5fn3gHGwdpDQVIQalpvU1G4XIzo8c/VOs6GxDCOZLou7fxxt2PTnUhduP xsqv691ypYiIxHH8EcchfMzqoE2N5FOJcvdXw8fAIIINQmyM/WnB0jJAJdyYT9QrN0nI 7Q3w== X-Gm-Message-State: AOAM530ZGhLMRaQEcs+Yzd9JssWrd6Pn8JHWbEnD0PqxDQ14MrXLpQ59 szRiRNRARjlmWhRj9ghaS9E= X-Google-Smtp-Source: ABdhPJz8hj2C2f7tZK9Y5Zg6GJBAVTXqdpOJAIza7AJ8eDVaFl4fTu7ZxobV5DsFp3bWukaljkzS8g== X-Received: by 2002:adf:a119:: with SMTP id o25mr7058888wro.36.1619215247430; Fri, 23 Apr 2021 15:00:47 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Vince Del Vecchio , Fredrik Noring , Richard Henderson , Petar Jovanovic , Filip Vidojevic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Craig Janeczek , Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang Subject: [PATCH] target/mips: Migrate missing CPU fields Date: Sat, 24 Apr 2021 00:00:44 +0200 Message-Id: <20210423220044.3004195-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add various missing fields to the CPU migration vmstate: - CP0_VPControl & CP0_GlobalNumber (01bc435b44b 2016-02-03) - CMGCRBase (c870e3f52ca 2016-03-15) - CP0_ErrCtl (0d74a222c27 2016-03-25) - MXU GPR[] & CR (eb5559f67dc 2018-10-18) - R5900 128-bit upper half (a168a796e1c 2019-01-17) This is a migration break. Fixes: 01bc435b44b ("target-mips: implement R6 multi-threading") Fixes: c870e3f52ca ("target-mips: add CMGCRBase register") Fixes: 0d74a222c27 ("target-mips: make ITC Configuration Tags accessible to= the CPU") Fixes: eb5559f67dc ("target/mips: Introduce MXU registers") Fixes: a168a796e1c ("target/mips: Introduce 32 R5900 multimedia registers") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard Henderson --- target/mips/machine.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/target/mips/machine.c b/target/mips/machine.c index b5fda6a2786..80d37f9c2fc 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -81,6 +81,9 @@ const VMStateDescription vmstate_inactive_fpu =3D { =20 static VMStateField vmstate_tc_fields[] =3D { VMSTATE_UINTTL_ARRAY(gpr, TCState, 32), +#if defined(TARGET_MIPS64) + VMSTATE_UINT64_ARRAY(gpr_hi, TCState, 32), +#endif /* TARGET_MIPS64 */ VMSTATE_UINTTL(PC, TCState), VMSTATE_UINTTL_ARRAY(HI, TCState, MIPS_DSP_ACC), VMSTATE_UINTTL_ARRAY(LO, TCState, MIPS_DSP_ACC), @@ -95,20 +98,22 @@ static VMStateField vmstate_tc_fields[] =3D { VMSTATE_INT32(CP0_Debug_tcstatus, TCState), VMSTATE_UINTTL(CP0_UserLocal, TCState), VMSTATE_INT32(msacsr, TCState), + VMSTATE_UINTTL_ARRAY(mxu_gpr, TCState, NUMBER_OF_MXU_REGISTERS - 1), + VMSTATE_UINTTL(mxu_cr, TCState), VMSTATE_END_OF_LIST() }; =20 const VMStateDescription vmstate_tc =3D { .name =3D "cpu/tc", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .fields =3D vmstate_tc_fields }; =20 const VMStateDescription vmstate_inactive_tc =3D { .name =3D "cpu/inactive_tc", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .fields =3D vmstate_tc_fields }; =20 @@ -213,8 +218,8 @@ const VMStateDescription vmstate_tlb =3D { =20 const VMStateDescription vmstate_mips_cpu =3D { .name =3D "cpu", - .version_id =3D 20, - .minimum_version_id =3D 20, + .version_id =3D 21, + .minimum_version_id =3D 21, .post_load =3D cpu_post_load, .fields =3D (VMStateField[]) { /* Active TC */ @@ -241,6 +246,7 @@ const VMStateDescription vmstate_mips_cpu =3D { =20 /* Remaining CP0 registers */ VMSTATE_INT32(env.CP0_Index, MIPSCPU), + VMSTATE_INT32(env.CP0_VPControl, MIPSCPU), VMSTATE_INT32(env.CP0_Random, MIPSCPU), VMSTATE_INT32(env.CP0_VPEControl, MIPSCPU), VMSTATE_INT32(env.CP0_VPEConf0, MIPSCPU), @@ -251,6 +257,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_INT32(env.CP0_VPEOpt, MIPSCPU), VMSTATE_UINT64(env.CP0_EntryLo0, MIPSCPU), VMSTATE_UINT64(env.CP0_EntryLo1, MIPSCPU), + VMSTATE_INT32(env.CP0_GlobalNumber, MIPSCPU), VMSTATE_UINTTL(env.CP0_Context, MIPSCPU), VMSTATE_INT32(env.CP0_MemoryMapID, MIPSCPU), VMSTATE_INT32(env.CP0_PageMask, MIPSCPU), @@ -286,6 +293,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_UINTTL(env.CP0_EPC, MIPSCPU), VMSTATE_INT32(env.CP0_PRid, MIPSCPU), VMSTATE_UINTTL(env.CP0_EBase, MIPSCPU), + VMSTATE_UINTTL(env.CP0_CMGCRBase, MIPSCPU), VMSTATE_INT32(env.CP0_Config0, MIPSCPU), VMSTATE_INT32(env.CP0_Config1, MIPSCPU), VMSTATE_INT32(env.CP0_Config2, MIPSCPU), @@ -305,6 +313,7 @@ const VMStateDescription vmstate_mips_cpu =3D { VMSTATE_INT32(env.CP0_Debug, MIPSCPU), VMSTATE_UINTTL(env.CP0_DEPC, MIPSCPU), VMSTATE_INT32(env.CP0_Performance0, MIPSCPU), + VMSTATE_INT32(env.CP0_ErrCtl, MIPSCPU), VMSTATE_UINT64(env.CP0_TagLo, MIPSCPU), VMSTATE_INT32(env.CP0_DataLo, MIPSCPU), VMSTATE_INT32(env.CP0_TagHi, MIPSCPU), --=20 2.26.3