diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 809dcac24e1822a84eae5db58085e690e68ea5a4..7d110ce5d7f49982cdb5b0d6efa4f416ad625811 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1792,6 +1792,9 @@ static bool has_mor_nontemporal(const struct arm64_cpu_capabilities *entry)
 static bool can_clearpage_use_stnp(const struct arm64_cpu_capabilities *entry,
 				   int scope)
 {
+	if (read_sysreg(dczid_el0) & BIT(DCZID_DZP_SHIFT))
+		return true;
+
 	return use_clearpage_stnp && has_mor_nontemporal(entry);
 }