From nobody Sun Jul 26 12:38:42 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=1782136648; cv=none; d=zohomail.com; s=zohoarc; b=DZ8HKwuHA77VcK0RSzr/UYuz0twAlZbpLAdwP9fQrCug7n7lF86wuUlofDpfEui465uw3MnzR4L9W2aCQH9eASDZsBAFrOrzsJQVPF0fyAFKOhZoI/9LXLNHS+xPaFQVt5KDEnHP2gg76VpbGLgBZwVx5M+vWgaLA/LAzIGxRcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782136648; 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=AkMffPovnZlGeD50GCpbLJdSgQdWfm1vJ5UbJhCKZO0=; b=jzeWyDs2mIFnzrFXqhj0TDa7oKvGwkJXOf35gsD84/+EeItLVNW9JsiLd/oN1E3EIf2BIz415AFWwH7xYLWGI0RD3z/NUGRBnZb9l7wMeuv5J+TJwq5dX+xedl26n+qOpWwKe/F8aRYgiI2OgSA3EseomxKQV38szGIbndvZDLU= 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 1782136648852934.0267814471594; Mon, 22 Jun 2026 06:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbf8p-0002Oa-I2; Mon, 22 Jun 2026 09:56:47 -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 1wbf8m-0002N3-Lq for qemu-devel@nongnu.org; Mon, 22 Jun 2026 09:56:44 -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 1wbf8j-0007vY-J2 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 09:56:42 -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-462-WO6wt2dnPD-ciN92cQ9YEw-1; Mon, 22 Jun 2026 09:56:39 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-46067399d5dso2263907f8f.2 for ; Mon, 22 Jun 2026 06:56:38 -0700 (PDT) Received: from rh.redhat.com (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-466643f4e9esm25162303f8f.1.2026.06.22.06.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 06:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782136600; 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=AkMffPovnZlGeD50GCpbLJdSgQdWfm1vJ5UbJhCKZO0=; b=IrHJ2XzFyPWoYJsK5tzQ2UqZzkCb1OVKvyUMvfI0PJO7UmiKmgk3DGrEbSW2NuyCGBvr3h zw/FIlSt/rSJgS+N085oc0Eu/VlELqJxXz01fp9Bd4fu+EQg0BAOuFHFMMn804U37AS2I3 ++iZ40CM1loYt0fK7RPlBTIbYuB1C+Y= X-MC-Unique: WO6wt2dnPD-ciN92cQ9YEw-1 X-Mimecast-MFC-AGG-ID: WO6wt2dnPD-ciN92cQ9YEw_1782136598 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782136598; x=1782741398; 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=AkMffPovnZlGeD50GCpbLJdSgQdWfm1vJ5UbJhCKZO0=; b=r4T7umfICmyUzxNkisBRdIhpwDT6tQGtQwzqoOJZT09xMF04iKQ1qdEMucLyHEW7iB mPLmI5yNseqOXt3bnnkUu0yGUpoJc3byttD+OUnNX2sLGNYVvkTt1IxTi7JEZGbJP63g bB311C8DfJZ/ddOCEh9LZFZLy+sczWdLGQRcebNxunKYAMrw+hM6fPADVGb5YeNR9Lxl VKxNTGindGYWTx4VGbWqC6C/4oq1nJWSTxMw1UuFH+zz/pHi3e0/oL6QALArDqMOkHVl p7z+1G9GKe+HPwxXNezkqMZ4WDNSpG60RO52flSlRKN3Fp57N4VJx6GPOjxWqCjy1prf h8yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782136598; x=1782741398; 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=AkMffPovnZlGeD50GCpbLJdSgQdWfm1vJ5UbJhCKZO0=; b=gmyv9vZjA0FbhJCknqCv3GnFtv/dsrFV+BjdVuo5sMqcNOyeZgEB4YB+tKT47ZSEH5 ePeukhdiLo9P6l1vJ5FaLAm0V3q/1FIdYu9UUNgs97Xce1JA11qkVXT6GSz6FCPa/Mpu Fr9MZHLDwvV9Kireq6wiuTf3PF7FCwG1h0V4IgvVdr7B4zgPQHrOjczUxLL2zWMedGK2 gJ09bfnfWpYQztKrcb620SweBJyws6F1MfoyDjagw6ujXELNLbIVwz/N7+qZDyWYwJhn pLo2AUq5VkcsrEsEfJDWbmfvptR1kB+HTJ9yndvPMUIEEv+yLXjXXDNjL74U4dcGn/d5 ybDw== X-Forwarded-Encrypted: i=1; AHgh+Rpq7GPV5qOd8871aTCJYI2gD5a9g+sKOJz2iDkQsJhztA1hz8jG0qAetXowSE/rpld40ehTIpoaLdou@nongnu.org X-Gm-Message-State: AOJu0Yw9p7Qffyx1yajSEVWhzlo+9mlnlk8fj08s92aSw8cWRah/oPv/ d5dvtemJhoI39C73NEWAJnwfLgI99+n/qRbL3QAaFZRiH5T77nKzuTBI4NrlRz2wc1RBc8XikLA l+6aT+Zs6+WEAPPXiVRczWMqHK9xrzvlPpGUmvv1eXdxHrDS807NYQBsf X-Gm-Gg: AfdE7clkkKMPoSryhFvs4mNAJUbpr7Jl7zOXC2/RsejH6DFLIZl0Beo/jXhkCVzocTG i4YCYtm/kOJYqUepRNW6GIhRUPwwamKBoKeSaeq8B9atNwYFDL+X9uYsNQRuww7AzKGuZWQPeb6 CVbT4srhhqtLtPnfiDHSWCrk0yEtI4AeEJ+g36BxTj9BZQ7+KaIaoC1UhzHJdlhfk/ugJTDqbgL +RH5hjStijbGOPSdLmiR2MXqn53pmflDlRcwNaVXZYH7kz2Nd4xWO6Idu9PfXcKXqi/x26PiJ5Q apAzv2sa5xmFIsL4baKRiigix/sPywEp/+4aITNVVNwOuvpHOItOyWUr7bpEBe8CUHmKGbpiSyy PAUSjkt5EKe13GNxM/6+OmtOnUs675VewkGbpV7OPiW5wTBAutCmeSfvMbc0mQ2Y8is/E13QcsW Q= X-Received: by 2002:a5d:598d:0:b0:46a:45d:2bed with SMTP id ffacd0b85a97d-46a045d2c13mr2308448f8f.8.1782136597767; Mon, 22 Jun 2026 06:56:37 -0700 (PDT) X-Received: by 2002:a5d:598d:0:b0:46a:45d:2bed with SMTP id ffacd0b85a97d-46a045d2c13mr2308400f8f.8.1782136597308; Mon, 22 Jun 2026 06:56:37 -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 v3 1/3] arm: handle demuxed ID registers Date: Mon, 22 Jun 2026 15:56:25 +0200 Message-ID: <20260622135627.40573-2-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260622135627.40573-1-sebott@redhat.com> References: <20260622135627.40573-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_H5=0.001, RCVD_IN_MSPIKE_WL=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: 1782136651294158500 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 Signed-off-by: Cornelia Huck Signed-off-by: Sebastian Ott Reviewed-by: Eric Auger Suggested-by: Richard Henderson --- 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 31a5567c95..fe0046b02e 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 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 12:38:42 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=1782136670; cv=none; d=zohomail.com; s=zohoarc; b=kJKppCKqsjQXxDzb14mtu381lZuNCtvjoc9UUk2hNRsW3BOQfVM3YOhWUQgoKF9Tj9e5B8EKSrExcRgkIR1nAPdsQJ6qDQph3UvpwmvK9pOXJHVwc3pfpKw7WE1hA9bz/p9lR2Nwihzdm+K9C0pW/sb7cfmH2L727PGiFgUWFyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782136670; 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=QVnx6GY30Jfx4X39iAYrbzKxf2to4Q1UYHho4oEQKcA=; b=hbNeiggrlq1mzh/+ynIDqbKHQlvwEhVb2gur1neomrmHxzlfKzft8QktAvg1E+gMH7Cx7i0RZiUwfxF31ZiLFGnabDAw7m2ptOuw/gc2mIeFaHrgN5/+By7eof4p6EZviETvcHhI8uBGqOLizxFSOaF5uSG4hX+xsfp7QJYo27I= 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 1782136670526111.3110147597398; Mon, 22 Jun 2026 06:57:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbf8s-0002PV-9s; Mon, 22 Jun 2026 09:56:50 -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 1wbf8q-0002Oz-Jo for qemu-devel@nongnu.org; Mon, 22 Jun 2026 09:56:48 -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 1wbf8m-0007wY-Dc for qemu-devel@nongnu.org; Mon, 22 Jun 2026 09:56:48 -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-279-Ec2drXP9MzWwOrXSiUqv1w-1; Mon, 22 Jun 2026 09:56:40 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-45ef0af9517so4405817f8f.3 for ; Mon, 22 Jun 2026 06:56:40 -0700 (PDT) Received: from rh.redhat.com (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-466643f4e9esm25162303f8f.1.2026.06.22.06.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 06:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782136602; 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=QVnx6GY30Jfx4X39iAYrbzKxf2to4Q1UYHho4oEQKcA=; b=CWVovEDgL3OfVTdAcB8qfuR4r8rTHKngBIPxsJCDIa9LMRnjqP30r+PGlsjFwUHhmN3UPX BxLPfAs/dZmHJI4i0ckcVOCOafjYrTQRl2vrzEGRJKcSBdnpDrpwBaetgd4M/SVUnoIij5 sqn+mR0Y4yVoTLFAsWFCNmgC61zTkeE= X-MC-Unique: Ec2drXP9MzWwOrXSiUqv1w-1 X-Mimecast-MFC-AGG-ID: Ec2drXP9MzWwOrXSiUqv1w_1782136599 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782136599; x=1782741399; 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=QVnx6GY30Jfx4X39iAYrbzKxf2to4Q1UYHho4oEQKcA=; b=BPxh0zGK3hoOUcZAST/UflRL4uBGjvzi+0nj5jYKfoCcPcn+yer4lx8Ke44qtD83j5 UpYRdysomrE2IDxzKxEpNmkVwE8uHV8j5pM1w1XuQzMnWDtXimJv82Yv8+hG8+pXgllm u2VEj/ZlJm5NEQTeBQkBXrfu3AG2jfJuconRfEETB/DfRFg3EIrvW6plU5onxjV2OBUq 31T7W3KK2YvXXL0YiVhgoURCZYwvw7NNnrb+zki674NBxMp6in64QgKvLRsm7j/Cyv9R Xw6cZvNLddpgdJs06lVr0MM4yHquTr7yDiMMst6QCByCH04CGrn4ZXh3wvzaxmhcdz8V 0IjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782136599; x=1782741399; 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=QVnx6GY30Jfx4X39iAYrbzKxf2to4Q1UYHho4oEQKcA=; b=fj/dwEBvO9Ky+NnxsQuiBusPqsB3GrLLqPkvDYXZYsrSeBFnPO/cHcSD7Tak3VJeF9 GIXx4JBR0X1x+fplsQYIOk0Vj1rTnsJHDe9I7mQwKg7KnuaFX3a8D8LKZ6uHgU3Ghgz3 FJ6af/XxYjFX/hO/Mek/JUorxj7ar1xybOeq6AEQYKHq8/ddIHdKNMcbmd7EJ8V1rRAs Lpp31u9hJi3PXQvXQDoWqtptw2D3e5aBD5WPTrP/iYLoKUlIk0dPD6nh/fO3Su5UOfZv tjtgwB0P9EbnQBWyozh3WY0Bozi5jW4oBseG25R5hHkEwpE4yBW3YxknkrCJRvQ96vxn tcZQ== X-Forwarded-Encrypted: i=1; AHgh+Roz9Wdvd2SHyEWizmjWI/b459KJHZecFI9t6V+0w06+sg3xN9WDtb1drsleofwKZbVJ9e3cHJhufqkB@nongnu.org X-Gm-Message-State: AOJu0Yy7xmvqZAqLJLL9xaMkmFlOkppTcpqa8zPzArXdKUY1lYkMfxSy ToXEUh/cjapNVICTbFoR29AlvMRwiC1ufFOj2v6mCsPTNol8UkusX7vqfaY6zYWFMHOZd5t/5+4 /Qrmcsa2dUJPSNGGL4wiNzbHx4LmqyOlk7YjcBIm8tasQE/Okbjyw2Bhc X-Gm-Gg: AfdE7cmN7Oo0+F0Ik7LGPN5n1rZxnwj9a6ta3tQo2iWKLEZjJlhF3Zd+HxGZodz9QYS KNNyg8eCI4i8DgddX2jqEErEYscLhfwjyinKJBWwOfOz1j2h9MogFrNcWgrauhxniLUlQf03NfE OWKTezY7ZF83YB+UlNDG0NJHnKg9CmefX4NjUr1aR7OvZ7QVqczj620xbR/TWGH8g7+NpXB4RHc Uuz4lReK/YkaPh7NMm6zoritoX92JWC5MwgGh7twzQM/CLwtFgafvPF53fb9787DLvL8t/tUOz1 3xKgWMBJSr7kjq7Luy0In31xzHiZxtA3Md1pbYzlxgiUoEBFV17A6i6Aw6/IXtB7chT2ChyNiFh nrbK4Qpn+1IHOR1MeMrpMUaWpkwc9RCRM6rlAZdner7zSmBKSeKPQkmVp2zVAlTqzL1CPfzSg5j Q= X-Received: by 2002:a05:6000:2902:b0:468:b71a:6efe with SMTP id ffacd0b85a97d-468b71a721dmr7735463f8f.6.1782136598750; Mon, 22 Jun 2026 06:56:38 -0700 (PDT) X-Received: by 2002:a05:6000:2902:b0:468:b71a:6efe with SMTP id ffacd0b85a97d-468b71a721dmr7735414f8f.6.1782136598307; Mon, 22 Jun 2026 06:56:38 -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 v3 2/3] arm: handle CCSIDR_EL1 as a demuxed register Date: Mon, 22 Jun 2026 15:56:26 +0200 Message-ID: <20260622135627.40573-3-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260622135627.40573-1-sebott@redhat.com> References: <20260622135627.40573-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: -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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1782136672817158500 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 --- hw/arm/virt.c | 23 ++++++------ 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, 68 insertions(+), 72 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d8d27f2ef6..ab2b566e69 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -307,21 +307,22 @@ void set_cpu_cache(CPUCoreCaches *cpu_cache, enum Cac= heType cache_type, =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(GET_IDREG_DEMUX(&armcpu->isar, = CCSIDR_EL1, bank_index), + CCSIDR_EL1, CCIDX_LINESIZE) + 4), + .associativity =3D FIELD_EX64(GET_IDREG_DEMUX(&armcpu->isar, C= CSIDR_EL1, bank_index), + CCSIDR_EL1, CCIDX_ASSOCIATIVITY) += 1, + .sets =3D FIELD_EX64(GET_IDREG_DEMUX(&armcpu->isar, CCSIDR_EL1= , bank_index), + 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, + .linesize =3D 1 << (FIELD_EX64(GET_IDREG_DEMUX(&armcpu->isar, = CCSIDR_EL1, bank_index), + CCSIDR_EL1, LINESIZE) + 4), + .associativity =3D FIELD_EX64(GET_IDREG_DEMUX(&armcpu->isar, C= CSIDR_EL1, bank_index), + CCSIDR_EL1, ASSOCIATIVITY) + 1, .sets =3D - FIELD_EX64(armcpu->ccsidr[bank_index], CCSIDR_EL1, NUMSETS= ) + 1, + FIELD_EX64(GET_IDREG_DEMUX(&armcpu->isar, CCSIDR_EL1, bank= _index), + 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 fe0046b02e..437e72d475 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; @@ -2132,8 +2128,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 a234aa031c..4bc616fff5 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -873,7 +873,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 f7a920a202..1d6e0362b1 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 12:38:42 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=1782136648; cv=none; d=zohomail.com; s=zohoarc; b=RV2refex/M7fJDCHlY954n8OGoMZx37t5VdQb50dyqswaY/5d8V9kwLwFAtlsUTzP0eK5zK888d7uKeo5xUmaXw6LnxRn+oaQ8iR1Yd+5ediKkZKaAPq2mU60fbDW/MWgGG4OclSnDDswsioGxsLM8H2/tV7KKIokqJxOQA61rU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782136648; 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=/URF9nfbf9hl1uNYYwQxU/heW1PoSsB716FltVdjwqg=; b=FFhx6hcSau3DyTFcLsIuhRgvUQiGEsPMLEgu9xBPiTOSegOEjZGR5ejBP/Qq/HlAjbycyJX+d9goyYtKlztuv7QHYSgMR63amzAaJokm9i8zBXEaeu88gqJU9ecIlm/Ol22iB/IZTl2SBfT5ev/IeOpJvbU6DEXpJNl2B6jdP3M= 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 1782136648530303.3350386058812; Mon, 22 Jun 2026 06:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbf8r-0002PC-L2; Mon, 22 Jun 2026 09:56:49 -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 1wbf8o-0002Nv-3g for qemu-devel@nongnu.org; Mon, 22 Jun 2026 09:56:46 -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 1wbf8m-0007wH-DR for qemu-devel@nongnu.org; Mon, 22 Jun 2026 09:56:45 -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-297-HOt69wpuOA2YDCWGIqlB3w-1; Mon, 22 Jun 2026 09:56:40 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-45ef4931de5so3197300f8f.1 for ; Mon, 22 Jun 2026 06:56:40 -0700 (PDT) Received: from rh.redhat.com (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-466643f4e9esm25162303f8f.1.2026.06.22.06.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 06:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782136602; 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=/URF9nfbf9hl1uNYYwQxU/heW1PoSsB716FltVdjwqg=; b=PkgroGLX877tJxImvtDNe7lAekQ/xM+U9CxuFzJzbH35zUt9UMtdLcfYGMZdFJYc4oF4zR AOGKHIpSEuFKkznNoPrjTu5gQNq29gxxG2W400A3ngrypzmAsgqa0rtzCi91PypiNwDydb T4QvQDaiW66hqbsCq7TkxxnVIGhdkTU= X-MC-Unique: HOt69wpuOA2YDCWGIqlB3w-1 X-Mimecast-MFC-AGG-ID: HOt69wpuOA2YDCWGIqlB3w_1782136600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782136599; x=1782741399; 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=/URF9nfbf9hl1uNYYwQxU/heW1PoSsB716FltVdjwqg=; b=flsDYqaiy/TudWu9BnJFj9fLqXXgj/83PRADEv81ak5eBWngav7u3gvyKWkFxUc7/P ap1pfXvzUZPPBM0jJ0LtVyapEyQFmx+WvjKkz32l0nua4cyALP4YG+lHwadTBnzpMmji KrDJ1NH+1AaMPQgwQM/TMLL1fmyOw1UIu0nW2B+GQ+B1dmdENUwEFT3sppa0JbztQ8IZ UJHOGuakCJZ0KFsCJPoCQFH0zzorjZBz59rJYhtoe5wWoIDycf33Tg+jDaYgews7KbTq r7CP9NnJRGhAZQ55Id/jtf5oNZoTrbgdk7ORM7D0M0Fn8VhO2JlDAkYAiepybkdQY2+S lZbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782136599; x=1782741399; 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=/URF9nfbf9hl1uNYYwQxU/heW1PoSsB716FltVdjwqg=; b=KKccHlTVTOY4fLNs34uQHh2VExmjrebS3D0UIjf/miZZfgC+LsonaJR950zx1UMiZI xunJe7G/dcKOean+4RVmkVLQvirJeaXHx0tHD4OCIcAmoIONwhaEazp4aVbdJJKW01a7 /9gzZtkP9TuofMNnz5hTJbw5P6LdAyhjW4Y2WXeM6hWYpMzs1Xehw9pJJRCAj6ZTp9dC onPyu6rcptcb0Bd0gfhLIcJYumc091pC8IFX3sZoZDso6TnQziRP50BSfw9r43+GVUy2 9pFyQR98lUhLkFzG0+vCoCP84X4MI/kYf7j95vp5+W70E/dn567GLp+1LR7dC4aziCQA cLHg== X-Forwarded-Encrypted: i=1; AHgh+RpRl2CQvDcRDT6SGAn2c1ZkX3+sCg2X8PPYtIlDug/K84BFo73gtv2qP/ak84/gueLqQbkQMcjrNUPq@nongnu.org X-Gm-Message-State: AOJu0Yw5As1rIbV5VI9xGEzfhXswd7Ahgg0QuhZyDj5nIBZgdPO0hIIN vG10/GEYhaxF1oPyQ2v8eBOU0qCt0m39YVbD6bhy+VtbetOCPbUz5I2+4vowhnL8mbwJlKBPPG2 nxv0hgxlQV8DiJVMTQga6/QbDF7a5wBc90Cun1vYRS7QY1/HtZy0Zy1g3 X-Gm-Gg: AfdE7cllZM2ToLut4IuQWJ3aKveXOJA1VrsqU0MOO4cBWSDXnR3O0gyVQ/zvZSrq0p9 +IDzkbGVUIkYi4OKej/idAUkSn3KbVYj1J1SVh3qLIAQdce5TNVAqkNEPiYomTNIe7Ao3JzfquX w5ab+9gh6Na84AH5XBVRaB1uWohpfl4OWEQauvLr7gnj5HD+nDA5mWRCo9NGPGwn4Rjn9xjpNOZ kEJkOFgb8J43z5qTG5PFSMJQ8Y8HCefoHDOTdytdlZtXiBG75YDHQwdkDrVtVX6Hf+nBI8jmzK3 iOMZwbkdRGn/a0rOLXCedNOvPqgJwp5EtvKegywLCRDE6mAUs4SBoPzrFT2Xs3+bOp1A0UGNGF+ pnPqMg8lwiZxAV/qMSCazHTT/s0+8D01Org7XicnJXWQVHbLPvWAtJHQh2HFwcvtL7ibBWQz4tu 8= X-Received: by 2002:a05:6000:1889:b0:460:21e7:330e with SMTP id ffacd0b85a97d-4651c4275bamr21841266f8f.10.1782136599643; Mon, 22 Jun 2026 06:56:39 -0700 (PDT) X-Received: by 2002:a05:6000:1889:b0:460:21e7:330e with SMTP id ffacd0b85a97d-4651c4275bamr21841229f8f.10.1782136599279; Mon, 22 Jun 2026 06:56:39 -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 v3 3/3] arm/kvm: get demuxed ID registers from kvm Date: Mon, 22 Jun 2026 15:56:27 +0200 Message-ID: <20260622135627.40573-4-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260622135627.40573-1-sebott@redhat.com> References: <20260622135627.40573-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: -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_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: 1782136651326158500 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 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index a54ef51ec2..059d361d88 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; used to index KVM_REG_ARM_DEMUX_ID_CCSIDR */ +#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]; @@ -286,6 +313,7 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFea= tures *ahcf) bool pmu_supported =3D false; uint64_t features =3D 0; int err; + int i; =20 ahcf->target =3D QEMU_KVM_ARM_TARGET_NONE; ahcf->dtb_compatible =3D "arm,armv8"; @@ -454,6 +482,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 (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