From nobody Tue May 14 00:00:33 2024 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=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1683127840; cv=none; d=zohomail.com; s=zohoarc; b=jLg1GP7d8LWr4xnm+prA78/KZkAMgrC8xJU045OkLf6gGCIMmPpwunroqI2jCjR3MFVr4fw+W8OQNr6TP8J/iFM0N3LH2IUGYKX1jl5QBlT29giC0d036z6QSPCxGfRx7G8DMtpew12wCYJbw79d6gfPyzWAVQW2XyAbSWGp6p0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683127840; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=OMTz4WaZav7ggbW3D2JGInU1tyLsnWu0ZUFlrCrX4oM=; b=Agx9rFpwPE6lRn4dsb4LNICD8gPrWJQobzCIpmWIX8m9tyGTKU4DLIvN+/qw42rw/pEqVA4LLjHwJKF6b+edA8tEydiOkUMdNj6S+z/BX6LZlWvKQUCW+8aY3BPfPTJYlctqwNc/PEMbM3khsp+WvpPULrgom0GkSt4WO5+aidI= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16831278406431000.5449201377158; Wed, 3 May 2023 08:30:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puEQw-0002xE-E1; Wed, 03 May 2023 11:30:22 -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 1puEQt-0002wh-HL for qemu-devel@nongnu.org; Wed, 03 May 2023 11:30:19 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puEQq-0002QK-9B for qemu-devel@nongnu.org; Wed, 03 May 2023 11:30:18 -0400 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 8BEAE2298E; Wed, 3 May 2023 15:30:12 +0000 (UTC) Received: from hawking.suse.de (unknown [10.168.4.11]) by relay2.suse.de (Postfix) with ESMTP id 709752C141; Wed, 3 May 2023 15:30:12 +0000 (UTC) Received: by hawking.suse.de (Postfix, from userid 17005) id 64D2F4AAD8C; Wed, 3 May 2023 17:30:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683127812; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=OMTz4WaZav7ggbW3D2JGInU1tyLsnWu0ZUFlrCrX4oM=; b=IfE8YayAZ0yLoj/oqMVJ+PpTSo/YJbsI7HHHVAmnDfRnVf4sCDLd9x10pBILyOXr9iYdyK TjyhcKCGl+LLxJe1DdLS0FbfrCudcBVNLPiiJJCGu2ea1sU/ZBNuAN6Bq+17oCzF+DxC9J VozC24frW3j3vnGSOG4kOjKwNzTr6e0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683127812; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=OMTz4WaZav7ggbW3D2JGInU1tyLsnWu0ZUFlrCrX4oM=; b=xY9cwfgJpoGm4Na5cUTTvHZnQ9RBO1f/JXfEetotlfVZiOlrO9f9R2jjcVtGDr8lDhvU80 wJO/V7dS9acxGiBw== From: Andreas Schwab To: Laurent Vivier Cc: Palmer Dabbelt , qemu-devel@nongnu.org Subject: [PATCH v3] linux-user: Add /proc/cpuinfo handler for RISC-V X-Yow: Do I hear th' SPINNING of various WHIRRING, ROUND, and WARM WHIRLOMATICS?! Date: Wed, 03 May 2023 17:30:12 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 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=195.135.220.28; envelope-from=schwab@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @suse.de) X-ZM-MESSAGEID: 1683127842361100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From 912af433fa5d93ce81d2054135ed475ab7462d2d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 18 Apr 2023 11:54:01 +0200 Signed-off-by: Andreas Schwab Reviewed-by: Palmer Dabbelt --- v3: fix isa order linux-user/syscall.c | 55 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 69f740ff98..5207259b56 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8231,7 +8231,8 @@ void target_exception_dump(CPUArchState *env, const c= har *fmt, int code) } =20 #if HOST_BIG_ENDIAN !=3D TARGET_BIG_ENDIAN || \ - defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) + defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) = || \ + defined(TARGET_RISCV) static int is_proc(const char *filename, const char *entry) { return strcmp(filename, entry) =3D=3D 0; @@ -8309,6 +8310,56 @@ static int open_cpuinfo(CPUArchState *cpu_env, int f= d) } #endif =20 +#if defined(TARGET_RISCV) +static int open_cpuinfo(CPUArchState *cpu_env, int fd) +{ + int i, num_cpus; + char isa[32]; + +#if defined(TARGET_RISCV32) + strcpy (isa, "rv32"); +#endif +#if defined(TARGET_RISCV64) + strcpy (isa, "rv64"); +#endif + i =3D strlen (isa); + if (riscv_has_ext (cpu_env, RVI)) + isa[i++] =3D 'i'; + if (riscv_has_ext (cpu_env, RVE)) + isa[i++] =3D 'e'; + if (riscv_has_ext (cpu_env, RVM)) + isa[i++] =3D 'm'; + if (riscv_has_ext (cpu_env, RVA)) + isa[i++] =3D 'a'; + if (riscv_has_ext (cpu_env, RVF)) + isa[i++] =3D 'f'; + if (riscv_has_ext (cpu_env, RVD)) + isa[i++] =3D 'd'; + if (riscv_has_ext (cpu_env, RVC)) + isa[i++] =3D 'c'; + if (riscv_has_ext (cpu_env, RVV)) + isa[i++] =3D 'v'; + isa[i] =3D 0; + + num_cpus =3D sysconf(_SC_NPROCESSORS_ONLN); + for (i =3D 0; i < num_cpus; i++) { + dprintf(fd, "processor\t: %d\n", i); + dprintf(fd, "hart\t\t: %d\n", i); + dprintf(fd, "isa\t\t: %s\n", isa); +#if defined(TARGET_RISCV32) + dprintf(fd, "mmu\t\t: sv32\n"); +#endif +#if defined(TARGET_RISCV64) + dprintf(fd, "mmu\t\t: sv57\n"); +#endif + dprintf(fd, "mvendorid\t: 0x0\n"); + dprintf(fd, "marchid\t\t: 0x0\n"); + dprintf(fd, "mimpid\t\t: 0x0\n\n"); + } + return 0; +} +#endif + #if defined(TARGET_M68K) static int open_hardware(CPUArchState *cpu_env, int fd) { @@ -8333,7 +8384,7 @@ static int do_openat(CPUArchState *cpu_env, int dirfd= , const char *pathname, int #if HOST_BIG_ENDIAN !=3D TARGET_BIG_ENDIAN { "/proc/net/route", open_net_route, is_proc }, #endif -#if defined(TARGET_SPARC) || defined(TARGET_HPPA) +#if defined(TARGET_SPARC) || defined(TARGET_HPPA) || defined(TARGET_RISCV) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif #if defined(TARGET_M68K) --=20 2.40.1 --=20 Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint =3D 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."