From owner-svn-src-head@FreeBSD.ORG Sun May 25 19:19:42 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28326C55; Sun, 25 May 2014 19:19:42 +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 EFA7C2964; Sun, 25 May 2014 19:19:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PJJfcT018470; Sun, 25 May 2014 19:19:41 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PJJfK4018468; Sun, 25 May 2014 19:19:41 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201405251919.s4PJJfK4018468@svn.freebsd.org> From: Zbigniew Bodek Date: Sun, 25 May 2014 19:19:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266673 - in head/sys/arm: arm include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 19:19:42 -0000 Author: zbb Date: Sun May 25 19:19:41 2014 New Revision: 266673 URL: http://svnweb.freebsd.org/changeset/base/266673 Log: Delete obsolete and unused PJ4B CPU functions Since PJ4Bv7 uses armv7_ CPU functions only pj4b_config function is necessary. Remove obsolete routines. Modified: head/sys/arm/arm/cpufunc_asm_pj4b.S head/sys/arm/include/cpufunc.h Modified: head/sys/arm/arm/cpufunc_asm_pj4b.S ============================================================================== --- head/sys/arm/arm/cpufunc_asm_pj4b.S Sun May 25 18:47:24 2014 (r266672) +++ head/sys/arm/arm/cpufunc_asm_pj4b.S Sun May 25 19:19:41 2014 (r266673) @@ -37,38 +37,6 @@ __FBSDID("$FreeBSD$"); .Lpj4b_sf_ctrl_reg: .word 0xf1021820 - -ENTRY(pj4b_setttb) - /* Cache synchronization is not required as this core has PIPT caches */ - mcr p15, 0, r1, c7, c10, 4 /* drain the write buffer */ -#ifdef SMP - orr r0, r0, #2 /* Set TTB shared memory flag */ -#endif - mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ - mcr p15, 0, r0, c8, c7, 0 /* invalidate I+D TLBs */ - RET -END(pj4b_setttb) - -ENTRY(pj4b_drain_readbuf) - mcr p15, 0, r0, c7, c5, 4 /* flush prefetch buffers */ - RET -END(pj4b_drain_readbuf) - -ENTRY(pj4b_flush_brnchtgt_all) - mcr p15, 0, r0, c7, c5, 6 /* flush entrie branch target cache */ - RET -END(pj4b_flush_brnchtgt_all) - -ENTRY(pj4b_flush_brnchtgt_va) - mcr p15, 0, r0, c7, c5, 7 /* flush branch target cache by VA */ - RET -END(pj4b_flush_brnchtgt_va) - -ENTRY(get_core_id) - mrc p15, 0, r0, c0, c0, 5 - RET -END(get_core_id) - ENTRY(pj4b_config) /* Set Auxiliary Debug Modes Control 0 register */ Modified: head/sys/arm/include/cpufunc.h ============================================================================== --- head/sys/arm/include/cpufunc.h Sun May 25 18:47:24 2014 (r266672) +++ head/sys/arm/include/cpufunc.h Sun May 25 19:19:41 2014 (r266673) @@ -391,13 +391,6 @@ void arm11_tlb_flushD_SE (u_int va); void arm11_drain_writebuf (void); -void pj4b_setttb (u_int); - -void pj4b_drain_readbuf (void); -void pj4b_flush_brnchtgt_all (void); -void pj4b_flush_brnchtgt_va (u_int); -void pj4b_sleep (int); - void armv6_icache_sync_all (void); void armv6_icache_sync_range (vm_offset_t, vm_size_t); @@ -432,8 +425,6 @@ u_int armv7_auxctrl (u_int, u_int); void pj4bv7_setup (char *string); void pj4b_config (void); -int get_core_id (void); - void armadaxp_idcache_wbinv_all (void); void cortexa_setup (char *);