From patchwork Fri Oct 18 13:18:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Rakic X-Patchwork-Id: 13841749 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 A84C6D30007 for ; Fri, 18 Oct 2024 13:19:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1mt8-0008LZ-MJ; Fri, 18 Oct 2024 09:19:30 -0400 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 1t1mt7-0008LQ-Bl for qemu-devel@nongnu.org; Fri, 18 Oct 2024 09:19:29 -0400 Received: from mail-db8eur05on2072a.outbound.protection.outlook.com ([2a01:111:f403:2614::72a] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1mt4-0005an-Px for qemu-devel@nongnu.org; Fri, 18 Oct 2024 09:19:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yDa/Z4LVPHfoZx2oebpbJhsgR/8CSdvZaHYASq3FfziCh9CaioA9nU/k+OSurNgbOaWiOybmxQ0HtJBbz8cGa/1IH+hFxXKHAvkjR7wOSLESC7/EHVv7cvjPCytqQZlwhQAJHLGQqfN7p0qRSCrLO4VO1tz36xDcIHOivHOZAsaoNSeV0sEoZQNNBhVlP73reKCQ2g0ybqca0g6zur5O8GxJMK6qzkm523kuz40GtIT6uQpORG73LPXVkLjfJWsVm3cSZrq5O+ZjAms6H+zjvZynpTW7tqYCgzDLN8jCBCWLhmi7w0euKZzAZuN/u/FtHFqb7njNXk2jaqzD9ISCOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BEmKwWCGcmpH14NswYF3OEdWGiRmw06OjqX/pb8ejko=; b=XLW3AOHv2de47C2pbs4rDJxXX9ZhR/hNOEAu0CGPiHdLWbB2IlIve28XOrIGF2HQNo3TnGH03tgBuxS81RIpvutPS4FunVKNeoStLl0K704dA0AZPtSk9cOEIKiVuv01mS282xF7dj311MX2mv38xU9WI3jCNIianh1Vhknbo3IkQ2051YafLJyCR58kfC53JDFEg9RkagOhyd5GVjUQHl2ktU80rDs59MgkdL6qiyWBV2DShWAAfVnNWuLPfsW6vICYBL23UuEf0hvsYL4IA9j3Q0J31AUiPhCHYgx561a2CdUITkq36/Vfmr6bb9eTR9zS+FI4W6iznNUHkE0zgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=htecgroup.com; dmarc=pass action=none header.from=htecgroup.com; dkim=pass header.d=htecgroup.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=htecgroup.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BEmKwWCGcmpH14NswYF3OEdWGiRmw06OjqX/pb8ejko=; b=VhKzAEiHNx8XfLviQJkZ5zLPYp8loD2jzPMyfCtv+7ZBawIet7QKIOvp1NS8EGhO7HAvvc/VmDhPGXcZiVzrEQyFrkv2QlPQoigeWc6c+K9xZIFRzjHzAUpfKYVkGDA9x5pVBtiXJiv1i1/idgb/O9+1UAT6dm7WaEY0t8yUahHQCWZkvuqac6icxRdY0T17TvWvB9PfT0WNBB1d198KuRiDkt/FQELoFCOsQtMnCr2BCDwOtukgV0wkuAbzdlHcNCIYOWiRCJKM5rTlw/6KBoXrvJd+GQa4qAB4UW3WBKYHtd0Y86+QQ4sojjUrt1CJFFzZTyV0LEL5GTGWHDiZDg== Received: from AM9PR09MB4851.eurprd09.prod.outlook.com (2603:10a6:20b:2d4::13) by DU0PR09MB6298.eurprd09.prod.outlook.com (2603:10a6:10:415::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.22; Fri, 18 Oct 2024 13:18:46 +0000 Received: from AM9PR09MB4851.eurprd09.prod.outlook.com ([fe80::2fed:370:dd45:13a2]) by AM9PR09MB4851.eurprd09.prod.outlook.com ([fe80::2fed:370:dd45:13a2%6]) with mapi id 15.20.8069.020; Fri, 18 Oct 2024 13:18:46 +0000 From: Aleksandar Rakic To: "qemu-devel@nongnu.org" CC: Djordje Todorovic , "cfu@mips.com" , "arikalo@gmail.com" , "peter.maydell@linaro.org" Subject: [PATCH v2 1/8] Add CP0 MemoryMapID register implementation Thread-Topic: [PATCH v2 1/8] Add CP0 MemoryMapID register implementation Thread-Index: AQHbIVwvyUJ3qMyeD0CUTzhAqgeeqA== Date: Fri, 18 Oct 2024 13:18:45 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=htecgroup.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM9PR09MB4851:EE_|DU0PR09MB6298:EE_ x-ms-office365-filtering-correlation-id: cbce13e8-c90a-4125-e8a9-08dcef776521 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|376014|1800799024|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?nXSmvegtG+lDBimP5TjsAZUung?= =?iso-8859-1?q?wHun7xuSxc5pDj2V2wrxYB0SXFM70hi3tOnChcL5TPp4yUDoAs7TSITVxX4C?= =?iso-8859-1?q?MWXRd/tpb9mdf4h6o8kz7JaCjYvl1fKCZ1UH/eFsQzNjMFceydck/V3coMjV?= =?iso-8859-1?q?K2HPbqacvGoHkxH1u1DSdc2+VrDGg+VghITu+Ny1zPd1+MeGwDcT9myLmHe9?= =?iso-8859-1?q?aff7VqrOza+YC9X4O3f93M/cHTEq0IXWTzHHgs1Ovziq3WAq5MdSsrRjo9sD?= =?iso-8859-1?q?xn5glRCJA6CI0diMHOqtcCIvDkYboGBw+vxyanEi5EycbI7cd3g2Ew2V94ka?= =?iso-8859-1?q?t/SNXAKNhm1lrkyXIXVQWd7v3VALO7zNCNorc2wv/CMoAkXUtN5OHwICK5TM?= =?iso-8859-1?q?oE2YofbpU7tUQLJPocKJuPDBAHCR4paGyRyCVrtGTrzxJH1VgeQRsjTZJdRS?= =?iso-8859-1?q?ONN4Ek4gyHvpRXqv0EHsX7zigkG3yeYGIK7665+UNUgjMudjKUiWAqIrxhjM?= =?iso-8859-1?q?V1LcSl8WRDXJFl4JxvLHn/gazzU69rENJn++7neYs3HJS/L5cM6R6Qww0eRR?= =?iso-8859-1?q?SA8Jq8cx5e07uZC1oFsBYI/LXm4a7nICmyFFZvymKMwWzrfVSqc8g1+DylvR?= =?iso-8859-1?q?0+AZGsI4Oi7gBya7jn6XyQQ17UmXgYQ2LOfPnjRqAeN+iESBKO+Lbe970mmV?= =?iso-8859-1?q?E34I0hrHis6aODpJ8VGVYzWTfIMgJl2APPu4HGKxJSBS4Ziy9+PcHo2+7E0D?= =?iso-8859-1?q?IAWBtPrZoV4QDIlo1mAlNShScm5A3iQKvo6OCyi75ZWajJ9zfWCyzFRdqy94?= =?iso-8859-1?q?wkgjwn/DA/l4/M47vx/tJ7hkuv4DMsb7BSpEr8BrWDgNrn2S8LRII/IZkvF0?= =?iso-8859-1?q?9QjBim0w/HicW1l7NhKaF9JCLihMlZybuNlqmlNT0krMKWzdFD6S02jZBLqS?= =?iso-8859-1?q?h86kyJILqWM9hiSAm8QxVtv2Yd+yEAvKPcKU3eiglWqJjH0qQHDSrY4HHFRe?= =?iso-8859-1?q?5QcJ+XmsyQcxE8wrdvcTN2Dr0+lEAnLRrkA0TXzq4U4Wm1VTAts3NjiQoCfJ?= =?iso-8859-1?q?EJA4nHP5zD3J6kTKOOWuMcYCe0hsojKyxqzVdbBVs3y2MuZZm4k3/wOchyob?= =?iso-8859-1?q?o038+dwnHmHtNrqtxl+eZkAJ8+jouValrzlYEeuZePYBI3/s7z5wDdH2OBBU?= =?iso-8859-1?q?JMtxnQMHAJGkV53pm0+m46rpsiF8yMQhfTuX2D7iojwKpOme41LltDhMa9wE?= =?iso-8859-1?q?qXR9KiLlLUsImbaJtyzmSdt1RzXrx1ynYSQ/7q19ceF2gpXGqtoWOkZOkEvy?= =?iso-8859-1?q?cSUGbjfxNN3uDFlUS6cjwobx7li1D5CWKrsgTH1VkaKW2SEYc8ZUR4RUU2dD?= =?iso-8859-1?q?V7p5+de9lZkp6U4wX5OKYb3Es2ie0XHt/gHkQDPx2CYL8hj2apC1lvgIElcK?= =?iso-8859-1?q?Uy?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR09MB4851.eurprd09.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024)(38070700018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?e6u3y5naVV1VGMPiYJgAwfe?= =?iso-8859-1?q?rqvgORyho4o8aZ9psrijZjuWwnhbpPOm9J8GdoUZle6akBlNycLL+nnFPCH/?= =?iso-8859-1?q?auYAhM9pvLAUA6bLm+uSGjkl0wRlsi6d9F7CBYNC2SpQySwHgkWlhSY8cLA7?= =?iso-8859-1?q?ms0u6iEltoBJpGPl484xTRHzeuQfDA10tfjOHEqsT5xNgfTvCAfOC0x1nCyo?= =?iso-8859-1?q?i6Yd9Z/i8BHmmSIvZGiq+0+GvoAduCcM+Bhpnb9iF/q+SMb7xx+rwqmCrtu/?= =?iso-8859-1?q?at1MDfszydbhvPezKgIxR+ceeFjXTkWM70mCw89nZFkgBSSQ0EZVS900RtH8?= =?iso-8859-1?q?iOddRNFA8jv6odpxwq6s9ohoI4TMToXVd4nTuR2usqvqLdT5mXpXRxyZfGa6?= =?iso-8859-1?q?rv/lBCg7Ogn8xibkTi7zwwkhTF9+QW7KqgYQ4A7wg0VGJhFZq2TMcsvuczX1?= =?iso-8859-1?q?c59aNrCJIvR2j5SKvC+jbVPXlOZFO0ShKji6LtAlPhPajzWDGZq5Ps2lJ3Cp?= =?iso-8859-1?q?niiBPdQrpMFkp+uKIcYtebiri02rOS1O0IFb+ygFvdZOHkH1rxiE5k6cF4Fu?= =?iso-8859-1?q?4TMu/Cr86o3ECo/VJwq52SpRm2QDIvLR4hW5kfXjq2TLZPt7sBY/W8rVztiU?= =?iso-8859-1?q?Xuw1RlatsSAluvy4EQV6vQus/ZC/1M1PfTIg8Cd0ZomqP04fQX04sY8zuYwh?= =?iso-8859-1?q?vPKWa06uetnt3pbGTivLgfA1lSupdrXIq5uNNZI4iQ+zxzuO8AGXDil7C9qo?= =?iso-8859-1?q?6mDJGBv0HhmpMGGz8xsZd//dMS+5DunxAn5SJ4QaWesylR9CaV/+0vipGdvn?= =?iso-8859-1?q?ruWbywiQ0N3EkDelZ2I4iPC0cr80OzBc0GlC8tYS51lr6fEFicOh0G6u+vZX?= =?iso-8859-1?q?95aBQ1Gh7FWYBnkJs8Fy+NBtJSrsu08qBagY7j+/WLXfduJY3t0fLyuFKxzW?= =?iso-8859-1?q?R7ycfBSi5SsGF0+8dmRCyY/iTgfUHE6a+ipsLzU3WXqTqDljhKLBDdPiJG0C?= =?iso-8859-1?q?Dy0l+jvc6kYQNUWmto3zEdYl9htL53el4Jgd9XuRzMU9S+1mvrggAPT67S/u?= =?iso-8859-1?q?v1yJA4uo1HiZ9MlhkrBHRfF0yClRhDREVNX4Qmdz+HTeYEIeOclxieIKcmR0?= =?iso-8859-1?q?Yn/DQn7H02PuqVq7TxFLMH8KKtpjr6u/5iQ4TBvJjTibJeL2clKjbRVWC9qK?= =?iso-8859-1?q?EtYQAoaFZq+MlUKLUlF8iv60gCRHon9IqnSuiSWhRS4/foOqyuyimdwTT0zm?= =?iso-8859-1?q?wpfQF/uR3ZnBHy3UPiyGO/rpEeH/APqbjN2keCcuX8fVXcfNVf+SCbaNXeg6?= =?iso-8859-1?q?IUvNmSa+jiJ0vLwfgP9FZScy92cGyqdmmrgNJJNHOjD/ND1v0VxAxJGVFNhw?= =?iso-8859-1?q?P+CONuiIn7Lg7hpHBKbcYNDf575YUVIr3YCMaLu6xeLRyQv280n7PWtmkjYe?= =?iso-8859-1?q?NJ0Fs7zcPhrRwp1ljCWvE3zBluQdK/74JWdmlSv7ZyyTSgmEohGkaEdhHa3l?= =?iso-8859-1?q?hn7l5snkmGLsm4vn5sHlDS7I/BR+MLVEkG1TbG6pu/ciZ7JZy/vYBti0Dq1+?= =?iso-8859-1?q?OVJ11Koe9jyL+736T0gJkFBWDsj20I4YdpSK9PGMElg0J8aG9DmJg39fMLEw?= =?iso-8859-1?q?Z1+V83bc1K7w4AwZBZQmXmqSr6PjJhOWErRlM2Q=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: htecgroup.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4851.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbce13e8-c90a-4125-e8a9-08dcef776521 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2024 13:18:45.6013 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9f85665b-7efd-4776-9dfe-b6bfda2565ee X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rP2Fkh8s6Oaki2LuLzV4R9QnNpNWHlHsAYtrYjBMZPSgojAY8lRP76YGLzITqd7LLPoDl+HRGvvqHwIvOMr7X0Ln/2CNMu+89MdMN6W1drs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR09MB6298 Received-SPF: pass client-ip=2a01:111:f403:2614::72a; envelope-from=aleksandar.rakic@htecgroup.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-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 Add CP0 MemoryMapID register implementation. Cherry-picked 9e0cb40adb110c2c76e2e97719ba8afcce72bcf5 from https://github.com/MIPS/gnutools-qemu Signed-off-by: Yongbok Kim Signed-off-by: Aleksandar Markovic Signed-off-by: Aleksandar Rakic Reviewed-by: Aleksandar Rikalo --- target/mips/sysemu/machine.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/mips/sysemu/machine.c b/target/mips/sysemu/machine.c index 213fd637fc..91cd9f1900 100644 --- a/target/mips/sysemu/machine.c +++ b/target/mips/sysemu/machine.c @@ -142,6 +142,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 = (flags >> 10) & 1; v->C0 = (flags >> 7) & 3; @@ -167,6 +168,7 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, r4k_tlb_t *v = pv; uint16_t asid = v->ASID; + uint32_t mmid = v->MMID; uint16_t flags = ((v->EHINV << 15) | (v->RI1 << 14) | (v->RI0 << 13) | @@ -183,6 +185,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]); @@ -204,8 +207,8 @@ static const VMStateInfo vmstate_info_tlb = { static const VMStateDescription vmstate_tlb = { .name = "cpu/tlb", - .version_id = 2, - .minimum_version_id = 2, + .version_id = 3, + .minimum_version_id = 3, .fields = (const VMStateField[]) { VMSTATE_UINT32(nb_tlb, CPUMIPSTLBContext), VMSTATE_UINT32(tlb_in_use, CPUMIPSTLBContext),