From aa070dea50c674e71eeac27df9bd0fd2a405e7bf Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Sun, 6 Jan 2013 01:17:36 +0000 Subject: [PATCH] Fix the build: * Use pl310_softc when the softc is otherwise unavailable. * Use the correct spelling of sc_rtl_revision. --- sys/arm/arm/pl310.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c index 672c12cdf46b..9153c20ceb6b 100644 --- a/sys/arm/arm/pl310.c +++ b/sys/arm/arm/pl310.c @@ -135,7 +135,7 @@ pl310_cache_sync(void) return; #ifdef PL310_ERRATA_753970 - if (sc->sc_rtl_release == CACHE_ID_RELEASE_r3p0) + if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) /* Write uncached PL310 register */ pl310_write4(pl310_softc, 0x740, 0xffffffff); else @@ -153,16 +153,16 @@ pl310_wbinv_all(void) PL310_LOCK(pl310_softc); #ifdef PL310_ERRATA_727915 - if (sc->sc_rtl_release == CACHE_ID_RELEASE_r2p0 || - sc->sc_rtl_release == CACHE_ID_RELEASE_r3p0) + if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r2p0 || + pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) platform_pl310_write_debug(pl310_softc, 3); #endif pl310_write4(pl310_softc, PL310_CLEAN_INV_WAY, g_l2cache_way_mask); pl310_wait_background_op(PL310_CLEAN_INV_WAY, g_l2cache_way_mask); pl310_cache_sync(); #ifdef PL310_ERRATA_727915 - if (sc->sc_rtl_release == CACHE_ID_RELEASE_r2p0 || - sc->sc_rtl_release == CACHE_ID_RELEASE_r3p0) + if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r2p0 || + pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) platform_pl310_write_debug(pl310_softc, 0); #endif PL310_UNLOCK(pl310_softc); @@ -187,13 +187,13 @@ pl310_wbinv_range(vm_paddr_t start, vm_size_t size) #ifdef PL310_ERRATA_727915 - if (sc->sc_rtl_release == CACHE_ID_RELEASE_r2p0 || - sc->sc_rtl_release == CACHE_ID_RELEASE_r3p0) + if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r2p0 || + pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) platform_pl310_write_debug(pl310_softc, 3); #endif while (size > 0) { #ifdef PL310_ERRATA_588369 - if (sc->sc_rtl_release <= CACHE_ID_RELEASE_r1p0) { + if (pl310_softc->sc_rtl_revision <= CACHE_ID_RELEASE_r1p0) { /* * Errata 588369 says that clean + inv may keep the * cache line if it was clean, the recommanded @@ -210,8 +210,8 @@ pl310_wbinv_range(vm_paddr_t start, vm_size_t size) size -= g_l2cache_line_size; } #ifdef PL310_ERRATA_727915 - if (sc->sc_rtl_release == CACHE_ID_RELEASE_r2p0 || - sc->sc_rtl_release == CACHE_ID_RELEASE_r3p0) + if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r2p0 || + pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) platform_pl310_write_debug(pl310_softc, 0); #endif @@ -317,7 +317,7 @@ pl310_attach(device_t dev) pl310_filter, NULL, sc, &sc->sc_irq_h); cache_id = pl310_read4(sc, PL310_CACHE_ID); - sc->sc_rtl_release = (cache_id >> CACHE_ID_RELEASE_SHIFT) & + sc->sc_rtl_revision = (cache_id >> CACHE_ID_RELEASE_SHIFT) & CACHE_ID_RELEASE_MASK; device_printf(dev, "Part number: 0x%x, release: 0x%x\n", (cache_id >> CACHE_ID_PARTNUM_SHIFT) & CACHE_ID_PARTNUM_MASK,