[PATCH] arm64/sysreg: Fix typo in Enum element regex

[PATCH] arm64/sysreg: Fix typo in Enum element regex

[Alejandro Tafalla]

In the awk script, there was a typo with the comparison operator when
checking if the matched pattern is inside an Enum block.
This prevented the generation of the whole sysreg-defs.h header.

Fixes: 66847e0618d7 ("arm64: Add sysreg header generation scripting")
Signed-off-by: Alejandro Tafalla <atafalla@dnyon.com>
---
 arch/arm64/tools/gen-sysreg.awk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/tools/gen-sysreg.awk b/arch/arm64/tools/gen-sysreg.awk
index 89bfb74e28de..5c55509eb43f 100755
--- a/arch/arm64/tools/gen-sysreg.awk
+++ b/arch/arm64/tools/gen-sysreg.awk
@@ -253,7 +253,7 @@ END {
 	next
 }
 
-/0b[01]+/ && block = "Enum" {
+/0b[01]+/ && block == "Enum" {
 	expect_fields(2)
 	val = $1
 	name = $2
-- 
2.36.1

Re: [PATCH] arm64/sysreg: Fix typo in Enum element regex

[Catalin Marinas]

On Thu, Jun 09, 2022 at 10:42:18PM +0200, Alejandro Tafalla wrote:
> In the awk script, there was a typo with the comparison operator when
> checking if the matched pattern is inside an Enum block.
> This prevented the generation of the whole sysreg-defs.h header.
> 
> Fixes: 66847e0618d7 ("arm64: Add sysreg header generation scripting")
> Signed-off-by: Alejandro Tafalla <atafalla@dnyon.com>
> ---
>  arch/arm64/tools/gen-sysreg.awk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/tools/gen-sysreg.awk b/arch/arm64/tools/gen-sysreg.awk
> index 89bfb74e28de..5c55509eb43f 100755
> --- a/arch/arm64/tools/gen-sysreg.awk
> +++ b/arch/arm64/tools/gen-sysreg.awk
> @@ -253,7 +253,7 @@ END {
>  	next
>  }
>  
> -/0b[01]+/ && block = "Enum" {
> +/0b[01]+/ && block == "Enum" {

This makes sense but I'm surprised that we haven't noticed it until now
(maybe some awk versions treat it as a relational operator).

-- 
Catalin

Re: [PATCH] arm64/sysreg: Fix typo in Enum element regex

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

On Fri, Jun 10, 2022 at 10:15:04AM +0100, Catalin Marinas wrote:
> On Thu, Jun 09, 2022 at 10:42:18PM +0200, Alejandro Tafalla wrote:

> > In the awk script, there was a typo with the comparison operator when
> > checking if the matched pattern is inside an Enum block.
> > This prevented the generation of the whole sysreg-defs.h header.

> > -/0b[01]+/ && block = "Enum" {
> > +/0b[01]+/ && block == "Enum" {

> This makes sense but I'm surprised that we haven't noticed it until now
> (maybe some awk versions treat it as a relational operator).

What Catlain said - if we weren't generating the full header contents
I'd expect things to fail to build normally, but it's entirely possible
this is just happening to work with some implementations and the patch
is clearly correct.

Reviewed-by: Mark Brown <broonie@kernel.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] arm64/sysreg: Fix typo in Enum element regex

[Alejandro T.]

On viernes, 10 de junio de 2022 13:19:50 (CEST) Mark Brown wrote:
> On Fri, Jun 10, 2022 at 10:15:04AM +0100, Catalin Marinas wrote:
> > On Thu, Jun 09, 2022 at 10:42:18PM +0200, Alejandro Tafalla wrote:
> > > In the awk script, there was a typo with the comparison operator when
> > > checking if the matched pattern is inside an Enum block.
> > > This prevented the generation of the whole sysreg-defs.h header.
> > > 
> > > -/0b[01]+/ && block = "Enum" {
> > > +/0b[01]+/ && block == "Enum" {
> > 
> > This makes sense but I'm surprised that we haven't noticed it until now
> > (maybe some awk versions treat it as a relational operator).
> 
> What Catlain said - if we weren't generating the full header contents
> I'd expect things to fail to build normally, but it's entirely possible
> this is just happening to work with some implementations and the patch
> is clearly correct.
> 
> Reviewed-by: Mark Brown <broonie@kernel.org>

Hi Mark, thanks for your review. 

Indeed, I'm building the kernel in Alpine, which uses Busybox instead of gawk.

Re: [PATCH] arm64/sysreg: Fix typo in Enum element regex

[Catalin Marinas]

On Thu, 9 Jun 2022 22:42:18 +0200, Alejandro Tafalla wrote:
> In the awk script, there was a typo with the comparison operator when
> checking if the matched pattern is inside an Enum block.
> This prevented the generation of the whole sysreg-defs.h header.
> 
> 

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64/sysreg: Fix typo in Enum element regex
      https://git.kernel.org/arm64/c/ce253b8573ce

-- 
Catalin