Date: Wed, 11 Feb 2015 06:45:00 +0000 (UTC) From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278552 - projects/pmac_pmu/sys/powerpc/powermac Message-ID: <201502110645.t1B6j0SX097134@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhibbits Date: Wed Feb 11 06:44:59 2015 New Revision: 278552 URL: https://svnweb.freebsd.org/changeset/base/278552 Log: KeyLargo doesn't have FCR5, so don't save or restore it. Modified: projects/pmac_pmu/sys/powerpc/powermac/macio.c Modified: projects/pmac_pmu/sys/powerpc/powermac/macio.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/macio.c Wed Feb 11 05:25:23 2015 (r278551) +++ projects/pmac_pmu/sys/powerpc/powermac/macio.c Wed Feb 11 06:44:59 2015 (r278552) @@ -911,7 +911,10 @@ macio_suspend(device_t dev) sc->sc_saved_fcrs[2] = bus_read_4(sc->sc_memr, KEYLARGO_FCR2); sc->sc_saved_fcrs[3] = bus_read_4(sc->sc_memr, KEYLARGO_FCR3); sc->sc_saved_fcrs[4] = bus_read_4(sc->sc_memr, KEYLARGO_FCR4); - sc->sc_saved_fcrs[5] = bus_read_4(sc->sc_memr, KEYLARGO_FCR5); + + /* KeyLargo doesn't have FCR5. */ + if (sc->sc_devid != 0x22) + sc->sc_saved_fcrs[5] = bus_read_4(sc->sc_memr, KEYLARGO_FCR5); if (sc->sc_devid == 0x4f) { sc->sc_saved_fcrs[6] = bus_read_4(sc->sc_memr, K2_FCR6); @@ -947,7 +950,10 @@ macio_resume(device_t dev) bus_write_4(sc->sc_memr, KEYLARGO_FCR2, sc->sc_saved_fcrs[2]); bus_write_4(sc->sc_memr, KEYLARGO_FCR3, sc->sc_saved_fcrs[3]); bus_write_4(sc->sc_memr, KEYLARGO_FCR4, sc->sc_saved_fcrs[4]); - bus_write_4(sc->sc_memr, KEYLARGO_FCR5, sc->sc_saved_fcrs[5]); + + /* KeyLargo doesn't have FCR5. */ + if (sc->sc_devid != 0x22) + bus_write_4(sc->sc_memr, KEYLARGO_FCR5, sc->sc_saved_fcrs[5]); if (sc->sc_devid == 0x4f) { bus_write_4(sc->sc_memr, K2_FCR6, sc->sc_saved_fcrs[6]);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502110645.t1B6j0SX097134>