diff --git a/arch/arm64/kvm/hisilicon/hisi_virt.c b/arch/arm64/kvm/hisilicon/hisi_virt.c
index d9029d612697c419af516ada58234d9cc763483c..d108b0ba31469f583c31a73ed006dbc3d6c611c3 100644
--- a/arch/arm64/kvm/hisilicon/hisi_virt.c
+++ b/arch/arm64/kvm/hisilicon/hisi_virt.c
@@ -179,6 +179,11 @@ bool hisi_ipiv_supported(void)
 		return false;
 	}
 
+	if (!gic_get_ipiv_status()) {
+		kvm_info("Hisi ipiv is disabled by BIOS\n");
+		return false;
+	}
+
 	/* User provided kernel command-line parameter */
 	if (!ipiv_enabled || !is_kernel_in_hyp_mode())
 		return false;
diff --git a/arch/arm64/kvm/hisilicon/hisi_virt.h b/arch/arm64/kvm/hisilicon/hisi_virt.h
index 531a7522797278115351e1cb762d3da4026418c1..85dccafde8a63c3cd3f1db7595470c9566190a90 100644
--- a/arch/arm64/kvm/hisilicon/hisi_virt.h
+++ b/arch/arm64/kvm/hisilicon/hisi_virt.h
@@ -135,5 +135,6 @@ static inline void kvm_hisi_reload_lsudvmbm(struct kvm *kvm) {}
 
 #ifdef CONFIG_ARM64_HISI_IPIV
 extern bool gic_dist_enable_ipiv(void);
+extern bool gic_get_ipiv_status(void);
 #endif /* CONFIG_ARM64_HISI_IPIV */
 #endif /* __HISI_VIRT_H__ */
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 9d2a5cc50c334171aebf0e7ee424e33b69683c9a..5686ca0b960cb3cc7af59bbe3d04291400eb82cf 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1525,11 +1525,7 @@ void gic_dist_enable_ipiv(void)
 {
 	u32 val;
 
-	val = readl_relaxed(gic_data.dist_base + GICD_MISC_CTRL);
-	val |= GICD_MISC_CTRL_CFG_IPIV_EN;
-	writel_relaxed(val, gic_data.dist_base + GICD_MISC_CTRL);
 	static_branch_enable(&ipiv_enable);
-
 	val = (0 << GICD_IPIV_CTRL_AFF_DIRECT_VPEID_SHIFT) |
 		(4 << GICD_IPIV_CTRL_AFF1_LEFT_SHIFT_SHIFT) |
 		(12 << GICD_IPIV_CTRL_AFF2_LEFT_SHIFT_SHIFT) |
@@ -1541,6 +1537,18 @@ void gic_dist_enable_ipiv(void)
 	writel_relaxed(0x4880, gic_data.dist_base + GICD_IPIV_ITS_TA_BASE);
 }
 EXPORT_SYMBOL(gic_dist_enable_ipiv);
+
+bool gic_get_ipiv_status(void)
+{
+	u32 val;
+
+	val = readl_relaxed(gic_data.dist_base + GICD_MISC_CTRL);
+	if (val & GICD_MISC_CTRL_CFG_IPIV_EN)
+		return true;
+
+	return false;
+}
+EXPORT_SYMBOL(gic_get_ipiv_status);
 #endif /* CONFIG_ARM64_HISI_IPIV */
 
 static void gic_cpu_init(void)