From patchwork Wed Sep 11 06:49:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 173583 Delivered-To: patch@linaro.org Received: by 2002:ac9:19ad:0:0:0:0:0 with SMTP id d45csp414681oce; Tue, 10 Sep 2019 23:53:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcziqpyiVtsKBysObjYVlME6KF33HVtG8REacPFSsidWVUtH4avVNHY10/ZhrQCow2GHGI X-Received: by 2002:a05:6214:1591:: with SMTP id m17mr12745203qvw.222.1568184811286; Tue, 10 Sep 2019 23:53:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568184811; cv=none; d=google.com; s=arc-20160816; b=UncCodogoN9EmnOS8q56BVyMp7Z+8MyPlIkPzxvmnLWmV8X0iErbtqRjLlV1q2+a9P r7AGUqFNY5l2Ohr1ijVekl5EwcyZ33BMh+ZceaPwfBTQ1duTaPuyAbk4WDv5jQaNQQXL N8VdnQ5hrdqAmLlpQSgifypNRCuQRpXFELKXyaIrnY9Tmpn6XdCfTlFQvsHJ7qjoDGK2 zxoMppzpvsEOpU09zAyVzz/8+ldWE3fsxPHjhqMDCBXvxttQz/yBlUGPr9rnrc96Nzfg 7GgsVe36KdbEJ2EL4gGQKKsTvqzwQt1Jfn94xuXCri6v5CInVpacboqRPtOlYQdoqJYW IhnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=NFKImPmr08G8SsfslwDCiB7mSjMEwDNYejz9mjUnLgQ=; b=UgwGmrJ1x9MDYa/uJ0ATbMBjzsoTo5wZ2k4/U4KM7NjPNMpgbvVEoekuG1kYFThufm GFBCjJM6M0XtUrkwjw1eTWnx5RKAOiT7ogZlfaBZBG2s4PrX0MxV7wr5PTXWCQWQ/MP5 wzCQ1sP4wGTwF+1wL7HdIgdtoCz7AVY2r5get9JcVdXNowrmiooOQtm/IruZTlks/qdH u4CTrGAjlTKWk88Chi6ppyS8ZvhGVmeGQgJd5uQa080/0I5Hl5C1DekoOlOm/zz8kx+/ V05EUWtmMEaqUZ++9eJWNxVHL5850zkhYer/v7VYU+Y1rd+SynnGmO46ku7s6/lXyCU8 10hg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j23si14360272qkk.160.2019.09.10.23.53.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 23:53:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:47048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7wVO-0002C3-0e for patch@linaro.org; Wed, 11 Sep 2019 02:53:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40764) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7wRb-0005wi-5a for qemu-devel@nongnu.org; Wed, 11 Sep 2019 02:49:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7wRa-0004Kg-1Y for qemu-devel@nongnu.org; Wed, 11 Sep 2019 02:49:34 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:41833) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7wRZ-0004Jr-Py for qemu-devel@nongnu.org; Wed, 11 Sep 2019 02:49:33 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MQNAv-1hmGox1OCH-00MH9W; Wed, 11 Sep 2019 08:49:26 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 11 Sep 2019 08:49:07 +0200 Message-Id: <20190911064920.1718-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190911064920.1718-1-laurent@vivier.eu> References: <20190911064920.1718-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:UhOsa0Li3ZyDuFmsDVyrTCLiv2TPTPABsCgKe8F3x9i9OA/gwZ9 vo06RmXRwf7uVchkxm5aXG9q0BsRImvXqf3YYoTBLvXQUQHjTrPM9ne0xswrJMcodq/Uhtf Tv2kfIy2PTN9AYoS663uR0+5Odd4+xw49C26ertwvCc4qbEEYH4h/Vl71cUSZmCBcabhdKO dmaSeX/cjQFTKTNS4PPbA== X-UI-Out-Filterresults: notjunk:1; V03:K0:9pFxjYD9aoQ=:aH3Zo5CmoFyoORO/tWz+bD WWPkPj2z9y/K8DzYONkHBhWnT7jYmAjMRIKg3+FX0+J0qTS37GQgGF6Di2l8FO/j2aboRXXNR md9m3NBzUsTA2PhAfEt4DZcDdf4qHE8MeswkA7bp99MRqvQbWzdg1SsAkedU6/JkEWpUxZSfi YVpNW+2c3cSMfitCTiAKhXc4rZURRlm1XWFNo2sEz2lWkOgjtmCLUuNY3BuiYntaLuDFcgQvk 1sk7XC3timCt0On/Rt+D3YeTn/Vzspg1yScFEgDgLzyaYmjQQCaHlfdhFPixPiQ2fx4YimBD8 70Lh97J+r58w9alfpOBj3F6uoz8p12f2+ADRsTByoKl/Si/1g+KhBIoxk8j17Qf/On33jpLIA SG3wX69wB8b2e5wn0rU9/YNxZsPWYb4dJyVnT2O8OjA0sU3ZqvWGr8PFq79MymZZKVrSM4BSe c2/9ovOZr/xP+or5skr5LJkf/blfaPAldbNIvrkMUMf8ER0q+UUaDkxGF0MrHJfbZQN75gV66 UAVbBYhyyJBfK86x+IXX2HH7LiBNlzBisT/RW/b3BGHDbv1VhdbzKRba0B3uHrppy/1DuBmEt jIDZVTUcpej5KATOB6oTlgSPQtqao1MfTdW2ok5u24hf6oTlwFCQjtQTkwjcay2wDSFIhIQnK M5ruflqlEqOms+X7/o6YzvvPy2RBb7VRgIa8xToc+plBWfONYhDid+5NMuZ4dioDtjUP86mp5 OFFyNt2cg1YHmvbfPAtqCNcAEp6VKTazDzmP+iKfQTX1FyfkIW2hjtSw5EknXoGwbhybUxnoB HVHzqkFd8xFjttmQmx2X4Fj4QsY7EISXMD/blbtAIjUVzkMnJM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL v2 02/15] linux-user: Add AT_HWCAP2 for aarch64-linux-user X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Richard Henderson , Laurent Vivier , Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Add the HWCAP2_* bits from kernel version v5.3-rc3. Enable the bits corresponding to ARMv8.5-CondM and ARMv8.5-FRINT. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-Id: <20190809171156.3476-1-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) -- 2.21.0 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 3365e192eb3f..43c16a846d33 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -607,9 +607,23 @@ enum { ARM_HWCAP_A64_SB = 1 << 29, ARM_HWCAP_A64_PACA = 1 << 30, ARM_HWCAP_A64_PACG = 1UL << 31, + + ARM_HWCAP2_A64_DCPODP = 1 << 0, + ARM_HWCAP2_A64_SVE2 = 1 << 1, + ARM_HWCAP2_A64_SVEAES = 1 << 2, + ARM_HWCAP2_A64_SVEPMULL = 1 << 3, + ARM_HWCAP2_A64_SVEBITPERM = 1 << 4, + ARM_HWCAP2_A64_SVESHA3 = 1 << 5, + ARM_HWCAP2_A64_SVESM4 = 1 << 6, + ARM_HWCAP2_A64_FLAGM2 = 1 << 7, + ARM_HWCAP2_A64_FRINT = 1 << 8, }; -#define ELF_HWCAP get_elf_hwcap() +#define ELF_HWCAP get_elf_hwcap() +#define ELF_HWCAP2 get_elf_hwcap2() + +#define GET_FEATURE_ID(feat, hwcap) \ + do { if (cpu_isar_feature(feat, cpu)) { hwcaps |= hwcap; } } while (0) static uint32_t get_elf_hwcap(void) { @@ -621,8 +635,6 @@ static uint32_t get_elf_hwcap(void) hwcaps |= ARM_HWCAP_A64_CPUID; /* probe for the extra features */ -#define GET_FEATURE_ID(feat, hwcap) \ - do { if (cpu_isar_feature(feat, cpu)) { hwcaps |= hwcap; } } while (0) GET_FEATURE_ID(aa64_aes, ARM_HWCAP_A64_AES); GET_FEATURE_ID(aa64_pmull, ARM_HWCAP_A64_PMULL); @@ -645,11 +657,22 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE_ID(aa64_sb, ARM_HWCAP_A64_SB); GET_FEATURE_ID(aa64_condm_4, ARM_HWCAP_A64_FLAGM); -#undef GET_FEATURE_ID + return hwcaps; +} + +static uint32_t get_elf_hwcap2(void) +{ + ARMCPU *cpu = ARM_CPU(thread_cpu); + uint32_t hwcaps = 0; + + GET_FEATURE_ID(aa64_condm_5, ARM_HWCAP2_A64_FLAGM2); + GET_FEATURE_ID(aa64_frint, ARM_HWCAP2_A64_FRINT); return hwcaps; } +#undef GET_FEATURE_ID + #endif /* not TARGET_AARCH64 */ #endif /* TARGET_ARM */