From nobody Tue Dec 16 11:44:18 2025 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=1745825799; cv=none; d=zohomail.com; s=zohoarc; b=IXoe2q35v38SfutHN/Xv2eY/W/xk40S2EvYtAI4tY6iD/KCqxXa4JyNIJbv5ISOW7asmf9QTA8VLbMxbrabptDbOc9//+YQL0Rt+e1dj6WooonYDHmDZDCbcMX0b0Ovgwk5bmY2SZPaJBtcRSBpv7zcaU7SulD2ZLgLUb4g95Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745825799; 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=odGwGJTkN5rT0dzaXsoDNbESsdKEm89dQk/J1U/878k=; b=PZEm8sIubmCmSeIxuYzLXRWSC/PoYal0NfCtKjsNud0KAp9Q+lC5zCrVxEqulyMTJ8GMdLus/M8XbN0NHTg6f/x0MNt8whCAnQnBPeAyxzIkDwnTqcPKcm0a30B9Q9AXCPb9Ev84MscHguWoqjyd+In7qZyoFKMnfzz/O5SrdNA= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745825799803191.4652080246599; Mon, 28 Apr 2025 00:36:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9J24-0006wM-H4; Mon, 28 Apr 2025 03:36:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9J1t-0006bp-Ja for qemu-devel@nongnu.org; Mon, 28 Apr 2025 03:35:56 -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 1u9J1s-0001Hg-0b for qemu-devel@nongnu.org; Mon, 28 Apr 2025 03:35:53 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-149-SMkVph5MMNqkcUwxerI_jw-1; Mon, 28 Apr 2025 03:35:47 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43cf5196c25so23415955e9.0 for ; Mon, 28 Apr 2025 00:35:47 -0700 (PDT) Received: from [192.168.122.1] ([151.95.54.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073cbe386sm10144250f8f.42.2025.04.28.00.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 00:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745825751; 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=odGwGJTkN5rT0dzaXsoDNbESsdKEm89dQk/J1U/878k=; b=ImzdfwbLP6pzvrmem3MQLMV419jubF8z2fUfhUZ/VYXUAevblqEcvfqt78fCrxMRdof+ey ZjIHKcCTvYYSuiw9k4qp0BzLsRPFdcofnsNm6EXKitZshpmJ9xvcmpHfc6E83KqFmymNBG izRR+GWxP8Fe2ZM3qxaqTY9EAVNKQKY= X-MC-Unique: SMkVph5MMNqkcUwxerI_jw-1 X-Mimecast-MFC-AGG-ID: SMkVph5MMNqkcUwxerI_jw_1745825746 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745825746; x=1746430546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=odGwGJTkN5rT0dzaXsoDNbESsdKEm89dQk/J1U/878k=; b=u/OqPvGeK0Q6szN5utYTZ+n8kga0Pt8sW/qOyPRzqysBj0g0gRIrwlKJTIIlJ1mcnQ +84SjTw89EE5qdHFuQUSpN93BeguyPpzhKfTEqq+tJCXnkMRI6buis6HZD19gzVoTnlz TEfIcuEmQbWdhkdURhEpYbFU8hSy3K7XAwH6d76KJg/lu27bWjfkf4ajCTgaWxNl/f+S efzBWcCwdx+3v5lL08bW0OsAkfaF0QJJTJys3gNm6Y8/QVFQrjZFX8lhTE2rSf3Tsx0u qTs9iI9hic4oWc3rm/gRgE35H5Ij0CfBIRkSVZxh9crVggJ1GSq6u/H1/JZBeoH0I/32 iRtA== X-Gm-Message-State: AOJu0YyBtQQ8ArNwRzPMivC6hJY4i8K+ft7JfqTeSeRGSWB9ahDPJScr ASHN3FUEGhcH/NhkMlhUxv3b1fXMcNjjXQgqMd/vaAjbTHq8snooAzENjGDrtXpbFNI25+dMrI4 rfrC6RtVQzz+WBRiSUxclvMYScwSXtglwAh9nghvUgaiacN8vwSUSrtjNAaaHV2XfZANYfwYIst IeJi7mFIYoC1hrd28USG2k5xczQ5drSHj7bcrE X-Gm-Gg: ASbGncutL6ZpRxkSi4iaW+6vShWlnqmb/GYptMuVpV81e9MvfTPdYuflnQHvgvNNg1P NJwhm47KMBVqVuIUketb5Tb/bdGzBPMTr+m/U1ulvllJwyv3J1xiIIqNgBjkMoFve+e4/0gzoQL YLPOkw4bdmoYCYiDcfSDhAdetlE4tfL+twISqTInOtQNk4NVYJCnOxlKPqbMEDVdVX/nAaBsy0n HboQgBNt2lCf91qEdrbEaGIjN90e6rrANlGV6uDWNYmxm8JeabmoZ2fFeNNhUB8DVIvsxb5jwSs thhi+rhFL08rq8I= X-Received: by 2002:a05:600c:5252:b0:43d:abd:ad1c with SMTP id 5b1f17b1804b1-440a65b6f77mr76467785e9.6.1745825745717; Mon, 28 Apr 2025 00:35:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHitAI7cxo+5r54d1x6kI8r99LOCzmzBfmqs9z8ka16Utr8zzLLu3HiIS2N9dpMpmY+P4c2ag== X-Received: by 2002:a05:600c:5252:b0:43d:abd:ad1c with SMTP id 5b1f17b1804b1-440a65b6f77mr76467635e9.6.1745825745387; Mon, 28 Apr 2025 00:35:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alistair.francis@wdc.com, dbarboza@ventanamicro.com Subject: [PATCH 25/26] target/riscv: convert Xiangshan Nanhu to RISCVCPUDef Date: Mon, 28 Apr 2025 09:34:40 +0200 Message-ID: <20250428073442.315770-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250428073442.315770-1-pbonzini@redhat.com> References: <20250428073442.315770-1-pbonzini@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=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.492, 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=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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: 1745825802735019100 Content-Type: text/plain; charset="utf-8" Reviewed-by: Alistair Francis Signed-off-by: Paolo Bonzini --- target/riscv/cpu.c | 80 +++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 57 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 6cdb92c8a4c..e7e9e6bfe80 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -441,16 +441,6 @@ const char *satp_mode_str(uint8_t satp_mode, bool is_3= 2_bit) g_assert_not_reached(); } =20 -static void __attribute__((unused)) -set_satp_mode_max_supported(RISCVCPU *cpu, int satp_mode) -{ - bool rv32 =3D riscv_cpu_mxl(&cpu->env) =3D=3D MXL_RV32; - const bool *valid_vm =3D rv32 ? valid_vm_1_10_32 : valid_vm_1_10_64; - - assert(valid_vm[satp_mode]); - cpu->cfg.max_satp_mode =3D satp_mode; -} - static bool get_satp_mode_supported(RISCVCPU *cpu, uint16_t *supported) { bool rv32 =3D riscv_cpu_is_32bit(cpu); @@ -499,38 +489,6 @@ static void riscv_register_custom_csrs(RISCVCPU *cpu, = const RISCVCSR *csr_list) } #endif =20 -#if defined(TARGET_RISCV64) - -static void rv64_xiangshan_nanhu_cpu_init(Object *obj) -{ - CPURISCVState *env =3D &RISCV_CPU(obj)->env; - RISCVCPU *cpu =3D RISCV_CPU(obj); - - riscv_cpu_set_misa_ext(env, RVG | RVC | RVB | RVS | RVU); - env->priv_ver =3D PRIV_VERSION_1_12_0; - - /* Enable ISA extensions */ - cpu->cfg.ext_zbc =3D true; - cpu->cfg.ext_zbkb =3D true; - cpu->cfg.ext_zbkc =3D true; - cpu->cfg.ext_zbkx =3D true; - cpu->cfg.ext_zknd =3D true; - cpu->cfg.ext_zkne =3D true; - cpu->cfg.ext_zknh =3D true; - cpu->cfg.ext_zksed =3D true; - cpu->cfg.ext_zksh =3D true; - cpu->cfg.ext_svinval =3D true; - - cpu->cfg.mmu =3D true; - cpu->cfg.pmp =3D true; - -#ifndef CONFIG_USER_ONLY - set_satp_mode_max_supported(cpu, VM_1_10_SV39); -#endif -} - -#endif /* !TARGET_RISCV64 */ - static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; @@ -2892,19 +2850,6 @@ void riscv_isa_write_fdt(RISCVCPU *cpu, void *fdt, c= har *nodename) } #endif =20 -#define DEFINE_VENDOR_CPU(type_name, misa_mxl_max_, initfn) \ - { \ - .name =3D (type_name), \ - .parent =3D TYPE_RISCV_VENDOR_CPU, \ - .instance_init =3D (initfn), \ - .class_data =3D &((const RISCVCPUDef) { \ - .misa_mxl_max =3D (misa_mxl_max_), \ - .priv_spec =3D RISCV_PROFILE_ATTR_UNUSED, \ - .vext_spec =3D RISCV_PROFILE_ATTR_UNUSED, \ - .cfg.max_satp_mode =3D -1, \ - }), \ - } - #define DEFINE_ABSTRACT_RISCV_CPU(type_name, parent_type_name, ...) \ { \ .name =3D (type_name), \ @@ -3204,8 +3149,29 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { .cfg.max_satp_mode =3D VM_1_10_SV48, ), =20 - DEFINE_VENDOR_CPU(TYPE_RISCV_CPU_XIANGSHAN_NANHU, - MXL_RV64, rv64_xiangshan_= nanhu_cpu_init), + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_XIANGSHAN_NANHU, TYPE_RISCV_VENDOR_CPU, + .misa_mxl_max =3D MXL_RV64, + .misa_ext =3D RVG | RVC | RVB | RVS | RVU, + .priv_spec =3D PRIV_VERSION_1_12_0, + + /* ISA extensions */ + .cfg.ext_zbc =3D true, + .cfg.ext_zbkb =3D true, + .cfg.ext_zbkc =3D true, + .cfg.ext_zbkx =3D true, + .cfg.ext_zknd =3D true, + .cfg.ext_zkne =3D true, + .cfg.ext_zknh =3D true, + .cfg.ext_zksed =3D true, + .cfg.ext_zksh =3D true, + .cfg.ext_svinval =3D true, + + .cfg.mmu =3D true, + .cfg.pmp =3D true, + + .cfg.max_satp_mode =3D VM_1_10_SV39, + ), + #if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) DEFINE_RISCV_CPU(TYPE_RISCV_CPU_BASE128, TYPE_RISCV_DYNAMIC_CPU, .cfg.max_satp_mode =3D VM_1_10_SV57, --=20 2.49.0