From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3E863C43602 for ; Thu, 2 Jul 2026 13:37:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wfHaX-00085w-Lq; Thu, 02 Jul 2026 09:36:21 -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 1wfHaW-00084h-4D for qemu-arm@nongnu.org; Thu, 02 Jul 2026 09:36:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wfHaT-00015c-CQ for qemu-arm@nongnu.org; Thu, 02 Jul 2026 09:36:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782999376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1rR3wOaCqir41NboczA76GKl3LF8SZvplqqP5ybbjVs=; b=RyCBsBRMtZIqs3mXIyE24OXaTaw8b1/QxhkJsnvSXYWYneKRki2NNIv+ybDQr8tWN0NrhY Ad6ZjUmpFIsgOZudSTPhyRUWYqwbrPm9vc37lK+dojO5XO2HOKSxaNfSVQXeVSJk/o9EsV X4MhUG5I2J462PaSes6CytV3iySRNg8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-536-WjZ4va_3PdGrCeOO4L6Z1A-1; Thu, 02 Jul 2026 09:36:15 -0400 X-MC-Unique: WjZ4va_3PdGrCeOO4L6Z1A-1 X-Mimecast-MFC-AGG-ID: WjZ4va_3PdGrCeOO4L6Z1A_1782999373 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-476608a9fefso477106f8f.1 for ; Thu, 02 Jul 2026 06:36:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782999373; x=1783604173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1rR3wOaCqir41NboczA76GKl3LF8SZvplqqP5ybbjVs=; b=dkSZTjcXaomlcuUOiURzUKAIHmUsWbFJA0Cs0KU805StQ76jRxN3Dszne82GoV8Y+S fd9ryn269x6NgfMoIn+MydU+T7oF5Q7518wJCtMRoBgaQHnzjgvYFRQNCcvCIWLZd3IQ ypOE5mtChaNJHVG5qI7NyuP5ZMGNe7q5LrXe+ORDK0SUs476jiPp5sbkCwIH33uDPPd7 lvxBTauBuINCpEUDCEPUi/19mXwjHPfQx+dr+m2NrbFTelSeEQ3QQx77sMhHfk57G6rD 0DQJeblOmGnSg06lVjd+EEypS6YKJ9nRQG0ACQDa5O5nE81vfd8yu7SohzgDWqpVjp2v aG1g== X-Gm-Message-State: AOJu0YxyIK+4WHMfBjhEC+/nzX8jhe5bcTxyALEHr0+kT0DTiZJ+1rsu 3BIJDPzG0/T/bld82vWv7rqA9cJm7DYzwzOGfcek8/qLYMGwRIJQMGOPMwKsWV55rtswNHZarqN OaoJDYX9Z+t1/8583Fd7t2hhxPD5UApze8YVn6/24J+Hb+dYQoc5Tfw== X-Gm-Gg: AfdE7cmH07w+4bcVicxFiJ6nYYl6pMObLZPJPMAbTFlYBffJ9YwMez47S7Cr5zcm4Oj k3D3YUgk1jtGU8/9AnXv2V0gV1Z+CXE0owTZ86WNHrE8jf4kBvTmB7BRRvvmDAUoztIDcQZWkJX FkZcvZeQSaOVBZAUF88AoOFTBUsiNK7qgpyRabVIIB67o68m83ZX8+zTmkRFdSSNdIt/W/N+4A0 qNmK0QW+lllX2XwkEqbrobwX2nzsfGgiIJ4uE3BEx8PWaJIerX9TQqaS82INFXDZ8IuLR+zaTLb ycUHrMDibNteVV4hPpJJ6jK3TA8TrdY5FVKQt8Z05X+aOerpRMZIDaOK6yB4OW4tbCnPa9XJN+l xnN+W1CypzY7WOhx0ZIwc2UmFLHr327rd6aEuuPdqTg0BSjsLFj6rhUy9zEgXSaA0B+BFzaR+cQ == X-Received: by 2002:a05:6000:26d3:b0:475:f0c2:75af with SMTP id ffacd0b85a97d-4774643eac5mr8474693f8f.26.1782999373256; Thu, 02 Jul 2026 06:36:13 -0700 (PDT) X-Received: by 2002:a05:6000:26d3:b0:475:f0c2:75af with SMTP id ffacd0b85a97d-4774643eac5mr8474641f8f.26.1782999372790; Thu, 02 Jul 2026 06:36:12 -0700 (PDT) Received: from rh.fritz.box (p200300f6af2a6100f239e076bbd76784.dip0.t-ipconnect.de. [2003:f6:af2a:6100:f239:e076:bbd7:6784]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dbb01sm9135980f8f.1.2026.07.02.06.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 06:36:12 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Eric Auger , Jonathan Cameron , Alireza Sanaee , Richard Henderson , Cornelia Huck Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Eric Auger , Sebastian Ott Subject: [PATCH v4 1/3] arm: handle demuxed ID registers Date: Thu, 2 Jul 2026 15:36:04 +0200 Message-ID: <20260702133606.34529-2-sebott@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260702133606.34529-1-sebott@redhat.com> References: <20260702133606.34529-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yU_Az1gGUfVlRTM7a-SLvpsrAfCpy2X_ABCL4z6F5bE_1782999373 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Received-SPF: pass client-ip=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org 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 @@ #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) NAME##_IDX, +#define DEF_MUX(NAME, OP0, OP1, CRN, CRM, OP2, NUM) \ + NAME##_IDX, \ + NAME##_IDX_LAST = NAME##_IDX + NUM - 1, + typedef enum ARMIDRegisterIdx { #include "cpu-sysregs.h.inc" NUM_ID_IDX, } ARMIDRegisterIdx; #undef DEF +#undef DEF_MUX #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) \ SYS_##NAME = ENCODE_ID_REG(OP0, OP1, CRN, CRM, OP2), +#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; #undef DEF +#undef DEF_MUX extern const uint32_t id_register_sysreg[NUM_ID_IDX]; diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 84d33e87dc..5668deee4c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -920,6 +920,18 @@ typedef struct { i_->idregs[REG ## _EL1_IDX]; \ }) +#define SET_IDREG_DEMUX(ISAR, REG, INDEX, VALUE) \ + ({ \ + ARMISARegisters *i_ = (ISAR); \ + i_->idregs[REG ## _IDX + INDEX] = VALUE; \ + }) + +#define GET_IDREG_DEMUX(ISAR, REG, INDEX) \ + ({ \ + ARMISARegisters *i_ = (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] = SYS_##NAME, +#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] = { #include "cpu-sysregs.h.inc" }; #undef DEF +#undef DEF_MUX #define DEF(NAME, OP0, OP1, CRN, CRM, OP2) \ case SYS_##NAME: return NAME##_IDX; +#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) } #undef DEF +#undef DEF_MUX void aarch64_cpu_sve_finalize(ARMCPU *cpu, Error **errp) { -- 2.54.0