Skip to contentSkip to conversation

Add Zhaoxin support to enable tsc_reliable and arch_random features

PATCH In review Runa Guo-oc 3 participants 3 messages May 22, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add Zhaoxin support to enable tsc_reliable and arch_random features

---
 arch/arch-x86-common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arch-x86-common.h +2 -1
index f32835cc..bd329c32 100644
@@ -68,7 +68,8 @@ static inline void arch_init(char *envp[])
 			 (unsigned int *) &str[4]);
 
 	str[12] = '\0';
-	if (!strcmp(str, "GenuineIntel"))
+	if (!strcmp(str, "GenuineIntel")) || (!strcmp(str, "  Shanghai  ") ||
+	    !strcmp(str, "CentaurHauls"))
 		arch_init_intel();
 	else if (!strcmp(str, "AuthenticAMD") || !strcmp(str, "HygonGenuine"))
 		arch_init_amd();
Signature · 1 line
2.17.1
#2 lore raw
In reply to Runa Guo-oc

Hi,

Quoted 6 lines · Runa Guo-oc
---
 arch/arch-x86-common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

<snip>

Quoted 5 lines · On Thu, 22 May 2025 at 07:51, <[email protected]> wrote:

The result of fio's continuous integration tests was: failure

For more details see https://github.com/fiotestbot/fio/actions/runs/15179641974

The bot has a point:

crc/../arch/arch-x86-common.h: In function ‘arch_init’:
135crc/../arch/arch-x86-common.h:71:43: error: expected expression before ‘||’ token
136 71 | if (!strcmp(str, "GenuineIntel")) || (!strcmp(str, " Shanghai ") || 137 | ^~
138crc/../arch/arch-x86-common.h:71:43: error: expected expression before ‘||’ token
139 71 | if (!strcmp(str, "GenuineIntel")) || (!strcmp(str, " Shanghai ") || 140 | ^~
141

Have you compiled and run this change to check it does what you expect?

Signature · 1 line
Sitsofe