From 72ebcd5db529cd7a2c80358b554ebdcca1d9ad93 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Thu, 26 May 2016 00:44:16 +0000 Subject: [PATCH] [bhnd] Fix release of uninitialized SPROM shadow in chipc detach. This was triggering a panic on detach; the SPROM shadow is now maintained by the bhnd_sprom_chipc driver, and should be removed from chipc. Submitted by: Landon Fuller Differential Revision: https://reviews.freebsd.org/D6548 --- sys/dev/bhnd/cores/chipc/chipc.c | 1 - sys/dev/bhnd/cores/chipc/chipcvar.h | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/dev/bhnd/cores/chipc/chipc.c b/sys/dev/bhnd/cores/chipc/chipc.c index 6a8104f05d24..6fce0dae6359 100644 --- a/sys/dev/bhnd/cores/chipc/chipc.c +++ b/sys/dev/bhnd/cores/chipc/chipc.c @@ -269,7 +269,6 @@ chipc_detach(device_t dev) chipc_release_region(sc, sc->core_region, RF_ALLOCATED|RF_ACTIVE); chipc_free_rman(sc); - bhnd_sprom_fini(&sc->sprom); CHIPC_LOCK_DESTROY(sc); diff --git a/sys/dev/bhnd/cores/chipc/chipcvar.h b/sys/dev/bhnd/cores/chipc/chipcvar.h index 14001ff61f2c..785b7e7bab4a 100644 --- a/sys/dev/bhnd/cores/chipc/chipcvar.h +++ b/sys/dev/bhnd/cores/chipc/chipcvar.h @@ -186,12 +186,8 @@ struct chipc_softc { bhnd_nvram_src_t nvram_src; /**< identified NVRAM source */ struct mtx mtx; /**< state mutex. */ - - struct bhnd_sprom sprom; /**< OTP/SPROM shadow, if any */ - size_t sprom_refcnt; /**< SPROM hardware refcount */ - + size_t sprom_refcnt; /**< SPROM pin enable refcount */ struct rman mem_rman; /**< port memory manager */ - STAILQ_HEAD(, chipc_region) mem_regions;/**< memory allocation records */ };