From nobody Sun Dec 14 21:43:45 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D101D152E0C for ; Wed, 15 Jan 2025 16:28:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958502; cv=none; b=kaSLj5GZINX44y1FLoxbmIFIxYKpn2hJLNKUBd5W3eROCk4FrU01xrVQi7NIz+MjynP/6UjnHHKUxcr5znPhdGdaGystngAnAb3MnjaH1N4nu9VljMf9HCJImLm1bRV78I7PawYjmIwYcsXmaBAPJi1LciXkxZH7TgM3D5OhBEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958502; c=relaxed/simple; bh=Ydu74jTkJBqux3E5+lH21Pwk5cdC4OOUFD/3fiZbbyk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W0ZTZG8vNpxMx7FqBiuPXk5mnDgkIFGFWEBkzzHtVSsrnlK766ntftV6oojKLtnPmMLil2uuZslBVKPEn84mQawXM0YGJ31tZ3r2SnFA4+9NipjE9yju4HK9cizxHx+0Dtm6zv2yw5oJlb2xyZCPaFc4eH/S8MV29taFOE6cqKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=JwYFNC80; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JwYFNC80" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4361f65ca01so66930595e9.1 for ; Wed, 15 Jan 2025 08:28:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736958499; x=1737563299; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rHQnBwBJbkwimUtYndf1g3bAYV0/uHZCDGGQQ3eb7y4=; b=JwYFNC80UIbZvafvHnVdLNU+XKeqVs0EY5tPSPH2CaT+49Vco+NJtnkhSmPdOP8ODW o2yasmDjgAYEFhP/MQobFpaeThiTEb0mtkWH3gGGpWvGzM+i6SOGrXMZWNqY6UhA9TVT 5MdCQfnxy9myHowx3YNNKK5Zw1dxKln/mEAs9rgaL8jm8i5MvA374s8lLpDiVKi9i+3M VZbDtfwDGEEGfvCWf8porzDmGrp4wpUnkKm2xRjHZIRBfm00slFBEQbwL1aFcM3+g2Vx GyWxf6nKwzqmwtz728svGq9py6Sp9TNu1He/DA/BYyh4h/t5RQRFHvLe5CGGC/H3+cws 7d7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736958499; x=1737563299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rHQnBwBJbkwimUtYndf1g3bAYV0/uHZCDGGQQ3eb7y4=; b=r4Hq/WWAo86Cd63bfHhj5Nb0CgLANZnnRSg1uy8LFfVYFxNSlhaIUMZ/yiLOj0yM/n z7u9CURjRDLlGkU4INXRbeXoKsQkChMVHrZ5bPQ/GgyTiIAxY96OCy61msgIdO9p6SXu Hjj1uXV1T/fV5/87JhBKMskDVAMonbp1plnAbS44vakE2mJPQnEPatBkkIFNGtqsDK92 zUyKiSYnuQ+wumKnqRoBi3q9501aecgSa56kJZyy89Rrt0p9B6+5gg+TPYONYck+FmCC ZkOm6bVno4kRzI6Qq728o9wdFzhkiEwfruC73E+OSW3frxgM9KLH6MnLy/w1isoED/+H ++eQ== X-Forwarded-Encrypted: i=1; AJvYcCV+KFrhtJE9VxDKfx+17zNy/4HMbwLUnzhn0bAX5FaDGBbMDdq5YztqLwZq+YbOq5SbCssF0sJXJm2Jva8=@vger.kernel.org X-Gm-Message-State: AOJu0YxV01hdnOQxmjqyUY7M4sTOfKzX5DhkZK68TFvivcQbdESoqSmH f3EloJRlL8l1Q0lyvjUlR0ZPBL7TQ+lHEN1zPWXWyMqdE5NeCv9vIB6mQnYfV5Y= X-Gm-Gg: ASbGncspCPiuwcB6R/Y/vqQ3ld93zVytkKJP5mpadSWWE6tbWhpfuerCw5MwZW5RJXB sOiKuhmeRpogSNP/XMglbGlmw/Ew7zSeXkmeN5K7mL17qqboQ1Leb07ShzIf+N0E0F5I84gZTVD yO1UhPMB9hTQYj5iCaHb4vnFwltIaLZDWai8uF5QyyPTTYLQfNeIgKnQnPsPt7gtyvrWVDpS9wd cvh7CDbgUx2aOF+FBhLBGnVj+7Bju2BP40oo9ibPa8+ZMLYDFvL/8c= X-Google-Smtp-Source: AGHT+IEYQxfJb+fGUXEj5FL1voCc6arCFh3k9mxfCcviGqqyVZFZPgPost2RecIw2PNDbBcm7fTJLA== X-Received: by 2002:a05:600c:1990:b0:436:17e4:ad4c with SMTP id 5b1f17b1804b1-436e26ae2acmr31032085e9.6.1736958499113; Wed, 15 Jan 2025 08:28:19 -0800 (PST) Received: from pop-os.. ([145.224.90.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74ac61csm28620115e9.14.2025.01.15.08.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 08:28:18 -0800 (PST) From: James Clark To: linux-arm-kernel@lists.infradead.org, robh@kernel.org, broonie@kernel.org, maz@kernel.org Cc: James Clark , Catalin Marinas , Will Deacon , Mark Rutland , Oliver Upton , James Morse , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] arm64/sysreg: Fix unbalanced closing block Date: Wed, 15 Jan 2025 16:25:55 +0000 Message-Id: <20250115162600.2153226-2-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250115162600.2153226-1-james.clark@linaro.org> References: <20250115162600.2153226-1-james.clark@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is a sysreg block so close it with one. This doesn't make a difference to the output because the script only matches on the beginning of the word to close blocks which is correct by coincidence here. Signed-off-by: James Clark Acked-by: Mark Rutland Acked-by: Will Deacon Reviewed-by: Anshuman Khandual --- arch/arm64/tools/sysreg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 762ee084b37c..bbe7df69da9c 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -2074,7 +2074,7 @@ EndEnum Res0 4:2 Field 1 ExTRE Field 0 E0TRE -EndSysregFields +EndSysreg =20 Sysreg SMPRI_EL1 3 0 1 2 4 Res0 63:4 --=20 2.34.1 From nobody Sun Dec 14 21:43:45 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B87A19258E for ; Wed, 15 Jan 2025 16:28:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958506; cv=none; b=kr2KmB2W6ULNqk3EXSXS3Q+Lxjkr9h+FgstKiTM0I4ZRa/K9t/AkVkcjSOlby2aTSMMJzy/jbYT2Zgq3wySOFEgZSSEUJqIjd7BHZTrBSNUilC2O1dHC7xbkPys5QzfWRPBk3fRTNflFGIpEsmnSccJH6+R5y8+4BfUqMgpGLJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958506; c=relaxed/simple; bh=YCE8ymdGPEvZ/Ud2my8+eDlMmwDf0ILj5aK7GWQKP4A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JucJ2f6xyi51PZziYaUenDfvcqmwBtwXjFOB5QGkaP1CDgWIJClOSMS+JnCLTrmzvrJRC4tMB50K7MYnEbAtK9WlkTgveNnPv6IsZH+MSu2ARDXAuvXXOwVqiEQAY/r2oOm/gHx3TFQun6wIo8mfBMzbIptFCfrYHntFLnMlrw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=jLkJqIpD; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jLkJqIpD" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4362bae4d7dso49969315e9.1 for ; Wed, 15 Jan 2025 08:28:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736958502; x=1737563302; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zjd4L+skRjDfREyt5/l20Z/nbYutI6PIQ0sn5+CJWLE=; b=jLkJqIpDgSxhPgQpnckAymjmTOY6ULMBmNS71R9CChVvQB1rw3OQuUpEVrBfvsIlKt s6rfz/rMaJ8IXrNKtY8vQFSj4eCFU524mCzXYuiG4AyuTmEPojy6zwx7oLrvH1G1q357 yMlgNmbZvW3403fs3I5Bg2sQfZV/3QMc1PDs2Z4bTIs72lzwblRxBfjKQyAdzxKbwGK1 9nf8TtRQhRvHDgmJFc5gJSTZrx/IY29Rk9eLotmONSltTAXAQrJj3ZGnVWrL308nqAy/ MYcCcpJ1kkLvIVxhbBT5cThLsy2xDX6aUxIavXD1sqeiKCmLPQb5/BgFJTVqqWgkioYT ztZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736958502; x=1737563302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zjd4L+skRjDfREyt5/l20Z/nbYutI6PIQ0sn5+CJWLE=; b=WZjeCQprQKsHKsN+FAbiVIPnogULf0vSQmnu5+84f8U4oLJu8td7BbQpOUzxhuX2vA g1P6b70bdV3c36efNJIY/3e/l5NGaNATsuoZtHo1/OYFTDTQZHfnKeeKfhrEbDunB0vO iOqbx2yMzeyN+Eyvci7ECPR07LdZJ5gTQEM8doDWU8h7WhKK/JDpK3jjETHvn7eCITgL TaRZwZ77kOVjLtzxG+4oTvC2NODu1XMWEQHSuzGj69ohfQUwFd+wxmFmBO10qezVph3m bxo/NxGDw4kpwzLyLlYfSv38OsRbBiX+IbuviTRh7ZZLFTEOWWrztvAf5N5yjm0DgQFS Ia0w== X-Forwarded-Encrypted: i=1; AJvYcCUirGNZbKsduEKQFgaI2k8SucSAlyMXPE64ZZiQP5UirG0H5oX+iJIoDqxLbUYlkwclNCL/88UFiTl36gQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwnxwjQRbhAPIESeRSEPqF8Mn54KHpk7nbpIJR8Hx63nT4J3/Ra nFOrxFo6DDKcFOwPRrsBIpxfYT46LJI0LAW9+bP4LpWxeX2GO7Z+3bD3cBHGEC2pfoJ6KpEO0Zc Y X-Gm-Gg: ASbGncuE6CE7cvJQyM1IFCk07LaNilBc/kn25LlebhQ0pupzDIMJrwmXwULaIDbRAWV rAyWXl0NfjrSnNm79oEO2/LC+cgbmOXlGok7LajhMHO6dtAIEeg3o5FQRFf/xglgf3cfgrO9Gqd m9YntMkEhw9kGX6CG/c4/rnITib+Em4P3iz0WYkJTAOwU/dv8AoinD1Qh4RlEfUnV0q5cuVlvui MLRiFgzKxuin1Q3hDxTz5IfTIB8+AmmxWlAf4QnK9wwohIo2vQ63XU= X-Google-Smtp-Source: AGHT+IFVNgnOJAPAG8manRzHjKDMqVJZ+LeOnlwimnKFOP7HxazUcQ5ElmsH3VOpcllswC4C2+OiCA== X-Received: by 2002:a05:600c:3485:b0:436:fbe0:cebe with SMTP id 5b1f17b1804b1-436fbe0d10cmr129899845e9.30.1736958502328; Wed, 15 Jan 2025 08:28:22 -0800 (PST) Received: from pop-os.. ([145.224.90.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74ac61csm28620115e9.14.2025.01.15.08.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 08:28:22 -0800 (PST) From: James Clark To: linux-arm-kernel@lists.infradead.org, robh@kernel.org, broonie@kernel.org, maz@kernel.org Cc: James Clark , Catalin Marinas , Will Deacon , Mark Rutland , Oliver Upton , Anshuman Khandual , James Morse , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] arm64/sysreg: Enforce whole word match for open/close tokens Date: Wed, 15 Jan 2025 16:25:56 +0000 Message-Id: <20250115162600.2153226-3-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250115162600.2153226-1-james.clark@linaro.org> References: <20250115162600.2153226-1-james.clark@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Opening and closing tokens can also match on words with common prefixes like "Endsysreg" vs "EndsysregFields". This could potentially make the script go wrong in weird ways so make it fall through to the fatal unhandled statement catcher if it doesn't fully match the current block. Closing ones also get expect_fields(1) to ensure nothing other than whitespace follows. Signed-off-by: James Clark Acked-by: Mark Rutland Acked-by: Will Deacon --- arch/arm64/tools/gen-sysreg.awk | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/arch/arm64/tools/gen-sysreg.awk b/arch/arm64/tools/gen-sysreg.= awk index 1a2afc9fdd42..f2a1732cb1f6 100755 --- a/arch/arm64/tools/gen-sysreg.awk +++ b/arch/arm64/tools/gen-sysreg.awk @@ -111,7 +111,7 @@ END { /^$/ { next } /^[\t ]*#/ { next } =20 -/^SysregFields/ && block_current() =3D=3D "Root" { +$1 =3D=3D "SysregFields" && block_current() =3D=3D "Root" { block_push("SysregFields") =20 expect_fields(2) @@ -127,7 +127,8 @@ END { next } =20 -/^EndSysregFields/ && block_current() =3D=3D "SysregFields" { +$1 =3D=3D "EndSysregFields" && block_current() =3D=3D "SysregFields" { + expect_fields(1) if (next_bit > 0) fatal("Unspecified bits in " reg) =20 @@ -145,7 +146,7 @@ END { next } =20 -/^Sysreg/ && block_current() =3D=3D "Root" { +$1 =3D=3D "Sysreg" && block_current() =3D=3D "Root" { block_push("Sysreg") =20 expect_fields(7) @@ -177,7 +178,8 @@ END { next } =20 -/^EndSysreg/ && block_current() =3D=3D "Sysreg" { +$1 =3D=3D "EndSysreg" && block_current() =3D=3D "Sysreg" { + expect_fields(1) if (next_bit > 0) fatal("Unspecified bits in " reg) =20 @@ -206,7 +208,7 @@ END { =20 # Currently this is effectivey a comment, in future we may want to emit # defines for the fields. -(/^Fields/ || /^Mapping/) && block_current() =3D=3D "Sysreg" { +($1 =3D=3D "Fields" || $1 =3D=3D "Mapping") && block_current() =3D=3D "Sys= reg" { expect_fields(2) =20 if (next_bit !=3D 63) @@ -224,7 +226,7 @@ END { } =20 =20 -/^Res0/ && (block_current() =3D=3D "Sysreg" || block_current() =3D=3D "Sys= regFields") { +$1 =3D=3D "Res0" && (block_current() =3D=3D "Sysreg" || block_current() = =3D=3D "SysregFields") { expect_fields(2) parse_bitdef(reg, "RES0", $2) field =3D "RES0_" msb "_" lsb @@ -234,7 +236,7 @@ END { next } =20 -/^Res1/ && (block_current() =3D=3D "Sysreg" || block_current() =3D=3D "Sys= regFields") { +$1 =3D=3D "Res1" && (block_current() =3D=3D "Sysreg" || block_current() = =3D=3D "SysregFields") { expect_fields(2) parse_bitdef(reg, "RES1", $2) field =3D "RES1_" msb "_" lsb @@ -244,7 +246,7 @@ END { next } =20 -/^Unkn/ && (block_current() =3D=3D "Sysreg" || block_current() =3D=3D "Sys= regFields") { +$1 =3D=3D "Unkn" && (block_current() =3D=3D "Sysreg" || block_current() = =3D=3D "SysregFields") { expect_fields(2) parse_bitdef(reg, "UNKN", $2) field =3D "UNKN_" msb "_" lsb @@ -254,7 +256,7 @@ END { next } =20 -/^Field/ && (block_current() =3D=3D "Sysreg" || block_current() =3D=3D "Sy= sregFields") { +$1 =3D=3D "Field" && (block_current() =3D=3D "Sysreg" || block_current() = =3D=3D "SysregFields") { expect_fields(3) field =3D $3 parse_bitdef(reg, field, $2) @@ -265,14 +267,14 @@ END { next } =20 -/^Raz/ && (block_current() =3D=3D "Sysreg" || block_current() =3D=3D "Sysr= egFields") { +$1 =3D=3D "Raz" && (block_current() =3D=3D "Sysreg" || block_current() =3D= =3D "SysregFields") { expect_fields(2) parse_bitdef(reg, field, $2) =20 next } =20 -/^SignedEnum/ && (block_current() =3D=3D "Sysreg" || block_current() =3D= =3D "SysregFields") { +$1 =3D=3D "SignedEnum" && (block_current() =3D=3D "Sysreg" || block_curren= t() =3D=3D "SysregFields") { block_push("Enum") =20 expect_fields(3) @@ -285,7 +287,7 @@ END { next } =20 -/^UnsignedEnum/ && (block_current() =3D=3D "Sysreg" || block_current() =3D= =3D "SysregFields") { +$1 =3D=3D "UnsignedEnum" && (block_current() =3D=3D "Sysreg" || block_curr= ent() =3D=3D "SysregFields") { block_push("Enum") =20 expect_fields(3) @@ -298,7 +300,7 @@ END { next } =20 -/^Enum/ && (block_current() =3D=3D "Sysreg" || block_current() =3D=3D "Sys= regFields") { +$1 =3D=3D "Enum" && (block_current() =3D=3D "Sysreg" || block_current() = =3D=3D "SysregFields") { block_push("Enum") =20 expect_fields(3) @@ -310,7 +312,8 @@ END { next } =20 -/^EndEnum/ && block_current() =3D=3D "Enum" { +$1 =3D=3D "EndEnum" && block_current() =3D=3D "Enum" { + expect_fields(1) =20 field =3D null msb =3D null --=20 2.34.1 From nobody Sun Dec 14 21:43:45 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8E7919A288 for ; Wed, 15 Jan 2025 16:28:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958511; cv=none; b=T0KJP+tS+2ZxOaEHNC1CO74P9InMyXli8OZ9jwwRJcZ4uGaO/HNvuJzjzvkpiDcPq0Fd08Hqlodrunq4xvN4ReLKg1kxazu9Zkm6YOnrl96G0z/PqU9ZBNOGxJ1qw/mMATNjKP4VRsyBpXatkwCN1Scuw+ZQx7DJNmBZWQ5QOqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958511; c=relaxed/simple; bh=UOk60CI7UsrHStIOYUsNTjg6PhlNz47yNoVGy5Ge8zo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ShoPV2gY7XDtRZ5+xw2+NWvBxZ9n8PBh3PAalONDOV1RIcjOjyAO1uQ1oypTL92ZB93S1nXlh7QP4r9s+rhSgTW4WYG0owjgEQzKmdiJcy4dlOyQzRFF4zlSXCJw4nvkWyGRyDB2+RKpG/LiruW94nZaMhvwacpc8BZW2Jq1Gt4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=my/EaK9u; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="my/EaK9u" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4363ae65100so73824125e9.0 for ; Wed, 15 Jan 2025 08:28:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736958506; x=1737563306; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m5TepKu0SZ93QxY0JjOwIhgH9C4Czywub5gafQUMdfE=; b=my/EaK9uWSK/MdzkbNVbMVt5mYwS/WPoeIYsblgq32Hcu2xmQ8ds82mgrVmLMv2jxJ VKXHPW0TVhZhfXdTHRFMAuGxrc85+q1J1BKzJj/vA4EXt7SbHKLf0DsnvSwd3NV0p/qo h7tCQLuKYv6ZD0tgZ9NSej7xRe7NrX7neP7kpAljr9D9nvq/xHh6QkcEOan45KI2JN5p t1j4aM/3dWmjLVpqsNAWb5nQH6+ChdMN9/3+ZHl55gnBt/ICxhPKRcnmn/PYb8sn0rA4 4bJZocJNYmzuS1LDsTGqqCKrhMppJ7NKuXXDTD69PIMGVymMSexuWb7HVmrQphzXFA66 YMFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736958506; x=1737563306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m5TepKu0SZ93QxY0JjOwIhgH9C4Czywub5gafQUMdfE=; b=ubZJ0DZBd7cKLXCV/ZyDTiJ0EOZkc4bKA+JlQ8jkkCIayJNNS392ofH16jVsAiGt2o U54o+RWOMl9sKoYDf8+sHj8kV+5eJqW2R4tqrGjnKTOLlwaUJYhFYKMZ3c5rq6URYb5e zEnb9aGr9cJzPWVl5ONfBK8C9N1NkWdWFkFRcYzYgeyKAFgBDj3qNJQVCPq5VAiB4NY9 VPYxKSbTQIP02z4N359nyFk+2ngeWHGUpIRvvlYU5OWKj0wtbYRCoVMyM8y/sjQC0kUQ lJoC6tx/3B0fvGZRC8ahUK4UH8nML+4dU7UzN44QZvgLa4Qw9SR7oaYyGN1SgHFHNg/m hOQg== X-Forwarded-Encrypted: i=1; AJvYcCWwYiTHUpW3XFFEpl43B4D4+DCeEaEavXd8X5HDHf7oLCdGe0oqiwn3vk5r5BDldMlx1qBccC05hS6Vqz0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1DfUjIL+Xm9CcrdutueFvLYtdpqFI1s786nehlrA+gQLjBGfW /73gaCeeP0AlvchH+UgDEERo02gTV9xTACsbTQxS9OcZgmVkq/FyFJrxFx/VKLE= X-Gm-Gg: ASbGnctYDjUdvr6zYN/7/AuBrfMz8Y0plQjmkOI/ivLS/routjQT2uhFMVFOrOybEY2 QwCl8qLtgwwihg7OdT1A6QZmSIP4EgATisvnY1Qn8ymUKQmB33iAXBo3Kqt9qLPruqHCYh5ui1M tZGa2VBbFUUlSgbaYScSyEJNv2LZEgd6lW/TtIm6aR+pmXZoUlUYRAUF59IyV8Izh7biDoUQZmu oCexxWTEmXW3aTDt2nNFSM6cXvTU+XwLCiTbgZR8it+hR5MzFuDloM= X-Google-Smtp-Source: AGHT+IFaCBSMwfPP2MvgCkPvhIdkphT0/28HrknSzwZG6Swnc2L/m58YlMbiBJqTUF3GDoO51w9mUw== X-Received: by 2002:a05:600c:6004:b0:436:e751:e436 with SMTP id 5b1f17b1804b1-436e751e59cmr237269845e9.19.1736958505934; Wed, 15 Jan 2025 08:28:25 -0800 (PST) Received: from pop-os.. ([145.224.90.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74ac61csm28620115e9.14.2025.01.15.08.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 08:28:25 -0800 (PST) From: James Clark To: linux-arm-kernel@lists.infradead.org, robh@kernel.org, broonie@kernel.org, maz@kernel.org Cc: James Clark , Catalin Marinas , Will Deacon , Mark Rutland , Oliver Upton , Anshuman Khandual , James Morse , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] arm64/sysreg: Sort sysreg by encoding Date: Wed, 15 Jan 2025 16:25:57 +0000 Message-Id: <20250115162600.2153226-4-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250115162600.2153226-1-james.clark@linaro.org> References: <20250115162600.2153226-1-james.clark@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's mostly been sorted by sysreg encoding, but not 100%. Sort it so new entries can be added without wondering where to put them. The following python script was used to sort, keeping the top level SysregFields and comments next to their current Sysreg entries by splitting on "EndSysreg": # cat arch/arm64/tools/sysreg | python3 sort.py > sorted-sysreg import sys, re def key(block): reg =3D r"\w+\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)" match =3D re.search(reg, block) sort_val =3D ''.join(f"{int(n):02d}" for n in match.groups()) return (sort_val, block) sysreg =3D sys.stdin.read().split("\nEndSysreg\n")[:-1] sysreg =3D sorted(sysreg, key=3Dkey) print("\nEndSysreg\n".join(sysreg) + "\nEndSysreg") Tested by diffing sorted outputs: $ diff <(sort arch/arm64/include/generated/asm/sysreg-defs.h) \ <(sort before-sysreg-defs.h) -s Files /dev/fd/63 and /dev/fd/62 are identical Signed-off-by: James Clark --- arch/arm64/tools/sysreg | 1006 +++++++++++++++++++-------------------- 1 file changed, 503 insertions(+), 503 deletions(-) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index bbe7df69da9c..fe1c58367ceb 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -661,71 +661,71 @@ UnsignedEnum 3:0 SEVL EndEnum EndSysreg =20 -Sysreg ID_ISAR6_EL1 3 0 0 2 7 -Res0 63:28 -UnsignedEnum 27:24 I8MM +Sysreg ID_MMFR4_EL1 3 0 0 2 6 +Res0 63:32 +UnsignedEnum 31:28 EVT 0b0000 NI - 0b0001 IMP + 0b0001 NO_TLBIS + 0b0010 TLBIS EndEnum -UnsignedEnum 23:20 BF16 +UnsignedEnum 27:24 CCIDX 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 19:16 SPECRES +UnsignedEnum 23:20 LSM 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 15:12 SB +UnsignedEnum 19:16 HPDS + 0b0000 NI + 0b0001 AA32HPD + 0b0010 HPDS2 +EndEnum +UnsignedEnum 15:12 CnP 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 11:8 FHM +UnsignedEnum 11:8 XNX 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 7:4 DP +UnsignedEnum 7:4 AC2 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 3:0 JSCVT +UnsignedEnum 3:0 SpecSEI 0b0000 NI 0b0001 IMP EndEnum EndSysreg =20 -Sysreg ID_MMFR4_EL1 3 0 0 2 6 -Res0 63:32 -UnsignedEnum 31:28 EVT - 0b0000 NI - 0b0001 NO_TLBIS - 0b0010 TLBIS -EndEnum -UnsignedEnum 27:24 CCIDX +Sysreg ID_ISAR6_EL1 3 0 0 2 7 +Res0 63:28 +UnsignedEnum 27:24 I8MM 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 23:20 LSM +UnsignedEnum 23:20 BF16 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 19:16 HPDS +UnsignedEnum 19:16 SPECRES 0b0000 NI - 0b0001 AA32HPD - 0b0010 HPDS2 + 0b0001 IMP EndEnum -UnsignedEnum 15:12 CnP +UnsignedEnum 15:12 SB 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 11:8 XNX +UnsignedEnum 11:8 FHM 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 7:4 AC2 +UnsignedEnum 7:4 DP 0b0000 NI 0b0001 IMP EndEnum -UnsignedEnum 3:0 SpecSEI +UnsignedEnum 3:0 JSCVT 0b0000 NI 0b0001 IMP EndEnum @@ -2064,6 +2064,16 @@ Field 17:16 ZEN Res0 15:0 EndSysreg =20 +SysregFields ZCR_ELx +Res0 63:9 +Raz 8:4 +Field 3:0 LEN +EndSysregFields + +Sysreg ZCR_EL1 3 0 1 2 0 +Fields ZCR_ELx +EndSysreg + Sysreg TRFCR_EL1 3 0 1 2 1 Res0 63:7 UnsignedEnum 6:5 TS @@ -2081,16 +2091,6 @@ Res0 63:4 Field 3:0 PRIORITY EndSysreg =20 -SysregFields ZCR_ELx -Res0 63:9 -Raz 8:4 -Field 3:0 LEN -EndSysregFields - -Sysreg ZCR_EL1 3 0 1 2 0 -Fields ZCR_ELx -EndSysreg - SysregFields SMCR_ELx Res0 63:32 Field 31 FA64 @@ -2104,6 +2104,36 @@ Sysreg SMCR_EL1 3 0 1 2 6 Fields SMCR_ELx EndSysreg =20 +SysregFields TTBRx_EL1 +Field 63:48 ASID +Field 47:1 BADDR +Field 0 CnP +EndSysregFields + +Sysreg TTBR0_EL1 3 0 2 0 0 +Fields TTBRx_EL1 +EndSysreg + +Sysreg TTBR1_EL1 3 0 2 0 1 +Fields TTBRx_EL1 +EndSysreg + +Sysreg TCR2_EL1 3 0 2 0 3 +Res0 63:16 +Field 15 DisCH1 +Field 14 DisCH0 +Res0 13:12 +Field 11 HAFT +Field 10 PTTWI +Res0 9:6 +Field 5 D128 +Field 4 AIE +Field 3 POE +Field 2 E0POE +Field 1 PIE +Field 0 PnCH +EndSysreg + SysregFields GCSCR_ELx Res0 63:10 Field 9 STREn @@ -2149,31 +2179,6 @@ Sysreg FAR_EL1 3 0 6 0 0 Field 63:0 ADDR EndSysreg =20 -Sysreg PMICNTR_EL0 3 3 9 4 0 -Field 63:0 ICNT -EndSysreg - -Sysreg PMICFILTR_EL0 3 3 9 6 0 -Res0 63:59 -Field 58 SYNC -Field 57:56 VS -Res0 55:32 -Field 31 P -Field 30 U -Field 29 NSK -Field 28 NSU -Field 27 NSH -Field 26 M -Res0 25 -Field 24 SH -Field 23 T -Field 22 RLK -Field 21 RLU -Field 20 RLH -Res0 19:16 -Field 15:0 evtCount -EndSysreg - Sysreg PMSCR_EL1 3 0 9 9 0 Res0 63:8 Field 7:6 PCT @@ -2298,72 +2303,283 @@ Field 4 P Field 3:0 ALIGN EndSysreg =20 -Sysreg PMUACR_EL1 3 0 9 14 4 -Res0 63:33 -Field 32 F0 -Field 31 C -Field 30:0 P +Sysreg TRBLIMITR_EL1 3 0 9 11 0 +Field 63:12 LIMIT +Res0 11:7 +Field 6 XE +Field 5 nVM +Enum 4:3 TM + 0b00 STOP + 0b01 IRQ + 0b11 IGNR +EndEnum +Enum 2:1 FM + 0b00 FILL + 0b01 WRAP + 0b11 CBUF +EndEnum +Field 0 E EndSysreg =20 -Sysreg PMSELR_EL0 3 3 9 12 5 -Res0 63:5 -Field 4:0 SEL +Sysreg TRBPTR_EL1 3 0 9 11 1 +Field 63:0 PTR EndSysreg =20 -SysregFields CONTEXTIDR_ELx -Res0 63:32 -Field 31:0 PROCID -EndSysregFields - -Sysreg CONTEXTIDR_EL1 3 0 13 0 1 -Fields CONTEXTIDR_ELx +Sysreg TRBBASER_EL1 3 0 9 11 2 +Field 63:12 BASE +Res0 11:0 EndSysreg =20 -Sysreg RCWSMASK_EL1 3 0 13 0 3 -Field 63:0 RCWSMASK +Sysreg TRBSR_EL1 3 0 9 11 3 +Res0 63:56 +Field 55:32 MSS2 +Field 31:26 EC +Res0 25:24 +Field 23 DAT +Field 22 IRQ +Field 21 TRG +Field 20 WRAP +Res0 19 +Field 18 EA +Field 17 S +Res0 16 +Field 15:0 MSS EndSysreg =20 -Sysreg TPIDR_EL1 3 0 13 0 4 -Field 63:0 ThreadID +Sysreg TRBMAR_EL1 3 0 9 11 4 +Res0 63:12 +Enum 11:10 PAS + 0b00 SECURE + 0b01 NON_SECURE + 0b10 ROOT + 0b11 REALM +EndEnum +Enum 9:8 SH + 0b00 NON_SHAREABLE + 0b10 OUTER_SHAREABLE + 0b11 INNER_SHAREABLE +EndEnum +Field 7:0 Attr EndSysreg =20 -Sysreg RCWMASK_EL1 3 0 13 0 6 -Field 63:0 RCWMASK +Sysreg TRBTRG_EL1 3 0 9 11 6 +Res0 63:32 +Field 31:0 TRG EndSysreg =20 -Sysreg SCXTNUM_EL1 3 0 13 0 7 -Field 63:0 SoftwareContextNumber +Sysreg TRBIDR_EL1 3 0 9 11 7 +Res0 63:12 +Enum 11:8 EA + 0b0000 NON_DESC + 0b0001 IGNORE + 0b0010 SERROR +EndEnum +Res0 7:6 +Field 5 F +Field 4 P +Field 3:0 Align EndSysreg =20 -# The bit layout for CCSIDR_EL1 depends on whether FEAT_CCIDX is implement= ed. -# The following is for case when FEAT_CCIDX is not implemented. -Sysreg CCSIDR_EL1 3 1 0 0 0 -Res0 63:32 -Unkn 31:28 -Field 27:13 NumSets -Field 12:3 Associativity -Field 2:0 LineSize +Sysreg PMUACR_EL1 3 0 9 14 4 +Res0 63:33 +Field 32 F0 +Field 31 C +Field 30:0 P EndSysreg =20 -Sysreg CLIDR_EL1 3 1 0 0 1 -Res0 63:47 -Field 46:33 Ttypen -Field 32:30 ICB -Field 29:27 LoUU -Field 26:24 LoC -Field 23:21 LoUIS -Field 20:18 Ctype7 -Field 17:15 Ctype6 -Field 14:12 Ctype5 -Field 11:9 Ctype4 -Field 8:6 Ctype3 -Field 5:3 Ctype2 -Field 2:0 Ctype1 -EndSysreg +SysregFields MAIR2_ELx +Field 63:56 Attr7 +Field 55:48 Attr6 +Field 47:40 Attr5 +Field 39:32 Attr4 +Field 31:24 Attr3 +Field 23:16 Attr2 +Field 15:8 Attr1 +Field 7:0 Attr0 +EndSysregFields =20 -Sysreg CCSIDR2_EL1 3 1 0 0 2 -Res0 63:24 -Field 23:0 NumSets +Sysreg MAIR2_EL1 3 0 10 2 1 +Fields MAIR2_ELx +EndSysreg + +SysregFields PIRx_ELx +Field 63:60 Perm15 +Field 59:56 Perm14 +Field 55:52 Perm13 +Field 51:48 Perm12 +Field 47:44 Perm11 +Field 43:40 Perm10 +Field 39:36 Perm9 +Field 35:32 Perm8 +Field 31:28 Perm7 +Field 27:24 Perm6 +Field 23:20 Perm5 +Field 19:16 Perm4 +Field 15:12 Perm3 +Field 11:8 Perm2 +Field 7:4 Perm1 +Field 3:0 Perm0 +EndSysregFields + +Sysreg PIRE0_EL1 3 0 10 2 2 +Fields PIRx_ELx +EndSysreg + +Sysreg PIR_EL1 3 0 10 2 3 +Fields PIRx_ELx +EndSysreg + +Sysreg POR_EL1 3 0 10 2 4 +Fields PIRx_ELx +EndSysreg + +Sysreg S2POR_EL1 3 0 10 2 5 +Fields PIRx_ELx +EndSysreg + +Sysreg AMAIR2_EL1 3 0 10 3 1 +Field 63:0 ImpDef +EndSysreg + +Sysreg LORSA_EL1 3 0 10 4 0 +Res0 63:52 +Field 51:16 SA +Res0 15:1 +Field 0 Valid +EndSysreg + +Sysreg LOREA_EL1 3 0 10 4 1 +Res0 63:52 +Field 51:48 EA_51_48 +Field 47:16 EA_47_16 +Res0 15:0 +EndSysreg + +Sysreg LORN_EL1 3 0 10 4 2 +Res0 63:8 +Field 7:0 Num +EndSysreg + +Sysreg LORC_EL1 3 0 10 4 3 +Res0 63:10 +Field 9:2 DS +Res0 1 +Field 0 EN +EndSysreg + +Sysreg MPAMIDR_EL1 3 0 10 4 4 +Res0 63:62 +Field 61 HAS_SDEFLT +Field 60 HAS_FORCE_NS +Field 59 SP4 +Field 58 HAS_TIDR +Field 57 HAS_ALTSP +Res0 56:40 +Field 39:32 PMG_MAX +Res0 31:21 +Field 20:18 VPMR_MAX +Field 17 HAS_HCR +Res0 16 +Field 15:0 PARTID_MAX +EndSysreg + +Sysreg LORID_EL1 3 0 10 4 7 +Res0 63:24 +Field 23:16 LD +Res0 15:8 +Field 7:0 LR +EndSysreg + +Sysreg MPAM1_EL1 3 0 10 5 0 +Field 63 MPAMEN +Res0 62:61 +Field 60 FORCED_NS +Res0 59:55 +Field 54 ALTSP_FRCD +Res0 53:48 +Field 47:40 PMG_D +Field 39:32 PMG_I +Field 31:16 PARTID_D +Field 15:0 PARTID_I +EndSysreg + +Sysreg MPAM0_EL1 3 0 10 5 1 +Res0 63:48 +Field 47:40 PMG_D +Field 39:32 PMG_I +Field 31:16 PARTID_D +Field 15:0 PARTID_I +EndSysreg + +Sysreg ISR_EL1 3 0 12 1 0 +Res0 63:11 +Field 10 IS +Field 9 FS +Field 8 A +Field 7 I +Field 6 F +Res0 5:0 +EndSysreg + +Sysreg ICC_NMIAR1_EL1 3 0 12 9 5 +Res0 63:24 +Field 23:0 INTID +EndSysreg + +SysregFields CONTEXTIDR_ELx +Res0 63:32 +Field 31:0 PROCID +EndSysregFields + +Sysreg CONTEXTIDR_EL1 3 0 13 0 1 +Fields CONTEXTIDR_ELx +EndSysreg + +Sysreg RCWSMASK_EL1 3 0 13 0 3 +Field 63:0 RCWSMASK +EndSysreg + +Sysreg TPIDR_EL1 3 0 13 0 4 +Field 63:0 ThreadID +EndSysreg + +Sysreg RCWMASK_EL1 3 0 13 0 6 +Field 63:0 RCWMASK +EndSysreg + +Sysreg SCXTNUM_EL1 3 0 13 0 7 +Field 63:0 SoftwareContextNumber +EndSysreg + +# The bit layout for CCSIDR_EL1 depends on whether FEAT_CCIDX is implement= ed. +# The following is for case when FEAT_CCIDX is not implemented. +Sysreg CCSIDR_EL1 3 1 0 0 0 +Res0 63:32 +Unkn 31:28 +Field 27:13 NumSets +Field 12:3 Associativity +Field 2:0 LineSize +EndSysreg + +Sysreg CLIDR_EL1 3 1 0 0 1 +Res0 63:47 +Field 46:33 Ttypen +Field 32:30 ICB +Field 29:27 LoUU +Field 26:24 LoC +Field 23:21 LoUIS +Field 20:18 Ctype7 +Field 17:15 Ctype6 +Field 14:12 Ctype5 +Field 11:9 Ctype4 +Field 8:6 Ctype3 +Field 5:3 Ctype2 +Field 2:0 Ctype1 +EndSysreg + +Sysreg CCSIDR2_EL1 3 1 0 0 2 +Res0 63:24 +Field 23:0 NumSets EndSysreg =20 Sysreg GMID_EL1 3 1 0 0 4 @@ -2448,6 +2664,40 @@ UnsignedEnum 2:0 F8S1 EndEnum EndSysreg =20 +Sysreg PMICNTR_EL0 3 3 9 4 0 +Field 63:0 ICNT +EndSysreg + +Sysreg PMICFILTR_EL0 3 3 9 6 0 +Res0 63:59 +Field 58 SYNC +Field 57:56 VS +Res0 55:32 +Field 31 P +Field 30 U +Field 29 NSK +Field 28 NSU +Field 27 NSH +Field 26 M +Res0 25 +Field 24 SH +Field 23 T +Field 22 RLK +Field 21 RLU +Field 20 RLH +Res0 19:16 +Field 15:0 evtCount +EndSysreg + +Sysreg PMSELR_EL0 3 3 9 12 5 +Res0 63:5 +Field 4:0 SEL +EndSysreg + +Sysreg POR_EL0 3 3 10 2 4 +Fields PIRx_ELx +EndSysreg + SysregFields HFGxTR_EL2 Field 63 nAMAIR2_EL1 Field 62 nMAIR2_EL1 @@ -2625,6 +2875,10 @@ Field 1 ICIALLU Field 0 ICIALLUIS EndSysreg =20 +Sysreg ZCR_EL2 3 4 1 2 0 +Fields ZCR_ELx +EndSysreg + Sysreg TRFCR_EL2 3 4 1 2 1 Res0 63:7 UnsignedEnum 6:5 TS @@ -2640,18 +2894,114 @@ Field 1 E2TRE Field 0 E0HTRE EndSysreg =20 +Sysreg HCRX_EL2 3 4 1 2 2 +Res0 63:25 +Field 24 PACMEn +Field 23 EnFPM +Field 22 GCSEn +Field 21 EnIDCP128 +Field 20 EnSDERR +Field 19 TMEA +Field 18 EnSNERR +Field 17 D128En +Field 16 PTTWI +Field 15 SCTLR2En +Field 14 TCR2En +Res0 13:12 +Field 11 MSCEn +Field 10 MCE2 +Field 9 CMOW +Field 8 VFNMI +Field 7 VINMI +Field 6 TALLINT +Field 5 SMPME +Field 4 FGTnXS +Field 3 FnXS +Field 2 EnASR +Field 1 EnALS +Field 0 EnAS0 +EndSysreg =20 -Sysreg HDFGRTR_EL2 3 4 3 1 4 -Field 63 PMBIDR_EL1 -Field 62 nPMSNEVFR_EL1 -Field 61 nBRBDATA -Field 60 nBRBCTL -Field 59 nBRBIDR -Field 58 PMCEIDn_EL0 -Field 57 PMUSERENR_EL0 -Field 56 TRBTRG_EL1 -Field 55 TRBSR_EL1 -Field 54 TRBPTR_EL1 +Sysreg SMPRIMAP_EL2 3 4 1 2 5 +Field 63:60 P15 +Field 59:56 P14 +Field 55:52 P13 +Field 51:48 P12 +Field 47:44 P11 +Field 43:40 P10 +Field 39:36 F9 +Field 35:32 P8 +Field 31:28 P7 +Field 27:24 P6 +Field 23:20 P5 +Field 19:16 P4 +Field 15:12 P3 +Field 11:8 P2 +Field 7:4 P1 +Field 3:0 P0 +EndSysreg + +Sysreg SMCR_EL2 3 4 1 2 6 +Fields SMCR_ELx +EndSysreg + +Sysreg TCR2_EL2 3 4 2 0 3 +Res0 63:16 +Field 15 DisCH1 +Field 14 DisCH0 +Field 13 AMEC1 +Field 12 AMEC0 +Field 11 HAFT +Field 10 PTTWI +Res0 9:6 +Field 5 D128 +Field 4 AIE +Field 3 POE +Field 2 E0POE +Field 1 PIE +Field 0 PnCH +EndSysreg + +Sysreg GCSCR_EL2 3 4 2 5 0 +Fields GCSCR_ELx +EndSysreg + +Sysreg GCSPR_EL2 3 4 2 5 1 +Fields GCSPR_ELx +EndSysreg + +Sysreg DACR32_EL2 3 4 3 0 0 +Res0 63:32 +Field 31:30 D15 +Field 29:28 D14 +Field 27:26 D13 +Field 25:24 D12 +Field 23:22 D11 +Field 21:20 D10 +Field 19:18 D9 +Field 17:16 D8 +Field 15:14 D7 +Field 13:12 D6 +Field 11:10 D5 +Field 9:8 D4 +Field 7:6 D3 +Field 5:4 D2 +Field 3:2 D1 +Field 1:0 D0 +EndSysreg + + +Sysreg HDFGRTR_EL2 3 4 3 1 4 +Field 63 PMBIDR_EL1 +Field 62 nPMSNEVFR_EL1 +Field 61 nBRBDATA +Field 60 nBRBCTL +Field 59 nBRBIDR +Field 58 PMCEIDn_EL0 +Field 57 PMUSERENR_EL0 +Field 56 TRBTRG_EL1 +Field 55 TRBSR_EL1 +Field 54 TRBPTR_EL1 Field 53 TRBMAR_EL1 Field 52 TRBLIMITR_EL1 Field 51 TRBIDR_EL1 @@ -2813,89 +3163,6 @@ Field 1 AMEVCNTR00_EL0 Field 0 AMCNTEN0 EndSysreg =20 -Sysreg ZCR_EL2 3 4 1 2 0 -Fields ZCR_ELx -EndSysreg - -Sysreg HCRX_EL2 3 4 1 2 2 -Res0 63:25 -Field 24 PACMEn -Field 23 EnFPM -Field 22 GCSEn -Field 21 EnIDCP128 -Field 20 EnSDERR -Field 19 TMEA -Field 18 EnSNERR -Field 17 D128En -Field 16 PTTWI -Field 15 SCTLR2En -Field 14 TCR2En -Res0 13:12 -Field 11 MSCEn -Field 10 MCE2 -Field 9 CMOW -Field 8 VFNMI -Field 7 VINMI -Field 6 TALLINT -Field 5 SMPME -Field 4 FGTnXS -Field 3 FnXS -Field 2 EnASR -Field 1 EnALS -Field 0 EnAS0 -EndSysreg - -Sysreg SMPRIMAP_EL2 3 4 1 2 5 -Field 63:60 P15 -Field 59:56 P14 -Field 55:52 P13 -Field 51:48 P12 -Field 47:44 P11 -Field 43:40 P10 -Field 39:36 F9 -Field 35:32 P8 -Field 31:28 P7 -Field 27:24 P6 -Field 23:20 P5 -Field 19:16 P4 -Field 15:12 P3 -Field 11:8 P2 -Field 7:4 P1 -Field 3:0 P0 -EndSysreg - -Sysreg SMCR_EL2 3 4 1 2 6 -Fields SMCR_ELx -EndSysreg - -Sysreg GCSCR_EL2 3 4 2 5 0 -Fields GCSCR_ELx -EndSysreg - -Sysreg GCSPR_EL2 3 4 2 5 1 -Fields GCSPR_ELx -EndSysreg - -Sysreg DACR32_EL2 3 4 3 0 0 -Res0 63:32 -Field 31:30 D15 -Field 29:28 D14 -Field 27:26 D13 -Field 25:24 D12 -Field 23:22 D11 -Field 21:20 D10 -Field 19:18 D9 -Field 17:16 D8 -Field 15:14 D7 -Field 13:12 D6 -Field 11:10 D5 -Field 9:8 D4 -Field 7:6 D3 -Field 5:4 D2 -Field 3:2 D1 -Field 1:0 D0 -EndSysreg - Sysreg FAR_EL2 3 4 6 0 0 Field 63:0 ADDR EndSysreg @@ -2915,6 +3182,30 @@ Field 1 E2SPE Field 0 E0HSPE EndSysreg =20 +Sysreg MAIR2_EL2 3 4 10 1 1 +Fields MAIR2_ELx +EndSysreg + +Sysreg PIRE0_EL2 3 4 10 2 2 +Fields PIRx_ELx +EndSysreg + +Sysreg PIR_EL2 3 4 10 2 3 +Fields PIRx_ELx +EndSysreg + +Sysreg POR_EL2 3 4 10 2 4 +Fields PIRx_ELx +EndSysreg + +Sysreg S2PIR_EL2 3 4 10 2 5 +Fields PIRx_ELx +EndSysreg + +Sysreg AMAIR2_EL2 3 4 10 3 1 +Field 63:0 ImpDef +EndSysreg + Sysreg MPAMHCR_EL2 3 4 10 4 0 Res0 63:32 Field 31 TRAP_MPAMIDR_EL1 @@ -3059,6 +3350,10 @@ Sysreg SMCR_EL12 3 5 1 2 6 Mapping SMCR_EL1 EndSysreg =20 +Sysreg TCR2_EL12 3 5 2 0 3 +Mapping TCR2_EL1 +EndSysreg + Sysreg GCSCR_EL12 3 5 2 5 0 Mapping GCSCR_EL1 EndSysreg @@ -3071,317 +3366,22 @@ Sysreg FAR_EL12 3 5 6 0 0 Field 63:0 ADDR EndSysreg =20 -Sysreg MPAM1_EL12 3 5 10 5 0 -Fields MPAM1_ELx -EndSysreg - -Sysreg CONTEXTIDR_EL12 3 5 13 0 1 -Mapping CONTEXTIDR_EL1 -EndSysreg - -SysregFields TTBRx_EL1 -Field 63:48 ASID -Field 47:1 BADDR -Field 0 CnP -EndSysregFields - -Sysreg TTBR0_EL1 3 0 2 0 0 -Fields TTBRx_EL1 -EndSysreg - -Sysreg TTBR1_EL1 3 0 2 0 1 -Fields TTBRx_EL1 -EndSysreg - -Sysreg TCR2_EL1 3 0 2 0 3 -Res0 63:16 -Field 15 DisCH1 -Field 14 DisCH0 -Res0 13:12 -Field 11 HAFT -Field 10 PTTWI -Res0 9:6 -Field 5 D128 -Field 4 AIE -Field 3 POE -Field 2 E0POE -Field 1 PIE -Field 0 PnCH -EndSysreg - -Sysreg TCR2_EL12 3 5 2 0 3 -Mapping TCR2_EL1 -EndSysreg - -Sysreg TCR2_EL2 3 4 2 0 3 -Res0 63:16 -Field 15 DisCH1 -Field 14 DisCH0 -Field 13 AMEC1 -Field 12 AMEC0 -Field 11 HAFT -Field 10 PTTWI -Res0 9:6 -Field 5 D128 -Field 4 AIE -Field 3 POE -Field 2 E0POE -Field 1 PIE -Field 0 PnCH -EndSysreg - -SysregFields MAIR2_ELx -Field 63:56 Attr7 -Field 55:48 Attr6 -Field 47:40 Attr5 -Field 39:32 Attr4 -Field 31:24 Attr3 -Field 23:16 Attr2 -Field 15:8 Attr1 -Field 7:0 Attr0 -EndSysregFields - -Sysreg MAIR2_EL1 3 0 10 2 1 -Fields MAIR2_ELx -EndSysreg - -Sysreg MAIR2_EL2 3 4 10 1 1 -Fields MAIR2_ELx -EndSysreg - -Sysreg AMAIR2_EL1 3 0 10 3 1 -Field 63:0 ImpDef -EndSysreg - -Sysreg AMAIR2_EL2 3 4 10 3 1 -Field 63:0 ImpDef -EndSysreg - -SysregFields PIRx_ELx -Field 63:60 Perm15 -Field 59:56 Perm14 -Field 55:52 Perm13 -Field 51:48 Perm12 -Field 47:44 Perm11 -Field 43:40 Perm10 -Field 39:36 Perm9 -Field 35:32 Perm8 -Field 31:28 Perm7 -Field 27:24 Perm6 -Field 23:20 Perm5 -Field 19:16 Perm4 -Field 15:12 Perm3 -Field 11:8 Perm2 -Field 7:4 Perm1 -Field 3:0 Perm0 -EndSysregFields - -Sysreg PIRE0_EL1 3 0 10 2 2 -Fields PIRx_ELx -EndSysreg - Sysreg PIRE0_EL12 3 5 10 2 2 Mapping PIRE0_EL1 EndSysreg =20 -Sysreg PIRE0_EL2 3 4 10 2 2 -Fields PIRx_ELx -EndSysreg - -Sysreg PIR_EL1 3 0 10 2 3 -Fields PIRx_ELx -EndSysreg - Sysreg PIR_EL12 3 5 10 2 3 Mapping PIR_EL1 EndSysreg =20 -Sysreg PIR_EL2 3 4 10 2 3 -Fields PIRx_ELx -EndSysreg - -Sysreg POR_EL0 3 3 10 2 4 -Fields PIRx_ELx -EndSysreg - -Sysreg POR_EL1 3 0 10 2 4 -Fields PIRx_ELx -EndSysreg - -Sysreg POR_EL2 3 4 10 2 4 -Fields PIRx_ELx -EndSysreg - Sysreg POR_EL12 3 5 10 2 4 Mapping POR_EL1 EndSysreg =20 -Sysreg S2POR_EL1 3 0 10 2 5 -Fields PIRx_ELx -EndSysreg - -Sysreg S2PIR_EL2 3 4 10 2 5 -Fields PIRx_ELx -EndSysreg - -Sysreg LORSA_EL1 3 0 10 4 0 -Res0 63:52 -Field 51:16 SA -Res0 15:1 -Field 0 Valid -EndSysreg - -Sysreg LOREA_EL1 3 0 10 4 1 -Res0 63:52 -Field 51:48 EA_51_48 -Field 47:16 EA_47_16 -Res0 15:0 -EndSysreg - -Sysreg LORN_EL1 3 0 10 4 2 -Res0 63:8 -Field 7:0 Num -EndSysreg - -Sysreg LORC_EL1 3 0 10 4 3 -Res0 63:10 -Field 9:2 DS -Res0 1 -Field 0 EN -EndSysreg - -Sysreg MPAMIDR_EL1 3 0 10 4 4 -Res0 63:62 -Field 61 HAS_SDEFLT -Field 60 HAS_FORCE_NS -Field 59 SP4 -Field 58 HAS_TIDR -Field 57 HAS_ALTSP -Res0 56:40 -Field 39:32 PMG_MAX -Res0 31:21 -Field 20:18 VPMR_MAX -Field 17 HAS_HCR -Res0 16 -Field 15:0 PARTID_MAX -EndSysreg - -Sysreg LORID_EL1 3 0 10 4 7 -Res0 63:24 -Field 23:16 LD -Res0 15:8 -Field 7:0 LR -EndSysreg - -Sysreg MPAM1_EL1 3 0 10 5 0 -Field 63 MPAMEN -Res0 62:61 -Field 60 FORCED_NS -Res0 59:55 -Field 54 ALTSP_FRCD -Res0 53:48 -Field 47:40 PMG_D -Field 39:32 PMG_I -Field 31:16 PARTID_D -Field 15:0 PARTID_I -EndSysreg - -Sysreg MPAM0_EL1 3 0 10 5 1 -Res0 63:48 -Field 47:40 PMG_D -Field 39:32 PMG_I -Field 31:16 PARTID_D -Field 15:0 PARTID_I -EndSysreg - -Sysreg ISR_EL1 3 0 12 1 0 -Res0 63:11 -Field 10 IS -Field 9 FS -Field 8 A -Field 7 I -Field 6 F -Res0 5:0 -EndSysreg - -Sysreg ICC_NMIAR1_EL1 3 0 12 9 5 -Res0 63:24 -Field 23:0 INTID -EndSysreg - -Sysreg TRBLIMITR_EL1 3 0 9 11 0 -Field 63:12 LIMIT -Res0 11:7 -Field 6 XE -Field 5 nVM -Enum 4:3 TM - 0b00 STOP - 0b01 IRQ - 0b11 IGNR -EndEnum -Enum 2:1 FM - 0b00 FILL - 0b01 WRAP - 0b11 CBUF -EndEnum -Field 0 E -EndSysreg - -Sysreg TRBPTR_EL1 3 0 9 11 1 -Field 63:0 PTR -EndSysreg - -Sysreg TRBBASER_EL1 3 0 9 11 2 -Field 63:12 BASE -Res0 11:0 -EndSysreg - -Sysreg TRBSR_EL1 3 0 9 11 3 -Res0 63:56 -Field 55:32 MSS2 -Field 31:26 EC -Res0 25:24 -Field 23 DAT -Field 22 IRQ -Field 21 TRG -Field 20 WRAP -Res0 19 -Field 18 EA -Field 17 S -Res0 16 -Field 15:0 MSS -EndSysreg - -Sysreg TRBMAR_EL1 3 0 9 11 4 -Res0 63:12 -Enum 11:10 PAS - 0b00 SECURE - 0b01 NON_SECURE - 0b10 ROOT - 0b11 REALM -EndEnum -Enum 9:8 SH - 0b00 NON_SHAREABLE - 0b10 OUTER_SHAREABLE - 0b11 INNER_SHAREABLE -EndEnum -Field 7:0 Attr -EndSysreg - -Sysreg TRBTRG_EL1 3 0 9 11 6 -Res0 63:32 -Field 31:0 TRG +Sysreg MPAM1_EL12 3 5 10 5 0 +Fields MPAM1_ELx EndSysreg =20 -Sysreg TRBIDR_EL1 3 0 9 11 7 -Res0 63:12 -Enum 11:8 EA - 0b0000 NON_DESC - 0b0001 IGNORE - 0b0010 SERROR -EndEnum -Res0 7:6 -Field 5 F -Field 4 P -Field 3:0 Align +Sysreg CONTEXTIDR_EL12 3 5 13 0 1 +Mapping CONTEXTIDR_EL1 EndSysreg --=20 2.34.1 From nobody Sun Dec 14 21:43:45 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C949E166F1B for ; Wed, 15 Jan 2025 16:28:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958512; cv=none; b=ee7f/sp8yHaiWEhdvEOle5lSDJHZFdZrAB1Cw4xEy/CSUwyW3e0sfVUR4M/Ei++WjJod1Be5xE0HFis+oHyd3guQJgiizAZSmClof2ArAoQPXnIc9pttH2Qu4pAaZB1AV4jXi+zYB/no9Xfrwo/axL8Rs93NA3a0Hteo6a4Gbow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736958512; c=relaxed/simple; bh=fjAlX40hpn5Kyco3eQ/cg7TEJR4sEc+5AnjMmMobZko=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iwvP1cMHvWSJ2JarFWFh83PAw/5zF8NcxP4hREATrv0C8Tc3VA/LdQB8GC2Ko3pYrhX+XmMevAlSHAEl37ZarTembr4WZE4gpChyP64dlUyefQEGLG916uqCMV/+JaWOFtNgIQnZnc+uSqxNpD2/MEHZA2O5rIIzobpBAsd8ZjM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=k6Yytslq; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="k6Yytslq" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-436249df846so48376915e9.3 for ; Wed, 15 Jan 2025 08:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736958509; x=1737563309; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JC8yyDuL+pKv6I+/+AFMyw5Z70RjkPmelojZw3uCds4=; b=k6Yytslq6xjPP50pwtgoYaoobKIxreMA16DWNFiYqpCluRD0vQvwVQdzT2p9e1Sl4J jq4tRajdks34krQyQzBjtyhPUFmF18aLCgNnEYus5vzR+x4CMOD0C85lLvIDnYnjihP1 93nc78MO+nnGQo9GcjY1JMQu5MHJ1aaMIQjDbvoHo+cXkp9tM/mHPCgLgHFe+FujjGjp t9qdV5WM0gbRS/8yySHffjgvEWqnIU+XNM/TBQFqZZTzeEuPfmmfwjD/hoI81/GFHNiC b6c06zWA9bUoZBCVsXGpEMDs/7YsK99CvHyyMJmiOwMzsVDI4Q4vGSc+vhuUk9Mrg4k+ vdxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736958509; x=1737563309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JC8yyDuL+pKv6I+/+AFMyw5Z70RjkPmelojZw3uCds4=; b=dF/m+3a4pNUyPvwhAtjvBKupJpy9c+SQE3mIMYdSbxN3L6wMxr418MTxou7WSYDfr1 5/ayjHWOg0zrcuJWMG4MKUGXY0r0+aqTButaxCSu53En1yKQcJPHLIkN5Q/voZA0QxYv PyXucbQ2ZANZW5COsszCvRA00lp8p0W3nK0VY6v76LUJw1zrcYR0GWb/GqxqI2M69+W8 u4zf+nhHJOSEr0sQdSSe7d1dBSML+h7cUNdREYnkVVzmKQkTTg77Uo3KaoqKqZhKhAD9 uubMfElkM8MkDW8AcyCZIZalme0GD+NZBZP/cZctc3UMdZ6EBgl4ov00i/4on5gbmRN0 oaRg== X-Forwarded-Encrypted: i=1; AJvYcCWviWVnyjKY7LiVM24GIQ9UYAqf/hagupg5RF9sJomr1IjZ55Hhvsxa2T/jIegJV8Syi/hzrewnas6BB/w=@vger.kernel.org X-Gm-Message-State: AOJu0YxnusPnBGKOWmqXRaVMqZc7x3inrlDbAxeDZnPSm9ehwWWX8N9C z3nDGmlIYx6xxuwNDR8HrWp4YaXWhAjQp2Uf8eBty0vUR2TPg1nIY4zS6IGK6YQ= X-Gm-Gg: ASbGncuFgTVaF8w+5y7j2kLFcPgZOibnUrvxotK3wFgXvNxxh3tjx5FfkB1fDkvfdph ahyE+OWeP9yqnRFwiS6x/hMbZUT558uqS1vGiKh+3+Bo2VPi+Ar8aeFeON4PpNjRMSG4KIPHwfN 8XoBH0YU6h0S2mCWU5aFbzxBGfthmmjITFXIKs2ypBLgqyftIDIya2uvFLQHD8WMXd/mWGeL5EC 59r84DE5HRu7uBN+n4Xj+vFKj7LOiQuSRfab8NWg+4eKcvcduc0Sik= X-Google-Smtp-Source: AGHT+IEeGOszGXKxZCV/VGzxwoDAMD5c7XL/BYl8fs44YnKjTM59nKZ3+sKi8wyy+Gp/hnlDgagt3w== X-Received: by 2002:a5d:5848:0:b0:385:f7a3:fea6 with SMTP id ffacd0b85a97d-38a872da434mr14029155f8f.13.1736958509113; Wed, 15 Jan 2025 08:28:29 -0800 (PST) Received: from pop-os.. ([145.224.90.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c74ac61csm28620115e9.14.2025.01.15.08.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 08:28:28 -0800 (PST) From: James Clark To: linux-arm-kernel@lists.infradead.org, robh@kernel.org, broonie@kernel.org, maz@kernel.org Cc: James Clark , Catalin Marinas , Will Deacon , Mark Rutland , Oliver Upton , James Morse , linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] arm64/sysreg: Enforce sorting Date: Wed, 15 Jan 2025 16:25:58 +0000 Message-Id: <20250115162600.2153226-5-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250115162600.2153226-1-james.clark@linaro.org> References: <20250115162600.2153226-1-james.clark@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make an unsorted sysreg file a build error so it stays sorted. Reviewed-by: Mark Brown Signed-off-by: James Clark --- arch/arm64/tools/gen-sysreg.awk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/tools/gen-sysreg.awk b/arch/arm64/tools/gen-sysreg.= awk index f2a1732cb1f6..03a4886524dd 100755 --- a/arch/arm64/tools/gen-sysreg.awk +++ b/arch/arm64/tools/gen-sysreg.awk @@ -98,6 +98,7 @@ BEGIN { =20 __current_block_depth =3D 0 __current_block[__current_block_depth] =3D "Root" + __last_sysreg_sort_val =3D 0 } =20 END { @@ -158,6 +159,12 @@ $1 =3D=3D "Sysreg" && block_current() =3D=3D "Root" { crm =3D $6 op2 =3D $7 =20 + sort_val =3D sprintf("%02d", $3) sprintf("%02d", $4) sprintf("%02d", $5) \ + sprintf("%02d", $6) sprintf("%02d", $7) + if (sort_val < __last_sysreg_sort_val) + fatal($2 ": Sysregs should be sorted by encoding") + __last_sysreg_sort_val =3D sort_val + res0 =3D "UL(0)" res1 =3D "UL(0)" unkn =3D "UL(0)" --=20 2.34.1