Merge tag 'aspeed-7.0-fixes-0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/bmc/linux into arm/fixes

krzk · krzk · commit 4b2b3f034a05 · 2026-04-01T13:29:57.000+02:00
aspeed: first batch of fixes for v7.0

* tag 'aspeed-7.0-fixes-0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/bmc/linux:
  soc: aspeed: socinfo: Mask table entries for accurate SoC ID matching

Signed-off-by: Krzysztof Kozlowski &lt;krzk@kernel.org&gt;
diff --git a/drivers/soc/aspeed/aspeed-socinfo.c b/drivers/soc/aspeed/aspeed-socinfo.c
@@ -39,7 +39,7 @@ static const char *siliconid_to_name(u32 siliconid)
 	unsigned int i;
 
 	for (i = 0 ; i < ARRAY_SIZE(rev_table) ; ++i) {
-		if (rev_table[i].id == id)
+		if ((rev_table[i].id & 0xff00ffff) == id)
 			return rev_table[i].name;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ static const char *siliconid_to_name(u32 siliconid)`
`39`	`39`	`unsigned int i;`
`40`	`40`
`41`	`41`	`for (i = 0 ; i < ARRAY_SIZE(rev_table) ; ++i) {`
`42`		`- if (rev_table[i].id == id)`
	`42`	`+ if ((rev_table[i].id & 0xff00ffff) == id)`
`43`	`43`	`return rev_table[i].name;`
`44`	`44`	`}`
`45`	`45`