7 files changed, 38 insertions, 58 deletions

diff --git a/sys/arm64/acpica/acpi_machdep.c b/sys/arm64/acpica/acpi_machdep.c
index 123e5c328255..5ff875a98e53 100644
--- a/sys/arm64/acpica/acpi_machdep.c
+++ b/sys/arm64/acpica/acpi_machdep.c
@@ -235,11 +235,7 @@ parse_pxm_tables(void *dummy)
 	if (arm64_bus_method != ARM64_BUS_ACPI)
 		return;
 
-	if (!get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0)) {
-		/* chosen arbitrarily */
-		mmfr0 = ID_AA64MMFR0_PARange_1T;
-	}
-
+	get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0);
 	switch (ID_AA64MMFR0_PARange_VAL(mmfr0)) {
 	case ID_AA64MMFR0_PARange_4G:
 		parange = (vm_paddr_t)4 << 30 /* GiB */;
diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index b1e22c900f3f..5e6a39381e84 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -178,8 +178,7 @@ pan_check(const struct cpu_feat *feat __unused, u_int midr __unused)
 {
 	uint64_t id_aa64mfr1;
 
-	if (!get_kernel_reg(ID_AA64MMFR1_EL1, &id_aa64mfr1))
-		return (FEAT_ALWAYS_DISABLE);
+	get_kernel_reg(ID_AA64MMFR1_EL1, &id_aa64mfr1);
 	if (ID_AA64MMFR1_PAN_VAL(id_aa64mfr1) == ID_AA64MMFR1_PAN_NONE)
 		return (FEAT_ALWAYS_DISABLE);
 
@@ -224,8 +223,7 @@ mops_check(const struct cpu_feat *feat __unused, u_int midr __unused)
 {
 	uint64_t id_aa64isar2;
 
-	if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2))
-		return (FEAT_ALWAYS_DISABLE);
+	get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2);
 	if (ID_AA64ISAR2_MOPS_VAL(id_aa64isar2) == ID_AA64ISAR2_MOPS_NONE)
 		return (FEAT_ALWAYS_DISABLE);
 
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index dbf5c820d20b..680209efd881 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -9161,16 +9161,15 @@ pmap_init_mp(void *dummy __unused)
 {
 	uint64_t reg;
 
-	if (get_kernel_reg(ID_AA64PFR1_EL1, &reg)) {
-		if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) {
-			if (bootverbose)
-				printf("Enabling BTI\n");
-			pmap_bti_support = true;
+	get_kernel_reg(ID_AA64PFR1_EL1, &reg);
+	if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) {
+		if (bootverbose)
+			printf("Enabling BTI\n");
+		pmap_bti_support = true;
 
-			pmap_bti_ranges_zone = uma_zcreate("BTI ranges",
-			    sizeof(struct rs_el), NULL, NULL, NULL, NULL,
-			    UMA_ALIGN_PTR, 0);
-		}
+		pmap_bti_ranges_zone = uma_zcreate("BTI ranges",
+		    sizeof(struct rs_el), NULL, NULL, NULL, NULL,
+		    UMA_ALIGN_PTR, 0);
 	}
 }
 SYSINIT(pmap_init_mp, SI_SUB_CPU, SI_ORDER_ANY, pmap_init_mp, NULL);
@@ -9185,9 +9184,7 @@ pmap_init_cnp(void *dummy __unused)
 	uint64_t reg;
 	u_int cpuid;
 
-	if (!get_kernel_reg(ID_AA64MMFR2_EL1, &reg))
-		return;
-
+	get_kernel_reg(ID_AA64MMFR2_EL1, &reg);
 	if (ID_AA64MMFR2_CnP_VAL(reg) != ID_AA64MMFR2_CnP_NONE) {
 		if (bootverbose)
 			printf("Enabling CnP\n");
diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c
index ab40b72887e9..29f73db14e74 100644
--- a/sys/arm64/arm64/ptrauth.c
+++ b/sys/arm64/arm64/ptrauth.c
@@ -113,18 +113,15 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused)
 	 * The QARMA5 or implementation defined algorithms are reported in
 	 * ID_AA64ISAR1_EL1.
 	 */
