From owner-svn-src-projects@FreeBSD.ORG Sat May 18 17:29:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E7A57E3D; Sat, 18 May 2013 17:29:33 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C040FA7E; Sat, 18 May 2013 17:29:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IHTXTr048407; Sat, 18 May 2013 17:29:33 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IHTXck048404; Sat, 18 May 2013 17:29:33 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201305181729.r4IHTXck048404@svn.freebsd.org> From: Justin Hibbits Date: Sat, 18 May 2013 17:29:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r250779 - in projects/pmac_pmu/sys/powerpc: include 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.14 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: Sat, 18 May 2013 17:29:34 -0000 Author: jhibbits Date: Sat May 18 17:29:32 2013 New Revision: 250779 URL: http://svnweb.freebsd.org/changeset/base/250779 Log: Add routines to save and restore DBDMA channels. Modified: projects/pmac_pmu/sys/powerpc/include/dbdma.h projects/pmac_pmu/sys/powerpc/powermac/dbdma.c projects/pmac_pmu/sys/powerpc/powermac/dbdmavar.h Modified: projects/pmac_pmu/sys/powerpc/include/dbdma.h ============================================================================== --- projects/pmac_pmu/sys/powerpc/include/dbdma.h Sat May 18 14:05:32 2013 (r250778) +++ projects/pmac_pmu/sys/powerpc/include/dbdma.h Sat May 18 17:29:32 2013 (r250779) @@ -147,4 +147,7 @@ void dbdma_insert_branch(dbdma_channel_t void dbdma_sync_commands(dbdma_channel_t *chan, bus_dmasync_op_t op); +void dbdma_save_state(dbdma_channel_t *chan); +void dbdma_restore_state(dbdma_channel_t *chan); + #endif /* _MACHINE_DBDMA_H_ */ Modified: projects/pmac_pmu/sys/powerpc/powermac/dbdma.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/dbdma.c Sat May 18 14:05:32 2013 (r250778) +++ projects/pmac_pmu/sys/powerpc/powermac/dbdma.c Sat May 18 17:29:32 2013 (r250779) @@ -343,6 +343,31 @@ dbdma_sync_commands(dbdma_channel_t *cha bus_dmamap_sync(chan->sc_dmatag, chan->sc_dmamap, op); } +void +dbdma_save_state(dbdma_channel_t *chan) +{ + + chan->sc_saved_regs[0] = dbdma_read_reg(chan, CHAN_CMDPTR); + chan->sc_saved_regs[1] = dbdma_read_reg(chan, CHAN_CMDPTR_HI); + chan->sc_saved_regs[2] = dbdma_read_reg(chan, CHAN_INTR_SELECT); + chan->sc_saved_regs[3] = dbdma_read_reg(chan, CHAN_BRANCH_SELECT); + chan->sc_saved_regs[4] = dbdma_read_reg(chan, CHAN_WAIT_SELECT); + + dbdma_stop(chan); +} + +void +dbdma_restore_state(dbdma_channel_t *chan) +{ + + dbdma_wake(chan); + dbdma_write_reg(chan, CHAN_CMDPTR, chan->sc_saved_regs[0]); + dbdma_write_reg(chan, CHAN_CMDPTR_HI, chan->sc_saved_regs[1]); + dbdma_write_reg(chan, CHAN_INTR_SELECT, chan->sc_saved_regs[2]); + dbdma_write_reg(chan, CHAN_BRANCH_SELECT, chan->sc_saved_regs[3]); + dbdma_write_reg(chan, CHAN_WAIT_SELECT, chan->sc_saved_regs[4]); +} + static uint32_t dbdma_read_reg(dbdma_channel_t *chan, u_int offset) { Modified: projects/pmac_pmu/sys/powerpc/powermac/dbdmavar.h ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/dbdmavar.h Sat May 18 14:05:32 2013 (r250778) +++ projects/pmac_pmu/sys/powerpc/powermac/dbdmavar.h Sat May 18 17:29:32 2013 (r250779) @@ -60,6 +60,7 @@ struct dbdma_channel { bus_dma_tag_t sc_dmatag; bus_dmamap_t sc_dmamap; + uint32_t sc_saved_regs[5]; };