Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63887C433EF for ; Mon, 4 Apr 2022 13:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VZiRgYx4ZWlWe2chACZq/2u4hJ4GphjbC3D/OGNQ9Tc=; b=Xm99F6hpp7rToD l+GFGQLZ5LuyLC5VdGqF8RoPIRPVyEbYj7kBtjiGeqiP7fY8Lha0KP7kAgG0mLF+AiG1cEGMx0KjH jgyfY8A33g4vQWw4vleOM/VTMcMMxxsDPTUfViNEvQOV4K7fRF5DpEsDWncNsFC4VoPaX0KHGlEen QV9EhmSGvf+LJ2/SW7O1LoLw5TfS/jawjK7818tUBZJOrlWAXyLZbjNcLJnDgYpqhYRCqghpHnaJF UaqboW52fMuVyMpzfuAMoL5JHJErK8zghvXCfrfiK/TDc99b4kXVQnnB3mpMhN761RmVmMLLnBncF 9ufqvSqQ0Kqw93z2s8lA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nbN69-00FBjs-K5; Mon, 04 Apr 2022 13:50:25 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nbN5W-00FBYv-Eb for linux-arm-kernel@lists.infradead.org; Mon, 04 Apr 2022 13:49:49 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id D959BCE1804; Mon, 4 Apr 2022 13:49:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5A0FC2BBE4; Mon, 4 Apr 2022 13:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649080183; bh=eCKmQMo4GusM7/N0LGN+q8b1sB8nNaCN+9U49tylAYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nc0nKaWdkNMsFt5wDSnKE3zC8pG3Rp4W93m4jDO8E9SbKT18OSrVmBoquj6X1ZSoR 9M/JZH+Sq+NDdQRcwB0OxBTeau1WtpCURGoBEYonuqswt2TG5X1bwAh7A+esuVJsi7 r/KoHwgSs+Hw2TaqNwOHjbEmJMAAkD0hpHoIutvwcL0yXlAO0RrCwvsDsNiQkL2W9f AIIAik1D0tX4Tjppsm1ltHarbp2UIulepPky34jT9veE8Ls7bg2r8QFKtwmiWtdbjN FYRUf4tqWhYEvP8wkzKzzxqZ4Lf/4Bt8ZuJ6g9ht0CZpdXWQF7KbHy0j+tnJ8HCz6i KXZOmYmAgch8Q== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Marc Zyngier , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v3 5/8] arm64/sysreg: Enable automatic generation of system register definitions Date: Mon, 4 Apr 2022 14:46:42 +0100 Message-Id: <20220404134645.1675346-6-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220404134645.1675346-1-broonie@kernel.org> References: <20220404134645.1675346-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2528; h=from:subject; bh=eCKmQMo4GusM7/N0LGN+q8b1sB8nNaCN+9U49tylAYg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiSvbBqYXSIqkJdeHxsV04W92cU5JgX1IT8+vvl72L edZVQ16JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYkr2wQAKCRAk1otyXVSH0OdvB/ 0R1IgdPs3IhNDMsRxhYQxwLtwCbG3oXeGJm4Nzq4qmBHzuK95ZQo8wWc50OUKgaELWm8EmGXFGKGor r5s5WTyyq1Wu+u4U1ygkalbdP9Aj+RNwAvCvIjBOH85ABUcnbi8SsomEzXBmIWLU8ajq2AVjP3AKL2 1D4SIIre1vjv92GBwnxLo2jEioBZIY9eBVtbNcsYlfv+ElIoXYiIOfjeC+eLNOjLZrWC9VFAwqsmm8 SYTfuDGr5pTrVeIsTJSHrKz4xukh8spumhEePIIqSYEm5U7HFyVO0P6KP+wTEeElApkbQKF44J1Z/t +sygiynXJj+tbD2e1PMFEAu4FGtE6w X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220404_064947_009255_65990E0C X-CRM114-Status: GOOD ( 15.80 ) 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 Now that we have a script for generating system registers hook it up to the build system similarly to cpucaps. Since we don't currently have any actual register information in the input file this should produce no change in the built kernel. For ease of review the register information will be converted in separate patches. Signed-off-by: Mark Brown --- arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/sysreg.h | 8 ++++++++ arch/arm64/tools/Makefile | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild index 345fe98605ba..1eac9aa6fa2e 100644 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild @@ -7,3 +7,4 @@ generic-y += parport.h generic-y += user.h generated-y += cpucaps.h +generated-y += sysreg-gen.h diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index f300c49d6281..11bf3636c741 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -114,6 +114,14 @@ #define SYS_DC_CSW sys_insn(1, 0, 7, 10, 2) #define SYS_DC_CISW sys_insn(1, 0, 7, 14, 2) +/* + * Automatically generated definitions for system registers, the + * manual encodings below are in the process of being converted to + * come from here. The header relies on the definition of sys_reg() + * earlier in this file. + */ +#include "asm/sysreg-gen.h" + /* * System registers, organised loosely by encoding but grouped together * where the architected name contains an index. e.g. ID_MMFR_EL1. diff --git a/arch/arm64/tools/Makefile b/arch/arm64/tools/Makefile index cf1307188150..8d2d38858a0d 100644 --- a/arch/arm64/tools/Makefile +++ b/arch/arm64/tools/Makefile @@ -3,7 +3,7 @@ gen := arch/$(ARCH)/include/generated kapi := $(gen)/asm -kapi-hdrs-y := $(kapi)/cpucaps.h +kapi-hdrs-y := $(kapi)/cpucaps.h $(kapi)/sysreg-gen.h targets += $(addprefix ../../../, $(kapi-hdrs-y)) @@ -14,5 +14,11 @@ kapi: $(kapi-hdrs-y) quiet_cmd_gen_cpucaps = GEN $@ cmd_gen_cpucaps = mkdir -p $(dir $@); $(AWK) -f $(real-prereqs) > $@ +quiet_cmd_gen_sysreg = GEN $@ + cmd_gen_sysreg = mkdir -p $(dir $@); $(AWK) -f $(real-prereqs) > $@ + $(kapi)/cpucaps.h: $(src)/gen-cpucaps.awk $(src)/cpucaps FORCE $(call if_changed,gen_cpucaps) + +$(kapi)/sysreg-gen.h: $(src)/gen-sysreg.awk $(src)/sysreg FORCE + $(call if_changed,gen_sysreg) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel