Update canonize to fix aarch64 bugs

vihangm · vihangm · commit d4bb8730426e · 2025-01-29T19:37:44.000-08:00
Signed-off-by: Vihang Mehta &lt;vihang@gimletlabs.ai&gt;
diff --git a/shared/source/gmm_helper/gmm_helper.cpp b/shared/source/gmm_helper/gmm_helper.cpp
@@ -63,7 +63,13 @@ GmmHelper::GmmHelper(const RootDeviceEnvironment &rootDeviceEnvironmentArg) : ro
 }
 
 uint64_t GmmHelper::canonize(uint64_t address) const {
+#if defined(__aarch64__)
+    // Memory layout on aarch64 doesn't require setting bits 63-48 to the same
+    // as bit 47. See https://docs.kernel.org/arch/arm64/memory.html
+    return static_cast<int64_t>(address);
+#else
     return static_cast<int64_t>(address << (64 - addressWidth)) >> (64 - addressWidth);
+#endif
 }
 
 uint64_t GmmHelper::decanonize(uint64_t address) const {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,13 @@ GmmHelper::GmmHelper(const RootDeviceEnvironment &rootDeviceEnvironmentArg) : ro`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`uint64_t GmmHelper::canonize(uint64_t address) const {`
	`66`	`+#if defined(__aarch64__)`
	`67`	`+ // Memory layout on aarch64 doesn't require setting bits 63-48 to the same`
	`68`	`+ // as bit 47. See https://docs.kernel.org/arch/arm64/memory.html`
	`69`	`+ return static_cast<int64_t>(address);`
	`70`	`+#else`
`66`	`71`	`return static_cast<int64_t>(address << (64 - addressWidth)) >> (64 - addressWidth);`
	`72`	`+#endif`
`67`	`73`	`}`
`68`	`74`
`69`	`75`	`uint64_t GmmHelper::decanonize(uint64_t address) const {`