From owner-svn-soc-all@freebsd.org Mon Jul 27 07:14:42 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32C799AC2CC for ; Mon, 27 Jul 2015 07:14:42 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 237B6B3C for ; Mon, 27 Jul 2015 07:14:42 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6R7EfbU064458 for ; Mon, 27 Jul 2015 07:14:41 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6R7Ef46064456 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 07:14:41 GMT (envelope-from mihai@FreeBSD.org) Date: Mon, 27 Jul 2015 07:14:41 GMT Message-Id: <201507270714.t6R7Ef46064456@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288798 - soc2015/mihai/bhyve-on-arm-head/sys/arm/arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 07:14:42 -0000 Author: mihai Date: Mon Jul 27 07:14:40 2015 New Revision: 288798 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288798 Log: soc2015: mihai: bhyve-arm: sys: arm: arm: locore-v6.S: fix comment typo Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S Mon Jul 27 04:11:41 2015 (r288797) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S Mon Jul 27 07:14:40 2015 (r288798) @@ -81,7 +81,7 @@ tst r0, #(PSR_MODE) bic r0, r0, #(PSR_MODE) orr r0, r0, #(PSR_F | PSR_I | PSR_SVC32_MODE) - /* If we are not in HYP, we disable all interrupts and set SCVN mode */ + /* If we are not in HYP, we disable all interrupts and set SVC mode */ bne 1f /* * If we are in HYP mode set the LR from HYP-Mode to the From owner-svn-soc-all@freebsd.org Mon Jul 27 07:16:52 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 447569AC34A for ; Mon, 27 Jul 2015 07:16:52 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 1BBD6BA0 for ; Mon, 27 Jul 2015 07:16:52 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6R7GpGe066047 for ; Mon, 27 Jul 2015 07:16:51 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6R7Gpr9066032 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 07:16:51 GMT (envelope-from mihai@FreeBSD.org) Date: Mon, 27 Jul 2015 07:16:51 GMT Message-Id: <201507270716.t6R7Gpr9066032@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288799 - soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 07:16:52 -0000 Author: mihai Date: Mon Jul 27 07:16:51 2015 New Revision: 288799 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288799 Log: soc2015: mihai: bhyve-arm: sys: arm: fvp_ve-cortex_a15x1: remove unused files Deleted: soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1/files.fvp_ve-cortex_a15x1_guest soc2015/mihai/bhyve-on-arm-head/sys/arm/fvp_ve-cortex_a15x1/fvp_ve-cortex_a15x1_machdep_guest.c From owner-svn-soc-all@freebsd.org Mon Jul 27 07:20:20 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F2A49AC3B1 for ; Mon, 27 Jul 2015 07:20:20 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 77809D00 for ; Mon, 27 Jul 2015 07:20:20 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6R7KKl4068793 for ; Mon, 27 Jul 2015 07:20:20 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6R7KJSS068622 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 07:20:19 GMT (envelope-from mihai@FreeBSD.org) Date: Mon, 27 Jul 2015 07:20:19 GMT Message-Id: <201507270720.t6R7KJSS068622@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288800 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 07:20:20 -0000 Author: mihai Date: Mon Jul 27 07:20:19 2015 New Revision: 288800 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288800 Log: soc2015: mihai: bhyve-arm: sys: arm: vmm: hyp_helpers.h: fix restoring SCTRL register [trashing r2 which retain the SCTRL] Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h Mon Jul 27 07:16:51 2015 (r288799) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h Mon Jul 27 07:20:19 2015 (r288800) @@ -156,8 +156,8 @@ #define load_cp15_regs_batch3 \ mrc p15, 0, r2, c14, c1, 0; /* CNTKCTL */ \ - mrrc p15, 0, r3, r4, c7; /* PAR */ \ - mrc p15, 0, r5, c10, c3, 0; /* AMAIR0 */ \ + mrrc p15, 0, r4, r5, c7; /* PAR */ \ + mrc p15, 0, r3, c10, c3, 0; /* AMAIR0 */ \ mrc p15, 0, r6, c10, c3, 1 /* AMAIR1 */ #define store_cp15_regs_batch1 \ @@ -186,8 +186,8 @@ #define store_cp15_regs_batch3 \ mcr p15, 0, r2, c14, c1, 0; /* CNTKCTL */ \ - mcrr p15, 0, r3, r4, c7; /* PAR */ \ - mcr p15, 0, r5, c10, c3, 0; /* AMAIR0 */ \ + mcrr p15, 0, r4, r5, c7; /* PAR */ \ + mcr p15, 0, r3, c10, c3, 0; /* AMAIR0 */ \ mcr p15, 0, r6, c10, c3, 1 /* AMAIR1 */ #define store_guest_cp15_regs_batch1 \ @@ -228,10 +228,10 @@ ldr r3, [r0, #HYPCTX_CP15_CPACR]; \ ldr r4, [r0, #HYPCTX_CP15_TTBCR]; \ ldr r5, [r0, #HYPCTX_CP15_DACR]; \ - add r2, r0, #HYPCTX_CP15_TTBR0; \ - ldrd r6, r7, [r2]; \ - add r2, r0, #HYPCTX_CP15_TTBR1; \ - ldrd r8, r9, [r2]; \ + add r10, r0, #HYPCTX_CP15_TTBR0; \ + ldrd r6, r7, [r10]; \ + add r10, r0, #HYPCTX_CP15_TTBR1; \ + ldrd r8, r9, [r10]; \ ldr r10, [r0, #HYPCTX_CP15_PRRR]; \ ldr r11, [r0, #HYPCTX_CP15_NMRR]; \ ldr r12, [r0, #HYPCTX_CP15_CSSELR] @@ -251,8 +251,8 @@ #define load_guest_cp15_regs_batch3 \ ldr r2, [r0, #HYPCTX_CP15_CNTKCTL]; \ - add r2, r0, #HYPCTX_CP15_PAR; \ - ldrd r4, r5, [r2]; \ + add r3, r0, #HYPCTX_CP15_PAR; \ + ldrd r4, r5, [r3]; \ ldr r3, [r0, #HYPCTX_CP15_AMAIR0]; \ ldr r6, [r0, #HYPCTX_CP15_AMAIR1] From owner-svn-soc-all@freebsd.org Mon Jul 27 07:21:19 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C11E39AC46D for ; Mon, 27 Jul 2015 07:21:19 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 A17DADA2 for ; Mon, 27 Jul 2015 07:21:19 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6R7LJmf071134 for ; Mon, 27 Jul 2015 07:21:19 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6R7LJLg071130 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 07:21:19 GMT (envelope-from mihai@FreeBSD.org) Date: Mon, 27 Jul 2015 07:21:19 GMT Message-Id: <201507270721.t6R7LJLg071130@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288801 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 07:21:19 -0000 Author: mihai Date: Mon Jul 27 07:21:18 2015 New Revision: 288801 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288801 Log: soc2015: mihai: bhyve-arm: sys: arm: vmm: hyp.S: handle irq exception Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Mon Jul 27 07:20:19 2015 (r288800) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Mon Jul 27 07:21:18 2015 (r288801) @@ -311,10 +311,15 @@ .align hyp_fiq: - b loop + b loop + .align hyp_irq: - b loop + push {r0, r1, r2} @ Save registers in order to use them + /* Load hypctx pointer to r0 */ + mrc p15, 4, r0, c13, c0, 2 + mov r1, #EXCEPTION_IRQ + b hyp_exit_guest .align ENTRY(handle_bad_exception) @@ -337,7 +342,6 @@ push {r0, r1, r2} @ Emulate a push to the stack to respect hyp_exit_guest restore convention /* Load hypctx pointer to r0 */ mrc p15, 4, r0, c13, c0, 2 - // TODO: load HSR in VCPU b hyp_exit_guest END(handle_bad_exception) From owner-svn-soc-all@freebsd.org Mon Jul 27 21:24:16 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88EF59AC21F for ; Mon, 27 Jul 2015 21:24:16 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 7A01BF9B for ; Mon, 27 Jul 2015 21:24:16 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6RLOGN2049523 for ; Mon, 27 Jul 2015 21:24:16 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6RLOFm2049521 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 21:24:15 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 27 Jul 2015 21:24:15 GMT Message-Id: <201507272124.t6RLOFm2049521@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288820 - soc2015/clord/head/sys/contrib/ficl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 21:24:16 -0000 Author: clord Date: Mon Jul 27 21:24:15 2015 New Revision: 288820 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288820 Log: Change position of a few typedefs to allow compatibility.c to compile properly Modified: soc2015/clord/head/sys/contrib/ficl/ficlcompatibility.h Modified: soc2015/clord/head/sys/contrib/ficl/ficlcompatibility.h ============================================================================== --- soc2015/clord/head/sys/contrib/ficl/ficlcompatibility.h Mon Jul 27 19:21:23 2015 (r288819) +++ soc2015/clord/head/sys/contrib/ficl/ficlcompatibility.h Mon Jul 27 21:24:15 2015 (r288820) @@ -1,11 +1,13 @@ /* $FreeBSD$ */ +typedef struct vm FICL_VM; +#define CELL ficlCell + #ifndef FICL_FORCE_COMPATIBILITY struct ficl_word; typedef struct ficl_word FICL_WORD; struct vm; -typedef struct vm FICL_VM; struct ficl_dict; typedef struct ficl_dict FICL_DICT; struct ficl_system; @@ -21,7 +23,6 @@ typedef ficlUnsigned8 UNS8; #define _cell ficlCell -#define CELL ficlCell #define LVALUEtoCELL(v) (*(ficlCell *)&v) #define PTRtoCELL (ficlCell *)(void *) From owner-svn-soc-all@freebsd.org Mon Jul 27 21:32:05 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B1339AC3F2 for ; Mon, 27 Jul 2015 21:32:05 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 0967069F for ; Mon, 27 Jul 2015 21:32:05 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6RLW4IK058613 for ; Mon, 27 Jul 2015 21:32:04 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6RLW4cZ058611 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 21:32:04 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 27 Jul 2015 21:32:04 GMT Message-Id: <201507272132.t6RLW4cZ058611@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288821 - soc2015/clord/head/sys/contrib/ficl/ficlplatform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 21:32:05 -0000 Author: clord Date: Mon Jul 27 21:32:03 2015 New Revision: 288821 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288821 Log: Fix ficlTextOut Have ficlCallbackDefaultTextOut call our local fixlTextOut function. Also add FICL_WANT_FILE option to functions requiring use of ficlFile. Modified: soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.c Modified: soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.c ============================================================================== --- soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.c Mon Jul 27 21:24:15 2015 (r288820) +++ soc2015/clord/head/sys/contrib/ficl/ficlplatform/unix.c Mon Jul 27 21:32:03 2015 (r288821) @@ -4,40 +4,27 @@ #include #include -#include "ficl.h" - - - -int ficlFileTruncate(ficlFile *ff, ficlUnsigned size) -{ - return ftruncate(fileno(ff->f), size); -} - +#include +#include "ficl.h" +#include "sysdep.h" -void *ficlMalloc(size_t size) -{ - return malloc(size); -} - -void *ficlRealloc(void *p, size_t size) +void ficlCallbackDefaultTextOut(ficlCallback *callback, char *message) { - return realloc(p, size); + FICL_IGNORE(callback); + ficlTextOutLocal(NULL, message, 0); + return; } -void ficlFree(void *p) +void ficlSystemCompilePlatform(ficlSystem *system) { - free(p); + return; } -void ficlCallbackDefaultTextOut(ficlCallback *callback, char *message) +#if (FICL_WANT_FILE) +int ficlFileTruncate(ficlFile *ff, ficlUnsigned size) { - FICL_IGNORE(callback); - if (message != NULL) - fputs(message, stdout); - else - fflush(stdout); - return; + return ftruncate(fileno(ff->f), size); } int ficlFileStatus(char *filename, int *status) @@ -65,13 +52,4 @@ return statbuf.st_size; } - - - - -void ficlSystemCompilePlatform(ficlSystem *system) -{ - return; -} - - +#endif From owner-svn-soc-all@freebsd.org Mon Jul 27 21:34:33 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A93A9AC434 for ; Mon, 27 Jul 2015 21:34:33 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 8BB34777 for ; Mon, 27 Jul 2015 21:34:33 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6RLYXIT059920 for ; Mon, 27 Jul 2015 21:34:33 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6RLYWSA059908 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 21:34:32 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 27 Jul 2015 21:34:32 GMT Message-Id: <201507272134.t6RLYWSA059908@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288822 - soc2015/clord/head/sys/contrib/ficl/softcore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 21:34:33 -0000 Author: clord Date: Mon Jul 27 21:34:32 2015 New Revision: 288822 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288822 Log: Update ficlCompileSoftCore to work with Ficl 4 types. Modified: soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk Modified: soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk ============================================================================== --- soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk Mon Jul 27 21:32:03 2015 (r288821) +++ soc2015/clord/head/sys/contrib/ficl/softcore/softcore.awk Mon Jul 27 21:34:32 2015 (r288822) @@ -167,15 +167,15 @@ if (commenting) end_comments(); printf "#endif /* WANT_SOFTWORDS */\n"; printf " \"quit \";\n"; - printf "\n\nvoid ficlCompileSoftCore(FICL_SYSTEM *pSys)\n"; + printf "\n\nvoid ficlSystemCompileSoftCore(ficlSystem *pSys)\n"; printf "{\n"; - printf " FICL_VM *pVM = pSys->vmList;\n"; - printf " CELL id = pVM->sourceID;\n"; + printf " ficlVm *pVM = pSys->vmList;\n"; + printf " CELL id = pVM->sourceId;\n"; printf " int ret = sizeof (softWords);\n"; printf " assert(pVM);\n"; - printf " pVM->sourceID.i = -1;\n"; + printf " pVM->sourceId.i = -1;\n"; printf " ret = ficlExec(pVM, softWords);\n"; - printf " pVM->sourceID = id;\n"; + printf " pVM->sourceId = id;\n"; printf " if (ret == VM_ERREXIT)\n"; printf " assert(FALSE);\n"; printf " return;\n"; From owner-svn-soc-all@freebsd.org Mon Jul 27 22:07:09 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D49B9ACACE for ; Mon, 27 Jul 2015 22:07:09 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 E89E0799 for ; Mon, 27 Jul 2015 22:07:08 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6RM78pX024345 for ; Mon, 27 Jul 2015 22:07:08 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6RM78VB024343 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 22:07:08 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 27 Jul 2015 22:07:08 GMT Message-Id: <201507272207.t6RM78VB024343@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288823 - soc2015/clord/head/sys/boot/ficl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2015 22:07:09 -0000 Author: clord Date: Mon Jul 27 22:07:07 2015 New Revision: 288823 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288823 Log: Add another missing source file to source list. Modified: soc2015/clord/head/sys/boot/ficl/Makefile Modified: soc2015/clord/head/sys/boot/ficl/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/ficl/Makefile Mon Jul 27 21:34:32 2015 (r288822) +++ soc2015/clord/head/sys/boot/ficl/Makefile Mon Jul 27 22:07:07 2015 (r288823) @@ -10,9 +10,10 @@ .else .PATH: ${FICLDIR}/${MACHINE_CPUARCH} .endif +.PATH: ${FICLDIR}/ficlplatform BASE_SRCS= bit.c callback.c compatibility.c dictionary.c double.c extras.c \ fileaccess.c float.c hash.c loader.c lzuncompress.c prefix.c \ - primitives.c search.c stack.c system.c tools.c utility.c vm.c word.c + primitives.c search.c stack.c system.c tools.c unix.c utility.c vm.c word.c SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c main main.o From owner-svn-soc-all@freebsd.org Tue Jul 28 05:36:22 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA0879ACC35 for ; Tue, 28 Jul 2015 05:36:22 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 9FAEADE5 for ; Tue, 28 Jul 2015 05:36:22 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6S5aMBv017974 for ; Tue, 28 Jul 2015 05:36:22 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6S5aLDw017948 for svn-soc-all@FreeBSD.org; Tue, 28 Jul 2015 05:36:21 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Tue, 28 Jul 2015 05:36:21 GMT Message-Id: <201507280536.t6S5aLDw017948@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to pratiksinghal@FreeBSD.org using -f From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288828 - in soc2015/pratiksinghal: . cubie-head/sys/arm/allwinner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2015 05:36:22 -0000 Author: pratiksinghal Date: Tue Jul 28 05:36:21 2015 New Revision: 288828 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288828 Log: Added the ac97_c file with preliminary code Added: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.c (contents, props changed) Modified: soc2015/pratiksinghal/ (props changed) soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.h Added: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.c Tue Jul 28 05:36:21 2015 (r288828) @@ -0,0 +1,179 @@ +/*- + * Copyright (c) 2015 Pratik Singhal + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#include "a10_ac97.h" + +/* TODO :- Add DMA support after the pio mode works corectly. */ + +struct a10_ac97_info +{ + device_t ac_dev; + struct resource * mem_res; + struct resource * irq_res; + int mem_rid; + int irq_rid; + void * intr_handle; + bus_space_handle_t ac97_bsh; + bus_space_tag_t ac97_bst; + struct mtx ac97_mtx; + struct ac97_info *codec; + + uint32_t ienab; + uint32_t use_dma; +}; + +#define AC97_READ(_sc, _reg) \ + bus_space_read_4((_sc)->ac97_bst, (_sc)->ac97_bsh, _reg) +#define AC97_WRITE(_sc, _reg, _value) \ + bus_space_write_4((_sc)->ac97_bst, (_sc)->ac97_bsh, _reg, _value) +#define AC97_LOCK(_sc) \ + mtx_lock((_sc)->ac97_mtx) +#define AC97_UNLOCK(_sc) \ + mtx_unlock((_sc)->ac97_mtx) + + +static int +ac97_probe(device_t dev) +{ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "allwinner,sun4i-a10-ac97")) + return (ENXIO); + device_set_desc(dev, "Allwinner AC97 Controller"); + + return (BUS_PROBE_DEFAULT); +} + +/* After cold reset perform the following steps :- + * set GPIO and release INTMASK/SUBINTMASK bits ( How to do that ? ) + * Enable Codec Ready interrupt + */ + +static ac97_attach(device_t dev) +{ + struct a10_ac97_info *sc; + device_t gpio; + int error; + + sc = device_get_softc(dev); + sc->ac_dev = dev; + sc->use_dma = 0; + error = 0; + ienab = 0; + + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->mem_rid, RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, "Cannot allocate memory resource\n"); + goto fail; + } + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, RF_ACTIVE | RF_SHAREABLE); + if (sc->irq_res == NULL) { + device_printf(dev, "Cannot allocate IRQ resource\n"); + goto fail; + } + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + NULL, ac97_intr, &sc->intr_handle); + if (error) { + device_printf(dev, "Cannot setup interrupt handler %d\n", error); + goto fail; + } + sc->ac97_bst = rman_get_bustag(sc->mem_res); + sc->ac97_bsh = rman_get_bushandle(sc->mem_res); + + mtx_init(&sc->ac97_mtx, device_get_nameunit(dev), "a10_ac97", MTX_DEF); + + device_printf("Before resetting device"); + + uint32_t val,total; + AC97_WRITE(sc, AC_CTL, AC_WARM_RST) + total = 0; + while (1) { + val = AC97_READ(sc, AC_CTL); + if ((val >> 1) & 1 == 0) + break; + else + DELAY(2) + total += 2; + if (total > 40) + break; + } + if (total > 40) + device_printf(dev, "Device timedout\n"); + else + device_printf(dev, "Device reset succesfully after %d seconds\n",total); + sc->ienab = AC_CODEC_READY_INT_EN; + AC97_WRITE(sc, AC_INT, 0); + AC97_WRITE(sc, AC_INT, sc->ienab); + + return (0); + +fail: + if (sc->mem_res != NULL) + bus_release_resouce(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem_res); + if (sc->irq_res != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intr_handle); + bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); + } + mtx_destroy(&sc->ac97_mtx); + + return (ENXIO); +} + +static ac97_detach(device_t dev) +{ + return (EBUSY); +} + +static device_method_t a10_ac97_methods[] = { + DEVMETHOD(device_probe, ac97_probe), + DEVMETHOD(device_attach, ac97_attach), + DEVMETHOD(device_detach, ac97_detach), + + DEVMETHOD_END + }; + +static devclass_t a10_ac97_devclass; + +static driver_t a10_ac97_driver = { + "a10_ac97", + a10_ac97_methods, + sizeof(struct a10_ac97_info); +}; + +DRIVER_MODULE(a10_ac97, pci, a10_ac97_driver, a10_ac97_devclass, 0, 0); Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.h Tue Jul 28 04:54:05 2015 (r288827) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_ac97.h Tue Jul 28 05:36:21 2015 (r288828) @@ -49,21 +49,21 @@ #define AC_RX_CNT 0x2C /* AC97 RX counter register */ /* AC_CTL */ -#define AC_CODEC_FULL (1U << 18) +#define AC_CODEC_FULL (1U << 18) #define AC_CMD_FULL (1U << 17) -#define AC_RX_MIC_IN (1U << 16) -#define AC_RX_MODE_MIC (1U << 9) +#define AC_RX_MIC_IN (1U << 16) +#define AC_RX_MODE_MIC (1U << 9) #define AC_TX_EN (1U << 7) #define AC_RX_EN (1U << 6) #define AC_LINK_EN (1U << 5) -#define AC_GLOBAL_EN (1U << 4) +#define AC_GLOBAL_EN (1U << 4) #define AC_WARM_RST (1U << 1) /* AC_FAT */ #define AC_TX_MODE_2 (0) #define AC_TX_MODE_6 (0U << 8)|(1U << 7) -#define AC_DRA_1 (1U << 6) -#define AC_VRA_MODE (1U << 4) +#define AC_DRA_1 (1U << 6) +#define AC_VRA_MODE (1U << 4) #define AC_TX_RES_16 (0U << 2) #define AC_TX_RES_18 (2U << 2) #define AC_TX_RES_20 (1U << 3) @@ -72,4 +72,24 @@ #define AC_RX_RES_20 (1U << 1) /* AC_CMD */ -#define AC_CMD_READ (1U << 23) +#define AC_CMD_READ (1U << 23) + +/* AC_INT */ +#define AC_CODEC_GPIO_INT_EN (1U << 9) +#define AC_CODEC_READY_INT_EN (1U << 8) +#define AC_TX_EMPTY_DRQ_EN (1U << 7) +#define AC_TX_UN_INT_EN (1U << 6) +#define AC_TX_ON_INT_EN (1U << 5) +#define AC_TX_EMPTY_INT_EN (1U << 4) +#define AC_RX_DATA_DRQ_EN (1U << 2) +#define AC_RX_ON_INT_EN (1U << 1) +#define AC_RX_DATA_INT_EN (1U << 0) + +/* AC_ISTA */ +#define AC_CODEC_GPIO_INT (1U << 9) +#define AC_CODEC_READY_INT (1U << 8) +#define AC_TX_UN_INT (1U << 6) +#define AC_TX_ON_INT (1U << 5) +#define AC_TX_EMPTY_INT (1U << 4) +#define AC_RX_ON_INT (1U << 1) +#define AC_RX_DATa_INT (1U << 0) From owner-svn-soc-all@freebsd.org Tue Jul 28 10:27:37 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97F089AD736 for ; Tue, 28 Jul 2015 10:27:37 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 6EBFC1CA6 for ; Tue, 28 Jul 2015 10:27:37 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6SARbZ0011075 for ; Tue, 28 Jul 2015 10:27:37 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6SARaUE011055 for svn-soc-all@FreeBSD.org; Tue, 28 Jul 2015 10:27:36 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Tue, 28 Jul 2015 10:27:36 GMT Message-Id: <201507281027.t6SARaUE011055@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to pratiksinghal@FreeBSD.org using -f From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288846 - in soc2015/pratiksinghal/cubie-head/sys: arm/allwinner boot/fdt/dts/arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2015 10:27:37 -0000 Author: pratiksinghal Date: Tue Jul 28 10:27:35 2015 New Revision: 288846 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288846 Log: Corrected the dts file and other minor problem Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h Tue Jul 28 09:36:26 2015 (r288845) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h Tue Jul 28 10:27:35 2015 (r288846) @@ -174,19 +174,11 @@ #define A10_MMC_IDMAC_RD (6U << 13) #define A10_MMC_IDMAC_WR (7U << 13) #define A10_MMC_IDMAC_DESC_CLOSE (8U << 13) -<<<<<<< .working #define A10_MMC_IDMAC_ERROR \ (A10_MMC_IDMAC_FATAL_BUS_ERR | A10_MMC_IDMAC_CARD_ERR_SUM | \ A10_MMC_IDMAC_DES_INVALID | A10_MMC_IDMAC_ABNORMAL_INT_SUM) #define A10_MMC_IDMAC_COMPLETE \ (A10_MMC_IDMAC_TRANSMIT_INT | A10_MMC_IDMAC_RECEIVE_INT) -======= -#define A10_MMC_IDMAC_ERROR \ - (A10_MMC_IDMAC_FATAL_BUS_ERR | A10_MMC_IDMAC_CARD_ERR_SUM | \ - A10_MMC_IDMAC_DES_INVALID | A10_MMC_IDMAC_ABNORMAL_INT_SUM) -#define A10_MMC_IDMAC_COMPLETE \ - (A10_MMC_IDMAC_TRANSMIT_INT | A10_MMC_IDMAC_RECEIVE_INT) ->>>>>>> .merge-right.r287986 /* The DMA descriptor table. */ struct a10_mmc_dma_desc { Modified: soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Tue Jul 28 09:36:26 2015 (r288845) +++ soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Tue Jul 28 10:27:35 2015 (r288846) @@ -130,7 +130,7 @@ ac97@01c21400 { compatible = "allwinner,sun4i-a10-ac97"; reg = <0x01C214000 0x1000>; - interrupts = <46> + interrupts = <46>; interrupt-parent = <&AINTC>; status = "disabled"; }; From owner-svn-soc-all@freebsd.org Wed Jul 29 05:32:21 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE00C9AE02F for ; Wed, 29 Jul 2015 05:32:21 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 9D51E1C6D for ; Wed, 29 Jul 2015 05:32:21 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6T5WLWj000150 for ; Wed, 29 Jul 2015 05:32:21 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6T5WKew000143 for svn-soc-all@FreeBSD.org; Wed, 29 Jul 2015 05:32:20 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Wed, 29 Jul 2015 05:32:20 GMT Message-Id: <201507290532.t6T5WKew000143@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to pratiksinghal@FreeBSD.org using -f From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288898 - in soc2015/pratiksinghal/cubie-head/sys/arm: allwinner conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2015 05:32:21 -0000 Author: pratiksinghal Date: Wed Jul 29 05:32:20 2015 New Revision: 288898 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288898 Log: Made changes to config files Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner Wed Jul 29 03:06:08 2015 (r288897) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner Wed Jul 29 05:32:20 2015 (r288898) @@ -8,6 +8,7 @@ arm/allwinner/a10_ahci.c optional ahci arm/allwinner/a10_clk.c standard arm/allwinner/a10_common.c standard +arm/allwinner/a10_ac97.c optional ac97 arm/allwinner/a10_dma.c optional dma arm/allwinner/a10_ehci.c optional ehci arm/allwinner/a10_gpio.c optional gpio Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Wed Jul 29 03:06:08 2015 (r288897) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Wed Jul 29 05:32:20 2015 (r288898) @@ -101,11 +101,14 @@ device emac #DMA controller -device dma +#device dma # USB ethernet support, requires miibus device miibus +# AC97 Interface +device ac97 + # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC From owner-svn-soc-all@freebsd.org Sat Aug 1 11:32:00 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E3F69B0652 for ; Sat, 1 Aug 2015 11:32:00 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 7F18F1D23 for ; Sat, 1 Aug 2015 11:32:00 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t71BW0Ot011519 for ; Sat, 1 Aug 2015 11:32:00 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t71BVxQ6011500 for svn-soc-all@FreeBSD.org; Sat, 1 Aug 2015 11:31:59 GMT (envelope-from iateaca@FreeBSD.org) Date: Sat, 1 Aug 2015 11:31:59 GMT Message-Id: <201508011131.t71BVxQ6011500@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to iateaca@FreeBSD.org using -f From: iateaca@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289057 - soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Aug 2015 11:32:00 -0000 Author: iateaca Date: Sat Aug 1 11:31:59 2015 New Revision: 289057 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289057 Log: copy the ether_crc32_be function from the net kernel module in the FreeBSD tree sources into my ne2000_ether_crc32_be Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c ============================================================================== --- soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Sat Aug 1 10:40:17 2015 (r289056) +++ soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Sat Aug 1 11:31:59 2015 (r289057) @@ -150,6 +150,9 @@ static int ne2000_ether_frame_is_valid(struct pci_ne2000_softc *sc); +static uint32_t +ne2000_ether_crc32_be(const uint8_t *buf, size_t len); + static int ne2000_parse_input(char *opts, char *tap_name, uint8_t *mac); @@ -449,6 +452,32 @@ return 0; } +/* + * This function is a copy of the ether_crc32_be function from the net kernel + * module in the FreeBSD tree sources + */ +static uint32_t +ne2000_ether_crc32_be(const uint8_t *buf, size_t len) +{ + size_t i; + uint32_t crc, carry; + int bit; + uint8_t data; + + crc = 0xffffffff; /* initial value */ + + for (i = 0; i < len; i++) { + for (data = *buf++, bit = 0; bit < 8; bit++, data >>= 1) { + carry = ((crc & 0x80000000) ? 1 : 0) ^ (data & 0x01); + crc <<= 1; + if (carry) + crc = (crc ^ ETHER_CRC_POLY_BE) | carry; + } + } + + return (crc); +} + static int ne2000_parse_input(char *opts, char *tap_name, uint8_t *mac) {