From nobody Sat Sep 26 20:00:20 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=1788965020; cv=none; d=zohomail.com; s=zohoarc; b=CRXsTzsIDqV6xS21Jo3HrGHAyOrlfgnv7gT5IOwm7kN4ZFLt8zBrYVTR3ZFvg6UhAiaGPM/DOHmSi3TUeVqqyl0GtC0uJHSgWkMduPSEDuf/34rl3QkJnLCGz05UQdvkbotXWpcPNbWQ3VjukU1eh36XpIy5iQAh6KrVMGir2uc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788965020; 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=NplcCtalrr4KaNtkMcW82lPswZ8AtudoDtbDep02z7I=; b=NB88yrVBT+JQbsC6pyba0bRz8frYUi1FAY1qwVKiqUDBK1iFdy2V6YJ44JRrQ2pJCDCKMVGtoFKi8HyaZEIaI5UQDhiM6/hO7el2zi7RU7vyijhAJLNDfjwob4Tarbvvml+g8CVRY6jJitZ4EE34cV1QShO0BbtotsHIj197ChQ= 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 1788965020778366.3103312074792; Wed, 9 Sep 2026 07:43:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4JW5-0000GO-Cr; Wed, 09 Sep 2026 10:43:13 -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 1x4JW4-0000FT-0P for qemu-devel@nongnu.org; Wed, 09 Sep 2026 10:43:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4JW2-0005fW-3h for qemu-devel@nongnu.org; Wed, 09 Sep 2026 10:43:11 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-30-X3D1KIMAPKKQYO0hAUJQ9g-1; Wed, 09 Sep 2026 10:42:02 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-47f6e8b5996so5115972f8f.2 for ; Wed, 09 Sep 2026 07:42:01 -0700 (PDT) Received: from rh.redhat.corp (p200300f6af0e1b00fa6b14698c8a91c3.dip0.t-ipconnect.de. [2003:f6:af0e:1b00:fa6b:1469:8c8a:91c3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485958f1493sm32933395f8f.37.2026.09.09.07.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 07:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788964989; 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=NplcCtalrr4KaNtkMcW82lPswZ8AtudoDtbDep02z7I=; b=OBE2QcJI5yLYnz3Y/75MUfyaGQchsDrUrNpY5Ww8tPCaBVGjEwvsUi/kflaUBx3el+MDs8 pqfSC0gFsefnWnk+rra4H/VE+fjFsR6qfuYjq0bHt/wscN6M7AHW56oPfiqv4ZoAMDBu8f 0dnzr6H8wFhpEoP4W22e3Seox8PJcnQ= X-MC-Unique: X3D1KIMAPKKQYO0hAUJQ9g-1 X-Mimecast-MFC-AGG-ID: X3D1KIMAPKKQYO0hAUJQ9g_1788964921 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1788964921; x=1789569721; 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:content-type; bh=NplcCtalrr4KaNtkMcW82lPswZ8AtudoDtbDep02z7I=; b=oOz5VdDC0gliX8RaLFgzfb6JbBsROxYeDSn4Bqm1tAozd/EUFqS9XosDngUDaH+9wg oqkdP3Mp2oMkVJ4IugFdxgExLGEtgsqcUy0cCQ/6+i/ZC7reFg0w8dxlf+Qu7o3Bzgn+ BV/YkwZ1mnTgPVnTD2/8BhBpikTBY0wcwz2w0wGJGKzEn5q4AXUJFv5n2Z2aMVeXeceo jewLE+FT4inVB9qjYY96OZuz5wfQMZfWC2pDwnd1nzhEipTueamU5ecVXVeKKt+qzIuD rhT980gP+ZW8QgrdTLymQPPMoCHapYxA0+dQK8B0qaMb7NQegJeCZ5GuvD86kf3bNjir crow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788964921; x=1789569721; 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:content-type; bh=NplcCtalrr4KaNtkMcW82lPswZ8AtudoDtbDep02z7I=; b=XrpCdIm3e2hJAhvrWq3bRWx6kPJ7KNrVXS03cG08tZLK5ZJ6VObn1ile2RzivYfCB5 uG/bQtxqptO2DAoiWfXUAuOHkAdWgWPTfKy60IJxV7acD6zxhCAAvEjpKTe78Ep15v8C g33teSeFN6S74K46mV29aseSgmimdZM6koNc2TxW1ssOQDeVz/6mPWdQSimJtwmlLiN1 SzohE4dyFUQccMJTzSY90faxPKl2u/pPl07OhP5ta8phjbEPooaZE3fzmfk4patjGKoy wdG3WFWyjjfxCo2abi4vJuyvyX++WSIVmDoVAr45a0awh6yU4iRpZ5DJmYBJssOEJ6u7 bZ4Q== X-Forwarded-Encrypted: i=1; AKwUvBwNn9XB07qtXR5jCl5sN6YWqzg+m+Jk7dLjLHJCSaZrYKfJQanfH/2/LTYBucnaW4117atABlFSoIcj@nongnu.org X-Gm-Message-State: AFuF++nR7MES5cnlaeKBpjvuQEMSz0xw8W9/EoaB0JojgnfUDA8bhcXl 13MEYSGGMiLYwX8yfokU3Q+K3Fz4OR7/rMXWKEra88S+Q5r3eej98Sqq4K/dM/tQHjw99D0KFiL K0xzVQwbKWm0kkdwQa8lCMIehzvO6VbzpWEcPtbK6ZAsvfICL2BFmRQJ2 X-Gm-Gg: AYBFou32gM0re1xFasnG/Q1H7cz768OUvuI4Fcm9h9sKmdxCE/ZcpGxkkHGrsIh/uq6 o/q4V6ZSqogKUk9z3SJG44zrMSSxNrQcaXK3ULyEsFbN+zWxHeGaVeylcLx+PYbO4GiRO7/CWgp j6XFLEA+9H4efIuDaq1DGge2YD0OggzGA/L4tfEUFs79J4PgChnHnqshTaIjQziubceQcg3sw3G m+U/4U20HXm4qM7Gy/AcRSh7HYar3WDUfo13dHMVR8crp3a+7msgiyGzgRlx3J9pshvuquFS9wl xOeuGMobEGfgZEe+UPSZq/FtOz8f4f4DbaajUidI+x5Y386lwZwzKk6cR1JoysZ4Fl2h2yTThGd ordyNsw7bAu5Pv2jamQFgqOAsbpFU8jU2bsHRbsahingaPpEdv0ru23be69BPHLnoiA== X-Received: by 2002:a05:6000:985:b0:485:8b95:706f with SMTP id ffacd0b85a97d-4858b9570c4mr31588714f8f.13.1788964920886; Wed, 09 Sep 2026 07:42:00 -0700 (PDT) X-Received: by 2002:a05:6000:985:b0:485:8b95:706f with SMTP id ffacd0b85a97d-4858b9570c4mr31588672f8f.13.1788964920455; Wed, 09 Sep 2026 07:42:00 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck , khushit.shah@nutanix.com Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Eric Auger , Sebastian Ott Subject: [PATCH v5 1/3] arm: handle demuxed ID registers Date: Wed, 9 Sep 2026 16:41:49 +0200 Message-ID: <20260909144151.26803-2-sebott@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909144151.26803-1-sebott@redhat.com> References: <20260909144151.26803-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.129.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=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: 1788965024742158500 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 e3f931dba2..9652f8b0bf 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -919,6 +919,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 4e8c472530..c11ab2da21 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.55.0 From nobody Sat Sep 26 20:00:20 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=1788965068; cv=none; d=zohomail.com; s=zohoarc; b=LfHHxMiVPC/plP6781OinVaeW+mZSL/PcNNalXmQ2W8e1b1mJxfbwk0NbeZRStwQj8aOX9KnzZ1eNx7LOBBg7tk5DEjKIvrX/g1uioLrIcww0a3/QVmTwuD5tY/HXYa3F26F5aT5cmkoBzGRH+cyY9215R5gZN1TnskWudWLilU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788965068; 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=3z3uG81r0Svs/ChPjpP+1B4Cf8w806Yhgna5tjlMtvs=; b=TodKOOYiW2Pu5t0kbalingdPJfpSsjjfSei//ued+S+H8D03k9yCXLUI/UmVJXmyxgPvPVBnAuC01RicmuxmSkbvu9UoxyCqkcESdJYFUK0Pw6cifCuPgXns07AjUbi8+ISebL5pzDKEgfeYIrINuV/qHIYUhTw77ddTjmYOaes= 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 1788965068835923.9357466014801; Wed, 9 Sep 2026 07:44:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4JW8-0000He-F4; Wed, 09 Sep 2026 10:43:17 -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 1x4JW6-0000HG-KP for qemu-devel@nongnu.org; Wed, 09 Sep 2026 10:43:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x4JW2-0005fh-Dl for qemu-devel@nongnu.org; Wed, 09 Sep 2026 10:43:14 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-339-QavUnqBAOe6qYn7Ubs1PGg-1; Wed, 09 Sep 2026 10:42:04 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-47f2de3ba47so4260186f8f.1 for ; Wed, 09 Sep 2026 07:42:04 -0700 (PDT) Received: from rh.redhat.corp (p200300f6af0e1b00fa6b14698c8a91c3.dip0.t-ipconnect.de. [2003:f6:af0e:1b00:fa6b:1469:8c8a:91c3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485958f1493sm32933395f8f.37.2026.09.09.07.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 07:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788964989; 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=3z3uG81r0Svs/ChPjpP+1B4Cf8w806Yhgna5tjlMtvs=; b=QuN6pg0AgaHJtiLZdN4WKyuZIUIgx5RVqaKkIH7dbA/mHR0F6bPZx/CROckWIiHfqD34/E 8sSkSHZTeNfcctM4TQUu7AfoReZpkpeGiMYdi5oJhWAiaP2d02hO7TKBa4oIP0U9eEkRV8 uBkhkaDhdj4FgyF5ca2LH+pDhjSgMDY= X-MC-Unique: QavUnqBAOe6qYn7Ubs1PGg-1 X-Mimecast-MFC-AGG-ID: QavUnqBAOe6qYn7Ubs1PGg_1788964923 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1788964923; x=1789569723; 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:content-type; bh=3z3uG81r0Svs/ChPjpP+1B4Cf8w806Yhgna5tjlMtvs=; b=Ag6ECAHnQsOFGtS/oc2VO2L3RYQLk34859556P62Rvt9qok89g8vwQjpJkLb8OBxQ4 Ht3uK54DmDTJgHF9I5IvMk85pXoRpct0EYtcPwaU+eKB6QwsvL/bZmFjyqdF2Aa77wtf Qd6HK5MGPdBNPkmxWSQr7pedAVPLTkWNRtxuo//TOWQGyJBW7CEBdJjZVqiba5PW422+ hLP1XNFjyxMUYmiAibr5iqRUewGIsPTBiVjVzKrwUy+bwUvXy6QEq4PJdYywt08I5bg+ ikl/vluyOOW2YRJv/+UUT18W5xBQlxJVHXZqjuXBWVI24JioWDL0y/40Pnkki11kdeBo +5dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788964923; x=1789569723; 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:content-type; bh=3z3uG81r0Svs/ChPjpP+1B4Cf8w806Yhgna5tjlMtvs=; b=cAuu7imCQ7ScLRgxgoEKUX+jQj79mPDuzzlFYJD/4Ug3ptaIUzkmgX4QlKDQOJEmcm L33GqPAxGT/sV/X9anY8txvKywwYSkm0v2sHaWczLE1DO7jq8PAwDJVQ5JghVzqqrA1R CzFBQGjOTjbb1vo6VCGs+Q5WMnhSiOJCj4bDu3yc/OVxkjAh9bRdQ8yqpNj6GaEHbAzv KX85oL+lNW148/dD3z2wSMFA1IjCNcKblvFIa8XTwQiwoDIuNGRQy0v8TQhdTuAm1z6e 6qdYBLjvjDNNBSEzqaNPXZoTsyRXh0pVWmoK1knIY+S/0yfVw/XvKuq6NWtD7Ow/IuA4 Qn+w== X-Forwarded-Encrypted: i=1; AKwUvBxj8dvj3eNa1ThhUbFnwDgnNDxSzrGI+hRPrUNm0Z7gTiH0t2F+6S58dxLySpA8JL9PHFnLqf7Efgl5@nongnu.org X-Gm-Message-State: AFuF++k66/ecVMdPGyTowJOgzVJqGzCdrOiFp6WUdY+BbXjV9E7yGS+Q J25/j+l7oHn/b0wOPmoKFfhS/idD50q6fdyYCpWXiUmAbCY8WAPou5uEVgPi8xD6WLDAmzXCTLA YLfRayxIhvikcGOJSvUpfNYA8xyLZY4eV6IStmy+isUjGW/SiQb4/CHZdrdl83HUW X-Gm-Gg: AYBFou1Ja1X/9AvKN3IPPbffy2wmNvoCrKuHX3WhaujcH+T1D8WxHFGidLQDKo3dUQb gyovfL1w8l+780M1nLVnar3LDxRvhgui5yBotC46q6EVkfxc7nmR/RFbd/DQlOXGHp7N5xTHY4z eeK07VBY9KZP5WI7xis+U7owh7AOHWVTSouPJttjPp1QsN1sbyqwY4Aqg3O/+PDVOmfEJAggAlJ kH9T1b9KlLy2yY9aSgrLMEz2zfq1blZBegppP1J5uTnG/VlZVjoxLYo+aMflfZyIqQptJik9ghm 01QGZTBOw4/i7Z1IcQ0Y4ck2PaUi13tdccfJhgWRfgYTqauK7z7XG1O5vRcNCo5i9UZYfvRdj8A 7cGksvo2Kep+YJuTE4qRAq8wAI9CFe+2kO25VG03Mtb2++6Zva1QGVhn5FwW+NgLzbg== X-Received: by 2002:a05:6000:2909:b0:485:8dd9:910f with SMTP id ffacd0b85a97d-4858dd991a5mr34922467f8f.9.1788964922694; Wed, 09 Sep 2026 07:42:02 -0700 (PDT) X-Received: by 2002:a05:6000:2909:b0:485:8dd9:910f with SMTP id ffacd0b85a97d-4858dd991a5mr34922405f8f.9.1788964922092; Wed, 09 Sep 2026 07:42:02 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck , khushit.shah@nutanix.com Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Eric Auger , Sebastian Ott Subject: [PATCH v5 2/3] arm: handle CCSIDR_EL1 as a demuxed register Date: Wed, 9 Sep 2026 16:41:50 +0200 Message-ID: <20260909144151.26803-3-sebott@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909144151.26803-1-sebott@redhat.com> References: <20260909144151.26803-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.129.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1788965070226158500 Content-Type: text/plain; charset="utf-8" From: Cornelia Huck Move handling of CCSIDR_EL1 over to the new *_IDREG_DEMUX infrastructure. Note: the existing size of 16 is kept and might be extended at a later time. Reviewed-by: Eric Auger Tested-by: Alireza Sanaee Signed-off-by: Cornelia Huck Signed-off-by: Sebastian Ott --- target/arm/cpu.h | 6 ---- target/arm/cpu-sysregs.h.inc | 1 + hw/arm/virt.c | 19 ++++------ hw/intc/armv7m_nvic.c | 2 +- target/arm/cpu-max.c | 6 ++-- target/arm/cpu64.c | 6 ++-- target/arm/helper.c | 2 +- target/arm/tcg/cpu32.c | 26 +++++++------- target/arm/tcg/cpu64.c | 68 ++++++++++++++++++------------------ 9 files changed, 63 insertions(+), 73 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 9652f8b0bf..f832cdd7e1 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1121,10 +1121,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; @@ -2138,8 +2134,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/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/hw/arm/virt.c b/hw/arm/virt.c index 0871a35e11..59ec51ddf3 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -306,24 +306,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 739500a04f..2ed1cfef9b 100644 --- a/target/arm/cpu-max.c +++ b/target/arm/cpu-max.c @@ -71,11 +71,11 @@ void aarch64_aa32_a57_init(ARMCPU *cpu, bool aarch64_en= abled) 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/cpu64.c b/target/arm/cpu64.c index c11ab2da21..dcd0d698b3 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -749,11 +749,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 c3f607e6d6..a608df1211 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -925,7 +925,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.c b/target/arm/tcg/cpu32.c index f292a269bf..7db35e1955 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -277,9 +277,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); @@ -355,8 +355,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); } @@ -429,9 +429,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 */ } @@ -478,9 +478,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); } @@ -670,8 +670,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 affd87a3ae..e156baf35d 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -83,11 +83,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; @@ -252,11 +252,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; @@ -323,11 +323,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; @@ -387,11 +387,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; @@ -460,11 +460,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; @@ -518,11 +518,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; @@ -711,11 +711,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; @@ -800,11 +800,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; @@ -1043,11 +1043,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; @@ -1146,11 +1146,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 @@ -1180,13 +1180,13 @@ void aarch64_max_v8_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.55.0 From nobody Sat Sep 26 20:00:20 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=1788965021; cv=none; d=zohomail.com; s=zohoarc; b=XJw4Q7nfSHZC5l6VZrrOTjjMDqF9schA3evBnIfTlsRAs9ghBIwL9OdadA/tlZYKGxlMrCsGBvIlJiAHldi6wK487xQo5dK0LAKrvUgkLdIgIJKR5WYejY97XxguHbGA5CFVclMdEg5PNPSSUGYvQ8kRnH9Qn3xmkGUjuT1irBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788965021; 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=wa+ZIKa32ONbC8JYjuP/+EOTZoP9I76CXnFoa7ddgXo=; b=hPc6iEpptK8AUmjKr6GzWxAyRZ9ANX89yc3lxLBkLzZ/vEjXF3Djnt7HLGgYQ5jBmtpBg/EMK/XBlejQr6AwiEzyWKdtmnEk9GhVHPqBAx8PddD1DSrVZTwKJTG1rSy4/2gPuM0e4HntVLatA43NTOIksYVnucnHJ3kEIWOTeH4= 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 1788965021497670.1740459254346; Wed, 9 Sep 2026 07:43:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x4JW6-0000Gd-28; Wed, 09 Sep 2026 10:43:14 -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 1x4JW4-0000Fz-OC for qemu-devel@nongnu.org; Wed, 09 Sep 2026 10:43:12 -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 1x4JW2-0005fv-HJ for qemu-devel@nongnu.org; Wed, 09 Sep 2026 10:43:12 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-302-jgw1gMW2MDiNPdZy5Wl1Mw-1; Wed, 09 Sep 2026 10:42:05 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48439ef42d8so4917279f8f.2 for ; Wed, 09 Sep 2026 07:42:05 -0700 (PDT) Received: from rh.redhat.corp (p200300f6af0e1b00fa6b14698c8a91c3.dip0.t-ipconnect.de. [2003:f6:af0e:1b00:fa6b:1469:8c8a:91c3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485958f1493sm32933395f8f.37.2026.09.09.07.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 07:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788964989; 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=wa+ZIKa32ONbC8JYjuP/+EOTZoP9I76CXnFoa7ddgXo=; b=RZ+3VQ0nNUSxpSUpZfq5QbDBvqlNT3F15ulKjhMsgAxh+BvRl8wLjRHiWwOlf0peuOwyjW qNav0AIa5EBsSzeb+9idRA+2oK3NFGPnKx2abzlK/4BEJ0qmcIphcPJwvceSwTPldlNCeS fXqO29Srq2C+libUnT6+j1gS+HjnTHs= X-MC-Unique: jgw1gMW2MDiNPdZy5Wl1Mw-1 X-Mimecast-MFC-AGG-ID: jgw1gMW2MDiNPdZy5Wl1Mw_1788964924 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1788964924; x=1789569724; 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:content-type; bh=wa+ZIKa32ONbC8JYjuP/+EOTZoP9I76CXnFoa7ddgXo=; b=fsMn32mowAvE9+1rY2nYK2Hv9xqlbkd9RZgCQCh59KP5wykJbc1cUHGG0XacI3128m MIgIpw+YmqQRBGvyIYPn57yPUBTeoCjbmaqza5ltZoK7tXYzeGHKSnn/6rrCZV14Pg/X PW2ZnpXwkrr0lx8OgS0CyVvH9lAYXieHuMAfzzMoeV48pHvJLD47A/vASqmLg0Qv9pRD uQVopIn5CXpPc2XFt1LTiBz/6w+YO8A3zYh4K3zvmjlMII5h58b34sMB06jsMbihQ0QO 0Vs5hxCJwG4hIw1SKCwKWQQ3Qt4DQabl+D7oyXt2AfQK5AcejYqw+7zH98+3uYp60h7H lAug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788964924; x=1789569724; 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:content-type; bh=wa+ZIKa32ONbC8JYjuP/+EOTZoP9I76CXnFoa7ddgXo=; b=rpcpMb9DNmbqEis1GTKKiL+Ve1Mv+yFwi0FUJKPf4zVQ5QXxgdDPDF901VYLEYyXkk LoJXuXcuzc9WPp0cD+1UR64Px8S9Lks4w6ZKTnjG/neHCzkqS6KTBApB0nTOL/6ylEG1 prWdYYKfHNUlQIKuCcwxmlyzhWL1Ih7hkWVDsJgMd/7ZMDP64TOvd5pj450/VkmVfm2n Fq2fn8eIZCcUruWD0bg3lsAGpcTr4ybBQIw2qUyxDzxhvy5jZpLT0QPgF2k167FYai5a 9moxcabWUt366VshF1WlF4JkKtnPN05FsENC1+17beof4M9FZ/jDh5KRreRuuN2ognPC PdCQ== X-Forwarded-Encrypted: i=1; AKwUvBxXgrVu7ug2sKDylT9I0FVn2K3ZVuCvEQh6dWq9784654YkHzh9Gy8Y/e3rNZqK5gHBwNR7mFQjIPNR@nongnu.org X-Gm-Message-State: AFuF++ntOEZ6iXSuSlpU+2Mhi8ET+xg9F7yxPK1QQVLbmaD1cuUhzqTI 45d8vZzri7koA0aNS72z4FvaupzwUs9y4NpeK9OhGPnXb/WDFCAv0JSQHqaR+xmV3MLzjtPps2S ldWC44+ZVukyAseY2OzTAS1Ld6fAjcRtZBu9N80BzQcfJhTqXkhQQejXoSuP4hgx2 X-Gm-Gg: AYBFou0K+WFmwMQXWEsAOeVdk8q6AeMdbE1I6oYaHSjuMx6FInNBKx4E0Vj5r95NLOX C0/AN33Ug7GV28idW0XiicHoGxDTIPRAL4R5//8UQgwsi9Ea5QtjgDji4qGpEfyZPJlFRHq8dtn lxZclhRY4u3ckbHyai5ZTs4bgqqejmZpyrVI65t2sCty7aDwZ8KMbslpn+ZN34xE9Buxkk+QsHQ ED4FT6f9gbRRovB2auYaHHfFyo227pV3avutGKIjCtpOT4Xjv+TwTHEjFZxGhwzi9xC3eofMTbZ 5dDGgG9GvJaUaY8w1Os/0RXqcHYuUgF6PThMb4ElMIrpEiOX8wKBPlBVDIlsUWyiRtKRBtaGgJd Kv0efmLwXVceuqNfG2sllROtAQIbGBNurQFPbjixpc6d/S9fWuGlKYfiqkwNCk7u1nw== X-Received: by 2002:a5d:6f10:0:b0:485:8a46:7061 with SMTP id ffacd0b85a97d-4858a467296mr33247748f8f.51.1788964924419; Wed, 09 Sep 2026 07:42:04 -0700 (PDT) X-Received: by 2002:a5d:6f10:0:b0:485:8a46:7061 with SMTP id ffacd0b85a97d-4858a467296mr33247719f8f.51.1788964924005; Wed, 09 Sep 2026 07:42:04 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck , khushit.shah@nutanix.com Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Sebastian Ott Subject: [PATCH v5 3/3] arm/kvm: get demuxed ID registers from kvm Date: Wed, 9 Sep 2026 16:41:51 +0200 Message-ID: <20260909144151.26803-4-sebott@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909144151.26803-1-sebott@redhat.com> References: <20260909144151.26803-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=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: 1788965024665158500 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 ed99be7fd8..1230acaff0 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.55.0