From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E087C433B4 for ; Thu, 13 May 2021 05:06:15 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FBF66142F for ; Thu, 13 May 2021 05:06:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FBF66142F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iBttyw5Cbw1nL1s8Ruso58UZ6hjsBMNReqmcw/1Pa8M=; b=dNa1ZBhnjRxz9CJ0RG3rM5E3/ WM+Gddgy1i2dclqfLpmY2hbPAhi6gMsQc83vWl5PWtxgPh4BusJ8j1Anyh4YKle+KXnXGGetYoRTR HMZT7k1pDLgJihPFf8SfhnxSMGA2mHTNrBetg8+CVxsYsebWWWJ4w30GzT0X86kurOy4o70uDUDA6 YxaPipRCW5yW2oJEZQEQFquJJOBANBu0FKDgej+93FTX/4vvt9bPA+loIM198vJhvLNHD9WMK6nND NJ95fWF/Zk+aSzyakeunEEFuyt+blcr2nf9lXsSIyccRRx2FXPKhSyU64qRlJ+ZEzsgpfbWPLjo6s 9TRUA5tAA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lh3WT-004lor-QG; Thu, 13 May 2021 05:04:34 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lh3WP-004loZ-RG for linux-arm-kernel@desiato.infradead.org; Thu, 13 May 2021 05:04:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=qcl4GFlINHXhUZiP6KUaoAievSCdfBFhLsWCnvXCHII=; b=PkatZFiAiu89D0pOoA3MLbbnr+ x9qNGKFu16o6Zv7LibW9/35YfHWEkiH8+bG+NSljmFPm+YM53MHbgxBp5df3pbvhjqQ+vZ39rlABJ ri0uUzx3+DfvXQxXyw+/CqB8YO15HnYpL9tTSBXTiAGa6UgGP07ugKsizUx+v8BiC/6mjxk6easG4 szli2xsZyIMtCFP1/ji4kmFJqEV7HM87zW9/pZOpCMiJXUlAkVM3/roViT9jIt0Hwath7rC9P8OJv /bo1i6XXwpjJgRJhV1TWpfYeT+wziIzUdYjFE4xSg54BndOhBdH3N4pgVGNzbgJo1GvYtz7lv0bYl Xa6GNo5g==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lh3WM-00B16b-CF for linux-arm-kernel@lists.infradead.org; Thu, 13 May 2021 05:04:28 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A4D23101E; Wed, 12 May 2021 22:04:20 -0700 (PDT) Received: from [10.163.78.16] (unknown [10.163.78.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CDB803F73B; Wed, 12 May 2021 22:04:18 -0700 (PDT) Subject: Re: [PATCH] arm64: Generate cpucaps.h To: Mark Brown , Catalin Marinas , Will Deacon Cc: Suzuki K Poulose , linux-arm-kernel@lists.infradead.org References: <20210428121231.11219-1-broonie@kernel.org> From: Anshuman Khandual Message-ID: <9abba2a3-ce01-1cbe-5db3-97575219efad@arm.com> Date: Thu, 13 May 2021 10:35:04 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210428121231.11219-1-broonie@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210512_220426_554663_1A295482 X-CRM114-Status: GOOD ( 33.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 4/28/21 5:42 PM, Mark Brown wrote: > The arm64 code allocates an internal constant to every CPU feature it can > detect, distinct from the public hwcap numbers we use to expose some > features to userspace. Currently this is maintained manually which is an > irritating source of conflicts when working on new features, to avoid this > replace the header with a simple text file listing the names we've assigned > and sort it to minimise conflicts. > > As part of doing this we also do the Kbuild hookup required to hook up > an arch tools directory and to generate header files in there. > > This will result in a renumbering and reordering of the existing constants, > since they are all internal only the values should not be important. The > reordering will impact the order in which some steps in enumeration handle > features but the algorithm is not intended to depend on this and I haven't > seen any issues when testing. Due to the UAO cpucap having been removed in > the past we end up with ARM64_NCAPS being 1 smaller than it was before. > > Signed-off-by: Mark Brown > --- > arch/arm64/Makefile | 3 ++ > arch/arm64/include/asm/Kbuild | 2 + > arch/arm64/include/asm/cpucaps.h | 74 -------------------------------- > arch/arm64/tools/Makefile | 22 ++++++++++ > arch/arm64/tools/cpucaps | 65 ++++++++++++++++++++++++++++ > arch/arm64/tools/gen-cpucaps.awk | 40 +++++++++++++++++ > 6 files changed, 132 insertions(+), 74 deletions(-) > delete mode 100644 arch/arm64/include/asm/cpucaps.h > create mode 100644 arch/arm64/tools/Makefile > create mode 100644 arch/arm64/tools/cpucaps > create mode 100755 arch/arm64/tools/gen-cpucaps.awk > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > index 7ef44478560d..b52481f0605d 100644 > --- a/arch/arm64/Makefile > +++ b/arch/arm64/Makefile > @@ -175,6 +175,9 @@ vdso_install: > $(if $(CONFIG_COMPAT_VDSO), \ > $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@) > > +archprepare: > + $(Q)$(MAKE) $(build)=arch/arm64/tools kapi Small nit. So going forward this new directory (arch/arm64/tools/), will be used to hold similar scripts that generate header or similar things ? At first the directory name 'tool' was bit confusing but seems like other archs (arm, m68k, mips, powerpc, s390, sh) have this directory as well. > + > # We use MRPROPER_FILES and CLEAN_FILES now > archclean: > $(Q)$(MAKE) $(clean)=$(boot) > diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild > index 73aa25843f65..64202010b700 100644 > --- a/arch/arm64/include/asm/Kbuild > +++ b/arch/arm64/include/asm/Kbuild > @@ -4,3 +4,5 @@ generic-y += mcs_spinlock.h > generic-y += qrwlock.h > generic-y += qspinlock.h > generic-y += user.h > + > +generated-y += cpucaps.h > diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h > deleted file mode 100644 > index b0c5eda0498f..000000000000 > --- a/arch/arm64/include/asm/cpucaps.h > +++ /dev/null > @@ -1,74 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > -/* > - * arch/arm64/include/asm/cpucaps.h > - * > - * Copyright (C) 2016 ARM Ltd. > - */ > -#ifndef __ASM_CPUCAPS_H > -#define __ASM_CPUCAPS_H > - > -#define ARM64_WORKAROUND_CLEAN_CACHE 0 > -#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1 > -#define ARM64_WORKAROUND_845719 2 > -#define ARM64_HAS_SYSREG_GIC_CPUIF 3 > -#define ARM64_HAS_PAN 4 > -#define ARM64_HAS_LSE_ATOMICS 5 > -#define ARM64_WORKAROUND_CAVIUM_23154 6 > -#define ARM64_WORKAROUND_834220 7 > -#define ARM64_HAS_NO_HW_PREFETCH 8 > -#define ARM64_HAS_VIRT_HOST_EXTN 11 > -#define ARM64_WORKAROUND_CAVIUM_27456 12 > -#define ARM64_HAS_32BIT_EL0 13 > -#define ARM64_SPECTRE_V3A 14 > -#define ARM64_HAS_CNP 15 > -#define ARM64_HAS_NO_FPSIMD 16 > -#define ARM64_WORKAROUND_REPEAT_TLBI 17 > -#define ARM64_WORKAROUND_QCOM_FALKOR_E1003 18 > -#define ARM64_WORKAROUND_858921 19 > -#define ARM64_WORKAROUND_CAVIUM_30115 20 > -#define ARM64_HAS_DCPOP 21 > -#define ARM64_SVE 22 > -#define ARM64_UNMAP_KERNEL_AT_EL0 23 > -#define ARM64_SPECTRE_V2 24 > -#define ARM64_HAS_RAS_EXTN 25 > -#define ARM64_WORKAROUND_843419 26 > -#define ARM64_HAS_CACHE_IDC 27 > -#define ARM64_HAS_CACHE_DIC 28 > -#define ARM64_HW_DBM 29 > -#define ARM64_SPECTRE_V4 30 > -#define ARM64_MISMATCHED_CACHE_TYPE 31 > -#define ARM64_HAS_STAGE2_FWB 32 > -#define ARM64_HAS_CRC32 33 > -#define ARM64_SSBS 34 > -#define ARM64_WORKAROUND_1418040 35 > -#define ARM64_HAS_SB 36 > -#define ARM64_WORKAROUND_SPECULATIVE_AT 37 > -#define ARM64_HAS_ADDRESS_AUTH_ARCH 38 > -#define ARM64_HAS_ADDRESS_AUTH_IMP_DEF 39 > -#define ARM64_HAS_GENERIC_AUTH_ARCH 40 > -#define ARM64_HAS_GENERIC_AUTH_IMP_DEF 41 > -#define ARM64_HAS_IRQ_PRIO_MASKING 42 > -#define ARM64_HAS_DCPODP 43 > -#define ARM64_WORKAROUND_1463225 44 > -#define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM 45 > -#define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 46 > -#define ARM64_WORKAROUND_1542419 47 > -#define ARM64_HAS_E0PD 48 > -#define ARM64_HAS_RNG 49 > -#define ARM64_HAS_AMU_EXTN 50 > -#define ARM64_HAS_ADDRESS_AUTH 51 > -#define ARM64_HAS_GENERIC_AUTH 52 > -#define ARM64_HAS_32BIT_EL1 53 > -#define ARM64_BTI 54 > -#define ARM64_HAS_ARMv8_4_TTL 55 > -#define ARM64_HAS_TLB_RANGE 56 > -#define ARM64_MTE 57 > -#define ARM64_WORKAROUND_1508412 58 > -#define ARM64_HAS_LDAPR 59 > -#define ARM64_KVM_PROTECTED_MODE 60 > -#define ARM64_WORKAROUND_NVIDIA_CARMEL_CNP 61 > -#define ARM64_HAS_EPAN 62 > - > -#define ARM64_NCAPS 63 > - > -#endif /* __ASM_CPUCAPS_H */ > diff --git a/arch/arm64/tools/Makefile b/arch/arm64/tools/Makefile > new file mode 100644 > index 000000000000..932b4fe5c768 > --- /dev/null > +++ b/arch/arm64/tools/Makefile > @@ -0,0 +1,22 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +gen := arch/$(ARCH)/include/generated > +kapi := $(gen)/asm > + > +kapi-hdrs-y := $(kapi)/cpucaps.h > + > +targets += $(addprefix ../../../,$(gen-y) $(kapi-hdrs-y)) > + > +PHONY += kapi > + > +kapi: $(kapi-hdrs-y) $(gen-y) > + > +# Create output directory if not already present > +_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') > + > +quiet_cmd_gen_cpucaps = GEN $@ > + cmd_gen_cpucaps = mkdir -p $(dir $@) && \ > + $(AWK) -f $(filter-out $(PHONY),$^) > $@ > + > +$(kapi)/cpucaps.h: $(src)/gen-cpucaps.awk $(src)/cpucaps FORCE > + $(call if_changed,gen_cpucaps) > diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps > new file mode 100644 > index 000000000000..21fbdda7086e > --- /dev/null > +++ b/arch/arm64/tools/cpucaps > @@ -0,0 +1,65 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Internal CPU capabilities constants, keep this list sorted > + > +BTI > +HAS_32BIT_EL0 > +HAS_32BIT_EL1 > +HAS_ADDRESS_AUTH > +HAS_ADDRESS_AUTH_ARCH > +HAS_ADDRESS_AUTH_IMP_DEF > +HAS_AMU_EXTN > +HAS_ARMv8_4_TTL > +HAS_CACHE_DIC > +HAS_CACHE_IDC > +HAS_CNP > +HAS_CRC32 > +HAS_DCPODP > +HAS_DCPOP > +HAS_E0PD > +HAS_EPAN > +HAS_GENERIC_AUTH > +HAS_GENERIC_AUTH_ARCH > +HAS_GENERIC_AUTH_IMP_DEF > +HAS_IRQ_PRIO_MASKING > +HAS_LDAPR > +HAS_LSE_ATOMICS > +HAS_NO_FPSIMD > +HAS_NO_HW_PREFETCH > +HAS_PAN > +HAS_RAS_EXTN > +HAS_RNG > +HAS_SB > +HAS_STAGE2_FWB > +HAS_SYSREG_GIC_CPUIF > +HAS_TLB_RANGE > +HAS_VIRT_HOST_EXTN > +HW_DBM > +KVM_PROTECTED_MODE > +MISMATCHED_CACHE_TYPE > +MTE > +SPECTRE_V2 > +SPECTRE_V3A > +SPECTRE_V4 > +SSBS > +SVE > +UNMAP_KERNEL_AT_EL0 > +WORKAROUND_834220 > +WORKAROUND_843419 > +WORKAROUND_845719 > +WORKAROUND_858921 > +WORKAROUND_1418040 > +WORKAROUND_1463225 > +WORKAROUND_1508412 > +WORKAROUND_1542419 > +WORKAROUND_CAVIUM_23154 > +WORKAROUND_CAVIUM_27456 > +WORKAROUND_CAVIUM_30115 > +WORKAROUND_CAVIUM_TX2_219_PRFM > +WORKAROUND_CAVIUM_TX2_219_TVM > +WORKAROUND_CLEAN_CACHE > +WORKAROUND_DEVICE_LOAD_ACQUIRE > +WORKAROUND_NVIDIA_CARMEL_CNP > +WORKAROUND_QCOM_FALKOR_E1003 > +WORKAROUND_REPEAT_TLBI > +WORKAROUND_SPECULATIVE_AT > diff --git a/arch/arm64/tools/gen-cpucaps.awk b/arch/arm64/tools/gen-cpucaps.awk > new file mode 100755 > index 000000000000..18737a1ce044 > --- /dev/null > +++ b/arch/arm64/tools/gen-cpucaps.awk > @@ -0,0 +1,40 @@ > +#!/bin/awk -f > +# SPDX-License-Identifier: GPL-2.0 > +# gen-cpucaps.awk: arm64 cpucaps header generator > +# > +# Usage: awk -f gen-cpucaps.awk cpucaps.txt > + > +# Log an error and terminate > +function fatal(msg) { > + print "Error at line " NR ": " msg > "/dev/stderr" > + exit 1 > +} > + > +# skip blank lines and comment lines > +/^$/ { next } > +/^#/ { next } > + > +BEGIN { > + print "#ifndef __ASM_CPUCAPS_H" > + print "#define __ASM_CPUCAPS_H" > + print "" > + print "/* Generated file - do not edit */" > + cap_num = 0 > + print "" > +} > + > +/^[vA-Z0-9_]+$/ { Small nit. Should this be length restricted at the least ? Like each CAP entries should not exceed a certain length. > + printf("#define ARM64_%-30s\t%d\n", $0, cap_num++) > + next > +} > + > +END { > + printf("#define ARM64_NCAPS\t\t\t\t%d\n", cap_num) > + print "" > + print "#endif" Small nit. Should it be print "#endif /* __ASM_CPUCAPS_H */" instead in order to be complete. > +} > + > +# Any lines not handled by previous rules are unexpected > +{ > + fatal("unhandled statement") > +} > Did not see any problem with the patch after using it with multiple 'awk' implementations. FWIW, with/without changes requested earlier. Reviewed-by: Anshuman Khandual Tested-by: Anshuman Khandual _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel