From patchwork Tue Nov 20 10:48:47 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sameera Deshpande <sameera.deshpande@linaro.org>
X-Patchwork-Id: 30219
Received: (qmail 24894 invoked by alias); 20 Nov 2018 10:49:06 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 24706 invoked by uid 89); 20 Nov 2018 10:49:01 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-23.8 required=5.0 tests=AWL, BAYES_00,
	GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,
	RCVD_IN_DNSWL_NONE, SEM_URI, SEM_URIRED,
	SPF_PASS autolearn=ham version=3.3.2 spammy=
X-HELO: mail-ot1-f47.google.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
	h=mime-version:from:date:message-id:subject:to:cc;
	bh=hPfdLDZrFF5aXsQCfXLGZ7r3KF2zcTgVsuXeL/pN4M0=;
	b=EJNtA/dSwlNWqyNe+A7TbCEL27f/zQ7jLbV8KhTbEYGi6MXgBvgW79+HYBuyowcpkJ
	U3tBuGVOFGK2zuKolYa0IBvd722wCh2kS1s61Sw2GhhAuAJQyirZSTEzHwOwf1HHBZ43
	TC7ReVWmY6iMJscQjr/HgHVVqBMjRr0jrBho8=
MIME-Version: 1.0
From: Sameera Deshpande <sameera.deshpande@linaro.org>
Date: Tue, 20 Nov 2018 16:18:47 +0530
Message-ID: 
 <CAAdirjyFJvdBNGyo7FpY2vdkxuo2G9bMkLX-34E4jmLQ=gn-=Q@mail.gmail.com>
Subject: AARCH64: Adding Saphira core detection using MIDR.
To: libc-alpha@sourceware.org
Cc: Siddhesh Poyarekar <siddhesh@gotplt.org>, szabolcs.nagy@arm.com

Hi!

Please find attached the patch for CPU detection using MIDR code for
Qualcomm's Saphira processor, and use Falkor specific memset routine
for Saphira.

Ok for trunk?
---
- Thanks and regards,
  Sameera D.

diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c
index d74ed3a..351b957 100644
--- a/sysdeps/aarch64/multiarch/memset.c
+++ b/sysdeps/aarch64/multiarch/memset.c
@@ -32,7 +32,7 @@ extern __typeof (__redirect_memset) __memset_falkor attribute_hidden;
 extern __typeof (__redirect_memset) __memset_generic attribute_hidden;
 
 libc_ifunc (__libc_memset,
-	    ((IS_FALKOR (midr) || IS_PHECDA (midr)) && zva_size == 64
+	    ((AVOID_SLOW_MRS (midr)) && zva_size == 64
 	     ? __memset_falkor
 	     : __memset_generic));
 
diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
index 39eba01..266e972 100644
--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
@@ -31,6 +31,7 @@ struct cpu_list
 };
 
 static struct cpu_list cpu_list[] = {
+      {"saphira",	 0x510FC010},
       {"falkor",	 0x510FC000},
       {"thunderxt88",	 0x430F0A10},
       {"thunderx2t99",   0x431F0AF0},
diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
index eb35adf..80ae39a 100644
--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
@@ -52,6 +52,13 @@
 #define IS_PHECDA(midr) (MIDR_IMPLEMENTOR(midr) == 'h'			      \
                         && MIDR_PARTNUM(midr) == 0x000)
 
+#define IS_SAPHIRA(midr) (MIDR_IMPLEMENTOR(midr) == 'Q'			      \
+                        && MIDR_PARTNUM(midr) == 0xc01)
+
+#define AVOID_SLOW_MRS(midr) (IS_FALKOR (midr)				\
+			 || IS_SAPHIRA (midr)				\
+			 || IS_PHECDA (midr))
+
 struct cpu_features
 {
   uint64_t midr_el1;