{"id":818937,"url":"http://patchwork.ozlabs.org/api/patches/818937/?format=json","web_url":"http://patchwork.ozlabs.org/project/sparclinux/patch/1506491952-9659-3-git-send-email-vijay.ac.kumar@oracle.com/","project":{"id":10,"url":"http://patchwork.ozlabs.org/api/projects/10/?format=json","name":"Linux SPARC Development ","link_name":"sparclinux","list_id":"sparclinux.vger.kernel.org","list_email":"sparclinux@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1506491952-9659-3-git-send-email-vijay.ac.kumar@oracle.com>","list_archive_url":null,"date":"2017-09-27T05:59:12","name":"[2/2] sparc64: Use lzcnt instruction for fls and __fls","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"6abb6d5838cd336a86d7b5359e94c83d30de0938","submitter":{"id":67939,"url":"http://patchwork.ozlabs.org/api/people/67939/?format=json","name":"Vijay Kumar","email":"vijay.ac.kumar@oracle.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/sparclinux/patch/1506491952-9659-3-git-send-email-vijay.ac.kumar@oracle.com/mbox/","series":[{"id":5285,"url":"http://patchwork.ozlabs.org/api/series/5285/?format=json","web_url":"http://patchwork.ozlabs.org/project/sparclinux/list/?series=5285","date":"2017-09-27T05:59:11","name":"sparc64: Optimize fls, fls64 and __fls","version":1,"mbox":"http://patchwork.ozlabs.org/series/5285/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818937/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818937/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=sparclinux-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y26c42Mnsz9t33\n\tfor ;\n\tWed, 27 Sep 2017 16:00:04 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752292AbdI0F7b (ORCPT );\n\tWed, 27 Sep 2017 01:59:31 -0400","from aserp1040.oracle.com ([141.146.126.69]:38410 \"EHLO\n\taserp1040.oracle.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752294AbdI0F72 (ORCPT\n\t); Wed, 27 Sep 2017 01:59:28 -0400","from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233])\n\tby aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2)\n\twith ESMTP id v8R5xOKn006057\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Wed, 27 Sep 2017 05:59:25 GMT","from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235])\n\tby aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id\n\tv8R5xOv2020244\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Wed, 27 Sep 2017 05:59:24 GMT","from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18])\n\tby aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id\n\tv8R5xOHn028059; Wed, 27 Sep 2017 05:59:24 GMT","from ca-sparc60.us.oracle.com (/10.147.24.150)\n\tby default (Oracle Beehive Gateway v4.0)\n\twith ESMTP ; Tue, 26 Sep 2017 22:59:24 -0700"],"From":"Vijay Kumar ","To":"davem@davemloft.net","Cc":"linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org,\n\tbabu.moger@oracle.com","Subject":"[PATCH 2/2] sparc64: Use lzcnt instruction for fls and __fls","Date":"Tue, 26 Sep 2017 23:59:12 -0600","Message-Id":"<1506491952-9659-3-git-send-email-vijay.ac.kumar@oracle.com>","X-Mailer":"git-send-email 1.7.1","In-Reply-To":"<1506491952-9659-1-git-send-email-vijay.ac.kumar@oracle.com>","References":"<1506491952-9659-1-git-send-email-vijay.ac.kumar@oracle.com>","X-Source-IP":"aserv0021.oracle.com [141.146.126.233]","Sender":"sparclinux-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"sparclinux@vger.kernel.org"},"content":"For T4 and above, patch fls and __fls functions\nat the boot time to use lzcnt instruction.\n\nSigned-off-by: Vijay Kumar \nReviewed-by: Babu Moger \n---\n arch/sparc/Makefile | 1 +\n arch/sparc/kernel/head_64.S | 2 ++\n arch/sparc/lib/Makefile | 3 +++\n arch/sparc/lib/NG4fls.S | 31 +++++++++++++++++++++++++++++++\n arch/sparc/lib/NG4patch.S | 9 +++++++++\n 5 files changed, 46 insertions(+), 0 deletions(-)","diff":"diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile\nindex 8496a07..0763cd8 100644\n--- a/arch/sparc/Makefile\n+++ b/arch/sparc/Makefile\n@@ -48,6 +48,7 @@ KBUILD_CFLAGS += -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare\n KBUILD_CFLAGS += -Wa,--undeclared-regs\n KBUILD_CFLAGS += $(call cc-option,-mtune=ultrasparc3)\n KBUILD_AFLAGS += -m64 -mcpu=ultrasparc -Wa,--undeclared-regs\n+KBUILD_AFLAGS += -Wa,-Asparc4\n \n ifeq ($(CONFIG_MCOUNT),y)\n KBUILD_CFLAGS += -pg\ndiff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S\nindex 78e0211..1165254 100644\n--- a/arch/sparc/kernel/head_64.S\n+++ b/arch/sparc/kernel/head_64.S\n@@ -628,6 +628,8 @@ niagara4_patch:\n \t nop\n \tcall\tniagara4_patch_pageops\n \t nop\n+\tcall\tniagara4_patch_fls\n+\t nop\n \n \tba,a,pt\t%xcc, 80f\n \t nop\ndiff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile\nindex eefbb9c..72d2d8c 100644\n--- a/arch/sparc/lib/Makefile\n+++ b/arch/sparc/lib/Makefile\n@@ -46,3 +46,6 @@ lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o\n obj-$(CONFIG_SPARC64) += iomap.o\n obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o\n obj-$(CONFIG_SPARC64) += PeeCeeI.o\n+\n+obj-$(CONFIG_SPARC64) += fls.o\n+obj-$(CONFIG_SPARC64) += NG4fls.o\ndiff --git a/arch/sparc/lib/NG4fls.S b/arch/sparc/lib/NG4fls.S\nnew file mode 100644\nindex 0000000..7c2cfb3\n--- /dev/null\n+++ b/arch/sparc/lib/NG4fls.S\n@@ -0,0 +1,31 @@\n+/* NG4fls.S: SPARC optimized fls and __fls for T4 and above.\n+ *\n+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.\n+ */\n+\n+\t.text\n+\t.align 32\n+\n+\t.globl NG4fls\n+\t.globl __NG4fls\n+\t.type NG4fls, #function\n+\t.type __NG4fls, #function\n+\n+NG4fls:\n+\tlzcnt %o0, %o1\n+\tmov 64, %o2\n+\tsub %o2, %o1, %o0\n+\tretl\n+\t.size NG4fls, .-NG4fls\n+\n+__NG4fls:\n+\tbrz,pn %o0, 1f\n+ mov\t%o0, %o1\n+\tlzcnt\t%o1, %o0\n+\tmov 63, %o2\n+\tsub %o2, %o0, %o0\n+1:\n+\tretl\n+\tnop\n+\tnop\n+\t.size __NG4fls, .-__NG4fls\ndiff --git a/arch/sparc/lib/NG4patch.S b/arch/sparc/lib/NG4patch.S\nindex 3cc0f8c..1010d53 100644\n--- a/arch/sparc/lib/NG4patch.S\n+++ b/arch/sparc/lib/NG4patch.S\n@@ -52,3 +52,12 @@ niagara4_patch_pageops:\n \tretl\n \t nop\n \t.size\tniagara4_patch_pageops,.-niagara4_patch_pageops\n+\n+\t.globl\tniagara4_patch_fls\n+\t.type\tniagara4_patch_fls,#function\n+niagara4_patch_fls:\n+\tNG_DO_PATCH(fls, NG4fls)\n+\tNG_DO_PATCH(__fls, __NG4fls)\n+\tretl\n+\t nop\n+\t.size\tniagara4_patch_fls,.-niagara4_patch_fls\n","prefixes":["2/2"]}