From nobody Sat Sep 6 16:56:43 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756974120; cv=none; d=zohomail.com; s=zohoarc; b=AtMfX7iOw3DEhBXaWARVKUUY955CQxOZQleDY9kdQOMM4GPCkZ/ACxJ5hFfE4UYfYYRsBVmVpyZONmqXBtHyye8C6L12iX8AqgPzybk71f7QFBBEMDW56LfQp5220kTbr1znX+CwKvNi2cyA4DgwX/nacdGPkPPm50MInCD/1bI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756974120; 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=JLxFb3NYbTS9f/pm1eUqTOiDM/5DBuFeeS5GZ+vjJzw=; b=CLvp1rZCtxo+itggzcres414+oX5roSa4qXQnKvAgzypGAqnSBoh535XA5ezIJL7RfNdE7wV35tCyWSVh9HrdgS3K0JFTuxuao0vhSb9JMW+aThRDc7ha4WM4MqTa/ZBth5e1u9OISB6BVexrmYAq4MsKaLEXlf73ToXbnZ5pKE= 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 1756974120384355.2200393963774; Thu, 4 Sep 2025 01:22:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu59d-0005Lq-0J; Thu, 04 Sep 2025 04:17:13 -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 1uu55J-0006kA-PE for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:12:49 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu54h-0004G4-17 for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:12:42 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-61e8fdfd9b4so1639226a12.1 for ; Thu, 04 Sep 2025 01:12:06 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc216304sm12809226a12.19.2025.09.04.01.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:11:58 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BE271603EE; Thu, 04 Sep 2025 09:11:35 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973524; x=1757578324; 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=JLxFb3NYbTS9f/pm1eUqTOiDM/5DBuFeeS5GZ+vjJzw=; b=ip+lrQZDNSFNY4DI7P4Y3AQgARPPBv4N05IrOFKAAaxL4csVrkMOykOJ9MKFM/kAKS iLWItl/58o+eTJgBRfXa8n2x74YYPz/WMDl5uGp56VbeZPzUjodQHKKVWePZfjDBbDb/ K8Cf+eLR3eief69E17hnxioUDfwisFFfeablYXK7wARiOvZrjo5fJ0/WDIoRgTfUMTsN 9KWayY29cfjj0RLDw2ypbj2tILsvKKmLqI9qRPqDZlodkoJ0O2DTrHTU/C0Q+DoqTVCW HLVXiYXNbqD8tNyoKGW5Y4DBSlKNJAsKd0eNCnMV10orGSyp4myU99UQVsewCuoMLwU4 xzBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973524; x=1757578324; 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=JLxFb3NYbTS9f/pm1eUqTOiDM/5DBuFeeS5GZ+vjJzw=; b=V2iI3ksNpginYqF3uMSxLxGIems3WnNwebCpCahuVa7WEcOIyZ07ukccqNeo5mjZ+U 0CGQqSESOTmzCXIuLMzdT5wZpHPyHr/DCqRSvbwWxZpc1YJwnT3uMACDUWUjViR5fif6 Pnw1TPLSUs6e1CyiYMFBA5BuWLwPlvoNr0Yhq/qfvTAI/vqpw0b2zUX/TSwIIsHYnFJE DJl/Y9mTLFv21DjznOODmaVgfrjZOac1Cnu0meyTedzX/gl0mRu4LF0D+6AYdvHwocGh m5vJyBMCukqrXkc+mRMiI7RVbSQYXxLcj1w6Pz9W47kNgRS7chJSZDpkok+dQwDUYrpE MKaQ== X-Gm-Message-State: AOJu0YzOsR+egzdGRGuFXZoy498VxOMaxQbd1jJNPoJbNGyBLOvZO/PP 6DM1f4dttY4nu7LOuVZ/WNGkfyfnHP+DHFCLvmOqUqLJBWpKb7Qowm1lxQc8IE2hQAu2OMN5d9+ ZUkQefs3V+A== X-Gm-Gg: ASbGnctDhCAcPQzzp11dThr2JDCXh9grBdDHommuSNyVFEYRVOSDF7IYKMoOLBRFMzU HvvWc5eyrMoBmxw1vJU2DQACOTdBaMeGMl7IJsF/KNHZxb0s5zqJmi9iKvuINHuTvDsRkgfooOq ofFZxpJeI+FX4qGnM6zv0lJ1tEM4nFCSGaeckEHerpiwLMemJaRJl43Z4FDv110afFAeq8GioxD Zi4CmxNcrNYehVyYFyOPVd2FJwfG8U9lhk1F97+LpcvdN2yDmSOjFXUEvR76Nkpevl2t1FJc6Lj RF0ZQLB5ufRxHx6iqx1pUol7duJZH/S351VmYzFYUyM/2kw3PJPMkxEzLcLL7VIp/KZV6CWRgt/ JZ3T/E5ZxE8nYE5+0y9tcGbI= X-Google-Smtp-Source: AGHT+IGCIzSs++vG4Q/r44POEQofytYBuUaIuGpsL8NKxkWgprP60aqkJ1SOMVPil+NtFGgd+q+1ug== X-Received: by 2002:a05:6402:2356:b0:61c:e287:7ad3 with SMTP id 4fb4d7f45d1cf-61d22dfbd0emr19350555a12.6.1756973524107; Thu, 04 Sep 2025 01:12:04 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Reinoud Zandijk , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Huacai Chen , Zhao Liu , Paolo Bonzini , Alistair Francis , qemu-arm@nongnu.org, Fam Zheng , Helge Deller , Matthew Rosato , Fabiano Rosas , qemu-rust@nongnu.org, Bibo Mao , qemu-riscv@nongnu.org, Thanos Makatos , Liu Zhiwei , Riku Voipio , Cameron Esfahani , Alexander Graf , Laurent Vivier , Harsh Prateek Bora , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Stafford Horne , Sunil Muthuswamy , Jagannathan Raman , Igor Mammedov , Brian Cain , Phil Dennis-Jordan , devel@lists.libvirt.org, Mads Ynddal , Elena Ufimtseva , Peter Xu , Jason Herne , Michael Rolnik , Weiwei Li , Laurent Vivier , Ilya Leoshkevich , qemu-block@nongnu.org, Peter Maydell , Kostiantyn Kostiuk , Kyle Evans , David Hildenbrand , "Edgar E. Iglesias" , Warner Losh , Daniel Henrique Barboza , John Snow , Yoshinori Sato , Aleksandar Rikalo , Alistair Francis , Marcelo Tosatti , Yonggang Luo , Radoslaw Biernacki , Artyom Tarasenko , Yanan Wang , Eduardo Habkost , Aurelien Jarno , Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , "Michael S. Tsirkin" , Ani Sinha , Roman Bolshakov , Manos Pitsidianakis , Chinmay Rath , Thomas Huth , Cleber Rosa , kvm@vger.kernel.org, Song Gao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Eric Farman , Palmer Dabbelt , Leif Lindholm , Christian Borntraeger , Michael Roth , Mauro Carvalho Chehab , Jiaxun Yang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Mark Cave-Ayland , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Nicholas Piggin , John Levon Subject: [PATCH v2 058/281] linux-user: Move get_elf_hwcap to mips/elfload.c Date: Thu, 4 Sep 2025 09:07:32 +0100 Message-ID: <20250904081128.1942269-59-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250904081128.1942269-1-alex.bennee@linaro.org> References: <20250904081128.1942269-1-alex.bennee@linaro.org> 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=2a00:1450:4864:20::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: 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 @linaro.org) X-ZM-MESSAGEID: 1756974122268116600 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Change the return type to abi_ulong, and pass in the cpu. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/loader.h | 2 +- linux-user/mips/target_elf.h | 2 ++ linux-user/mips64/target_elf.h | 2 ++ linux-user/elfload.c | 52 +--------------------------------- linux-user/mips/elfload.c | 50 ++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 52 deletions(-) diff --git a/linux-user/loader.h b/linux-user/loader.h index 92b6d41145e..04457737dd4 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -103,7 +103,7 @@ const char *get_elf_cpu_model(uint32_t eflags); =20 #if defined(TARGET_I386) || defined(TARGET_X86_64) || defined(TARGET_ARM) \ || defined(TARGET_SPARC) || defined(TARGET_PPC) \ - || defined(TARGET_LOONGARCH64) + || defined(TARGET_LOONGARCH64) || defined(TARGET_MIPS) abi_ulong get_elf_hwcap(CPUState *cs); abi_ulong get_elf_hwcap2(CPUState *cs); #endif diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h index febf710c7ae..877f8347d70 100644 --- a/linux-user/mips/target_elf.h +++ b/linux-user/mips/target_elf.h @@ -8,4 +8,6 @@ #ifndef MIPS_TARGET_ELF_H #define MIPS_TARGET_ELF_H =20 +#define HAVE_ELF_HWCAP 1 + #endif diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index 02e6d14840a..c0347e5cb6e 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -8,4 +8,6 @@ #ifndef MIPS64_TARGET_ELF_H #define MIPS64_TARGET_ELF_H =20 +#define HAVE_ELF_HWCAP 1 + #endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 574b37a22c1..dc3f502277a 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -834,57 +834,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *r= egs, const CPUMIPSState *e #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 -/* See arch/mips/include/uapi/asm/hwcap.h. */ -enum { - HWCAP_MIPS_R6 =3D (1 << 0), - HWCAP_MIPS_MSA =3D (1 << 1), - HWCAP_MIPS_CRC32 =3D (1 << 2), - HWCAP_MIPS_MIPS16 =3D (1 << 3), - HWCAP_MIPS_MDMX =3D (1 << 4), - HWCAP_MIPS_MIPS3D =3D (1 << 5), - HWCAP_MIPS_SMARTMIPS =3D (1 << 6), - HWCAP_MIPS_DSP =3D (1 << 7), - HWCAP_MIPS_DSP2 =3D (1 << 8), - HWCAP_MIPS_DSP3 =3D (1 << 9), - HWCAP_MIPS_MIPS16E2 =3D (1 << 10), - HWCAP_LOONGSON_MMI =3D (1 << 11), - HWCAP_LOONGSON_EXT =3D (1 << 12), - HWCAP_LOONGSON_EXT2 =3D (1 << 13), - HWCAP_LOONGSON_CPUCFG =3D (1 << 14), -}; - -#define ELF_HWCAP get_elf_hwcap() - -#define GET_FEATURE_INSN(_flag, _hwcap) \ - do { if (cpu->env.insn_flags & (_flag)) { hwcaps |=3D _hwcap; } } whil= e (0) - -#define GET_FEATURE_REG_SET(_reg, _mask, _hwcap) \ - do { if (cpu->env._reg & (_mask)) { hwcaps |=3D _hwcap; } } while (0) - -#define GET_FEATURE_REG_EQU(_reg, _start, _length, _val, _hwcap) \ - do { \ - if (extract32(cpu->env._reg, (_start), (_length)) =3D=3D (_val)) {= \ - hwcaps |=3D _hwcap; \ - } \ - } while (0) - -static uint32_t get_elf_hwcap(void) -{ - MIPSCPU *cpu =3D MIPS_CPU(thread_cpu); - uint32_t hwcaps =3D 0; - - GET_FEATURE_REG_EQU(CP0_Config0, CP0C0_AR, CP0C0_AR_LENGTH, - 2, HWCAP_MIPS_R6); - GET_FEATURE_REG_SET(CP0_Config3, 1 << CP0C3_MSAP, HWCAP_MIPS_MSA); - GET_FEATURE_INSN(ASE_LMMI, HWCAP_LOONGSON_MMI); - GET_FEATURE_INSN(ASE_LEXT, HWCAP_LOONGSON_EXT); - - return hwcaps; -} - -#undef GET_FEATURE_REG_EQU -#undef GET_FEATURE_REG_SET -#undef GET_FEATURE_INSN +#define ELF_HWCAP get_elf_hwcap(thread_cpu) =20 #endif /* TARGET_MIPS */ =20 diff --git a/linux-user/mips/elfload.c b/linux-user/mips/elfload.c index 04e3b767401..739f71c21b1 100644 --- a/linux-user/mips/elfload.c +++ b/linux-user/mips/elfload.c @@ -42,3 +42,53 @@ const char *get_elf_cpu_model(uint32_t eflags) return "24Kf"; #endif } + +/* See arch/mips/include/uapi/asm/hwcap.h. */ +enum { + HWCAP_MIPS_R6 =3D (1 << 0), + HWCAP_MIPS_MSA =3D (1 << 1), + HWCAP_MIPS_CRC32 =3D (1 << 2), + HWCAP_MIPS_MIPS16 =3D (1 << 3), + HWCAP_MIPS_MDMX =3D (1 << 4), + HWCAP_MIPS_MIPS3D =3D (1 << 5), + HWCAP_MIPS_SMARTMIPS =3D (1 << 6), + HWCAP_MIPS_DSP =3D (1 << 7), + HWCAP_MIPS_DSP2 =3D (1 << 8), + HWCAP_MIPS_DSP3 =3D (1 << 9), + HWCAP_MIPS_MIPS16E2 =3D (1 << 10), + HWCAP_LOONGSON_MMI =3D (1 << 11), + HWCAP_LOONGSON_EXT =3D (1 << 12), + HWCAP_LOONGSON_EXT2 =3D (1 << 13), + HWCAP_LOONGSON_CPUCFG =3D (1 << 14), +}; + +#define GET_FEATURE_INSN(_flag, _hwcap) \ + do { if (cpu->env.insn_flags & (_flag)) { hwcaps |=3D _hwcap; } } whil= e (0) + +#define GET_FEATURE_REG_SET(_reg, _mask, _hwcap) \ + do { if (cpu->env._reg & (_mask)) { hwcaps |=3D _hwcap; } } while (0) + +#define GET_FEATURE_REG_EQU(_reg, _start, _length, _val, _hwcap) \ + do { \ + if (extract32(cpu->env._reg, (_start), (_length)) =3D=3D (_val)) {= \ + hwcaps |=3D _hwcap; \ + } \ + } while (0) + +abi_ulong get_elf_hwcap(CPUState *cs) +{ + MIPSCPU *cpu =3D MIPS_CPU(cs); + abi_ulong hwcaps =3D 0; + + GET_FEATURE_REG_EQU(CP0_Config0, CP0C0_AR, CP0C0_AR_LENGTH, + 2, HWCAP_MIPS_R6); + GET_FEATURE_REG_SET(CP0_Config3, 1 << CP0C3_MSAP, HWCAP_MIPS_MSA); + GET_FEATURE_INSN(ASE_LMMI, HWCAP_LOONGSON_MMI); + GET_FEATURE_INSN(ASE_LEXT, HWCAP_LOONGSON_EXT); + + return hwcaps; +} + +#undef GET_FEATURE_REG_EQU +#undef GET_FEATURE_REG_SET +#undef GET_FEATURE_INSN --=20 2.47.2