From nobody Thu Dec 18 03:39:17 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 76159243867 for ; Wed, 15 Jan 2025 13:43:21 +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=1736948603; cv=none; b=n/nsHk6EUY5Tiz8jqwcHsK3HQVCEl7BJpywuA0TdHeqhC6W7niVQCqplds9nKq817cZQ99d+T7V+6po2Z9HAw3vqZsfbGxTDcvI4zNXuBg6gnN0cKA5u6Qth/9PYQnVnvbQq6PTuW/laEyqITl3SV5DYutqgSRw1FrmDgAYJ9Ig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736948603; c=relaxed/simple; bh=+kRVZqyEqiJek7zqLyxeSd2TeztXMiK8BtEGo5XjW1w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sgU5/3PdoVJyiTOCUwDwDlSwgHQn6ZfYemMFGvkQMeYQuayT17mspigZVYEtAIz/+spOXZcwEentoRlyvVFf9aTZwuTcu8I9jpxHOg7IZxEQd6trlruZY6FKdLhZ2OMloFUaKOiZJ+4AcZuX2jUY9KeKJ3F9owFNzGyvuBINyOo= 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=bSwcaYq4; 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="bSwcaYq4" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4361dc6322fso47864875e9.3 for ; Wed, 15 Jan 2025 05:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736948600; x=1737553400; 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=KeZuvH3UGnQUtqtWabBejUBG0pdX8SFSDZ3OStfizlM=; b=bSwcaYq4cpkck0Vvk1q2mJfVaFZyvDkNpfAtXh6QgQ9QRaPf3q1n9rgNBClEe0KptP MJmF5jK+Q1K+cDkODsiB4JZm0CHoCR0P0gKI9e22FWvbPAQs1jo9fCwwjXFzvUqAm5m4 ByR0XYIsYRpRDcbMr1u3HiFisYwJUPuo87Y+X3mArhF+z3QsLn+dTrQ/azZvTuUgw/ND 3xFShfEdGJMS0YAyJA8GJLpdVXEoXTuDArfa1vGFQw6AseDyWd6VDDbfHTnQAHr9TlkI +0uQEn0hnCY6NyOPEUc5ICwBYdszEU1B9uMJSusscZ0ZLCF2j7y/wCgzLYhFHhOkND+K UZ6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736948600; x=1737553400; 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=KeZuvH3UGnQUtqtWabBejUBG0pdX8SFSDZ3OStfizlM=; b=TqszkYbKHPBVkmJGtc7/gIA8cZMaURhtaxytoOEqySnrXb8p745rdR4Iwz4xMU+p5F RBq8Fvuh1Qs2roOCUYbGtLZVLc5nedADAoDC3HDI2lAS8Yv8yihP55P+TxI89mEWsvcy Oozz/lVeNxl26KkHGyjMtETp8fQrI9RAF80cP66DhMfOPHeiIYwh7q3l3QGXrRwG423I OmkFpT7yB302d/lBDs4FDz0SrjFFhN8CYVfnE7DpOdXCqXoAbg2zLv19ZShyTsR9QVoY f0e60aIwGXstBhUzqAiDQlY8MiHjJ2IWFLum8dhrcWNANe0T2g5sr593RsfJVP6Cf4V1 tq8Q== X-Forwarded-Encrypted: i=1; AJvYcCVmnWbxzy/kLA2pKqkigqEji2fXEKiibvk5wQ7UkYJt02cWHUWvg2y9cK5NS8xMXp6KzexikC7UZCUd7SE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzy+25y3b0FCsZEVSxuGdddLp7vBwJk+khJiCN3kD+QS3NuAMkq 6EfV+EIkgdAA93XaHqQjGN6QUyflJeAx7D/jKIwZObuXjYvQ+0dopFPyV4njoZw= X-Gm-Gg: ASbGncvA0Atf6pOvTb/EbJdQg1JGfKxmMM+vVkcEE/bAIqBhXnsxs60e0cMX0DLIYiV gBUO70ODVG8do1nLKPF7czdL6WNM9vWtMWVhUk1F7oWa6xbovkCTQM+67hrsdD0PyCTSR8vclON rMWjr4RmLWk8vrx8rtgYZk6a0EWzMaLsk3mtcloMPCRrvG9bIuxfvSknQ3mG2VhCX2lUAwTPBYT /aorya6084ijBTPWtDF20pqi+hYypZaIX+ZI987KC6+vQiJjpagLkM= X-Google-Smtp-Source: AGHT+IF6/6miVqA8lxPXwEMJFgSltM5n1uymfk4FgX+ZbGSSTlwfp9RcgUI/CSyzjF1w9ekENozQyg== X-Received: by 2002:a05:600c:1384:b0:436:1c04:aa8e with SMTP id 5b1f17b1804b1-436e26bdac1mr316746855e9.16.1736948599790; Wed, 15 Jan 2025 05:43:19 -0800 (PST) Received: from pop-os.. ([145.224.90.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-437c7499bbasm24853825e9.3.2025.01.15.05.43.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 05:43:19 -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 3/5] arm64/sysreg: Enforce whole word for opening blocks Date: Wed, 15 Jan 2025 13:42:55 +0000 Message-Id: <20250115134259.1864060-4-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250115134259.1864060-1-james.clark@linaro.org> References: <20250115134259.1864060-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" Similarly to the previous change, opening blocks can also match on words with common prefixes. Fix it by ensuring the whole word matches. This doesn't do much more than catch trailing typos. Signed-off-by: James Clark --- arch/arm64/tools/gen-sysreg.awk | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/arm64/tools/gen-sysreg.awk b/arch/arm64/tools/gen-sysreg.= awk index 7c7412adf90e..7f578216dc68 100755 --- a/arch/arm64/tools/gen-sysreg.awk +++ b/arch/arm64/tools/gen-sysreg.awk @@ -111,11 +111,10 @@ 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) - reg =3D $2 =20 res0 =3D "UL(0)" @@ -145,7 +144,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) @@ -206,7 +205,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 +223,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 +233,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 +243,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 +253,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 +264,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 +284,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 +297,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) --=20 2.34.1