diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
index b873deaf9e3c..39aea45fface 100644
--- a/arch/arm64/kvm/psci.c
+++ b/arch/arm64/kvm/psci.c
@@ -280,7 +280,7 @@ out:
 static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
 {
 	u32 psci_fn = smccc_get_function(vcpu);
-	u32 arg;
+	u32 feature;
 	unsigned long val;
 	int ret = 1;
 
@@ -292,12 +292,12 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
 		val = minor == 0 ? KVM_ARM_PSCI_1_0 : KVM_ARM_PSCI_1_1;
 		break;
 	case PSCI_1_0_FN_PSCI_FEATURES:
-		arg = smccc_get_arg1(vcpu);
-		val = kvm_psci_check_allowed_function(vcpu, arg);
+		feature = smccc_get_arg1(vcpu);
+		val = kvm_psci_check_allowed_function(vcpu, feature);
 		if (val)
 			break;
 
-		switch(arg) {
+		switch(feature) {
 		case PSCI_0_2_FN_PSCI_VERSION:
 		case PSCI_0_2_FN_CPU_SUSPEND:
 		case PSCI_0_2_FN64_CPU_SUSPEND:
@@ -313,36 +313,11 @@ static int kvm_psci_1_x_call(struct kvm_vcpu *vcpu, u32 minor)
 		case ARM_SMCCC_VERSION_FUNC_ID:
 			val = 0;
 			break;
-		case PSCI_1_1_FN_SYSTEM_RESET2:
-		case PSCI_1_1_FN64_SYSTEM_RESET2:
-			if (minor >= 1) {
-				val = 0;
-				break;
-			}
-			fallthrough;
 		default:
 			val = PSCI_RET_NOT_SUPPORTED;
 			break;
 		}
 		break;
-	case PSCI_1_1_FN_SYSTEM_RESET2:
-		kvm_psci_narrow_to_32bit(vcpu);
-		fallthrough;
-	case PSCI_1_1_FN64_SYSTEM_RESET2:
-		if (minor >= 1) {
-			arg = smccc_get_arg1(vcpu);
-
-			if (arg > PSCI_1_1_RESET_TYPE_SYSTEM_WARM_RESET &&
-			    arg < PSCI_1_1_RESET_TYPE_VENDOR_START) {
-				val = PSCI_RET_INVALID_PARAMS;
-			} else {
-				kvm_psci_system_reset(vcpu);
-				val = PSCI_RET_INTERNAL_FAILURE;
-				ret = 0;
-			}
-			break;
-		};
-		fallthrough;
 	default:
 		return kvm_psci_0_2_call(vcpu);
 	}
diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index 2bf93c0d6354..2fcad1dd0b0e 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -82,10 +82,6 @@
 #define PSCI_0_2_TOS_UP_NO_MIGRATE		1
 #define PSCI_0_2_TOS_MP				2
 
-/* PSCI v1.1 reset type encoding for SYSTEM_RESET2 */
-#define PSCI_1_1_RESET_TYPE_SYSTEM_WARM_RESET	0
-#define PSCI_1_1_RESET_TYPE_VENDOR_START	0x80000000U
-
 /* PSCI version decoding (independent of PSCI version) */
 #define PSCI_VERSION_MAJOR_SHIFT		16
 #define PSCI_VERSION_MINOR_MASK			\