From nobody Mon Feb 9 23:40:08 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1565354987; cv=none; d=zoho.com; s=zohoarc; b=fuoa4IzDXGtVKEDhj9ZjUN6fQZG8CVEGT5X90a2LT8mrvzq/BfwmFFg/DMlCELBIfY1f4+k4h+a4DUjathAZU8LvIcqpv2KAUW3+AlOBmEjyVs6in4Si5oocy8UAzP1wm2D1dflMcTKOZWXW3fgiUr+EMzcyweKklFfCnTWfirQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565354987; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=YJilDuLouktCS+w5DttTBPD8j7upoBu/Wyfkh7i/Vk4=; b=KH4TICf1Chv9oc2HOsmhBTXWDNEpUluoQ2y2DOy569a+ZhSJxkeVZlcqIPgBHEjjSZATmrodBCT8EDZNW8pGsbhmPWO5MjPt0YLXtAqrm3Lp661DUz2BdBcjLh/PLkjCOc0F1QkWvzMvfENazre5gUU3Gg+i4gKAPq0J6vrD/co= ARC-Authentication-Results: i=1; mx.zoho.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 1565354987581813.5500824677204; Fri, 9 Aug 2019 05:49:47 -0700 (PDT) Received: from localhost ([::1]:59030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw4L4-0003bH-K8 for importer@patchew.org; Fri, 09 Aug 2019 08:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52822) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw4Jo-0001kA-II for qemu-devel@nongnu.org; Fri, 09 Aug 2019 08:48:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw4Jm-000188-Qy for qemu-devel@nongnu.org; Fri, 09 Aug 2019 08:48:28 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:52422 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hw4Jm-00017g-KP for qemu-devel@nongnu.org; Fri, 09 Aug 2019 08:48:26 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 8BEEC1A209A; Fri, 9 Aug 2019 14:48:24 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.13.43]) by mail.rt-rk.com (Postfix) with ESMTPSA id 702FF1A1E6F; Fri, 9 Aug 2019 14:48:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Date: Fri, 9 Aug 2019 14:46:36 +0200 Message-Id: <1565354819-1495-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565354819-1495-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1565354819-1495-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH for 4.2 v7 03/26] target/mips: Amend CP0 MemoryMapID register implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arikalo@wavecomp.com, Yongbok Kim , philmd@redhat.com, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yongbok Kim Add migration support and fix preprocessor constant name for MemoryMapID register. Signed-off-by: Yongbok Kim Signed-off-by: Aleksandar Markovic --- target/mips/cpu.h | 2 +- target/mips/machine.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 6406ba8..eda8350 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -290,7 +290,7 @@ typedef struct mips_def_t mips_def_t; #define CP0_REG04__CONTEXT 0 #define CP0_REG04__USERLOCAL 2 #define CP0_REG04__DBGCONTEXTID 4 -#define CP0_REG00__MMID 5 +#define CP0_REG04__MEMORYMAPID 5 /* CP0 Register 05 */ #define CP0_REG05__PAGEMASK 0 #define CP0_REG05__PAGEGRAIN 1 diff --git a/target/mips/machine.c b/target/mips/machine.c index c3e52f8..e23b767 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -137,6 +137,7 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size, qemu_get_betls(f, &v->VPN); qemu_get_be32s(f, &v->PageMask); qemu_get_be16s(f, &v->ASID); + qemu_get_be32s(f, &v->MMID); qemu_get_be16s(f, &flags); v->G =3D (flags >> 10) & 1; v->C0 =3D (flags >> 7) & 3; @@ -162,6 +163,7 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, r4k_tlb_t *v =3D pv; =20 uint16_t asid =3D v->ASID; + uint32_t mmid =3D v->MMID; uint16_t flags =3D ((v->EHINV << 15) | (v->RI1 << 14) | (v->RI0 << 13) | @@ -178,6 +180,7 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, qemu_put_betls(f, &v->VPN); qemu_put_be32s(f, &v->PageMask); qemu_put_be16s(f, &asid); + qemu_put_be32s(f, &mmid); qemu_put_be16s(f, &flags); qemu_put_be64s(f, &v->PFN[0]); qemu_put_be64s(f, &v->PFN[1]); @@ -199,8 +202,8 @@ const VMStateInfo vmstate_info_tlb =3D { =20 const VMStateDescription vmstate_tlb =3D { .name =3D "cpu/tlb", - .version_id =3D 2, - .minimum_version_id =3D 2, + .version_id =3D 3, + .minimum_version_id =3D 3, .fields =3D (VMStateField[]) { VMSTATE_UINT32(nb_tlb, CPUMIPSTLBContext), VMSTATE_UINT32(tlb_in_use, CPUMIPSTLBContext), --=20 2.7.4