-	if (get_kernel_reg(ID_AA64ISAR1_EL1, &isar)) {
-		if (ID_AA64ISAR1_APA_VAL(isar) > 0 ||
-		    ID_AA64ISAR1_API_VAL(isar) > 0) {
-			return (FEAT_DEFAULT_ENABLE);
-		}
+	get_kernel_reg(ID_AA64ISAR1_EL1, &isar);
+	if (ID_AA64ISAR1_APA_VAL(isar) > 0 || ID_AA64ISAR1_API_VAL(isar) > 0) {
+		return (FEAT_DEFAULT_ENABLE);
 	}
 
 	/* The QARMA3 algorithm is reported in ID_AA64ISAR2_EL1. */
-	if (get_kernel_reg(ID_AA64ISAR2_EL1, &isar)) {
-		if (ID_AA64ISAR2_APA3_VAL(isar) > 0) {
-			return (FEAT_DEFAULT_ENABLE);
-		}
+	get_kernel_reg(ID_AA64ISAR2_EL1, &isar);
+	if (ID_AA64ISAR2_APA3_VAL(isar) > 0) {
+		return (FEAT_DEFAULT_ENABLE);
 	}
 
 	return (FEAT_ALWAYS_DISABLE);
diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c
index 64f13458e2d9..d4c0eacf690c 100644
--- a/sys/arm64/arm64/vfp.c
+++ b/sys/arm64/arm64/vfp.c
@@ -895,9 +895,7 @@ sve_init(const void *dummy __unused)
 	uint64_t reg;
 	int i;
 
-	if (!get_kernel_reg(ID_AA64PFR0_EL1, &reg))
-		return;
-
+	get_kernel_reg(ID_AA64PFR0_EL1, &reg);
 	if (ID_AA64PFR0_SVE_VAL(reg) == ID_AA64PFR0_SVE_NONE)
 		return;
 
diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c
index 031400f3f1d0..4231746e7eb2 100644
--- a/sys/arm64/vmm/vmm.c
+++ b/sys/arm64/vmm/vmm.c
@@ -154,9 +154,8 @@ vmm_regs_init(struct vmm_regs *regs, const struct vmm_regs *masks)
 {
 #define	_FETCH_KERN_REG(reg, field) do {				\
 	regs->field = vmm_arch_regs_masks.field;			\
-	if (!get_kernel_reg_iss_masked(reg ## _ISS, &regs->field,	\
-	    masks->field))						\
-		regs->field = 0;					\
+	get_kernel_reg_iss_masked(reg ## _ISS, &regs->field,		\
+	    masks->field);						\
 } while (0)
 	_FETCH_KERN_REG(ID_AA64AFR0_EL1, id_aa64afr0);
 	_FETCH_KERN_REG(ID_AA64AFR1_EL1, id_aa64afr1);
diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c
index 6643d32684d8..712783338214 100644
--- a/sys/arm64/vmm/vmm_arm64.c
+++ b/sys/arm64/vmm/vmm_arm64.c
@@ -251,10 +251,7 @@ vmmops_modinit(int ipinum)
 		return (ENODEV);
 	}
 
-	if (!get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1)) {
-		printf("vmm: Unable to read ID_AA64MMFR0_EL1\n");
-		return (ENXIO);
-	}
+	get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1);
 	pa_range_field = ID_AA64MMFR0_PARange_VAL(id_aa64mmfr0_el1);
 	/*
 	 * Use 3 levels to give us up to 39 bits with 4k pages, or
@@ -522,27 +519,25 @@ vmmops_init(struct vm *vm, pmap_t pmap)
 	hyp->vm = vm;
 	hyp->vgic_attached = false;
 
-	if (get_kernel_reg(ID_AA64MMFR0_EL1, &idreg)) {
-		if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF)
-			hyp->feats |= HYP_FEAT_ECV_POFF;
+	get_kernel_reg(ID_AA64MMFR0_EL1, &idreg);
+	if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF)
+		hyp->feats |= HYP_FEAT_ECV_POFF;
 
-		switch (ID_AA64MMFR0_FGT_VAL(idreg)) {
-		case ID_AA64MMFR0_FGT_NONE:
-			break;
-		default:
-		case ID_AA64MMFR0_FGT_8_9:
-			hyp->feats |= HYP_FEAT_FGT2;
-			/* FALLTHROUGH */
-		case ID_AA64MMFR0_FGT_8_6:
-			hyp->feats |= HYP_FEAT_FGT;
-			break;
-		}
+	switch (ID_AA64MMFR0_FGT_VAL(idreg)) {
+	case ID_AA64MMFR0_FGT_NONE:
+		break;
+	default:
+	case ID_AA64MMFR0_FGT_8_9:
+		hyp->feats |= HYP_FEAT_FGT2;
+		/* FALLTHROUGH */
+	case ID_AA64MMFR0_FGT_8_6:
+		hyp->feats |= HYP_FEAT_FGT;
+		break;
 	}
 
-	if (get_kernel_reg(ID_AA64MMFR1_EL1, &idreg)) {
-		if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL)
-			hyp->feats |= HYP_FEAT_HCX;
-	}
+	get_kernel_reg(ID_AA64MMFR1_EL1, &idreg);
+	if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL)
+		hyp->feats |= HYP_FEAT_HCX;
 
 	vtimer_vminit(hyp);
 	vgic_vminit(hyp);