diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index a19683f1e953dffa829bf96602708de7051baa63..92fc1fbb85ccd9b38e1eca0f02f233e78225835a 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -1205,8 +1205,6 @@ struct kvm_ppc_resize_hpt {
 
 #define KVM_CAP_SEV_ES_GHCB 500
 #define KVM_CAP_HYGON_COCO_EXT 501
-
-#define KVM_CAP_ARM_IPIV_MODE 503
 /* support userspace to request firmware to build CSV3 guest's memory space */
 #define KVM_CAP_HYGON_COCO_EXT_CSV3_SET_PRIV_MEM  (1 << 0)
 /* support request to update CSV3 guest's memory region multiple times */
@@ -1216,6 +1214,7 @@ struct kvm_ppc_resize_hpt {
 
 #define KVM_CAP_ARM_HW_DIRTY_STATE_TRACK 502
 
+#define KVM_CAP_ARM_HISI_IPIV 798
 #define KVM_CAP_ARM_VIRT_MSI_BYPASS 799
 
 #define KVM_EXIT_HYPERCALL_VALID_MASK (1 << KVM_HC_MAP_GPA_RANGE)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index b0f70de01888e4b94a01299560b6eb2adf71faa3..09d391bd348aaf9c7e59a58d35487a1e68b540e6 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1324,25 +1324,9 @@ static void arm_cpu_dump_state(CPUState *cs, FILE *f, int flags)
 
 uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz)
 {
-    uint64_t Aff0 = 0, Aff1 = 0, Aff2 = 0, Aff3 = 0;
-    int mode;
-
-    if (!kvm_enabled()) {
-        Aff1 = idx / clustersz;
-        Aff0 = idx % clustersz;
-        return (Aff1 << ARM_AFF1_SHIFT) | Aff0;
-    }
-
-    mode = kvm_check_extension(kvm_state, KVM_CAP_ARM_IPIV_MODE);
-    if (mode) {
-        Aff1 = idx % 16;
-        Aff2 = idx / 16;
-    } else {
-        Aff1 = idx / clustersz;
-        Aff0 = idx % clustersz;
-    }
-    return (Aff3 << ARM_AFF3_SHIFT) | (Aff2 << ARM_AFF2_SHIFT) |
-        (Aff1 << ARM_AFF1_SHIFT) | Aff0;
+    uint32_t Aff1 = idx / clustersz;
+    uint32_t Aff0 = idx % clustersz;
+    return (Aff1 << ARM_AFF1_SHIFT) | Aff0;
 }
 
 static void arm_cpu_initfn(Object *obj)
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index ee5ba683058a6e4b50cf59f86bb611624003d440..ab31515a2af6500374ec9676117c162e13692365 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -257,6 +257,22 @@ int kvm_arch_get_default_type(MachineState *ms)
     return fixed_ipa ? 0 : size;
 }
 
+static void kvm_update_ipiv_cap(KVMState *s)
+{
+    int ret;
+
+    if (!kvm_check_extension(s, KVM_CAP_ARM_HISI_IPIV)) {
+        return;
+    }
+
+    ret = kvm_vm_enable_cap(s, KVM_CAP_ARM_HISI_IPIV, 0);
+    if (ret) {
+        fprintf(stderr, "Could not enable KVM_CAP_ARM_HISI_IPIV: %d\n", ret);
+    }
+
+    return;
+}
+
 int kvm_arch_init(MachineState *ms, KVMState *s)
 {
     MachineClass *mc = MACHINE_GET_CLASS(ms);
@@ -330,6 +346,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
     }
 
     kvm_arm_init_debug(s);
+    kvm_update_ipiv_cap(s);
 
     return ret;
 }