From nobody Sun Jul 26 10:59:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782999387; cv=none; d=zohomail.com; s=zohoarc; b=oFcpQl62C+JLicZ11NUqT2JbGM9miH+/nFS5SqzboUNeKk3gHJGeTIOQwPcMWxXXIqdXcGq5idwN2zwOmb9qQOWqR3rp/Tvw17D/UsAo85j8+L5G8F4bQZqU4ZmjKbQ5WNHUcIFp3UZxoUownxdsTryFW2CDutLwRHurl2Un820= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782999387; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1rR3wOaCqir41NboczA76GKl3LF8SZvplqqP5ybbjVs=; b=cndBMg6TIp3fgtPOmKEy1J+M3YlJ6lCaSVUnDRzcnnNCHO2Zdm9zLTsil/DBQZHewHOqRW/8ARXpRaRpTih0qxoVpaqYGa+f+6tINhpW03Hju8WSfbAJTmbUzVDQcQEReOO/sReLQr86Nkz23k+WPbstr0ou8rzU14I1hD1LaVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782999387664391.1588098337978; Thu, 2 Jul 2026 06:36:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfHaW-00084k-8I; Thu, 02 Jul 2026 09:36:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaV-00084B-4A for qemu-devel@nongnu.org; Thu, 02 Jul 2026 09:36:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaT-00015a-AW for qemu-devel@nongnu.org; Thu, 02 Jul 2026 09:36:18 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-536-QqBrvTwHO86RJHaOZCRSaA-1; Thu, 02 Jul 2026 09:36:15 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-476608a9fefso477104f8f.1 for ; Thu, 02 Jul 2026 06:36:14 -0700 (PDT) Received: from rh.fritz.box (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dbb01sm9135980f8f.1.2026.07.02.06.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 06:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782999376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1rR3wOaCqir41NboczA76GKl3LF8SZvplqqP5ybbjVs=; b=ek11kYKdaslO2sFsZL9Hs33A0Bfxm+w/12a1QkOMncwAt/XUzkEGVOJBkQBZP0ptcwLyUz S691BoTGSyCeXZo4a1gZ1D8bSlDTRMFjHLm+EsvEF7noZFvepfQQSWFN70jAUQfr/o0+U+ 8Ou6RCVuxcR1uXORWVEp2ipqvwo4nOw= X-MC-Unique: QqBrvTwHO86RJHaOZCRSaA-1 X-Mimecast-MFC-AGG-ID: QqBrvTwHO86RJHaOZCRSaA_1782999373 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782999373; x=1783604173; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1rR3wOaCqir41NboczA76GKl3LF8SZvplqqP5ybbjVs=; b=qwMtD1N9P+Hk1NnFMJvpPaqLNxt1B5rM2MC2dTSZ/+g6qsNX6exUrH8d12KSzgTv8b b9+GU0eyGbe+4SyGVQyYOTvcD2QcpyASl4K14bEF1kqLWUfI2NOCsHGDJ1vUhHb9Qece DHqpnjwA5eT1zPHd9GdRfzEfL7wyMeoZWy3xA31wk/PTPC756FvOaxpAP0Vca+JFFDKU 36Uu9WsMYyTnxRnO1WtpX3MBP2oCS1roqAC4pNnJrEvRLGHpsCnq0zH4Q/L/XQeLy7zt qdGXvS82lx7yyAik6Hbpn5NaySI/Js1w+W3nVxoTJg6QBR5t8f5oLLRMcXkyEMe4jGF9 IL5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782999373; x=1783604173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1rR3wOaCqir41NboczA76GKl3LF8SZvplqqP5ybbjVs=; b=Zk7VBOXQvzBFlFcBHnXaog/O9l8OrnnoeHyCnsgvjzb40PMPgdl00Hs4idZWaDBVoL pYpACqcPvx8uZ8fyhXkpyjsyh3ytUBHZabjotlZ7WI9qCqlkzXBSxBviOUkEYLgz9WD1 70pX05BzlPAyb3TGQkJ7qryrPvt9pXbS5flWs5AJ5wg4phx+M6awQZNnvKJeMcPQiuZO ltGUXDG9vMuk4iamUcO/AM7lDZu3OhwNO5f+Brkk8M/qXWHe5ePaYCy6ySyKgs9F5XMa 0Hv/LsPzTUQTcK+eGx4DoAL3pFNZnbmjXZIxZvNvZ/L0OpOOzje5cQnmaEQ/iDH3n3v5 GOLA== X-Forwarded-Encrypted: i=1; AHgh+RoCOTBKVHz3TJqVn+wdKDtIURo3dRlLx8XdeZBv7bHmsk1zCw1MFZiXPzHE/Kyw+pSxTPXq6uDG3EzI@nongnu.org X-Gm-Message-State: AOJu0YxAL6+LxPtVO2d0VB8VvnlOtQRFE3B6AHwPn8u8zYIoHR4z16BB Ju5UWT83iBlKMvuOUlvbYcKk5YMPvV/Y+ElGjxeZ7OGVR013LTvPxXty0JFNqaDaHyztFpLrPIf adTtqKzybG8MhmBcy7fJY9mnG4E39dtbu91H9PPjYBdp+pqH91zR9+bB1 X-Gm-Gg: AfdE7cmF60OiSzftbmKViH0p3MXopCew6fRxEz81HGcbbpBrcXM8megUrvoOHk8C3Sd RmM+Ea6U9ocv5kmpcQrdFe91x/Wv5GPZU5zDtWQ4w8LEmbzwg94T+oZcUvGeIoXSmDqzDLki6vF EpCnxjyw+XnTpAwo7zpmGdkudLWJY/Epfg3CFZvaYGvHr13skyeNc3/Ww7t/7Leggcca0gIivsq +lYT6ty7MD5hc4oH0QoNBJoYK/t74KrIicsewOKqrhS94+e1oxj2kzKytQ1xF0CbqKexz3krId9 C5HOkTxpVmK+Mbv0k9mkhSOIHJ5WwnfM+QONlMBn3OYWJ/GjxutDXuIRIFA53M5aEIIwzECyV5C 3KyzjNeM4rs7rAwX2FczW/SKWIWGOu2ye5/1x9PfihL3w49+ks79ziP9MJlWOfLxG2N9XbXnXiA == X-Received: by 2002:a05:6000:26d3:b0:475:f0c2:75af with SMTP id ffacd0b85a97d-4774643eac5mr8474698f8f.26.1782999373277; Thu, 02 Jul 2026 06:36:13 -0700 (PDT) X-Received: by 2002:a05:6000:26d3:b0:475:f0c2:75af with SMTP id ffacd0b85a97d-4774643eac5mr8474641f8f.26.1782999372790; Thu, 02 Jul 2026 06:36:12 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Eric Auger , Sebastian Ott Subject: [PATCH v4 1/3] arm: handle demuxed ID registers Date: Thu, 2 Jul 2026 15:36:04 +0200 Message-ID: <20260702133606.34529-2-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260702133606.34529-1-sebott@redhat.com> References: <20260702133606.34529-1-sebott@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1782999389663158500 Content-Type: text/plain; charset="utf-8" From: Cornelia Huck For some registers, we do not have a single ID register, but actually an array of values (e.g. CCSIDR_EL1, where the actual value is determined by whatever CSSELR_EL1 points to.) If we want to avoid using a different way to handle registers like that for every instance, we should provide some kind of infrastructure. Therefore, add accessors {GET,SET}_IDREG_DEMUX that are similar to the accessors we already use for regular ID registers. Tested-by: Alireza Sanaee Suggested-by: Richard Henderson Reviewed-by: Eric Auger Signed-off-by: Cornelia Huck Signed-off-by: Sebastian Ott --- target/arm/cpu-sysregs.h | 9 +++++++++ target/arm/cpu.h | 12 ++++++++++++ target/arm/cpu64.c | 8 ++++++++ 3 files changed, 29 insertions(+) diff --git a/target/arm/cpu-sysregs.h b/target/arm/cpu-sysregs.h index 7877a3b06a..a4b9621a7e 100644 --- a/target/arm/cpu-sysregs.h +++ b/target/arm/cpu-sysregs.h @@ -20,20 +20,29 @@ =20 #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) NAME##_IDX, =20 +#define DEF_MUX(NAME, OP0, OP1, CRN, CRM, OP2, NUM) \ + NAME##_IDX, \ + NAME##_IDX_LAST =3D NAME##_IDX + NUM - 1, + typedef enum ARMIDRegisterIdx { #include "cpu-sysregs.h.inc" NUM_ID_IDX, } ARMIDRegisterIdx; =20 #undef DEF +#undef DEF_MUX #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) \ SYS_##NAME =3D ENCODE_ID_REG(OP0, OP1, CRN, CRM, OP2), =20 +#define DEF_MUX(NAME, OP0, OP1, CRN, CRM, OP2, NUM) \ + DEF(NAME, OP0, OP1, CRN, CRM, OP2) + typedef enum ARMSysRegs { #include "cpu-sysregs.h.inc" } ARMSysRegs; =20 #undef DEF +#undef DEF_MUX =20 extern const uint32_t id_register_sysreg[NUM_ID_IDX]; =20 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 84d33e87dc..5668deee4c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -920,6 +920,18 @@ typedef struct { i_->idregs[REG ## _EL1_IDX]; \ }) =20 +#define SET_IDREG_DEMUX(ISAR, REG, INDEX, VALUE) \ + ({ \ + ARMISARegisters *i_ =3D (ISAR); \ + i_->idregs[REG ## _IDX + INDEX] =3D VALUE; \ + }) + +#define GET_IDREG_DEMUX(ISAR, REG, INDEX) \ + ({ \ + ARMISARegisters *i_ =3D (ISAR); \ + i_->idregs[REG ## _IDX + INDEX]; \ + }) + /** * ARMCPU: * @env: #CPUARMState diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 2816735577..48a0421674 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -42,14 +42,21 @@ #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) \ [NAME##_IDX] =3D SYS_##NAME, =20 +#define DEF_MUX(NAME, OP0, OP1, CRN, CRM, OP2, NUM) \ + DEF(NAME, OP0, OP1, CRN, CRM, OP2) + const uint32_t id_register_sysreg[NUM_ID_IDX] =3D { #include "cpu-sysregs.h.inc" }; =20 #undef DEF +#undef DEF_MUX #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) \ case SYS_##NAME: return NAME##_IDX; =20 +#define DEF_MUX(NAME, OP0, OP1, CRN, CRM, OP2, NUM) \ + DEF(NAME, OP0, OP1, CRN, CRM, OP2) + int get_sysreg_idx(ARMSysRegs sysreg) { switch (sysreg) { @@ -59,6 +66,7 @@ int get_sysreg_idx(ARMSysRegs sysreg) } =20 #undef DEF +#undef DEF_MUX =20 void aarch64_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { --=20 2.54.0 From nobody Sun Jul 26 10:59:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782999449; cv=none; d=zohomail.com; s=zohoarc; b=eABqP6ZT3RrhkpxJCLSeNF03CIIZnQzFtnn6GLTKt3wFEJj7N29FUs42JNEbOnW0eUpyAcJKuwhkfh3x2wq1C0mGGk7QjWuEP5aXxblZNhFSekPo7M1n7nC6nGamoFQAvDKjqli/QI4AQvLmamGpYewuvqDOdr0gLmBJNP8vzV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782999449; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Z2nwuEdbqG1bbvwDCO52/KE1VtY4ihgBaPJMPHTbLYw=; b=eOhQXu3Xql9DEGiTBBhn69lDqi1KKiTdBnBF9DSzA6lo3gHExgr64kl/bCt329UJhMuV5lvamlnDdvM6jgSybFN8wxCPTW/FtJEfZy2iGkXfAodKNcubwDT6uvU0KaUPma22QB/CdugHmk9H54zw/AyiMo0sac7P3tjfGaxhRfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782999449242260.0006023810348; Thu, 2 Jul 2026 06:37:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfHaZ-00086m-SK; Thu, 02 Jul 2026 09:36:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaX-000863-V5 for qemu-devel@nongnu.org; Thu, 02 Jul 2026 09:36:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaU-00016g-Tv for qemu-devel@nongnu.org; Thu, 02 Jul 2026 09:36:21 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-uDbzG8b8Mvmklf_0ACy45w-1; Thu, 02 Jul 2026 09:36:17 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-492488f8583so27586315e9.2 for ; Thu, 02 Jul 2026 06:36:15 -0700 (PDT) Received: from rh.fritz.box (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dbb01sm9135980f8f.1.2026.07.02.06.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 06:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782999378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z2nwuEdbqG1bbvwDCO52/KE1VtY4ihgBaPJMPHTbLYw=; b=CfljBMxyhbKbtbmIz/ysXmkxFzA+vKdrDQhysCszH8AEq3yH0anka6cNgRbjTg12jL0gi2 D6O9ypBaQMBXFcU8VDN29Fy+FnWu1uqnF4c6T8PHqv0TyolOS4xWGzPKxVYLvzB6nyMCbd C+9cwmMBeQ4fq64+ZMiY8GYMSfdSyTY= X-MC-Unique: uDbzG8b8Mvmklf_0ACy45w-1 X-Mimecast-MFC-AGG-ID: uDbzG8b8Mvmklf_0ACy45w_1782999375 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782999375; x=1783604175; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z2nwuEdbqG1bbvwDCO52/KE1VtY4ihgBaPJMPHTbLYw=; b=qNc7tTojpu1qsq8ybUZd1/q5ym4ImhrwOimNLy6xGMGjY5bAyugBJ4oUIDH+vWSXYZ JG8VaiLVUSwTwP1b/+W0fY/g8kHQynDMz2p4EN0m+hGsg+dLjwmZ/JRzwLxRcYJgvlOy ja3OPU1wQviuq9AbofqZ+nwTfdSV1lGk2/mdo+9KKSalljewJK+o4SBH3gpVXWlo0167 dc5A6gnSCr+pJa20kEoRyb2CJDalX7I/xUqDZBNwNvF3PPbOvCGG5Cih44nXmHUxz6TP 2aiKSf+TFMZjEvoIBZT42X1fJbimpugHd/acaGxNHIhf+IuflkY/okO8ykzDdcj+XlF7 9Efg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782999375; x=1783604175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Z2nwuEdbqG1bbvwDCO52/KE1VtY4ihgBaPJMPHTbLYw=; b=B80LmmK6NgXBXRD3be9Jq143snStXOu9Qnz5xHsuAGfTgYVRnX6ed7haI54pOTc3J9 RWylW205dgkCZnOwAC0H5s3xUNTs9KnR0zBeLnCl0gjBLMICAJbU45HNcGymv2gfsg8Q TzkBe0m9tbVclmJEa9jN8pBkqS4DL9WxfvqciOO0XpWFLKU03dRRoQ7pANezjgo4xVzx f/Vl90qRTKjYUeDG3hMTgJkCQLRMFdolpY+3VHZMEFssVduByvLH1Y1xQ6Lco9E4LlKw 9NXnaQq3xqj0G7F0Vg0hg7fFCDKyNMIk5l0nGsOiQnZ4w/htHWjQqYUyU58s4OYJTAM5 30Ug== X-Forwarded-Encrypted: i=1; AFNElJ/DTv7UZlxJNsu0oc8sLHAsbMFIireQRRwNxHbWi+UNvpsEP892kSrdPu+9Bp+zstI6AQDXG9VZIQv1@nongnu.org X-Gm-Message-State: AOJu0Yyj4wmYjSRXZipxVZmdqUJGsjaTVlwhHlzkTBd9TWauGPKZKC10 nJETbHRBKBZ6aHFrWpXTzv0XXo/d8AFe38GQz90B6l9tLUh0eWWFSejnw/TaxhXT/1ML1siBLGs vSlB7pSTjcBScI54ezQESxN68fyVhBgczMPsDdlT6d5J72byhOmZvGGCC X-Gm-Gg: AfdE7ckpFY0EJJKWvUGWQb2ysp04hmsx2CqpdClLqP3JQVipttMqaR0i5vOEWxabvWG 8a7WTKvvvKgrAgWgrZlRJSjLlc+xb7P8fLjtYtP8SXsWsZ9A5AysjXGOGMepQWpH+RL/lNrBZ/f B/Gt2i6vma1r7ffddIKUXK25wUq1q+v6wvTOUsqptHXAVhMJVwxMSlC97jMsidDfmnoaFqWhP4B 0ec1aHtZNhNP9Jc/U0H2Q2VBdvzkRBt1/X6yNFYkm6UXhpfGKNs29LxnMtNPD7zp8QPOcGFm8gX cIxycMwuyJamezNkcklASTw75sNVSHrReMCLIClzXgcbI+g0cSI11gD+eZfUGLNv5FtAY/Mb/W2 zleexIYuCw0P1wLMdzigJ5tuIMeypXvhfEgsAer87sd4fTwFH7wwhMGD3j/ogzK45yR0lYecZJA == X-Received: by 2002:a7b:cb55:0:b0:493:aaa2:f034 with SMTP id 5b1f17b1804b1-493c2b7a70bmr69475365e9.26.1782999374524; Thu, 02 Jul 2026 06:36:14 -0700 (PDT) X-Received: by 2002:a7b:cb55:0:b0:493:aaa2:f034 with SMTP id 5b1f17b1804b1-493c2b7a70bmr69474715e9.26.1782999373932; Thu, 02 Jul 2026 06:36:13 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Sebastian Ott Subject: [PATCH v4 2/3] arm: handle CCSIDR_EL1 as a demuxed register Date: Thu, 2 Jul 2026 15:36:05 +0200 Message-ID: <20260702133606.34529-3-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260702133606.34529-1-sebott@redhat.com> References: <20260702133606.34529-1-sebott@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1782999450063158500 Content-Type: text/plain; charset="utf-8" From: Cornelia Huck Move handling of CCSIDR_EL1 over to the new *_IDREG_DEMUX infrastructure. Tested-by: Alireza Sanaee Signed-off-by: Cornelia Huck Signed-off-by: Sebastian Ott Reviewed-by: Eric Auger --- hw/arm/virt.c | 19 ++++------ hw/intc/armv7m_nvic.c | 2 +- target/arm/cpu-max.c | 6 ++-- target/arm/cpu-sysregs.h.inc | 1 + target/arm/cpu.h | 6 ---- target/arm/cpu64.c | 6 ++-- target/arm/helper.c | 2 +- target/arm/tcg/cpu32-system.c | 26 +++++++------- target/arm/tcg/cpu64.c | 68 +++++++++++++++++------------------ 9 files changed, 63 insertions(+), 73 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d8d27f2ef6..e20b5a4fc9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -304,24 +304,19 @@ void set_cpu_cache(CPUCoreCaches *cpu_cache, enum Cac= heType cache_type, int bank_index =3D ((cache_level - 1) * 2) | is_i_cache0; ARMCPU *armcpu =3D ARM_CPU(qemu_get_cpu(0)); bool ccidx =3D cpu_isar_feature(any_ccidx, armcpu); + uint64_t ccsidr =3D GET_IDREG_DEMUX(&armcpu->isar, CCSIDR_EL1, bank_in= dex); =20 if (ccidx) { *cpu_cache =3D (CPUCoreCaches){ - .linesize =3D 1 << (FIELD_EX64(armcpu->ccsidr[bank_index], CCS= IDR_EL1, - CCIDX_LINESIZE) + 4), - .associativity =3D FIELD_EX64(armcpu->ccsidr[bank_index], CCSI= DR_EL1, - CCIDX_ASSOCIATIVITY) + 1, - .sets =3D FIELD_EX64(armcpu->ccsidr[bank_index], CCSIDR_EL1, - CCIDX_NUMSETS) + 1, + .linesize =3D 1 << (FIELD_EX64(ccsidr, CCSIDR_EL1, CCIDX_LINES= IZE) + 4), + .associativity =3D FIELD_EX64(ccsidr, CCSIDR_EL1, CCIDX_ASSOCI= ATIVITY) + 1, + .sets =3D FIELD_EX64(ccsidr, CCSIDR_EL1, CCIDX_NUMSETS) + 1, }; } else { *cpu_cache =3D (CPUCoreCaches){ - .linesize =3D 1 << (FIELD_EX64(armcpu->ccsidr[bank_index], CCS= IDR_EL1, - LINESIZE) + 4), - .associativity =3D FIELD_EX64(armcpu->ccsidr[bank_index], CCSI= DR_EL1, - ASSOCIATIVITY) + 1, - .sets =3D - FIELD_EX64(armcpu->ccsidr[bank_index], CCSIDR_EL1, NUMSETS= ) + 1, + .linesize =3D 1 << (FIELD_EX64(ccsidr, CCSIDR_EL1, LINESIZE) += 4), + .associativity =3D FIELD_EX64(ccsidr, CCSIDR_EL1, ASSOCIATIVIT= Y) + 1, + .sets =3D FIELD_EX64(ccsidr, CCSIDR_EL1, NUMSETS) + 1, }; } cpu_cache->type =3D cache_type; diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index a7651f831e..5dd867242b 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -1360,7 +1360,7 @@ static uint32_t nvic_readl(NVICState *s, uint32_t off= set, MemTxAttrs attrs) case 0xd80: /* CSSIDR */ { int idx =3D cpu->env.v7m.csselr[attrs.secure] & R_V7M_CSSELR_INDEX= _MASK; - return cpu->ccsidr[idx]; + return GET_IDREG_DEMUX(&cpu->isar, CCSIDR_EL1, idx); } case 0xd84: /* CSSELR */ return cpu->env.v7m.csselr[attrs.secure]; diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c index d38bdfcf81..d2f69b6bcf 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -72,11 +72,11 @@ void aarch64_aa32_a57_init(Object *obj, bool aa32_only) cpu->isar.reset_pmcr_el0 =3D 0x41013000; SET_IDREG(isar, CLIDR, 0x0a200023); /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 7)); /* 48KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 3, 64, 48 * KiB, 2)); /* 2048KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 16, 64, 2 * MiB, 7)); if (aarch64_enabled) { set_dczid_bs(cpu, 4); /* 64 bytes */ cpu->gic_num_lrs =3D 4; diff --git a/target/arm/cpu-sysregs.h.inc b/target/arm/cpu-sysregs.h.inc index 6e8b335b8f..d9e058a57e 100644 --- a/target/arm/cpu-sysregs.h.inc +++ b/target/arm/cpu-sysregs.h.inc @@ -39,6 +39,7 @@ DEF(MVFR2_EL1, 3, 0, 0, 3, 2) DEF(ID_PFR2_EL1, 3, 0, 0, 3, 4) DEF(ID_DFR1_EL1, 3, 0, 0, 3, 5) DEF(ID_MMFR5_EL1, 3, 0, 0, 3, 6) +DEF_MUX(CCSIDR_EL1, 3, 1, 0, 0, 0, 16) DEF(CLIDR_EL1, 3, 1, 0, 0, 1) DEF(ID_AA64ZFR0_EL1, 3, 0, 0, 4, 4) DEF(CTR_EL0, 3, 3, 0, 0, 1) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5668deee4c..de2304c049 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1122,10 +1122,6 @@ struct ArchCPU { uint64_t pmceid0; uint64_t pmceid1; uint64_t mp_affinity; /* MP ID without feature bits */ - /* The elements of this array are the CCSIDR values for each cache, - * in the order L1DCache, L1ICache, L2DCache, L2ICache, etc. - */ - uint64_t ccsidr[16]; uint64_t reset_cbar; uint32_t reset_auxcr; bool reset_hivecs; @@ -2139,8 +2135,6 @@ FIELD(MFAR, FPA, 12, 40) FIELD(MFAR, NSE, 62, 1) FIELD(MFAR, NS, 63, 1) =20 -QEMU_BUILD_BUG_ON(ARRAY_SIZE(((ARMCPU *)0)->ccsidr) <=3D R_V7M_CSSELR_INDE= X_MASK); - /* If adding a feature bit which corresponds to a Linux ELF * HWCAP bit, remember to update the feature-bit-to-hwcap * mapping in linux-user/elfload.c:get_elf_hwcap(). diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 48a0421674..9bcef81dce 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -748,11 +748,11 @@ static void aarch64_a53_initfn(Object *obj) cpu->isar.reset_pmcr_el0 =3D 0x41033000; SET_IDREG(isar, CLIDR, 0x0a200023); /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 7)); /* 32KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 1, 64, 32 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 1, 64, 32 * KiB, 2)); /* 1024KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 1 * MiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 16, 64, 1 * MiB, 7)); set_dczid_bs(cpu, 4); /* 64 bytes */ cpu->gic_num_lrs =3D 4; cpu->gic_vpribits =3D 5; diff --git a/target/arm/helper.c b/target/arm/helper.c index 93e3d8b575..04cace7b8f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -882,7 +882,7 @@ static uint64_t ccsidr_read(CPUARMState *env, const ARM= CPRegInfo *ri) uint32_t index =3D A32_BANKED_REG_GET(env, csselr, ri->secure & ARM_CP_SECSTATE_S); =20 - return cpu->ccsidr[index]; + return GET_IDREG_DEMUX(&cpu->isar, CCSIDR_EL1, index); } =20 static void csselr_write(CPUARMState *env, const ARMCPRegInfo *ri, diff --git a/target/arm/tcg/cpu32-system.c b/target/arm/tcg/cpu32-system.c index 6e98390089..f00c996db3 100644 --- a/target/arm/tcg/cpu32-system.c +++ b/target/arm/tcg/cpu32-system.c @@ -270,9 +270,9 @@ static void cortex_a8_initfn(Object *obj) SET_IDREG(isar, ID_ISAR4, 0x00111142); cpu->isar.dbgdidr =3D 0x15141000; SET_IDREG(isar, CLIDR, (1 << 27) | (2 << 24) | 3); - cpu->ccsidr[0] =3D 0xe007e01a; /* 16k L1 dcache. */ - cpu->ccsidr[1] =3D 0x2007e01a; /* 16k L1 icache. */ - cpu->ccsidr[2] =3D 0xf0000000; /* No L2 icache. */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, 0xe007e01a); /* 16k L1 dcache. */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, 0x2007e01a); /* 16k L1 icache. */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, 0xf0000000); /* No L2 icache. */ cpu->reset_auxcr =3D 2; cpu->isar.reset_pmcr_el0 =3D 0x41002000; define_arm_cp_regs(cpu, cortexa8_cp_reginfo); @@ -346,8 +346,8 @@ static void cortex_a9_initfn(Object *obj) SET_IDREG(isar, ID_ISAR4, 0x00111142); cpu->isar.dbgdidr =3D 0x35141000; SET_IDREG(isar, CLIDR, (1 << 27) | (1 << 24) | 3); - cpu->ccsidr[0] =3D 0xe00fe019; /* 16k L1 dcache. */ - cpu->ccsidr[1] =3D 0x200fe019; /* 16k L1 icache. */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, 0xe00fe019); /* 16k L1 dcache. */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, 0x200fe019); /* 16k L1 icache. */ cpu->isar.reset_pmcr_el0 =3D 0x41093000; define_arm_cp_regs(cpu, cortexa9_cp_reginfo); } @@ -418,9 +418,9 @@ static void cortex_a7_initfn(Object *obj) cpu->isar.dbgdevid =3D 0x01110f13; cpu->isar.dbgdevid1 =3D 0x1; SET_IDREG(isar, CLIDR, 0x0a200023); - cpu->ccsidr[0] =3D 0x701fe00a; /* 32K L1 dcache */ - cpu->ccsidr[1] =3D 0x201fe00a; /* 32K L1 icache */ - cpu->ccsidr[2] =3D 0x711fe07a; /* 4096K L2 unified cache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, 0x701fe00a); /* 32K L1 dcache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, 0x201fe00a); /* 32K L1 icache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, 0x711fe07a); /* 4096K L2 unified = cache */ cpu->isar.reset_pmcr_el0 =3D 0x41072000; define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */ } @@ -466,9 +466,9 @@ static void cortex_a15_initfn(Object *obj) cpu->isar.dbgdevid =3D 0x01110f13; cpu->isar.dbgdevid1 =3D 0x0; SET_IDREG(isar, CLIDR, 0x0a200023); - cpu->ccsidr[0] =3D 0x701fe00a; /* 32K L1 dcache */ - cpu->ccsidr[1] =3D 0x201fe00a; /* 32K L1 icache */ - cpu->ccsidr[2] =3D 0x711fe07a; /* 4096K L2 unified cache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, 0x701fe00a); /* 32K L1 dcache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, 0x201fe00a); /* 32K L1 icache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, 0x711fe07a); /* 4096K L2 unified = cache */ cpu->isar.reset_pmcr_el0 =3D 0x410F3000; define_arm_cp_regs(cpu, cortexa15_cp_reginfo); } @@ -657,8 +657,8 @@ static void cortex_r52_initfn(Object *obj) SET_IDREG(isar, ID_ISAR5, 0x00010001); cpu->isar.dbgdidr =3D 0x77168000; SET_IDREG(isar, CLIDR, (1 << 27) | (1 << 24) | 0x3); - cpu->ccsidr[0] =3D 0x700fe01a; /* 32KB L1 dcache */ - cpu->ccsidr[1] =3D 0x201fe00a; /* 32KB L1 icache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, 0x700fe01a); /* 32KB L1 dcache */ + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, 0x201fe00a); /* 32KB L1 icache */ =20 cpu->pmsav7_dregion =3D 16; cpu->pmsav8r_hdregion =3D 16; diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index ae3952a1ed..ff9811d90b 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -82,11 +82,11 @@ static void aarch64_a35_initfn(Object *obj) =20 /* From B2.29 Cache ID registers */ /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 7)); /* 32KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 2)); /* 512KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 512 * KiB= , 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 16, 64, 512 * KiB, 7)); =20 /* From B3.5 VGIC Type register */ cpu->gic_num_lrs =3D 4; @@ -250,11 +250,11 @@ static void aarch64_a55_initfn(Object *obj) =20 /* From B2.23 CCSIDR_EL1 */ /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 7)); /* 32KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 2)); /* 512KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 512 * KiB= , 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 16, 64, 512 * KiB, 7)); =20 /* From B2.96 SCTLR_EL3 */ cpu->reset_sctlr =3D 0x30c50838; @@ -320,11 +320,11 @@ static void aarch64_a72_initfn(Object *obj) cpu->isar.reset_pmcr_el0 =3D 0x41023000; SET_IDREG(isar, CLIDR, 0x0a200023); /* 32KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 32 * KiB, 7)); /* 48KB L1 dcache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 3, 64, 48 * KiB, 2)); /* 1MB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 1 * MiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 16, 64, 1 * MiB, 7)); set_dczid_bs(cpu, 4); /* 64 bytes */ cpu->gic_num_lrs =3D 4; cpu->gic_vpribits =3D 5; @@ -383,11 +383,11 @@ static void aarch64_a76_initfn(Object *obj) =20 /* From B2.18 CCSIDR_EL1 */ /* 64KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 7)); /* 64KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 2)); /* 512KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 8, 64, 512 * KiB,= 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 8, 64, 512 * KiB, 7)); =20 /* From B2.93 SCTLR_EL3 */ cpu->reset_sctlr =3D 0x30c50838; @@ -455,11 +455,11 @@ static void aarch64_a78ae_initfn(Object *obj) =20 /* From 3.2.33 CCSIDR_EL1 */ /* 64KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 7)); /* 64KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 2)); /* 512KB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 8, 64, 512 * KiB,= 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 8, 64, 512 * KiB, 7)); =20 /* From 3.2.118 SCTLR_EL3 */ cpu->reset_sctlr =3D 0x30c50838; @@ -512,11 +512,11 @@ static void aarch64_a64fx_initfn(Object *obj) SET_IDREG(isar, ID_AA64ZFR0, 0x0000000000000000); SET_IDREG(isar, CLIDR, 0x0000000080000023); /* 64KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 256, 64 * KiB,= 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 256, 64 * KiB, 7)); /* 64KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 256, 64 * KiB,= 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 256, 64 * KiB, 2)); /* 8MB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 256, 8 * MiB,= 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 16, 256, 8 * MiB, 7)); set_dczid_bs(cpu, 6); /* 256 bytes */ cpu->gic_num_lrs =3D 4; cpu->gic_vpribits =3D 5; @@ -704,11 +704,11 @@ static void aarch64_neoverse_n1_initfn(Object *obj) =20 /* From B2.23 CCSIDR_EL1 */ /* 64KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 7)); /* 64KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 2)); /* 1MB L2 dcache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 8, 64, 1 * MiB, 7= ); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 8, 64, 1 * MiB, 7)); =20 /* From B2.98 SCTLR_EL3 */ cpu->reset_sctlr =3D 0x30c50838; @@ -792,11 +792,11 @@ static void aarch64_neoverse_v1_initfn(Object *obj) * L3: No L3 (this matches the CLIDR_EL1 value). */ /* 64KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_CCIDX, 4, 64, 64 * KiB, 0= ); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 4, 64, 64 * KiB, 0)); /* 64KB L1 icache */ - cpu->ccsidr[1] =3D cpu->ccsidr[0]; + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 4, 64, 64 * KiB, 0)); /* 1MB L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_CCIDX, 8, 64, 1 * MiB, 0); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 8, 64, 1 * MiB, 0)); =20 /* From 3.2.115 SCTLR_EL3 */ cpu->reset_sctlr =3D 0x30c50838; @@ -1034,11 +1034,11 @@ static void aarch64_a710_initfn(Object *obj) * L2: 8-way set associative 64 byte line size, total either 256K or 5= 12K. */ /* L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_CCIDX, 4, 64, 64 * KiB, 0= ); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 4, 64, 64 * KiB, 0)); /* L1 icache */ - cpu->ccsidr[1] =3D cpu->ccsidr[0]; + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 4, 64, 64 * KiB, 0)); /* L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_CCIDX, 8, 64, 512 * KiB, = 0); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 8, 64, 512 * KiB, 0)); =20 /* FIXME: Not documented -- copied from neoverse-v1 */ cpu->reset_sctlr =3D 0x30c50838; @@ -1136,11 +1136,11 @@ static void aarch64_neoverse_n2_initfn(Object *obj) * L2: 8-way set associative 64 byte line size, total either 512K or 1= 024K. */ /* L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_CCIDX, 4, 64, 64 * KiB, 0= ); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 4, 64, 64 * KiB, 0)); /* L1 icache */ - cpu->ccsidr[1] =3D cpu->ccsidr[0]; + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 4, 64, 64 * KiB, 0)); /* L2 cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_CCIDX, 8, 64, 512 * KiB, = 0); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_CCIDX, = 8, 64, 512 * KiB, 0)); /* FIXME: Not documented -- copied from neoverse-v1 */ cpu->reset_sctlr =3D 0x30c50838; =20 @@ -1169,13 +1169,13 @@ void aarch64_max_tcg_initfn(Object *obj) =20 SET_IDREG(isar, CLIDR, 0x8200123); /* 64KB L1 dcache */ - cpu->ccsidr[0] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 7); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 0, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 7)); /* 64KB L1 icache */ - cpu->ccsidr[1] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 64 * KiB, = 2); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 1, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 4, 64, 64 * KiB, 2)); /* 1MB L2 unified cache */ - cpu->ccsidr[2] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 8, 64, 1 * MiB, 7= ); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 2, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 8, 64, 1 * MiB, 7)); /* 2MB L3 unified cache */ - cpu->ccsidr[4] =3D make_ccsidr(CCSIDR_FORMAT_LEGACY, 8, 64, 2 * MiB, 7= ); + SET_IDREG_DEMUX(isar, CCSIDR_EL1, 4, make_ccsidr(CCSIDR_FORMAT_LEGACY,= 8, 64, 2 * MiB, 7)); =20 /* * Unset ARM_FEATURE_BACKCOMPAT_CNTFRQ, which we would otherwise defau= lt --=20 2.54.0 From nobody Sun Jul 26 10:59:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782999444; cv=none; d=zohomail.com; s=zohoarc; b=FbqX9be5y+eN1d6NYSzqvnEK47jwcuIEpN6imvEG+jEUG7+cncoXmNrv2zX8+GBjr9PAIIUWNH9aPkHA2pnbbgQ5eV7qDHTLcJ55qH4mj0TxkrLFJiYIRzs9nShTc4X23+H9twdA+ncLOw5/NLx11v2V2KA4o8QXhEc3W++BU0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782999444; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6HITbRUTeXA1wLotn5EvEHiy6VVopLkZs61O7SoCF+I=; b=YGmsjIOnBMejfWma4OxEu3poeJM233UoP/lVbZXXLmy/hjmmdizg2lRoe3MgIyBlerxt1DjpsJW9XR6/4SY/38SBFraHUeGicZLtcEjK33z6hjE2mPQy8ts4PdbfP3fEOBOoN9agjK9EvzxPTcG3WZR56i25LSA76+BTwAOQAsM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782999444913325.00486234351854; Thu, 2 Jul 2026 06:37:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfHaa-00087V-Dc; Thu, 02 Jul 2026 09:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaX-000860-TA for qemu-devel@nongnu.org; Thu, 02 Jul 2026 09:36:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaV-000186-Rw for qemu-devel@nongnu.org; Thu, 02 Jul 2026 09:36:21 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-oY8aCXILMGORJVPMmv6LNw-1; Thu, 02 Jul 2026 09:36:16 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-493c1bc7a70so17770385e9.1 for ; Thu, 02 Jul 2026 06:36:16 -0700 (PDT) Received: from rh.fritz.box (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dbb01sm9135980f8f.1.2026.07.02.06.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 06:36:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782999379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6HITbRUTeXA1wLotn5EvEHiy6VVopLkZs61O7SoCF+I=; b=De0/HWMUh1+UFvmV5jjwIeru/aRH8vCIrpBXPmClYLfste0WYYsnQctQJsvNziwBNedsIo oEbEtOEBO6eLiIUa8ESOmG5ROBzTrVV34Iso3KyIYIbNDWvMvJDnJTRJKNSkxit1S6FfND b+2OBGRl/WXPJ6YNNNkR0Qgc5kjJvs8= X-MC-Unique: oY8aCXILMGORJVPMmv6LNw-1 X-Mimecast-MFC-AGG-ID: oY8aCXILMGORJVPMmv6LNw_1782999376 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782999375; x=1783604175; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6HITbRUTeXA1wLotn5EvEHiy6VVopLkZs61O7SoCF+I=; b=ronR+u5OAbSpdBPO1xDAemNgJkQTBsGXl2BWjwtsLOS00ODvWEGDT0IKyqSGVeD+RZ cyqwCbqgea3nNR9ne8BihV7wUQaGvr3wO+wvqK8Q7Firi1yO/E9ylt2ruvu+6+Rk0qrn u8JdhXuaZtnTtFJ1OwBcWE2xcVOD+5jJg1ilBMW0C2KJ4X0jaBcO9yc3wVHXxqgSH1Eu ea6mubtnp6AvLHn4uIR21NuKMoY7UZK/WXmFbABULhFlJc5gL7Zd4s6q21GmEwZLJyKb 9BOtJ6ivAayWnDP3nTQJ//Zo83YlFXKLqf+vrTaZ/AnmXmFc2vHMwUqgCPdVbvAS0T1c J6TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782999375; x=1783604175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6HITbRUTeXA1wLotn5EvEHiy6VVopLkZs61O7SoCF+I=; b=qjhaAbaUMQRqS1JhCxgAzXqZTBE4Tz+HjSr1Pf9lVsCHOQg40/Aomd4ON3UIQvltJt 5uISQ9HnYHAobqK9j+rMvc3h57p9mvHxo+xZZz/iUdVWCADepucJizqujF6A19dzwAIZ OgtRVzyTb7jhC/U1iFh4HkXD2/TzIoLVsmaPq7XZcatPLHNXRVI/p3CKvD8O/F88Lf/o OAh+v6EkLVL3ToTQQ9lX6slTHGCtt6CdpGQQaEFhCzixXSW/mMGnjY6mlUGcBk0OMESW 7DbEti6kKvjI2FNWWM2JJ0Zqh32lITaye6/dcmQ1U4QDfbViszv5JEBTugL0yLDPi6ml /+aA== X-Forwarded-Encrypted: i=1; AFNElJ/7xN9eHMNzSTchfAItDw6q0EtPzMslLcMMRCskUooaoFvDPY3PyXDeNJB6Y/M9C22Ff6nF+iIyFy8p@nongnu.org X-Gm-Message-State: AOJu0YwluAzhN6LksRsYA6by5DMR0kUSgcgKXHaVI7uzU36YBq6NLFNU 6N1/3UaDtEej1FNNQKcMF4DjxuLFTS/86i6Zx3GWdV7MWm0XFRH1x2bG4djB1foS4F7hy7GVXR9 GEOACWpILx7YsJPXW+WWf0xhGDFmx5ykVJbiRr9Y/eDkzgadthJAk3x5j X-Gm-Gg: AfdE7ckqX9pGMDMUHqusXXsuv+yEf0HrqrxcoxThwKErizPnZiGJ18TmzmmUaQ/wBBD FrtenK9w1KFm4FJ4+DrvyBZD52pplfhAf67Cl1hwBr5BXH0PFANwClKDBlXlMxSrO0Zo38Vt/n+ w2ZGnsh4fea8HisQH/cBunzngCKGgKfsRA9xJStpACxS+Kp1Dp2UaztzYmYW0aecGw5I19db4VC ZlL2IzF6vhN+Y95OT/G+g5rbBwbbjLSGMeum8VclZOvVDw7vQZIYlipYoDQrr4zUhqHAiwbR749 OlsA8OvsIfTbPHQnXQbX2nmYYCLiJv3ThITMRMFOqES6cHuaxLsVAluMiz8L2h28FlhbVNOCuZM UuFxKyyZhlF3fUYpQ+wfCNihWNYbe340ObktBpvHptFT+GNWQ1H/3KS0SrAO+/1Yow3I4Jcf3ew == X-Received: by 2002:a05:600c:820d:b0:490:b00c:8e6a with SMTP id 5b1f17b1804b1-493c83a5b92mr16574235e9.28.1782999375455; Thu, 02 Jul 2026 06:36:15 -0700 (PDT) X-Received: by 2002:a05:600c:820d:b0:490:b00c:8e6a with SMTP id 5b1f17b1804b1-493c83a5b92mr16573725e9.28.1782999375055; Thu, 02 Jul 2026 06:36:15 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Sebastian Ott Subject: [PATCH v4 3/3] arm/kvm: get demuxed ID registers from kvm Date: Thu, 2 Jul 2026 15:36:06 +0200 Message-ID: <20260702133606.34529-4-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260702133606.34529-1-sebott@redhat.com> References: <20260702133606.34529-1-sebott@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1782999446048158500 Content-Type: text/plain; charset="utf-8" From: Cornelia Huck We now have the infrastructure in place to handle demuxed ID registers from kvm. Use it to get the values that kvm emulates for CCSIDR_EL1. Tested-by: Alireza Sanaee Signed-off-by: Cornelia Huck Signed-off-by: Sebastian Ott --- target/arm/kvm.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index a54ef51ec2..f57e86b441 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -244,6 +244,33 @@ static int get_host_cpu_reg(int fd, ARMHostCPUFeatures= *ahcf, return ret; } =20 + +/* CSSELR values supported by kvm; used to index KVM_REG_ARM_DEMUX_ID_CCSI= DR */ +#define CSSELR_MAX 14 + +static int get_host_cpu_reg_demux(int fd, ARMHostCPUFeatures *ahcf, + ARMIDRegisterIdx index, int subindex) +{ + + struct kvm_one_reg one_reg =3D { + .id =3D KVM_REG_ARM64 | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX, + }; + + switch (index) { + case CCSIDR_EL1_IDX: + if (subindex >=3D CSSELR_MAX) { + return -EINVAL; + } + one_reg.id |=3D KVM_REG_ARM_DEMUX_ID_CCSIDR | subindex; + one_reg.addr =3D (uintptr_t)&ahcf->isar.idregs[index + subindex]; + break; + default: + return -EINVAL; + } + + return ioctl(fd, KVM_GET_ONE_REG, &one_reg); +} + static uint32_t kvm_arm_sve_get_vls(int fd) { uint64_t vls[KVM_ARM64_SVE_VLS_WORDS]; @@ -454,6 +481,10 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFe= atures *ahcf) /* Read the set of supported vector lengths. */ arm_host_cpu_features.sve_vq_supported =3D kvm_arm_sve_get_vls= (fd); } + /* Grab demuxed registers. */ + for (int i =3D 0; i < CSSELR_MAX; i++) { + err |=3D get_host_cpu_reg_demux(fd, ahcf, CCSIDR_EL1_IDX, i); + } } =20 kvm_arm_destroy_scratch_host_vcpu(fdarray); --=20 2.54.0