diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/cortexA55.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/cortexA55.S
index b8f9bd5fc..1a63b65b5 100644
--- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/cortexA55.S
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a55/preboot_for_3568/cortexA55.S
@@ -21,7 +21,8 @@ Modification:
     .func cpu_get_current
 cpu_get_current:
     mrs   x0, mpidr_el1
-    and   x0, x0, #3
+    and   x0, x0, #0xFFF
+    lsr   x0, x0, #8
     ret
     .endfunc
 
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/hard_spinlock.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/hard_spinlock.S
index 1f568e62c..ff7fba64c 100644
--- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/hard_spinlock.S
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a55/hard_spinlock.S
@@ -67,7 +67,8 @@ cmp     w1, #UNLOCKED
 bne     _spinlock_lock
 
 mrs     x1, mpidr_el1                // get our CPU ID
-and     x1, x1, #3
+and     x1, x1, #0xFFF
+lsr     x1, x1, #8
 stxrb   w2, w1, [x0]
 cmp     x2, #0
 bne     _spinlock_lock        // check if the write was successful, if the write failed, start over
@@ -86,7 +87,8 @@ ret
 _spinlock_unlock:
 
 mrs     x1, mpidr_el1                // get our CPU ID
-and     x1, x1, #3
+and     x1, x1, #0xFFF
+lsr     x1, x1, #8
 
 ldr     w2, [x0]
 cmp     w1, w2