From patchwork Wed Jun 25 13:12:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 32476 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0D76D201EF for ; Wed, 25 Jun 2014 13:13:18 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id o8sf3433686qcw.3 for ; Wed, 25 Jun 2014 06:13:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:x-original-sender:x-original-authentication-results; bh=+pu/jSyX+MOk9rckaDa3alUEyZ7aLtmOhIH2rF9afUY=; b=bRrwiXfJospVe/0DK9IL32TVssoMVRswWo6mDhYrdpqk2LSi+J3OVbudbuRKaZLtS8 RqAls2tDOYCgnNPaVwZo+Yq68wxFE/xU5nqetPqKvmQxZC/Qro31if/cyc+rijjzO5qM G3mKC5NWeJ9O9a+FE4Llm0bY36f4JF/AGOEWXSHbE+LQOwMfIYRkTszuBg6fAHdHNC77 cMbFaFu6rCZKOXRFUq7dgbFBzVusHWGtLHt81j3pY9fDZZGw270Pyb2XuPI7BJA59WZG aSJHQYnOxHcXk59Gy8JTlHVzOX66pVAn/Qy7E9D50A0Ly90qCa0r7krBz4d8PioZAm8r n7Fg== X-Gm-Message-State: ALoCoQnLFJL0g5a1enX6piAyTFB3AQO9f7YyQlJW+wtjQfFeIKolkL3w4KB4wfLuhICp8fvB7LIJ X-Received: by 10.58.187.44 with SMTP id fp12mr4403186vec.24.1403701998654; Wed, 25 Jun 2014 06:13:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.244 with SMTP id z107ls1130383qgz.43.gmail; Wed, 25 Jun 2014 06:13:18 -0700 (PDT) X-Received: by 10.58.132.41 with SMTP id or9mr6818541veb.5.1403701998540; Wed, 25 Jun 2014 06:13:18 -0700 (PDT) Received: from mail-vc0-x232.google.com (mail-vc0-x232.google.com [2607:f8b0:400c:c03::232]) by mx.google.com with ESMTPS id s5si2221274vcu.2.2014.06.25.06.13.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Jun 2014 06:13:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::232 as permitted sender) client-ip=2607:f8b0:400c:c03::232; Received: by mail-vc0-f178.google.com with SMTP id ij19so1855104vcb.37 for ; Wed, 25 Jun 2014 06:13:18 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr6919854vcb.0.1403701998448; Wed, 25 Jun 2014 06:13:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp288865vcb; Wed, 25 Jun 2014 06:13:17 -0700 (PDT) X-Received: by 10.68.203.132 with SMTP id kq4mr11794720pbc.12.1403701997685; Wed, 25 Jun 2014 06:13:17 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id oj8si5117520pbb.186.2014.06.25.06.13.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jun 2014 06:13:17 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-51196-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 28657 invoked by alias); 25 Jun 2014 13:13:07 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list List-Id: List-Unsubscribe: , List-Subscribe: List-Archive: List-Post: , List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 28646 invoked by uid 89); 25 Jun 2014 13:13:06 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f47.google.com X-Received: by 10.180.13.69 with SMTP id f5mr836426wic.48.1403701977280; Wed, 25 Jun 2014 06:12:57 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH] ARM: Add support for AT_HWCAP2 in _dl_procinfo Date: Wed, 25 Jun 2014 14:12:50 +0100 Message-Id: <1403701970-21947-1-git-send-email-will.newton@linaro.org> X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::232 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 Add support for the new HWCAP2 values for ARMv8 added in the 3.15 kernel. Tested using QEMU which supports these extensions. ChangeLog: 2014-06-25 Will Newton * sysdeps/unix/sysv/linux/arm/dl-procinfo.c (_dl_arm_cap_flags): Add HWCAP2 values. * sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_DL_HWCAP_COUNT): Increase to 37. (_DL_HWCAP_LAST): New define. (_DL_HWCAP2_LAST): New define. (_dl_procinfo): Add support for printing AT_HWCAP2 entries. (_dl_string_hwcap): Use _dl_hwcap_string. --- sysdeps/unix/sysv/linux/arm/dl-procinfo.c | 5 ++- sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 67 +++++++++++++++++++------------ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c index 113cda5..7cb3be9 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c @@ -23,7 +23,7 @@ If anything should be added here check whether the size of each string is still ok with the given array size. - All the #ifdefs in the definitions ar equite irritating but + All the #ifdefs in the definitions are quite irritating but necessary if we want to avoid duplicating the information. There are three different modes: @@ -46,13 +46,14 @@ #if !defined PROCINFO_DECL && defined SHARED ._dl_arm_cap_flags #else -PROCINFO_CLASS const char _dl_arm_cap_flags[22][10] +PROCINFO_CLASS const char _dl_arm_cap_flags[37][10] #endif #ifndef PROCINFO_DECL = { "swp", "half", "thumb", "26bit", "fastmult", "fpa", "vfp", "edsp", "java", "iwmmxt", "crunch", "thumbee", "neon", "vfpv3", "vfpv3d16", "tls", "vfpv4", "idiva", "idivt", "vfpd32", "lpae", "evtstrm", + "aes", "pmull", "sha1", "sha2", "crc32", } #endif #if !defined SHARED || defined PROCINFO_DECL diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h index 20a3e92..f7557b9 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -23,32 +23,17 @@ #include #include -#define _DL_HWCAP_COUNT 22 +#define _DL_HWCAP_COUNT 37 -/* The kernel provides platform data but it is not interesting. */ -#define _DL_HWCAP_PLATFORM 0 - - -static inline int -__attribute__ ((unused)) -_dl_procinfo (unsigned int type, unsigned long int word) -{ - int i; - - /* Fallback to unknown output mechanism. */ - if (type == AT_HWCAP2) - return -1; - - _dl_printf ("AT_HWCAP: "); +/* Low 22 bits are allocated in HWCAP. */ +#define _DL_HWCAP_LAST 21 - for (i = 0; i < _DL_HWCAP_COUNT; ++i) - if (word & (1 << i)) - _dl_printf (" %s", GLRO(dl_arm_cap_flags)[i]); +/* Low 5 bits are allocated in HWCAP2. */ +#define _DL_HWCAP2_LAST 4 - _dl_printf ("\n"); +/* The kernel provides platform data but it is not interesting. */ +#define _DL_HWCAP_PLATFORM 0 - return 0; -} static inline const char * __attribute__ ((unused)) @@ -57,17 +42,47 @@ _dl_hwcap_string (int idx) return GLRO(dl_arm_cap_flags)[idx]; }; +static inline int +__attribute__ ((unused)) +_dl_procinfo (unsigned int type, unsigned long int word) +{ + switch(type) + { + case AT_HWCAP: + _dl_printf ("AT_HWCAP: "); + + for (int i = 0; i <= _DL_HWCAP_LAST; ++i) + if (word & (1 << i)) + _dl_printf (" %s", _dl_hwcap_string (i)); + break; + case AT_HWCAP2: + { + unsigned int offset = _DL_HWCAP_LAST + 1; + + _dl_printf ("AT_HWCAP2: "); + + for (int i = 0; i <= _DL_HWCAP2_LAST; ++i) + if (word & (1 << i)) + _dl_printf (" %s", _dl_hwcap_string (offset + i)); + break; + } + default: + /* This should not happen. */ + return -1; + } + _dl_printf ("\n"); + return 0; +} + #define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON) static inline int __attribute__ ((unused)) _dl_string_hwcap (const char *str) { - int i; - - for (i = 0; i < _DL_HWCAP_COUNT; i++) + for (int i = 0; i < _DL_HWCAP_COUNT; i++) { - if (strcmp (str, GLRO(dl_arm_cap_flags)[i]) == 0) + if (strcmp (str, _dl_hwcap_string (i)) == 0) return i; } return -1;