From owner-p4-projects@FreeBSD.ORG Mon Apr 22 09:51:06 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABCF4323; Mon, 22 Apr 2013 09:51:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4A608321 for ; Mon, 22 Apr 2013 09:51:06 +0000 (UTC) (envelope-from prw35@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3C3DD1BCE for ; Mon, 22 Apr 2013 09:51:06 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3M9p5ha077001 for ; Mon, 22 Apr 2013 09:51:05 GMT (envelope-from prw35@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3M9p5MF076998 for perforce@freebsd.org; Mon, 22 Apr 2013 09:51:05 GMT (envelope-from prw35@FreeBSD.org) Date: Mon, 22 Apr 2013 09:51:05 GMT Message-Id: <201304220951.r3M9p5MF076998@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to prw35@FreeBSD.org using -f From: Philip Withnall Subject: PERFORCE change 227975 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 09:51:06 -0000 http://p4web.freebsd.org/@@227975?ac=10 Change 227975 by prw35@pwithnall_zenith on 2013/04/22 09:50:10 Remove debugging code from CSU's MIPS Makefile We shouldn't copy to /tmp; it breaks shared builds. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/lib/csu/mips/Makefile#5 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/lib/csu/mips/Makefile#5 (text+ko) ==== @@ -33,42 +33,33 @@ gcrt1_c.s: crt1_c.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1_c.c sed ${SED_FIX_NOTE} ${.TARGET} - cp ${.TARGET} /tmp gcrt1_c.o: gcrt1_c.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1_c.s - cp ${.TARGET} /tmp gcrt1.o: gcrt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o - cp ${.TARGET} /tmp # Compile crt1_c.c without -DGCRT crt1_c.s: crt1_c.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1_c.c sed ${SED_FIX_NOTE} ${.TARGET} - cp ${.TARGET} /tmp crt1_c.o: crt1_c.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1_c.s - cp ${.TARGET} /tmp crt1.o: crt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o - cp ${.TARGET} /tmp # Compile crt1_c.c with -fPIC -DPIC Scrt1_c.s: crt1_c.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1_c.c sed ${SED_FIX_NOTE} ${.TARGET} - cp ${.TARGET} /tmp Scrt1_c.o: Scrt1_c.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1_c.s - cp ${.TARGET} /tmp Scrt1.o: Scrt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o - cp ${.TARGET} /tmp .include From owner-p4-projects@FreeBSD.ORG Mon Apr 22 15:28:20 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 158AB15C; Mon, 22 Apr 2013 15:28:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CC34015A for ; Mon, 22 Apr 2013 15:28:19 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id BCB151171 for ; Mon, 22 Apr 2013 15:28:19 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MFSJ7u013999 for ; Mon, 22 Apr 2013 15:28:19 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3MFSJXZ013996 for perforce@freebsd.org; Mon, 22 Apr 2013 15:28:19 GMT (envelope-from brooks@freebsd.org) Date: Mon, 22 Apr 2013 15:28:19 GMT Message-Id: <201304221528.r3MFSJXZ013996@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227979 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 15:28:20 -0000 http://p4web.freebsd.org/@@227979?ac=10 Change 227979 by brooks@brooks_zenith on 2013/04/22 15:27:53 Enable SSH none-cypher support by default in our branch. Affected files ... .. //depot/projects/ctsrd/beribsd/src/share/mk/bsd.own.mk#9 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/share/mk/bsd.own.mk#9 (text+ko) ==== @@ -317,6 +317,7 @@ NS_CACHING \ NTP \ OPENSSH \ + OPENSSH_NONE_CIPHER \ OPENSSL \ PAM \ PC_SYSINSTALL \ @@ -375,7 +376,6 @@ NMTREE \ NAND \ OFED \ - OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN # From owner-p4-projects@FreeBSD.ORG Mon Apr 22 15:29:21 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 461F725D; Mon, 22 Apr 2013 15:29:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0767725B for ; Mon, 22 Apr 2013 15:29:21 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id EBAA41181 for ; Mon, 22 Apr 2013 15:29:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MFTKjK014153 for ; Mon, 22 Apr 2013 15:29:20 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3MFTK84014150 for perforce@freebsd.org; Mon, 22 Apr 2013 15:29:20 GMT (envelope-from brooks@freebsd.org) Date: Mon, 22 Apr 2013 15:29:20 GMT Message-Id: <201304221529.r3MFTK84014150@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227980 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 15:29:21 -0000 http://p4web.freebsd.org/@@227980?ac=10 Change 227980 by brooks@brooks_zenith on 2013/04/22 15:29:06 Merge enabling SSH non-cypher support. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/share/mk/bsd.own.mk#7 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/share/mk/bsd.own.mk#7 (text+ko) ==== @@ -317,6 +317,7 @@ NS_CACHING \ NTP \ OPENSSH \ + OPENSSH_NONE_CIPHER \ OPENSSL \ PAM \ PC_SYSINSTALL \ @@ -375,7 +376,6 @@ NMTREE \ NAND \ OFED \ - OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN # From owner-p4-projects@FreeBSD.ORG Mon Apr 22 19:34:47 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F339D9D; Mon, 22 Apr 2013 19:34:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 31419D9B for ; Mon, 22 Apr 2013 19:34:47 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 08F461046 for ; Mon, 22 Apr 2013 19:34:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MJYkXM040948 for ; Mon, 22 Apr 2013 19:34:46 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3MJYkLj040945 for perforce@freebsd.org; Mon, 22 Apr 2013 19:34:46 GMT (envelope-from brooks@freebsd.org) Date: Mon, 22 Apr 2013 19:34:46 GMT Message-Id: <201304221934.r3MJYkLj040945@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227989 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 19:34:47 -0000 http://p4web.freebsd.org/@@227989?ac=10 Change 227989 by brooks@brooks_zenith on 2013/04/22 19:34:37 GC some commented out junk. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_ic_if.m#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_ic_if.m#2 (text+ko) ==== @@ -39,12 +39,6 @@ */ INTERFACE fdt_ic; -# -# Default implementations of some methods. -# -#CODE { -#}; - /** * @brief Allocate an interrupt resource * From owner-p4-projects@FreeBSD.ORG Tue Apr 23 13:55:44 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB34EB33; Tue, 23 Apr 2013 13:55:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8D710B31 for ; Tue, 23 Apr 2013 13:55:44 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6487E14A3 for ; Tue, 23 Apr 2013 13:55:44 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3NDti3x059689 for ; Tue, 23 Apr 2013 13:55:44 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3NDti4f059686 for perforce@freebsd.org; Tue, 23 Apr 2013 13:55:44 GMT (envelope-from bz@freebsd.org) Date: Tue, 23 Apr 2013 13:55:44 GMT Message-Id: <201304231355.r3NDti4f059686@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" Subject: PERFORCE change 228019 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 13:55:45 -0000 http://p4web.freebsd.org/@@228019?ac=10 Change 228019 by bz@bz_zenith on 2013/04/23 13:55:30 Add kernel side support for large TLB on BERI/CHERI. Modelled similar to NLM. Tested by: jdw57 Hardware changes in: r6828 Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#9 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#5 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cpufunc.h#7 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/cpu.c#4 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#9 (text+ko) ==== @@ -79,6 +79,11 @@ OCTEON_BOARD_CAPK_0100ND opt_cvmx.h # +# Options specific to the BERI and CHERI CPUs. +# +BERI_LARGE_TLB opt_global.h + +# # Options that control the Atheros SoC peripherals # ARGE_DEBUG opt_arge.h ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/std.beri#5 (text+ko) ==== @@ -2,3 +2,6 @@ files "../beri/files.beri" cpu CPU_MIPS4KC + +options BERI_LARGE_TLB + ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cpufunc.h#7 (text+ko) ==== @@ -242,8 +242,13 @@ #ifdef CPU_CNMIPS MIPS_RW32_COP0_SEL(config4, MIPS_COP_0_CONFIG, 4); #endif +#ifdef BERI_LARGE_TLB +MIPS_RW32_COP0_SEL(config5, MIPS_COP_0_CONFIG, 5); +#endif +#if defined(CPU_NLM) || defined(BERI_LARGE_TLB) +MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6); +#endif #ifdef CPU_NLM -MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6); MIPS_RW32_COP0_SEL(config7, MIPS_COP_0_CONFIG, 7); #endif MIPS_RW32_COP0(count, MIPS_COP_0_COUNT); ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/cpu.c#4 (text+ko) ==== @@ -99,17 +99,29 @@ /* Learn TLB size and L1 cache geometry. */ cfg1 = mips_rd_config1(); -#ifndef CPU_NLM - cpuinfo->tlb_nentries = - ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1; -#else + +#if defined(CPU_NLM) /* Account for Extended TLB entries in XLP */ tmp = mips_rd_config6(); cpuinfo->tlb_nentries = ((tmp >> 16) & 0xffff) + 1; +#elif defined(BERI_LARGE_TLB) + /* Check if we support extended TLB entries and if so activate. */ + tmp = mips_rd_config5(); +#define BERI_CP5_LTLB_SUPPORTED 0x1 + if (tmp & BERI_CP5_LTLB_SUPPORTED) { + /* See how many extra TLB entries we have. */ + tmp = mips_rd_config6(); + cpuinfo->tlb_nentries = (tmp >> 16) + 1; + /* Activate the extended entries. */ + mips_wr_config6(tmp|0x4); + } else +#endif +#if !defined(CPU_NLM) + cpuinfo->tlb_nentries = + ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1; #endif - +#if defined(CPU_CNMIPS) /* Add extended TLB size information from config4. */ -#if defined(CPU_CNMIPS) cfg4 = mips_rd_config4(); if ((cfg4 & MIPS_CONFIG4_MMUEXTDEF) == MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT) cpuinfo->tlb_nentries += (cfg4 & MIPS_CONFIG4_MMUSIZEEXT) * 0x40; From owner-p4-projects@FreeBSD.ORG Wed Apr 24 21:57:44 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 451E3492; Wed, 24 Apr 2013 21:57:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 04BA4490 for ; Wed, 24 Apr 2013 21:57:44 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id E94341056 for ; Wed, 24 Apr 2013 21:57:43 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OLvhiq073126 for ; Wed, 24 Apr 2013 21:57:43 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3OLvhb2073123 for perforce@freebsd.org; Wed, 24 Apr 2013 21:57:43 GMT (envelope-from brooks@freebsd.org) Date: Wed, 24 Apr 2013 21:57:43 GMT Message-Id: <201304242157.r3OLvhb2073123@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 228060 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 21:57:44 -0000 http://p4web.freebsd.org/@@228060?ac=10 Change 228060 by brooks@brooks_zenith on 2013/04/24 21:57:27 Add a (commented out for now) uart entry. Fix a comment in the usb entry. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#22 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#22 (text+ko) ==== @@ -91,6 +91,17 @@ */ } +/* + serial0x3f002100 { + compatible = "ns16550"; + reg = <0x3f002100 0x20>; + reg-shift = <2>; + clock-frequency = <0>; + /* interrupts = <33>; */ + /* interrupt-parent = <&beripic>; */ + }; +*/ + serial@7f000000 { compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; @@ -197,7 +208,7 @@ compatible = "philips,isp1761"; reg = <0x7f100000 0x40000 0x7f140000 0x4>; - / * IRQ 4 is DC, IRQ 5 is HC. * / + /* IRQ 4 is DC, IRQ 5 is HC. */ interrupts = <4 5>; interrupt-parent = <&beripic>; }; From owner-p4-projects@FreeBSD.ORG Fri Apr 26 19:36:38 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5FF0FDE; Fri, 26 Apr 2013 19:36:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 83562FDC for ; Fri, 26 Apr 2013 19:36:38 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5A3B41AC5 for ; Fri, 26 Apr 2013 19:36:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QJabue073325 for ; Fri, 26 Apr 2013 19:36:37 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3QJabDN073322 for perforce@freebsd.org; Fri, 26 Apr 2013 19:36:37 GMT (envelope-from brooks@freebsd.org) Date: Fri, 26 Apr 2013 19:36:37 GMT Message-Id: <201304261936.r3QJabDN073322@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 228122 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 19:36:39 -0000 http://p4web.freebsd.org/@@228122?ac=10 Change 228122 by brooks@brooks_zenith on 2013/04/26 19:36:22 Add the OpenCores 16550 compatible UART to the DE4 confiuration. Not yet configured as a console. Due to the requirement that tty names be unique, rename the Altera JTAG UART devices to ttyj# and update /etc/ttys accordingly. Affected files ... .. //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#23 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#9 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#6 (text+ko) ==== @@ -42,6 +42,10 @@ # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty std.115200" xterm on secure -ttyu1 "/usr/libexec/getty std.115200" xterm on secure -ttyu2 "/usr/libexec/getty std.115200" xterm on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure ttyu3 "/usr/libexec/getty std.115200" dialup off secure +# Altera JTAG UART +ttyj0 "/usr/libexec/getty std.115200" xterm on secure +ttyj1 "/usr/libexec/getty std.115200" xterm on secure +ttyj2 "/usr/libexec/getty std.115200" xterm on secure ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#23 (text+ko) ==== @@ -91,16 +91,14 @@ */ } -/* - serial0x3f002100 { + serial@7f002100 { compatible = "ns16550"; - reg = <0x3f002100 0x20>; + reg = <0x7f002100 0x20>; reg-shift = <2>; - clock-frequency = <0>; - /* interrupts = <33>; */ - /* interrupt-parent = <&beripic>; */ + clock-frequency = <50000000>; + interrupts = <6>; + interrupt-parent = <&beripic>; }; -*/ serial@7f000000 { compatible = "altera,jtag_uart-11_0"; @@ -208,7 +206,7 @@ compatible = "philips,isp1761"; reg = <0x7f100000 0x40000 0x7f140000 0x4>; - /* IRQ 4 is DC, IRQ 5 is HC. */ + // IRQ 4 is DC, IRQ 5 is HC. interrupts = <4 5>; interrupt-parent = <&beripic>; }; ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#9 (text+ko) ==== @@ -75,7 +75,7 @@ u_int *ajus_jtag_missedp; }; -#define AJU_TTYNAME "ttyu" +#define AJU_TTYNAME "ttyj" /* * Flag values for ajus_flags. ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#6 (text+ko) ==== @@ -34,6 +34,8 @@ options CFI_SUPPORT_STRATAFLASH device sc +device uart + device miibus options DEVICE_POLLING From owner-p4-projects@FreeBSD.ORG Fri Apr 26 21:49:04 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD0C14D9; Fri, 26 Apr 2013 21:49:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8FDEC4D7 for ; Fri, 26 Apr 2013 21:49:03 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6762B1019 for ; Fri, 26 Apr 2013 21:49:03 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QLn3N9087667 for ; Fri, 26 Apr 2013 21:49:03 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3QLn3FA087664 for perforce@freebsd.org; Fri, 26 Apr 2013 21:49:03 GMT (envelope-from brooks@freebsd.org) Date: Fri, 26 Apr 2013 21:49:03 GMT Message-Id: <201304262149.r3QLn3FA087664@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 228129 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 21:49:04 -0000 http://p4web.freebsd.org/@@228129?ac=10 Change 228129 by brooks@brooks_zenith on 2013/04/26 21:48:20 Merge 228019 (large TLB support) from cheribsd. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#11 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/cpufunc.h#7 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/cpu.c#4 integrate Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#11 (text+ko) ==== @@ -78,6 +78,11 @@ OCTEON_BOARD_CAPK_0100ND opt_cvmx.h # +# Options specific to the BERI and CHERI CPUs. +# +BERI_LARGE_TLB opt_global.h + +# # Options that control the Atheros SoC peripherals # ARGE_DEBUG opt_arge.h ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#5 (text+ko) ==== @@ -2,3 +2,6 @@ files "../beri/files.beri" cpu CPU_MIPS4KC + +options BERI_LARGE_TLB + ==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/cpufunc.h#7 (text+ko) ==== @@ -242,8 +242,13 @@ #ifdef CPU_CNMIPS MIPS_RW32_COP0_SEL(config4, MIPS_COP_0_CONFIG, 4); #endif +#ifdef BERI_LARGE_TLB +MIPS_RW32_COP0_SEL(config5, MIPS_COP_0_CONFIG, 5); +#endif +#if defined(CPU_NLM) || defined(BERI_LARGE_TLB) +MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6); +#endif #ifdef CPU_NLM -MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6); MIPS_RW32_COP0_SEL(config7, MIPS_COP_0_CONFIG, 7); #endif MIPS_RW32_COP0(count, MIPS_COP_0_COUNT); ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/cpu.c#4 (text+ko) ==== @@ -99,17 +99,29 @@ /* Learn TLB size and L1 cache geometry. */ cfg1 = mips_rd_config1(); -#ifndef CPU_NLM - cpuinfo->tlb_nentries = - ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1; -#else + +#if defined(CPU_NLM) /* Account for Extended TLB entries in XLP */ tmp = mips_rd_config6(); cpuinfo->tlb_nentries = ((tmp >> 16) & 0xffff) + 1; +#elif defined(BERI_LARGE_TLB) + /* Check if we support extended TLB entries and if so activate. */ + tmp = mips_rd_config5(); +#define BERI_CP5_LTLB_SUPPORTED 0x1 + if (tmp & BERI_CP5_LTLB_SUPPORTED) { + /* See how many extra TLB entries we have. */ + tmp = mips_rd_config6(); + cpuinfo->tlb_nentries = (tmp >> 16) + 1; + /* Activate the extended entries. */ + mips_wr_config6(tmp|0x4); + } else +#endif +#if !defined(CPU_NLM) + cpuinfo->tlb_nentries = + ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1; #endif - +#if defined(CPU_CNMIPS) /* Add extended TLB size information from config4. */ -#if defined(CPU_CNMIPS) cfg4 = mips_rd_config4(); if ((cfg4 & MIPS_CONFIG4_MMUEXTDEF) == MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT) cpuinfo->tlb_nentries += (cfg4 & MIPS_CONFIG4_MMUSIZEEXT) * 0x40;