svn commit: r338501 - head/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Thu Sep  6 17:25:01 2018
New Revision: 338501
URL: https://svnweb.freebsd.org/changeset/base/338501

Log:
  Remove the check that the Arm generic interrupt controller variant is
  non-zero. This is the case on qemu, so remove it to allow us to boot there.
  This change is needed to boot on qemu with ACPI.
  
  Approved by:	re (gjb)

Modified:
  head/sys/arm/arm/gic.c

Modified: head/sys/arm/arm/gic.c
==============================================================================
--- head/sys/arm/arm/gic.c	Thu Sep  6 17:07:21 2018	(r338500)
+++ head/sys/arm/arm/gic.c	Thu Sep  6 17:25:01 2018	(r338501)
@@ -497,8 +497,7 @@ arm_gic_read_ivar(device_t dev, device_t child, int wh
 
 	switch(which) {
 	case GIC_IVAR_HW_REV:
-		KASSERT(GICD_IIDR_VAR(sc->gic_iidr) < 3 &&
-		    GICD_IIDR_VAR(sc->gic_iidr) != 0,
+		KASSERT(GICD_IIDR_VAR(sc->gic_iidr) < 3,
 		    ("arm_gic_read_ivar: Unknown IIDR revision %u (%.08x)",
 		     GICD_IIDR_VAR(sc->gic_iidr), sc->gic_iidr));
 		*result = GICD_IIDR_VAR(sc->gic_iidr);