From nobody Tue Nov 18 02:53:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.66 as permitted sender) client-ip=209.85.218.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607120812; cv=none; d=zohomail.com; s=zohoarc; b=NFpKCPdkCEtV9QiyWxCSwsiDNkGwrF7lYakL9hHL9Y6cO3Jzx3E2bveGD3Wr8knpmrN6Umu88Ko2flHZ+FxKD7TfmhfjemSX9HNPErariQGT0m3tAAsq7q/M6t4OF0io+Lwzr4otCNPtUmql8MJwU5fW3bDNIXH0qsxRkkldpMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607120812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yPVQZVrJYHV9VRQKq9oG2AAR4beoTafSJ17RxMCvpOk=; b=YwFmPD2l9hivvtVhtfsfQIbgJW0sXWjfpfIsRdnZT/vRu4BHcTN3CO9Q00JOKadfzLwR9i1OA50fYTCQZbxfIaaS+E36ldyc7RoWWfNkT+puZ0wRNLptnvFABE4/u5KvKodYa+ElaEyz0vQCnqKvazF1VbpmbC1ki4OzQ5cVh7k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by mx.zohomail.com with SMTPS id 1607120812967430.7305729874531; Fri, 4 Dec 2020 14:26:52 -0800 (PST) Received: by mail-ej1-f66.google.com with SMTP id jx16so10879551ejb.10 for ; Fri, 04 Dec 2020 14:26:52 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id p22sm3896344ejx.59.2020.12.04.14.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 14:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yPVQZVrJYHV9VRQKq9oG2AAR4beoTafSJ17RxMCvpOk=; b=Bb+fncHR/1kTHmi2VJPpS7u6w0kDJt4JaWbYIuzHTOzo6mnPEID9spQrGXNYlJ/CDg JfA1pJfRX1p+Qk55P0EN6vXZlRe+oxSNaP3hxfeQlsEiL/JeNLecDsidOdYWGMiebjkH iMixCbadpiaOZptlCTw43sQfsvAq6I2S/eczF5zDbBVd2AbLFyFEQpWEGv/qUAuUlSTO D7Xx1bu7S1qbdOg8EThn3ZKv0Bjnlq55u9RpfTmoRH6jahGP0Xtla0nOPb23EtnHaM8/ Cguy3xZOpAoh737Ncj7CoDY4EE/HQmumMdBV9ck6D3OTvl7RJ/XOQMYNS9cEw6A9un9q 9ppA== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=yPVQZVrJYHV9VRQKq9oG2AAR4beoTafSJ17RxMCvpOk=; b=axuatiO+mZCn0bXWe2GM+zXhw9X3VcWOpb9LR90p60i/8p2spI4xj6lTjBBHEHhJR0 cn8ihO2prZsINVzl5O41askOQE9M9e9bF725+uZNTerWkzYuL1CxHA7+XjUygrCr9Asb r1leKSroNz6PTJveSiycoJ2agVjv7WLyPS8OyihGfCZQHB3Dq1EQGbyr1EjbF26wZv3c Fib8Xtbiv3plRHh8R3UFIbwX2JiXhFe1h1OPFj1+YRScCgOD9YW2xVIewAg+9O5uxud3 V9iS4mmqBIXyXuS+sVC3AgXgG6fMZoKDvUw8befFGnMHP7GXxRQoXC1F7L3ntAFbvQLY qCFw== X-Gm-Message-State: AOAM533HgyhA4HKHTq8bKN+FbY2ypIhikiM9u4jEnk9PNdLkB7hqCXvt Ip0Tc3VUnrMyIKog2ldQVjE= X-Google-Smtp-Source: ABdhPJznyaEiLXNVRdJ+jnvNs6rKjbzwldBEb83ibl9Am7rdn29z6610yrZX1+X4suaKzSozg+JCfg== X-Received: by 2002:a17:906:7104:: with SMTP id x4mr9343458ejj.141.1607120811094; Fri, 04 Dec 2020 14:26:51 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Jiaxun Yang , Huacai Chen , qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Aurelien Jarno Subject: [PATCH 5/5] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit() Date: Fri, 4 Dec 2020 23:26:22 +0100 Message-Id: <20201204222622.2743175-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201204222622.2743175-1-f4bug@amsat.org> References: <20201204222622.2743175-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) PTC field has 8 bits, PVPE has 4. We plan to use the "hw/registerfields.h" API with MIPS CPU definitions (target/mips/cpu.h). Meanwhile we use magic 8 and 4. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- We want to move that to mips_cpu_reset() later, because this is not Malta specific but cpu-specific. However SMP 'cpus' come from MachineState ("hw/boards.h"). So meanwhile this is early review. --- hw/mips/malta.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 350b92b4d79..c35fbf97272 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -24,6 +24,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/bitops.h" #include "qemu-common.h" #include "cpu.h" #include "hw/clock.h" @@ -1135,8 +1136,11 @@ static void malta_mips_config(MIPSCPU *cpu) CPUState *cs =3D CPU(cpu); =20 if (ase_mt_available(env)) { - env->mvp->CP0_MVPConf0 |=3D ((smp_cpus - 1) << CP0MVPC0_PVPE) | - ((smp_cpus * cs->nr_threads - 1) << CP0MVPC0_PTC); + env->mvp->CP0_MVPConf0 =3D deposit32(env->mvp->CP0_MVPConf0, + CP0MVPC0_PTC, 8, + smp_cpus * cs->nr_threads - 1); + env->mvp->CP0_MVPConf0 =3D deposit32(env->mvp->CP0_MVPConf0, + CP0MVPC0_PVPE, 4, smp_cpus - 1); } } =20 --=20 2.26.2