From patchwork Wed Aug 14 13:39:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13763505 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 lists.gnu.org (lists.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 13628C531DD for ; Wed, 14 Aug 2024 13:40:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1seEEG-0006dH-Dj; Wed, 14 Aug 2024 09:39:56 -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 1seEEE-0006cV-IH for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:39:54 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1seEED-0004Pz-0m for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:39:54 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4281ca54fd3so49416265e9.2 for ; Wed, 14 Aug 2024 06:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723642790; x=1724247590; 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=IzGby2LfOJ0PSTr7E7Scgqvd+RTVUALDNaU5gvfZclk=; b=GtunYBGEiiyutsKssbQyMEOfYVAkyc7rc14UmmxdApvT7WwlDooeuYs8E3soKK+T1L 6uk4NdQTuJkKQO9APFrFmegO8KcvWfz2UVPSwpMtO78BKSzbCSTojMztzOs7u0LNP/ZZ 0xwbKWa5SAKxc3/AEsAABky7Wdl1kXU8C0/JOp6ZG+Czimv3KM53tQt1jRFgX2Vv19Yb gLidHj4nuDGge/xDz4/4brEjTeVVl7cnaA7SD2fMal69RsXMwjrUSYa0UI8TGogMVUdM 9EXavST58zb+22myN+LjOUmZYGryKlDu6xGsHbk3awJOcSPXGmstqtl/IAy9SU8rs1B0 oY0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723642790; x=1724247590; 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=IzGby2LfOJ0PSTr7E7Scgqvd+RTVUALDNaU5gvfZclk=; b=KZDLzAh/M6aFnMoKxTvlP6DmD+iYDO2S5XUrO+CqXCmPsZL1iliUpbQZ+DlC86wmIR ss9lcPG/cxe//GqT3fl1MG3qajbd6TJIWHBuid3gJeI3dwgqnNNnIHfiMLlfnUQBgYQi 04GIGNi6UTdPRj+G5IAjIZ4EDAnjFocQ5k3WfA5PhLTwylSAXscVDp6c7Mou5R/6DTX1 RsvfZbrThzNMDTqMD4emjuJn5gb405vMGR6PVLZK17Q3e7rLzShE+T5bBgabJrQlrDka 5Ff0ntvyHOOYNqw2/OHwplzj6Dq5XrvSkvBJJTrmRAV4Ldi1xaJXF97MYECP4oxFXsOo fFsw== X-Gm-Message-State: AOJu0YyeYGJ7SY044lQ6x2Qq0vfVZv9EjZBlbyjuypSvMC4EFS26lwz+ NyDc0JCiZo1E9pa2ccuE8W10mNUjB+0I8XGhjXWaUgtV507iD5LW3rzpvl8VsGDT4UNPJwm77FH mfOA= X-Google-Smtp-Source: AGHT+IECNJAuWIyAvPQ6Fg6noo3XvXNdo0VYHynBZeINMsbEvo/pCg/PfgGfa8qvvT88ft5k9v5Z6Q== X-Received: by 2002:a05:600c:a42:b0:426:5f06:5462 with SMTP id 5b1f17b1804b1-429dd268f31mr19589125e9.37.1723642790057; Wed, 14 Aug 2024 06:39:50 -0700 (PDT) Received: from m1x-phil.lan ([176.187.208.57]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ded4e3f4sm20354515e9.37.2024.08.14.06.39.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 06:39:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Laurent Vivier , Richard Henderson , YunQiang Su , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-9.1 1/4] linux-user/mips: Do not try to use removed R5900 CPU Date: Wed, 14 Aug 2024 15:39:25 +0200 Message-ID: <20240814133928.6746-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814133928.6746-1-philmd@linaro.org> References: <20240814133928.6746-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org R5900 emulation was removed in commit 823f2897bd. Remove it from ELF parsing in order to avoid: $ qemu-mipsn32 ./test5900 qemu-mipsn32: unable to find CPU model 'R5900' This reverts commit 4d9e5a0eb7df6e98ac6cf5e16029f35dd05b9537. Fixes: 823f2897bd ("target/mips: Disable R5900 support") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- linux-user/mips/target_elf.h | 3 --- linux-user/mips64/target_elf.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h index b965e86b2b..71a32315a8 100644 --- a/linux-user/mips/target_elf.h +++ b/linux-user/mips/target_elf.h @@ -12,9 +12,6 @@ static inline const char *cpu_get_model(uint32_t eflags) if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_32R6) { return "mips32r6-generic"; } - if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) { - return "R5900"; - } if (eflags & EF_MIPS_NAN2008) { return "P5600"; } diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index 5f2f2df29f..ec55d8542a 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -12,9 +12,6 @@ static inline const char *cpu_get_model(uint32_t eflags) if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_64R6) { return "I6400"; } - if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) { - return "R5900"; - } return "5KEf"; } #endif From patchwork Wed Aug 14 13:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13763503 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 lists.gnu.org (lists.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 D92EFC3DA4A for ; Wed, 14 Aug 2024 13:40:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1seEEP-00074t-Q2; Wed, 14 Aug 2024 09:40:05 -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 1seEEO-00073j-4j for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:40:04 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1seEEM-0004RB-CE for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:40:03 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3684bea9728so3910054f8f.3 for ; Wed, 14 Aug 2024 06:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723642800; x=1724247600; 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=jxLHqx+S5C+GI1KIVnOAvNeyCE7KTQMJVIjAY6qG4kE=; b=M1JdrgpRAdN78DDRdwZPpPQ6Rg2uIMpne6tJIlimLIaVcRbH5ucqqfewk9HSm2nupo 06umrhXuUT/GtIkaA04cNOAvB7TWKA8ISJphj13WrQgjW4hlcVNuFpwFIusGdTwkjzc9 U+COr1Uml0kAmD5/wojJqM4pcNmOQEk1wkyNOCfw6tm1PwFHUfJp3dFlYHvRL4mbzKmR gTJf+/b0nqkdbX7VonjOVQUqhA2fx3SIU5CN+ZVcE5WTE9Qdo3layuwPJEP2Xok3l8X6 HAUwq0ZfFCXFD/KGPoDARygWptYeRqkVXhbkMCdln1uFqh928wqrL7by6xo25eoj/hRd 4jPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723642800; x=1724247600; 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=jxLHqx+S5C+GI1KIVnOAvNeyCE7KTQMJVIjAY6qG4kE=; b=LOEDR9aIVdELHweDaOslm1F+L9AoMW+wfw4lK/x7MFtHcDHK/kuaz3PbHcOMmAM/La 5Y6KAaFAHF9MCD6DESnaJX86FX3ZT2RZe7oNY/xfwa8vm3u8QkdxjEbNBsmXQ1oMAECt 1XTpynICXHcouVCM/9Ruuo3WPxefiASO9hUdPP+AxMdfn0/TaAUFf91NaMpjyqQ9hpwp v6DThI6fXzTmE9xMjcOnMlDliAiwktKOe2H0gAdtm/OEX3awfQ9fH0hwmuBKq9WUx6xS SNAgyAk0uEEWJIkUPnxwv4Imf0Fc2KdlXHMMQA3v5TAurF1h4MSlgp/iWi4+E0KsTI+M e7Vw== X-Gm-Message-State: AOJu0YzmIZnj/XEm1Hwz++VWsmRPqyAj7SlW0HxjMSwvYP/AD8z+W6W7 Le1Er9PcqUEHfMRhhXjmzNdQNP9z3jTiM7Py1IoROkHadofTC0PdbbKDfhJD0vk4YHk7E9CN+k4 F+hY= X-Google-Smtp-Source: AGHT+IGpWkFi07doCplbrzZz3dDjDbBNd+a4oenVB3ShtBAM2SIzkFdS4igdKIPRnNpaw4/eIWu+3g== X-Received: by 2002:adf:fa4a:0:b0:367:8ff0:e022 with SMTP id ffacd0b85a97d-37177837cb2mr1780181f8f.63.1723642800475; Wed, 14 Aug 2024 06:40:00 -0700 (PDT) Received: from m1x-phil.lan ([176.187.208.57]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36e4c938280sm12912096f8f.36.2024.08.14.06.39.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 06:40:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Laurent Vivier , Richard Henderson , YunQiang Su , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pavel Dovgalyuk , =?utf-8?b?Sm9obmF0aGFuIEjhu691?= =?utf-8?b?IFRyw60=?= Subject: [PATCH-for-9.1 2/4] linux-user/mips: Select Octeon68XX CPU for Octeon binaries Date: Wed, 14 Aug 2024 15:39:26 +0200 Message-ID: <20240814133928.6746-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814133928.6746-1-philmd@linaro.org> References: <20240814133928.6746-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The Octeon68XX CPU is available since commit 9a6046a655 ("target/mips: introduce Cavium Octeon CPU model"). Cc: Pavel Dovgalyuk Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1722 Reported-by: Johnathan Hữu Trí Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- linux-user/mips64/target_elf.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index ec55d8542a..ce6fb6541e 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -9,6 +9,14 @@ #define MIPS64_TARGET_ELF_H static inline const char *cpu_get_model(uint32_t eflags) { + switch (eflags & EF_MIPS_MACH) { + case EF_MIPS_MACH_OCTEON: + case EF_MIPS_MACH_OCTEON2: + case EF_MIPS_MACH_OCTEON3: + return "Octeon68XX"; + default: + break; + } if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_64R6) { return "I6400"; } From patchwork Wed Aug 14 13:39:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13763506 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 lists.gnu.org (lists.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 B06FBC3DA4A for ; Wed, 14 Aug 2024 13:40:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1seEEn-0007KA-BW; Wed, 14 Aug 2024 09:40:29 -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 1seEEZ-0007Gd-Ar for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:40:15 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1seEEX-0004eM-Td for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:40:15 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-428243f928fso65717475e9.0 for ; Wed, 14 Aug 2024 06:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723642812; x=1724247612; 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=oX+ZJO9GlIxEvNmltPXVnl0FgCfTKQ9x41AhOi1yyeY=; b=c8y28m64glR/xWisZBrroEi0aygK92ge4j8pZq4qRANGS/sG0EXwFE7cmdOWE7XJWW 5rWqUk8tA6Fhrfl+VCXuF8RzVEr4OeziZKh/p8Pr6wL/gauC2nFpGnlihXuNhY3EG8dw wbWth5gGY9gRFThwdwvoZK0UWS6NHWnZdySvUUKiO9NzcmZUjaOuafjqJghJ1DHNIJCL NSLLeOicCK2WwPDiErmwCtGAvosDEww0HSl3cpnHFsmSkKFv0z7catBpDUa4SRqX2R6I dzm485ydRjWEDYOssvdh5w1gi1or6M7jnp3gZPdFJ5BaaX2YvQTlsglmYa0TzZaacqEc 6pAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723642812; x=1724247612; 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=oX+ZJO9GlIxEvNmltPXVnl0FgCfTKQ9x41AhOi1yyeY=; b=EaGIiJ9f5dYfMKMbF1dYFzSO1JYuhasQo3sxZHhp7LC3Bj87CFIQrD4NNTEW6MGGUE tQ0eIOuDWqvXfxE+fB0lP+AZd+nO+JCCIAro4YkxRNYDDSomCtHYhiISZZRQ+n0vSNha JqR6ftShyrVZ+T2E396e7urM9hQSG4e6r5oimJK3PeBxaIRuCwjgxOvs7m9/oT+aB4Iv glVk4bp3Ce6qKnhgaDaaYdWzAXj3juieG84+4DplTu8DmWYpTfXec5Vq2RCyGm6wLsZ8 yI9h+CWQgYd4Omm4VxYTEV+SyCwzhtPwnHzxpNuPxF09LoAg8U3m/GfNNb7hjcY7jP/Z MBjg== X-Gm-Message-State: AOJu0YyM48xrrEaCu8wERU2jOjmp1jJEmNrY82EkWHg9L9Xdx9Rak604 rvmwSDVRW02814PW0jOfKJh+j1fcYzIS9uHdSXRYgMevjMedAHBHZKAib9JoxVbfklrVLUKsrQD +6CM= X-Google-Smtp-Source: AGHT+IHFgKMELNwMktbIzke0PrxEUnWIUrbvmw4ZRiuRAMS9atc/udYMxrJMiXKVbDa9DSLzpIcoiQ== X-Received: by 2002:adf:ca86:0:b0:368:3384:e9da with SMTP id ffacd0b85a97d-371778209cfmr2403059f8f.62.1723642811832; Wed, 14 Aug 2024 06:40:11 -0700 (PDT) Received: from m1x-phil.lan ([176.187.208.57]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36e4d1dac3fsm12787520f8f.63.2024.08.14.06.40.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 06:40:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Laurent Vivier , Richard Henderson , YunQiang Su , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-9.1 3/4] linux-user/mips: Select MIPS64R2-generic for Rel2 binaries Date: Wed, 14 Aug 2024 15:39:27 +0200 Message-ID: <20240814133928.6746-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814133928.6746-1-philmd@linaro.org> References: <20240814133928.6746-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Cc: YunQiang Su Reported-by: Jiaxun Yang Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- linux-user/mips64/target_elf.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index ce6fb6541e..a3a8b2e385 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -17,8 +17,13 @@ static inline const char *cpu_get_model(uint32_t eflags) default: break; } - if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_64R6) { + switch (eflags & EF_MIPS_ARCH) { + case EF_MIPS_ARCH_64R6: return "I6400"; + case EF_MIPS_ARCH_64R2: + return "MIPS64R2-generic"; + default: + break; } return "5KEf"; } From patchwork Wed Aug 14 13:39:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13763507 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 lists.gnu.org (lists.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 4E80AC3DA4A for ; Wed, 14 Aug 2024 13:40:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1seEEp-0007kO-4S; Wed, 14 Aug 2024 09:40:31 -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 1seEEk-0007QX-Ls for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:40:29 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1seEEi-0004fU-Gx for qemu-devel@nongnu.org; Wed, 14 Aug 2024 09:40:26 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-36bcc168cdaso4498152f8f.0 for ; Wed, 14 Aug 2024 06:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723642823; x=1724247623; 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=cmqvLXpHsMm1BHP4snAIAmxsuND6y2HmjOEmCpPOzSI=; b=tddrXg450q937Wo+qbCfEsSWctKgwVA0LDrjH1FQV0Ph9/VOQwVAc1dhWc5GttZNe1 XPeugubb7bNfhA3NhmhGXDKlZf8mpYGxWngDWIt9bZ3XNMdmF04AWwgCzIGFvz4ZBewp OfN59YfjAONwTdYLrGSwNwhsc8KPS+3mIICXxhUrmw8LkRPw7Axm0ruLYJauKaLDFrPa p8nCZ3epwXk7aJoJNjO4NdSEcCodcb+So/WiAU3ohz+ky1RM8svEJelTM3G9wsobFmIc 2IwMvh28pXn71+yoq3STGDCchKaSCR00fnhhFCmp/dXp0Qt2zkZu5YuDjodC6ECJtJKo 5nQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723642823; x=1724247623; 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=cmqvLXpHsMm1BHP4snAIAmxsuND6y2HmjOEmCpPOzSI=; b=b/OShccNOjzkaentqMQ+EtzlsQADfs499xz0nbZQVbXtJikV50ImVEY0spzX7HDntZ Wtf6G0mzqbGhsb+Hlp+YJGsTC6xzrHxp165LvF4HLswYBr7ZiLNU36T4T1YHnxgwYMLe lKUAGddLkxsGt0ZByzVD7PkPxJ8Li0I5wWu0Ciyzv7/hjaMEwjBd2+t2/mipu4CJcBfL B9xAZiuyVNZFC9FCJsI3wQB2FtDElPNXsZ4IyLh6nU86yZZgCgKG06UcIztOrfzorCN1 1spOhw1/1IQw2poGLXGtgc6p8l96LP9Tc9bLr8BY0z/KajZaqmGWgWnruTtF9q1bwFXH HzoQ== X-Gm-Message-State: AOJu0YwrhG5Vt+fLP5nLtk6XHoz76LBzcSjM1sj91b+m/1I0Minm0Pha iMPFw8RyljZukFZerIfry0tss2cDRzh1O39yMgqTBD2KLdRXXRV+e4Xc6PgTFI/aj/h1YrAFsyZ Gf80= X-Google-Smtp-Source: AGHT+IFvhODmAfAuwVZxgCpoYf8NdEklFCc4gWVOb35d4limDWjg0Cf675n3PiH0H7fDqyUPChE1Vw== X-Received: by 2002:a5d:5e0f:0:b0:371:8283:94c1 with SMTP id ffacd0b85a97d-371828395eamr379163f8f.0.1723642822653; Wed, 14 Aug 2024 06:40:22 -0700 (PDT) Received: from m1x-phil.lan ([176.187.208.57]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36e4c937b5fsm12803551f8f.31.2024.08.14.06.40.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 06:40:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Laurent Vivier , Richard Henderson , YunQiang Su , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-9.1? 4/4] linux-user/mips: Select Loongson CPU for Loongson binaries Date: Wed, 14 Aug 2024 15:39:28 +0200 Message-ID: <20240814133928.6746-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814133928.6746-1-philmd@linaro.org> References: <20240814133928.6746-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- linux-user/mips64/target_elf.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index a3a8b2e385..502af9d278 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -14,6 +14,12 @@ static inline const char *cpu_get_model(uint32_t eflags) case EF_MIPS_MACH_OCTEON2: case EF_MIPS_MACH_OCTEON3: return "Octeon68XX"; + case EF_MIPS_MACH_LS2E: + return "Loongson-2E"; + case EF_MIPS_MACH_LS2F: + return "Loongson-2F"; + case EF_MIPS_MACH_LS3A: + return "Loongson-3A1000"; default: break; }