Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 2 Apr 2015 03:25:36 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r280979 - head/sys/arm/arm
Message-ID:  <201504020325.t323PaNE088200@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gonzo
Date: Thu Apr  2 03:25:35 2015
New Revision: 280979
URL: https://svnweb.freebsd.org/changeset/base/280979

Log:
  - Make interrupt resource optional: some upstream FDT blobs (e.g. TI's) do
      not have interupt property in pl310 node. Interrupt is used only to
      detect cache activity when L2 cache is disabled, it's not vital for
      normal operations.
  - Fix intrhook allocation/initialization

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

Modified: head/sys/arm/arm/pl310.c
==============================================================================
--- head/sys/arm/arm/pl310.c	Thu Apr  2 02:43:48 2015	(r280978)
+++ head/sys/arm/arm/pl310.c	Thu Apr  2 03:25:35 2015	(r280979)
@@ -420,6 +420,7 @@ pl310_config_intr(void *arg)
 
 	config_intrhook_disestablish(sc->sc_ich);
 	free(sc->sc_ich, M_DEVBUF);
+	sc->sc_ich = NULL;
 }
 
 static int
@@ -453,7 +454,7 @@ pl310_attach(device_t dev)
 	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	                                        RF_ACTIVE | RF_SHAREABLE);
 	if (sc->sc_irq_res == NULL) {
-		panic("Cannot allocate IRQ\n");
+		device_printf(dev, "cannot allocate IRQ, not using interrupt\n");
 	}
 
 	pl310_softc = sc;
@@ -505,14 +506,18 @@ pl310_attach(device_t dev)
 		if (bootverbose)
 			pl310_print_config(sc);
 	} else {
-		malloc(sizeof(*sc->sc_ich), M_DEVBUF, M_WAITOK);
-		sc->sc_ich->ich_func = pl310_config_intr;
-		sc->sc_ich->ich_arg = sc;
-		if (config_intrhook_establish(sc->sc_ich) != 0) {
-			device_printf(dev,
-			    "config_intrhook_establish failed\n");
-			return(ENXIO);
+		if (sc->sc_irq_res != NULL) {
+			sc->sc_ich = malloc(sizeof(*sc->sc_ich), M_DEVBUF, M_WAITOK);
+			sc->sc_ich->ich_func = pl310_config_intr;
+			sc->sc_ich->ich_arg = sc;
+			if (config_intrhook_establish(sc->sc_ich) != 0) {
+				device_printf(dev,
+				    "config_intrhook_establish failed\n");
+				free(sc->sc_ich, M_DEVBUF);
+				return(ENXIO);
+			}
 		}
+
 		device_printf(dev, "L2 Cache disabled\n");
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504020325.t323PaNE088200>