From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 06:45:00 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8ABB93BD; Wed, 11 Feb 2015 06:45:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76564F62; Wed, 11 Feb 2015 06:45:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B6j0dg097135; Wed, 11 Feb 2015 06:45:00 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B6j0SX097134; Wed, 11 Feb 2015 06:45:00 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201502110645.t1B6j0SX097134@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 11 Feb 2015 06:45:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278552 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2015 06:45:00 -0000 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]);