From owner-svn-soc-all@FreeBSD.ORG Sun May 17 04:39:13 2015 Return-Path: Delivered-To: svn-soc-all@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 14FAEF39 for ; Sun, 17 May 2015 04:39:13 +0000 (UTC) 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 DC4201EB3 for ; Sun, 17 May 2015 04:39:12 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4H4dCJe089654 for ; Sun, 17 May 2015 04:39:12 GMT (envelope-from btw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4H4dC7x089653 for svn-soc-all@FreeBSD.org; Sun, 17 May 2015 04:39:12 GMT (envelope-from btw@FreeBSD.org) Date: Sun, 17 May 2015 04:39:12 GMT Message-Id: <201505170439.t4H4dC7x089653@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to btw@FreeBSD.org using -f From: btw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r285614 - soc2015/btw 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: Sun, 17 May 2015 04:39:13 -0000 Author: btw Date: Sun May 17 04:39:12 2015 New Revision: 285614 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285614 Log: Add the user directory soc2015/btw. Added: soc2015/btw/ From owner-svn-soc-all@FreeBSD.ORG Sun May 17 05:01:38 2015 Return-Path: Delivered-To: svn-soc-all@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 455DAFDF for ; Sun, 17 May 2015 05:01:38 +0000 (UTC) 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 1AA961121 for ; Sun, 17 May 2015 05:01:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4H51bbi039851 for ; Sun, 17 May 2015 05:01:37 GMT (envelope-from btw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4H51bYZ039730 for svn-soc-all@FreeBSD.org; Sun, 17 May 2015 05:01:37 GMT (envelope-from btw@FreeBSD.org) Date: Sun, 17 May 2015 05:01:37 GMT Message-Id: <201505170501.t4H51bYZ039730@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to btw@FreeBSD.org using -f From: btw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r285617 - soc2015/btw/head 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: Sun, 17 May 2015 05:01:38 -0000 Author: btw Date: Sun May 17 05:01:37 2015 New Revision: 285617 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285617 Log: Create the branch for Multiqueue Testing Project, based on projects/ifnet. Added: soc2015/btw/head/ (props changed) - copied from r285614, mirror/FreeBSD/projects/ifnet/ From owner-svn-soc-all@FreeBSD.ORG Sun May 17 16:33:10 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42BD2EEA for ; Sun, 17 May 2015 16:33:10 +0000 (UTC) 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 17CAC124F for ; Sun, 17 May 2015 16:33:10 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HGX9FU099096 for ; Sun, 17 May 2015 16:33:09 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4HGX95v099093 for svn-soc-all@FreeBSD.org; Sun, 17 May 2015 16:33:09 GMT (envelope-from iateaca@FreeBSD.org) Date: Sun, 17 May 2015 16:33:09 GMT Message-Id: <201505171633.t4HGX95v099093@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: r285620 - soc2015/iateaca 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: Sun, 17 May 2015 16:33:10 -0000 Author: iateaca Date: Sun May 17 16:33:09 2015 New Revision: 285620 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285620 Log: Added: soc2015/iateaca/ From owner-svn-soc-all@FreeBSD.ORG Sun May 17 16:35:51 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43B49F46 for ; Sun, 17 May 2015 16:35:51 +0000 (UTC) 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 18CC31266 for ; Sun, 17 May 2015 16:35:51 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HGZod7099984 for ; Sun, 17 May 2015 16:35:50 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4HGZoMa099983 for svn-soc-all@FreeBSD.org; Sun, 17 May 2015 16:35:50 GMT (envelope-from iateaca@FreeBSD.org) Date: Sun, 17 May 2015 16:35:50 GMT Message-Id: <201505171635.t4HGZoMa099983@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: r285621 - soc2015/iateaca/bhyve-ne2000-head 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: Sun, 17 May 2015 16:35:51 -0000 Author: iateaca Date: Sun May 17 16:35:50 2015 New Revision: 285621 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285621 Log: Added: soc2015/iateaca/bhyve-ne2000-head/ (props changed) - copied from r285620, mirror/FreeBSD/head/ From owner-svn-soc-all@FreeBSD.ORG Mon May 18 05:17:40 2015 Return-Path: Delivered-To: svn-soc-all@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 ABF10351 for ; Mon, 18 May 2015 05:17:40 +0000 (UTC) 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 803761E8B for ; Mon, 18 May 2015 05:17:40 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4I5HeBO001543 for ; Mon, 18 May 2015 05:17:40 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4I5HeND001542 for svn-soc-all@FreeBSD.org; Mon, 18 May 2015 05:17:40 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Mon, 18 May 2015 05:17:40 GMT Message-Id: <201505180517.t4I5HeND001542@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: r285640 - soc2015/pratiksinghal 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, 18 May 2015 05:17:40 -0000 Author: pratiksinghal Date: Mon May 18 05:17:39 2015 New Revision: 285640 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285640 Log: Created the empty username directory Added: soc2015/pratiksinghal/ From owner-svn-soc-all@FreeBSD.ORG Mon May 18 05:19:55 2015 Return-Path: Delivered-To: svn-soc-all@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 5B37737E for ; Mon, 18 May 2015 05:19:55 +0000 (UTC) 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 304781E9A for ; Mon, 18 May 2015 05:19:55 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4I5JtT7002225 for ; Mon, 18 May 2015 05:19:55 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4I5Jt2C002223 for svn-soc-all@FreeBSD.org; Mon, 18 May 2015 05:19:55 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Mon, 18 May 2015 05:19:55 GMT Message-Id: <201505180519.t4I5Jt2C002223@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: r285641 - soc2015/pratiksinghal/cubie-head 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, 18 May 2015 05:19:55 -0000 Author: pratiksinghal Date: Mon May 18 05:19:54 2015 New Revision: 285641 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285641 Log: Added the files of ~head to the repository Added: soc2015/pratiksinghal/cubie-head/ (props changed) - copied from r285640, mirror/FreeBSD/head/ From owner-svn-soc-all@FreeBSD.ORG Tue May 19 01:37:37 2015 Return-Path: Delivered-To: svn-soc-all@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 C5EF5CC9 for ; Tue, 19 May 2015 01:37:37 +0000 (UTC) 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 AFFB51175 for ; Tue, 19 May 2015 01:37:37 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4J1bb1I017991 for ; Tue, 19 May 2015 01:37:37 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4J1bQLF017926 for svn-soc-all@FreeBSD.org; Tue, 19 May 2015 01:37:26 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Tue, 19 May 2015 01:37:26 GMT Message-Id: <201505190137.t4J1bQLF017926@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: r285687 - in soc2015/pratiksinghal/cubie-head: . contrib/tzdata etc etc/rc.d etc/rc.d/tests etc/tests gnu/lib gnu/usr.bin/groff/src/preproc/soelim lib/libc lib/libc/db/hash lib/libed... 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, 19 May 2015 01:37:37 -0000 Author: pratiksinghal Date: Tue May 19 01:37:25 2015 New Revision: 285687 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285687 Log: Merged against r285641 Added: soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/ahtable.c - copied unchanged from r285686, mirror/FreeBSD/head/sys/contrib/dev/acpica/common/ahtable.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acuuid.h - copied unchanged from r285686, mirror/FreeBSD/head/sys/contrib/dev/acpica/include/acuuid.h soc2015/pratiksinghal/cubie-head/tests/etc/ - copied from r285686, mirror/FreeBSD/head/tests/etc/ Deleted: soc2015/pratiksinghal/cubie-head/etc/rc.d/tests/ soc2015/pratiksinghal/cubie-head/etc/tests/Makefile soc2015/pratiksinghal/cubie-head/gnu/usr.bin/groff/src/preproc/soelim/ Modified: soc2015/pratiksinghal/cubie-head/ (props changed) soc2015/pratiksinghal/cubie-head/contrib/tzdata/ (props changed) soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica soc2015/pratiksinghal/cubie-head/etc/ (props changed) soc2015/pratiksinghal/cubie-head/etc/Makefile soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile soc2015/pratiksinghal/cubie-head/gnu/lib/ (props changed) soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile soc2015/pratiksinghal/cubie-head/lib/libc/ (props changed) soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h soc2015/pratiksinghal/cubie-head/lib/libedit/el.c soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c soc2015/pratiksinghal/cubie-head/lib/libedit/map.c soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c soc2015/pratiksinghal/cubie-head/sbin/ (props changed) soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8 soc2015/pratiksinghal/cubie-head/sys/ (props changed) soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726 soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 soc2015/pratiksinghal/cubie-head/sys/boot/ (props changed) soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.h soc2015/pratiksinghal/cubie-head/sys/boot/uboot/lib/net.c soc2015/pratiksinghal/cubie-head/sys/conf/ (props changed) soc2015/pratiksinghal/cubie-head/sys/conf/options.arm soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/ (props changed) soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/changes.txt soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/adisasm.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/ahpredef.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmextern.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmtable.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmtbdump.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/common/dmtbinfo.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslascii.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslcompiler.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslcompiler.l soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/asldefine.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslfiles.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslmessages.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslmessages.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslprepkg.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslstartup.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/aslutils.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtcompile.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtcompiler.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtio.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtsubtable.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dttable.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dttemplate.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dttemplate.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/dtutils.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/preprocess.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/prscan.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/compiler/prutils.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/debugger/dbfileio.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/debugger/dbinput.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/hardware/hwpci.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/namespace/nsprepkg.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/namespace/nsrepair.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/parser/psopinfo.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/utilities/utfileio.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/utilities/uthex.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/components/utilities/utxferror.c soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acdebug.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acdisasm.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/aclocal.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acparser.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acpixf.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acpredef.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl1.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl2.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actbl3.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/actypes.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/acutils.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/platform/acenv.h soc2015/pratiksinghal/cubie-head/sys/contrib/dev/acpica/include/platform/acenvex.h soc2015/pratiksinghal/cubie-head/sys/ddb/db_break.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_command.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_examine.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_expr.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_input.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_main.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_ps.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_run.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_sym.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_textdump.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_watch.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_write_cmd.c soc2015/pratiksinghal/cubie-head/sys/dev/hyperv/ (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c soc2015/pratiksinghal/cubie-head/sys/dev/hyperv/storvsc/hv_vstorage.h soc2015/pratiksinghal/cubie-head/sys/dev/sfxge/sfxge.c soc2015/pratiksinghal/cubie-head/sys/dev/sfxge/sfxge_tx.c soc2015/pratiksinghal/cubie-head/sys/dev/sound/pci/hda/hdaa.c soc2015/pratiksinghal/cubie-head/sys/dev/usb/controller/dwc_otg.c soc2015/pratiksinghal/cubie-head/sys/dev/usb/controller/dwc_otg.h soc2015/pratiksinghal/cubie-head/sys/kern/kern_descrip.c soc2015/pratiksinghal/cubie-head/sys/kern/vfs_syscalls.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf.c soc2015/pratiksinghal/cubie-head/tests/Makefile soc2015/pratiksinghal/cubie-head/tools/build/mk/OptionalObsoleteFiles.inc soc2015/pratiksinghal/cubie-head/usr.bin/m4/extern.h soc2015/pratiksinghal/cubie-head/usr.bin/m4/gnum4.c soc2015/pratiksinghal/cubie-head/usr.bin/m4/look.c soc2015/pratiksinghal/cubie-head/usr.bin/m4/m4.1 soc2015/pratiksinghal/cubie-head/usr.bin/m4/main.c soc2015/pratiksinghal/cubie-head/usr.bin/m4/mdef.h soc2015/pratiksinghal/cubie-head/usr.bin/m4/misc.c soc2015/pratiksinghal/cubie-head/usr.bin/m4/parser.y soc2015/pratiksinghal/cubie-head/usr.bin/netstat/route.c soc2015/pratiksinghal/cubie-head/usr.bin/time/time.c soc2015/pratiksinghal/cubie-head/usr.sbin/acpi/acpidb/acpidb.c soc2015/pratiksinghal/cubie-head/usr.sbin/acpi/iasl/Makefile soc2015/pratiksinghal/cubie-head/usr.sbin/bhyveload/ (props changed) soc2015/pratiksinghal/cubie-head/usr.sbin/bhyveload/bhyveload.c Modified: soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa ============================================================================== --- soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/contrib/tzdata/africa Tue May 19 01:37:25 2015 (r285687) @@ -328,35 +328,20 @@ # http://almogaz.com/news/weird-news/2015/04/05/1947105 ... # http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html -# From Paul Eggert (2015-04-08): -# For now, guess that later spring and fall transitions will use -# 2014's rules, and guess that Egypt will switch to standard time at -# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the -# first Friday after Ramadan. To implement this, -# transition dates for 2015 through 2037 were determined by running -# the following program under GNU Emacs 24.4, with the results integrated -# by hand into the table below. Ramadan again intrudes on the guessed -# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff. -# (let ((islamic-year 1436)) -# (while (< islamic-year 1460) -# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (friday 5)) -# (while (/= friday (mod a 7)) -# (setq a (1- a))) -# (while (/= friday (mod b 7)) -# (setq b (1+ b))) -# (setq a (1- a)) -# (setq b (1- b)) -# (setq a (calendar-gregorian-from-absolute a)) -# (setq b (calendar-gregorian-from-absolute b)) -# (insert -# (format -# (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n" -# "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n") -# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) -# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) -# (setq islamic-year (+ 1 islamic-year)))) +# From Ahmed Nazmy (2015-04-20): +# Egypt's ministers cabinet just announced ... that it will cancel DST at +# least for 2015. +# +# From Tim Parenti (2015-04-20): +# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx +# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving +# time this summer, and carry out studies on the possibility of canceling the +# practice altogether in future years." +# +# From Paul Eggert (2015-04-20): +# For now, assume DST will be canceled. Any resumption would likely +# use different rules anyway. + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -365,22 +350,7 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S Rule Egypt 2014 only - Jun 26 24:00 0 - Rule Egypt 2014 only - Jul 31 24:00 1:00 S -Rule Egypt 2014 max - Sep lastThu 24:00 0 - -Rule Egypt 2015 2019 - Apr lastThu 24:00 1:00 S -Rule Egypt 2015 only - Jun 11 24:00 0 - -Rule Egypt 2015 only - Jul 23 24:00 1:00 S -Rule Egypt 2016 only - Jun 2 24:00 0 - -Rule Egypt 2016 only - Jul 7 24:00 1:00 S -Rule Egypt 2017 only - May 25 24:00 0 - -Rule Egypt 2017 only - Jun 29 24:00 1:00 S -Rule Egypt 2018 only - May 10 24:00 0 - -Rule Egypt 2018 only - Jun 14 24:00 1:00 S -Rule Egypt 2019 only - May 2 24:00 0 - -Rule Egypt 2019 only - Jun 6 24:00 1:00 S -Rule Egypt 2020 only - May 28 24:00 1:00 S -Rule Egypt 2021 only - May 13 24:00 1:00 S -Rule Egypt 2022 only - May 5 24:00 1:00 S -Rule Egypt 2023 max - Apr lastThu 24:00 1:00 S +Rule Egypt 2014 only - Sep lastThu 24:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:09 - LMT 1900 Oct Modified: soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica ============================================================================== --- soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/contrib/tzdata/northamerica Tue May 19 01:37:25 2015 (r285687) @@ -227,9 +227,14 @@ # The law doesn't give abbreviations. # # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow: -# Public law 106-564 (2000-12-23) introduced the abbreviation -# "Chamorro Standard Time" for time in Guam and the Northern Marianas. -# See the file "australasia". +# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time" +# for time in Guam and the Northern Marianas. See the file "australasia". +# +# From Paul Eggert (2015-04-17): +# HST and HDT are standardized abbreviations for Hawaii-Aleutian +# standard and daylight times. See section 9.47 (p 234) of the +# U.S. Government Printing Office Style Manual (2008) +# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf # From Arthur David Olson, 2005-08-09 # The following was signed into law on 2005-08-08. @@ -536,7 +541,7 @@ -11:00 - BST 1969 -11:00 US B%sT 1983 Oct 30 2:00 -10:00 US AH%sT 1983 Nov 30 - -10:00 US HA%sT + -10:00 US H%sT # The following switches don't quite make our 1970 cutoff. # # Shanks writes that part of southwest Alaska (e.g. Aniak) @@ -1841,17 +1846,115 @@ # Dawson switched to PST in 1973. Inuvik switched to MST in 1979. # Mathew Englander (1996-10-07) gives the following refs: # * 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68, -# c. 7 defines Yukon standard time as UTC-9. This is still valid; +# c. 7 defines Yukon standard time as UTC-9.... # see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1). +# [http://canlii.ca/t/7vhg] # * C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00. # * O.I.C. 1980/02 established DST. # * O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00. -# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go -# with Englander. -# From Chris Walton (2006-06-26): -# Here is a link to the old daylight saving portion of the interpretation -# act which was last updated in 1987: -# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf + +# From Brian Inglis (2015-04-14): +# +# I tried to trace the history of Yukon time and found the following +# regulations, giving the reference title and URL if found, regulation name, +# and relevant quote if available. Each regulation specifically revokes its +# predecessor. The final reference is to the current Interpretation Act +# authorizing and resulting from these regulatory changes. +# +# Only recent regulations were retrievable via Yukon government site search or +# index, and only some via Canadian legal sources. Other sources used include +# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS +# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and +# 1970 quoted below; each article includes current extracts from provincial +# and territorial ST and DST regulations at the end, summaries and details of +# standard times and daylight saving time at many locations across Canada, +# with time zone maps, tables and calculations for Canadian Sunrise, Sunset, +# and LMST; they also cover many countries and global locations, with a chart +# and table showing current Universal Time offsets, and may be useful as +# another source of information for 1970 and earlier. +# +# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26, +# pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS) +# http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75: +# Yukon Interpretation Ordinance +# Yukon standard time is the local mean time at the one hundred and +# thirty-fifth meridian. +# +# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.; +# JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System +# (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1: +# Yukon Interpretation Ordinance, 1955, Chap. 16. +# +# (1) Subject to this section, standard time shall be reckoned as nine +# hours behind Greenwich Time and called Yukon Standard Time. +# +# (2) Notwithstanding subsection (1), the Commissioner may make regulations +# varying the manner of reckoning standard time. +# +# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance +# http://? - no online source found +# +# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC, +# Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS) +# http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon +# Territory Commissioner's Order 1967-59 Interpretation Ordinance ... +# +# 1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon +# Territory on 27th January, 1966, is hereby revoked. +# +# 2. Yukon (East) Standard Time as defined by section 36 of the +# Interpretation Ordinance from and after mid-night on the 28th day of May, +# 1967 shall be reckoned in the same manner as Pacific Standard Time, that +# is to say, eight hours behind Greenwich Time in the area of the Yukon +# Territory lying east of the 138th degree longitude west. +# +# 3. In the remainder of the Territory, lying west of the 138th degree +# longitude west, Yukon (West) Standard Time shall be reckoned as nine +# hours behind Greenwich Time. +# +# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214 +# http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html +# C.O. 1973/214 INTERPRETATION ACT ... +# +# 1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby +# revoked. +# +# 2. Yukon Standard Time as defined by section 36 of the Interpretation +# Act from and after midnight on the twenty-eighth day of October, 1973 +# shall be reckoned in the same manner as Pacific Standard Time, that is +# to say eight hours behind Greenwich Time. +# +# * O.I.C. 1980/02 INTERPRETATION ACT +# http://? - no online source found +# +# * Yukon Daylight Saving Time, YOIC 1987/56 +# http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html +# O.I.C. 1987/056 INTERPRETATION ACT ... +# +# In every year between +# (a) two o'clock in the morning in the first Sunday in April, and +# (b) two o'clock in the morning in the last Sunday in October, +# Standard Time shall be reckoned as seven hours behind Greenwich Time and +# called Yukon Daylight Saving Time. +# ... +# Dated ... 9th day of March, A.D., 1987. +# +# * Yukon Daylight Saving Time 2006, YOIC 2006/127 +# http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html +# O.I.C. 2006/127 INTERPRETATION ACT ... +# +# 1. In Yukon each year the time for general purposes shall be 7 hours +# behind Greenwich mean time during the period commencing at two o'clock +# in the forenoon on the second Sunday of March and ending at two o'clock +# in the forenoon on the first Sunday of November and shall be called +# Yukon Daylight Saving Time. +# +# 2. Order-in-Council 1987/56 is revoked. +# +# 3. This order comes into force January 1, 2007. +# +# * Interpretation Act, RSY 2002, c 125 +# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html # From Rives McDow (1999-09-04): # Nunavut ... moved ... to incorporate the whole territory into one time zone. @@ -2077,7 +2180,7 @@ -7:00 NT_YK M%sT 1980 -7:00 Canada M%sT Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20 - -9:00 NT_YK Y%sT 1966 Jul 1 2:00 + -9:00 NT_YK Y%sT 1967 May 28 0:00 -8:00 NT_YK P%sT 1980 -8:00 Canada P%sT Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 Modified: soc2015/pratiksinghal/cubie-head/etc/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/etc/Makefile Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/etc/Makefile Tue May 19 01:37:25 2015 (r285687) @@ -10,10 +10,6 @@ SUBDIR+=sendmail .endif -.if ${MK_TESTS} != "no" -SUBDIR+=tests -.endif - BIN1= crontab \ devd.conf \ devfs.conf \ Modified: soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/etc/rc.d/Makefile Tue May 19 01:37:25 2015 (r285687) @@ -263,10 +263,6 @@ FILES+= sendmail .endif -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .if ${MK_TIMED} != "no" FILES+= timed .endif Modified: soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/gnu/lib/Makefile Tue May 19 01:37:25 2015 (r285687) @@ -2,10 +2,10 @@ .include -SUBDIR= csu libgcc libgcov libdialog libregex libreadline +SUBDIR= csu libgcc libdialog libregex .if ${MK_GCC} != "no" -SUBDIR+= libgomp +SUBDIR+= libgcov libgomp .endif .if ${MK_SSP} != "no" @@ -16,6 +16,10 @@ SUBDIR+= tests .endif +.if ${MK_GDB} != "no" +SUBDIR+= libreadline +.endif + # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. .if ${MK_GNUCXX} != "no" Modified: soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libc/db/hash/hash.c Tue May 19 01:37:25 2015 (r285687) @@ -808,7 +808,7 @@ hashp->DSIZE = dirsize << 1; } if ((hashp->dir[new_segnum] = - (SEGMENT)calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL) + calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL) return (-1); hashp->exsegs++; hashp->nsegs++; @@ -877,7 +877,7 @@ int save_errno; if ((hashp->dir = - (SEGMENT *)calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) { + calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) { save_errno = errno; (void)hdestroy(hashp); errno = save_errno; @@ -887,8 +887,7 @@ if (nsegs == 0) return (0); /* Allocate segments */ - if ((store = (SEGMENT)calloc(nsegs << hashp->SSHIFT, - sizeof(SEGMENT))) == NULL) { + if ((store = calloc(nsegs << hashp->SSHIFT, sizeof(SEGMENT))) == NULL) { save_errno = errno; (void)hdestroy(hashp); errno = save_errno; Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.c Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: chartype.c,v 1.10 2011/08/16 16:25:15 christos Exp $ */ +/* $NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: chartype.c,v 1.10 2011/08/16 16:25:15 christos Exp $"); +__RCSID("$NetBSD: chartype.c,v 1.12 2015/02/22 02:16:19 christos Exp $"); #endif /* not lint && not SCCSID */ #include __FBSDID("$FreeBSD$"); @@ -42,31 +42,46 @@ #define CT_BUFSIZ ((size_t)1024) #ifdef WIDECHAR -protected void -ct_conv_buff_resize(ct_buffer_t *conv, size_t mincsize, size_t minwsize) +protected int +ct_conv_cbuff_resize(ct_buffer_t *conv, size_t csize) { void *p; - if (mincsize > conv->csize) { - conv->csize = mincsize; - p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff)); - if (p == NULL) { - conv->csize = 0; - el_free(conv->cbuff); - conv->cbuff = NULL; - } else - conv->cbuff = p; + + if (csize <= conv->csize) + return 0; + + conv->csize = csize; + + p = el_realloc(conv->cbuff, conv->csize * sizeof(*conv->cbuff)); + if (p == NULL) { + conv->csize = 0; + el_free(conv->cbuff); + conv->cbuff = NULL; + return -1; } + conv->cbuff = p; + return 0; +} - if (minwsize > conv->wsize) { - conv->wsize = minwsize; - p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff)); - if (p == NULL) { - conv->wsize = 0; - el_free(conv->wbuff); - conv->wbuff = NULL; - } else - conv->wbuff = p; +protected int +ct_conv_wbuff_resize(ct_buffer_t *conv, size_t wsize) +{ + void *p; + + if (wsize <= conv->wsize) + return 0; + + conv->wsize = wsize; + + p = el_realloc(conv->wbuff, conv->wsize * sizeof(*conv->wbuff)); + if (p == NULL) { + conv->wsize = 0; + el_free(conv->wbuff); + conv->wbuff = NULL; + return -1; } + conv->wbuff = p; + return 0; } @@ -74,26 +89,22 @@ ct_encode_string(const Char *s, ct_buffer_t *conv) { char *dst; - ssize_t used = 0; + ssize_t used; if (!s) return NULL; - if (!conv->cbuff) - ct_conv_buff_resize(conv, CT_BUFSIZ, (size_t)0); - if (!conv->cbuff) - return NULL; dst = conv->cbuff; - while (*s) { - used = (ssize_t)(conv->csize - (size_t)(dst - conv->cbuff)); - if (used < 5) { - used = dst - conv->cbuff; - ct_conv_buff_resize(conv, conv->csize + CT_BUFSIZ, - (size_t)0); - if (!conv->cbuff) + for (;;) { + used = (ssize_t)(dst - conv->cbuff); + if ((conv->csize - (size_t)used) < 5) { + if (ct_conv_cbuff_resize(conv, + conv->csize + CT_BUFSIZ) == -1) return NULL; dst = conv->cbuff + used; } + if (!*s) + break; used = ct_encode_char(dst, (size_t)5, *s); if (used == -1) /* failed to encode, need more buffer space */ abort(); @@ -107,22 +118,19 @@ public Char * ct_decode_string(const char *s, ct_buffer_t *conv) { - size_t len = 0; + size_t len; if (!s) return NULL; - if (!conv->wbuff) - ct_conv_buff_resize(conv, (size_t)0, CT_BUFSIZ); - if (!conv->wbuff) - return NULL; len = ct_mbstowcs(NULL, s, (size_t)0); if (len == (size_t)-1) return NULL; - if (len > conv->wsize) - ct_conv_buff_resize(conv, (size_t)0, len + 1); - if (!conv->wbuff) - return NULL; + + if (conv->wsize < ++len) + if (ct_conv_wbuff_resize(conv, len + CT_BUFSIZ) == -1) + return NULL; + ct_mbstowcs(conv->wbuff, s, conv->wsize); return conv->wbuff; } @@ -141,9 +149,9 @@ * the argv strings. */ for (i = 0, bufspace = 0; i < argc; ++i) bufspace += argv[i] ? strlen(argv[i]) + 1 : 0; - ct_conv_buff_resize(conv, (size_t)0, bufspace); - if (!conv->wsize) - return NULL; + if (conv->wsize < ++bufspace) + if (ct_conv_wbuff_resize(conv, bufspace + CT_BUFSIZ) == -1) + return NULL; wargv = el_malloc((size_t)argc * sizeof(*wargv)); Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/chartype.h Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: chartype.h,v 1.10 2011/11/16 01:45:10 christos Exp $ */ +/* $NetBSD: chartype.h,v 1.15 2015/05/17 13:14:41 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ * supports non-BMP code points without requiring UTF-16, but nothing * seems to actually advertise this properly, despite Unicode 3.1 having * been around since 2001... */ -#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__) +#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other @@ -67,6 +67,7 @@ #define FUN(prefix,rest) prefix ## _w ## rest #define FUNW(type) type ## _w #define TYPE(type) type ## W +#define FCHAR "%lc" #define FSTR "%ls" #define STR(x) L ## x #define UC(c) c @@ -121,6 +122,7 @@ #define FUN(prefix,rest) prefix ## _ ## rest #define FUNW(type) type #define TYPE(type) type +#define FCHAR "%c" #define FSTR "%s" #define STR(x) x #define UC(c) (unsigned char)(c) @@ -184,7 +186,8 @@ protected Char **ct_decode_argv(int, const char *[], ct_buffer_t *); /* Resizes the conversion buffer(s) if needed. */ -protected void ct_conv_buff_resize(ct_buffer_t *, size_t, size_t); +protected int ct_conv_cbuff_resize(ct_buffer_t *, size_t); +protected int ct_conv_wbuff_resize(ct_buffer_t *, size_t); protected ssize_t ct_encode_char(char *, size_t, Char); protected size_t ct_enc_width(Char); @@ -194,7 +197,8 @@ #define ct_encode_string(s, b) (s) #define ct_decode_string(s, b) (s) #define ct_decode_argv(l, s, b) (s) -#define ct_conv_buff_resize(b, os, ns) +#define ct_conv_cbuff_resize(b, s) ((s) == (0)) +#define ct_conv_wbuff_resize(b, s) ((s) == (0)) #define ct_encode_char(d, l, s) (*d = s, 1) #define ct_free_argv(s) #endif Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/edit/readline/readline.h Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $ */ +/* $NetBSD: readline.h,v 1.34 2013/05/28 00:10:34 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/el.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/el.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/el.c Tue May 19 01:37:25 2015 (r285687) @@ -96,7 +96,7 @@ */ el->el_flags = 0; #ifdef WIDECHAR - if (setlocale(LC_CTYPE, NULL) != NULL) { + if (setlocale(LC_CTYPE, NULL) != NULL){ if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) el->el_flags |= CHARSET_IS_UTF8; } Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/eln.c Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: eln.c,v 1.17 2014/06/18 18:12:28 christos Exp $ */ +/* $NetBSD: eln.c,v 1.19 2015/05/18 15:07:04 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: eln.c,v 1.17 2014/06/18 18:12:28 christos Exp $"); +__RCSID("$NetBSD: eln.c,v 1.19 2015/05/18 15:07:04 christos Exp $"); #endif /* not lint && not SCCSID */ #include __FBSDID("$FreeBSD$"); @@ -77,18 +77,18 @@ el_gets(EditLine *el, int *nread) { const wchar_t *tmp; - int nwread; - - *nread = 0; if (!(el->el_flags & CHARSET_IS_UTF8)) el->el_flags |= IGNORE_EXTCHARS; - tmp = el_wgets(el, &nwread); + tmp = el_wgets(el, nread); + if (tmp != NULL) { + size_t nwread = 0; + for (int i = 0; i < *nread; i++) + nwread += ct_enc_width(tmp[i]); + *nread = (int)nwread; + } if (!(el->el_flags & CHARSET_IS_UTF8)) el->el_flags &= ~IGNORE_EXTCHARS; - for (int i = 0; i < nwread; i++) - *nread += ct_enc_width(tmp[i]); - return ct_encode_string(tmp, &el->el_lgcyconv); } Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/map.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/map.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/map.c Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $ */ +/* $NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $"); +__RCSID("$NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $"); #endif #endif /* not lint && not SCCSID */ #include @@ -1302,8 +1302,8 @@ return 0; default: (void) fprintf(el->el_errfile, - "" FSTR ": Invalid switch `%c'.\n", - argv[0], p[1]); + "" FSTR ": Invalid switch `" FCHAR "'.\n", + argv[0], (Int)p[1]); } else break; Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/readline.c Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.113 2014/10/18 08:33:23 snj Exp $ */ +/* $NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: readline.c,v 1.113 2014/10/18 08:33:23 snj Exp $"); +__RCSID("$NetBSD: readline.c,v 1.115 2015/04/01 15:23:15 christos Exp $"); #endif /* not lint && not SCCSID */ #include __FBSDID("$FreeBSD$"); @@ -364,6 +364,37 @@ _el_rl_tstp); el_set(e, EL_BIND, "^Z", "rl_tstp", NULL); + /* + * Set some readline compatible key-bindings. + */ + el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL); + + /* + * Allow the use of Home/End keys. + */ + el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL); + el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL); + el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL); + el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL); + el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL); + el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL); + + /* + * Allow the use of the Delete/Insert keys. + */ + el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL); + el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL); + + /* + * Ctrl-left-arrow and Ctrl-right-arrow for word moving. + */ + el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL); + el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL); + el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL); + el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL); + el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL); + el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL); + /* read settings from configuration file */ el_source(e, NULL); @@ -950,7 +981,8 @@ for (; str[j]; j++) { if (str[j] == '\\' && str[j + 1] == history_expansion_char) { - (void)strcpy(&str[j], &str[j + 1]); + len = strlen(&str[j + 1]) + 1; + memmove(&str[j], &str[j + 1], len); continue; } if (!loop_again) { Modified: soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/lib/libedit/tty.c Tue May 19 01:37:25 2015 (r285687) @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $ */ +/* $NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $"); +__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $"); #endif #endif /* not lint && not SCCSID */ #include @@ -1173,8 +1173,8 @@ break; default: (void) fprintf(el->el_errfile, - "%s: Unknown switch `%c'.\n", - name, argv[0][1]); + "%s: Unknown switch `" FCHAR "'.\n", + name, (Int)argv[0][1]); return -1; } Modified: soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/geom_mountver.c Tue May 19 01:37:25 2015 (r285687) @@ -43,14 +43,14 @@ { G_OPT_SENTINEL }, - "[-v] dev ..." + "[-v] prov ..." }, { "destroy", G_FLAG_VERBOSE, NULL, { { 'f', "force", NULL, G_TYPE_BOOL }, G_OPT_SENTINEL }, - "[-fv] prov ..." + "[-fv] name" }, G_CMD_SENTINEL }; Modified: soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8 Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sbin/geom/class/mountver/gmountver.8 Tue May 19 01:37:25 2015 (r285687) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 27, 2015 +.Dd May 18, 2015 .Dt GMOUNTVER 8 .Os .Sh NAME @@ -35,11 +35,11 @@ .Nm .Cm create .Op Fl v -.Ar dev ... +.Ar prov ... .Nm .Cm destroy .Op Fl fv -.Ar prov ... +.Ar name .Nm .Cm list .Nm @@ -66,8 +66,11 @@ indicates an action to be performed: .Bl -tag -width ".Cm destroy" .It Cm create -Cache the given devices with specified -.Ar name . +Enable mount verification for the given provider. +If the operation succeeds, a new GEOM provider will be created using the +given provider's name with a +.Ql .mountver +suffix. The kernel module .Pa geom_mountver.ko will be loaded if it is not loaded already. Modified: soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_machdep.c Tue May 19 01:37:25 2015 (r285687) @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -181,43 +182,31 @@ { NULL, NULL } }; +#ifndef DEV_GIC static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, int *pol) { /* - * The single core chips have just an Amlogic PIC. However the - * multi core chips also have a GIC. + * The single core chips have just an Amlogic PIC. */ -#ifdef SMP - if (!fdt_is_compatible_strict(node, "arm,cortex-a9-gic")) -#else if (!fdt_is_compatible_strict(node, "amlogic,aml8726-pic")) -#endif return (ENXIO); *interrupt = fdt32_to_cpu(intr[1]); *trig = INTR_TRIGGER_EDGE; *pol = INTR_POLARITY_HIGH; - switch (*interrupt) { - case 30: /* INT_USB_A */ - case 31: /* INT_USB_B */ - *trig = INTR_TRIGGER_LEVEL; - break; - default: - break; - } - -#ifdef SMP - *interrupt += 32; -#endif - return (0); } +#endif fdt_pic_decode_t fdt_pic_table[] = { +#ifdef DEV_GIC + &gic_decode_fdt, +#else &fdt_pic_decode_ic, +#endif NULL }; Modified: soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pic.c Tue May 19 01:37:25 2015 (r285687) @@ -169,7 +169,7 @@ CSR_WRITE_4(sc, AML_PIC_0_FIRQ_SEL + i * 16, 0); } -#ifndef SMP +#ifndef DEV_GIC arm_post_filter = aml8726_pic_eoi; #else device_printf(dev, "disabled in favor of gic\n"); @@ -207,7 +207,7 @@ EARLY_DRIVER_MODULE(pic, simplebus, aml8726_pic_driver, aml8726_pic_devclass, 0, 0, BUS_PASS_INTERRUPT); -#ifndef SMP +#ifndef DEV_GIC int arm_get_next_irq(int last) { Modified: soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 Tue May 19 01:37:25 2015 (r285687) @@ -13,7 +13,7 @@ arm/amlogic/aml8726/aml8726_identsoc.c standard arm/amlogic/aml8726/aml8726_ccm.c standard arm/amlogic/aml8726/aml8726_clkmsr.c standard -arm/amlogic/aml8726/aml8726_pic.c standard +arm/amlogic/aml8726/aml8726_pic.c optional aml_pic arm/amlogic/aml8726/aml8726_rtc.c standard arm/amlogic/aml8726/aml8726_timer.c standard arm/amlogic/aml8726/aml8726_wdt.c standard Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/ALPINE Tue May 19 01:37:25 2015 (r285687) @@ -19,8 +19,8 @@ ident ALPINE -include "std.armv6" -include "../annapurna/alpine/std.alpine" +include "std.armv6" +include "../annapurna/alpine/std.alpine" makeoptions MODULES_OVERRIDE="" makeoptions WERROR="-Werror" @@ -35,11 +35,6 @@ options KDB options DDB #Enable the kernel debugger -# NFS support -options NFSCL #Network Filesystem Client -options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as /, requires NFSCLIENT - # Interrupt controller device gic Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726 Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/AML8726 Tue May 19 01:37:25 2015 (r285687) @@ -27,7 +27,6 @@ options SCHED_ULE # ULE scheduler options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options LINUX_BOOT_ABI -options SMP # Enable multiple cores # Debugging makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols @@ -52,6 +51,9 @@ #options BOOTP_NFSV3 #options BOOTP_WIRED_TO=axe0 +# Interrupt controller +device aml_pic + # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards @@ -59,9 +61,6 @@ # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:mmcsd0s2\" -# Interrupt controller -device gic - # GPIO device gpio device gpioled Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Tue May 19 01:37:25 2015 (r285687) @@ -96,8 +96,6 @@ device loop device ether device mii -device smscphy -#device cpsw device bpf device emac Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 Tue May 19 01:37:25 2015 (r285687) @@ -100,8 +100,6 @@ device loop device ether device mii -device smscphy -#device cpsw device bpf device emac Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 Tue May 19 01:37:25 2015 (r285687) @@ -22,5 +22,8 @@ include "AML8726" ident ODROIDC1 +# Interrupt controller +device gic + options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=odroidc1.dts Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 Tue May 19 01:37:25 2015 (r285687) @@ -22,5 +22,8 @@ include "AML8726" ident VSATV102 +# Interrupt controller +device gic + options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=vsatv102-m6.dts Modified: soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/boot/arm/uboot/Makefile Tue May 19 01:37:25 2015 (r285687) @@ -77,6 +77,8 @@ LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a .endif +CFLAGS+= -DNETIF_OPEN_CLOSE_ONCE + .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes Modified: soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c Mon May 18 23:46:11 2015 (r285686) +++ soc2015/pratiksinghal/cubie-head/sys/boot/common/dev_net.c Tue May 19 01:37:25 2015 (r285687) @@ -111,6 +111,8 @@ static int net_open(struct open_file *f, ...) { + char temp[FNAME_SIZE]; + struct iodesc *d; va_list args; char *devname; /* Device part of file name (or NULL). */ int error = 0; @@ -140,6 +142,10 @@ printf("net_open: netif_open() succeeded\n"); #endif } + /* + * If network params were not set by netif_open(), try to get + * them via bootp, rarp, etc. + */ if (rootip.s_addr == 0) { /* Get root IP address, and path, etc. */ error = net_getparams(netdev_sock); @@ -151,6 +157,20 @@ return (error); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Tue May 19 06:28:45 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93EF56FB for ; Tue, 19 May 2015 06:28:45 +0000 (UTC) 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 804C812A0 for ; Tue, 19 May 2015 06:28:45 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4J6Sj4i065248 for ; Tue, 19 May 2015 06:28:45 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4J6SgK5065240 for svn-soc-all@FreeBSD.org; Tue, 19 May 2015 06:28:42 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Tue, 19 May 2015 06:28:42 GMT Message-Id: <201505190628.t4J6SgK5065240@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: r285693 - in soc2015/pratiksinghal/cubie-head: . share share/man/man3 sys sys/mips/atheros sys/mips/conf tools/bsdbox 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, 19 May 2015 06:28:45 -0000 Author: pratiksinghal Date: Tue May 19 06:28:42 2015 New Revision: 285693 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285693 Log: Merged with r283097 Added: soc2015/pratiksinghal/cubie-head/sys/mips/atheros/qca955x_pci.c - copied unchanged from r285692, mirror/FreeBSD/head/sys/mips/atheros/qca955x_pci.c Modified: soc2015/pratiksinghal/cubie-head/ (props changed) soc2015/pratiksinghal/cubie-head/share/ (props changed) soc2015/pratiksinghal/cubie-head/share/man/man3/pthread_getspecific.3 soc2015/pratiksinghal/cubie-head/sys/ (props changed) soc2015/pratiksinghal/cubie-head/sys/mips/atheros/files.ar71xx soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135 soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135.hints soc2015/pratiksinghal/cubie-head/sys/mips/conf/QCA955X_BASE soc2015/pratiksinghal/cubie-head/tools/bsdbox/Makefile.base Modified: soc2015/pratiksinghal/cubie-head/share/man/man3/pthread_getspecific.3 ============================================================================== --- soc2015/pratiksinghal/cubie-head/share/man/man3/pthread_getspecific.3 Tue May 19 05:41:00 2015 (r285692) +++ soc2015/pratiksinghal/cubie-head/share/man/man3/pthread_getspecific.3 Tue May 19 06:28:42 2015 (r285693) @@ -64,6 +64,11 @@ The .Fn pthread_getspecific function may be called from a thread-specific data destructor function. +A call to +.Fn pthread_getspecific +for the thread-specific data key being destroyed returns the value NULL, +unless the value is changed (after the destructor starts) by a call to +.Fn pthread_setspecific . .Sh RETURN VALUES The .Fn pthread_getspecific Modified: soc2015/pratiksinghal/cubie-head/sys/mips/atheros/files.ar71xx ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/mips/atheros/files.ar71xx Tue May 19 05:41:00 2015 (r285692) +++ soc2015/pratiksinghal/cubie-head/sys/mips/atheros/files.ar71xx Tue May 19 06:28:42 2015 (r285693) @@ -30,5 +30,6 @@ mips/atheros/qca955x_chip.c standard mips/atheros/ar71xx_fixup.c optional ar71xx_ath_eeprom mips/atheros/qca955x_apb.c optional qca955x_apb +mips/atheros/qca955x_pci.c optional qca955x_pci pci dev/hwpmc/hwpmc_mips24k.c optional hwpmc_mips24k Copied: soc2015/pratiksinghal/cubie-head/sys/mips/atheros/qca955x_pci.c (from r285692, mirror/FreeBSD/head/sys/mips/atheros/qca955x_pci.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/pratiksinghal/cubie-head/sys/mips/atheros/qca955x_pci.c Tue May 19 06:28:42 2015 (r285693, copy of r285692, mirror/FreeBSD/head/sys/mips/atheros/qca955x_pci.c) @@ -0,0 +1,606 @@ +/*- + * Copyright (c) 2009, Oleksandr Tymoshenko + * Copyright (c) 2011, Luiz Otavio O Souza. + * Copyright (c) 2015, Adrian Chadd + * 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 unmodified, 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 +__FBSDID("$FreeBSD$"); + +#include "opt_ar71xx.h" + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include "pcib_if.h" + +#include /* XXX aim to eliminate this! */ +#include +#include +#include + +#include + +#undef AR724X_PCI_DEBUG +//#define AR724X_PCI_DEBUG +#ifdef AR724X_PCI_DEBUG +#define dprintf printf +#else +#define dprintf(x, arg...) +#endif + +/* + * This is a PCI controller for the QCA955x and later SoCs. + * It needs to be aware of >1 PCIe host endpoints. + * + * XXX TODO; it may be nice to merge this with ar724x_pci.c; + * they're very similar. + */ +struct ar71xx_pci_irq { + struct ar71xx_pci_softc *sc; + int irq; +}; + +struct ar71xx_pci_softc { + device_t sc_dev; + + int sc_busno; + struct rman sc_mem_rman; + struct rman sc_irq_rman; + + uint32_t sc_pci_reg_base; /* XXX until bus stuff is done */ + uint32_t sc_pci_crp_base; /* XXX until bus stuff is done */ + uint32_t sc_pci_ctrl_base; /* XXX until bus stuff is done */ + uint32_t sc_pci_mem_base; /* XXX until bus stuff is done */ + uint32_t sc_pci_membase_limit; + + struct intr_event *sc_eventstab[AR71XX_PCI_NIRQS]; + mips_intrcnt_t sc_intr_counter[AR71XX_PCI_NIRQS]; + struct ar71xx_pci_irq sc_pci_irq[AR71XX_PCI_NIRQS]; + struct resource *sc_irq; + void *sc_ih; +}; + +static int qca955x_pci_setup_intr(device_t, device_t, struct resource *, int, + driver_filter_t *, driver_intr_t *, void *, void **); +static int qca955x_pci_teardown_intr(device_t, device_t, struct resource *, + void *); +static int qca955x_pci_intr(void *); + +static void +qca955x_pci_write(uint32_t reg, uint32_t offset, uint32_t data, int bytes) +{ + uint32_t val, mask, shift; + + /* Register access is 32-bit aligned */ + shift = (offset & 3) * 8; + if (bytes % 4) + mask = (1 << (bytes * 8)) - 1; + else + mask = 0xffffffff; + + val = ATH_READ_REG(reg + (offset & ~3)); + val &= ~(mask << shift); + val |= ((data & mask) << shift); + ATH_WRITE_REG(reg + (offset & ~3), val); + + dprintf("%s: %#x/%#x addr=%#x, data=%#x(%#x), bytes=%d\n", __func__, + reg, reg + (offset & ~3), offset, data, val, bytes); +} + +static uint32_t +qca955x_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, + u_int reg, int bytes) +{ + struct ar71xx_pci_softc *sc = device_get_softc(dev); + uint32_t data, shift, mask; + + /* Register access is 32-bit aligned */ + shift = (reg & 3) * 8; + + /* Create a mask based on the width, post-shift */ + if (bytes == 2) + mask = 0xffff; + else if (bytes == 1) + mask = 0xff; + else + mask = 0xffffffff; + + dprintf("%s: tag (%x, %x, %x) reg %d(%d)\n", __func__, bus, slot, + func, reg, bytes); + + if ((bus == 0) && (slot == 0) && (func == 0)) + data = ATH_READ_REG(sc->sc_pci_reg_base + (reg & ~3)); + else + data = -1; + + /* Get request bytes from 32-bit word */ + data = (data >> shift) & mask; + + dprintf("%s: read 0x%x\n", __func__, data); + + return (data); +} + +static void +qca955x_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, + u_int reg, uint32_t data, int bytes) +{ + struct ar71xx_pci_softc *sc = device_get_softc(dev); + + dprintf("%s: tag (%x, %x, %x) reg %d(%d): %x\n", __func__, bus, slot, + func, reg, bytes, data); + + if ((bus != 0) || (slot != 0) || (func != 0)) + return; + + qca955x_pci_write(sc->sc_pci_reg_base, reg, data, bytes); +} + +static void +qca955x_pci_mask_irq(void *source) +{ + uint32_t reg; + struct ar71xx_pci_irq *pirq = source; + struct ar71xx_pci_softc *sc = pirq->sc; + + /* XXX - Only one interrupt ? Only one device ? */ + if (pirq->irq != AR71XX_PCI_IRQ_START) + return; + + /* Update the interrupt mask reg */ + reg = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_MASK); + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_MASK, + reg & ~QCA955X_PCI_INTR_DEV0); + + /* Clear any pending interrupt */ + reg = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_STATUS); + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_STATUS, + reg | QCA955X_PCI_INTR_DEV0); +} + +static void +qca955x_pci_unmask_irq(void *source) +{ + uint32_t reg; + struct ar71xx_pci_irq *pirq = source; + struct ar71xx_pci_softc *sc = pirq->sc; + + if (pirq->irq != AR71XX_PCI_IRQ_START) + return; + + /* Update the interrupt mask reg */ + reg = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_MASK); + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_MASK, + reg | QCA955X_PCI_INTR_DEV0); +} + +static int +qca955x_pci_setup(device_t dev) +{ + struct ar71xx_pci_softc *sc = device_get_softc(dev); + uint32_t reg; + + /* setup COMMAND register */ + reg = PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN | PCIM_CMD_SERRESPEN | + PCIM_CMD_BACKTOBACK | PCIM_CMD_PERRESPEN | PCIM_CMD_MWRICEN; + + qca955x_pci_write(sc->sc_pci_crp_base, PCIR_COMMAND, reg, 2); + + /* These are the memory/prefetch base/limit parameters */ + qca955x_pci_write(sc->sc_pci_crp_base, 0x20, sc->sc_pci_membase_limit, 4); + qca955x_pci_write(sc->sc_pci_crp_base, 0x24, sc->sc_pci_membase_limit, 4); + + reg = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_RESET); + if (reg != 0x7) { + DELAY(100000); + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_RESET, 0); + ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_RESET); + DELAY(100); + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_RESET, 4); + ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_RESET); + DELAY(100000); + } + + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_APP, 0x1ffc1); + /* Flush write */ + (void) ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_APP); + + DELAY(1000); + + reg = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_RESET); + if ((reg & QCA955X_PCI_RESET_LINK_UP) == 0) { + device_printf(dev, "no PCIe controller found\n"); + return (ENXIO); + } + + return (0); +} + +static int +qca955x_pci_probe(device_t dev) +{ + + return (BUS_PROBE_NOWILDCARD); +} + +static int +qca955x_pci_attach(device_t dev) +{ + struct ar71xx_pci_softc *sc = device_get_softc(dev); + int unit = device_get_unit(dev); + int busno = 0; + int rid = 0; + + /* Dirty; maybe these could all just be hints */ + if (unit == 0) { + sc->sc_pci_reg_base = QCA955X_PCI_CFG_BASE0; + sc->sc_pci_crp_base = QCA955X_PCI_CRP_BASE0; + sc->sc_pci_ctrl_base = QCA955X_PCI_CTRL_BASE0; + sc->sc_pci_mem_base = QCA955X_PCI_MEM_BASE0; + /* XXX verify */ + sc->sc_pci_membase_limit = 0x11f01000; + } else if (unit == 1) { + sc->sc_pci_reg_base = QCA955X_PCI_CFG_BASE1; + sc->sc_pci_crp_base = QCA955X_PCI_CRP_BASE1; + sc->sc_pci_ctrl_base = QCA955X_PCI_CTRL_BASE1; + sc->sc_pci_mem_base = QCA955X_PCI_MEM_BASE1; + /* XXX verify */ + sc->sc_pci_membase_limit = 0x12f01200; + } else { + device_printf(dev, "%s: invalid unit (%d)\n", __func__, unit); + return (ENXIO); + } + + sc->sc_mem_rman.rm_type = RMAN_ARRAY; + sc->sc_mem_rman.rm_descr = "qca955x PCI memory window"; + if (rman_init(&sc->sc_mem_rman) != 0 || + rman_manage_region(&sc->sc_mem_rman, + sc->sc_pci_mem_base, + sc->sc_pci_mem_base + QCA955X_PCI_MEM_SIZE - 1) != 0) { + panic("qca955x_pci_attach: failed to set up I/O rman"); + } + + sc->sc_irq_rman.rm_type = RMAN_ARRAY; + sc->sc_irq_rman.rm_descr = "qca955x PCI IRQs"; + if (rman_init(&sc->sc_irq_rman) != 0 || + rman_manage_region(&sc->sc_irq_rman, AR71XX_PCI_IRQ_START, + AR71XX_PCI_IRQ_END) != 0) + panic("qca955x_pci_attach: failed to set up IRQ rman"); + + /* Disable interrupts */ + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_STATUS, 0); + ATH_WRITE_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_MASK, 0); + + /* Hook up our interrupt handler. */ + if ((sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE)) == NULL) { + device_printf(dev, "unable to allocate IRQ resource\n"); + return (ENXIO); + } + + if ((bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC, + qca955x_pci_intr, NULL, sc, &sc->sc_ih))) { + device_printf(dev, + "WARNING: unable to register interrupt handler\n"); + return (ENXIO); + } + + /* Reset PCIe core and PCIe PHY */ + ar71xx_device_stop(QCA955X_RESET_PCIE); + ar71xx_device_stop(QCA955X_RESET_PCIE_PHY); + DELAY(100); + ar71xx_device_start(QCA955X_RESET_PCIE_PHY); + ar71xx_device_start(QCA955X_RESET_PCIE); + + if (qca955x_pci_setup(dev)) + return (ENXIO); + + /* + * Write initial base address. + * + * I'm not yet sure why this is required and/or why it isn't + * initialised like this. The AR71xx PCI code initialises + * the PCI windows for each device, but neither it or the + * 724x PCI bridge modules explicitly initialise the BAR. + * + * So before this gets committed, have a chat with jhb@ or + * someone else who knows PCI well and figure out whether + * the initial BAR is supposed to be determined by /other/ + * means. + */ + qca955x_pci_write_config(dev, 0, 0, 0, PCIR_BAR(0), + sc->sc_pci_mem_base, + 4); + + /* Fixup internal PCI bridge */ + qca955x_pci_write_config(dev, 0, 0, 0, PCIR_COMMAND, + PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN + | PCIM_CMD_SERRESPEN | PCIM_CMD_BACKTOBACK + | PCIM_CMD_PERRESPEN | PCIM_CMD_MWRICEN, 2); + + device_add_child(dev, "pci", busno); + return (bus_generic_attach(dev)); +} + +static int +qca955x_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +{ + struct ar71xx_pci_softc *sc = device_get_softc(dev); + + switch (which) { + case PCIB_IVAR_DOMAIN: + *result = 0; + return (0); + case PCIB_IVAR_BUS: + *result = sc->sc_busno; + return (0); + } + + return (ENOENT); +} + +static int +qca955x_pci_write_ivar(device_t dev, device_t child, int which, uintptr_t result) +{ + struct ar71xx_pci_softc * sc = device_get_softc(dev); + + switch (which) { + case PCIB_IVAR_BUS: + sc->sc_busno = result; + return (0); + } + + return (ENOENT); +} + +static struct resource * +qca955x_pci_alloc_resource(device_t bus, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + struct ar71xx_pci_softc *sc = device_get_softc(bus); + struct resource *rv; + struct rman *rm; + + switch (type) { + case SYS_RES_IRQ: + rm = &sc->sc_irq_rman; + break; + case SYS_RES_MEMORY: + rm = &sc->sc_mem_rman; + break; + default: + return (NULL); + } + + rv = rman_reserve_resource(rm, start, end, count, flags, child); + + if (rv == NULL) + return (NULL); + + rman_set_rid(rv, *rid); + + if (flags & RF_ACTIVE) { + if (bus_activate_resource(child, type, *rid, rv)) { + rman_release_resource(rv); + return (NULL); + } + } + + return (rv); +} + +static int +qca955x_pci_activate_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + int res = (BUS_ACTIVATE_RESOURCE(device_get_parent(bus), + child, type, rid, r)); + + if (!res) { + switch(type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + + rman_set_bustag(r, ar71xx_bus_space_pcimem); + break; + } + } + + return (res); +} + +static int +qca955x_pci_setup_intr(device_t bus, device_t child, struct resource *ires, + int flags, driver_filter_t *filt, driver_intr_t *handler, + void *arg, void **cookiep) +{ + struct ar71xx_pci_softc *sc = device_get_softc(bus); + struct intr_event *event; + int irq, error; + + irq = rman_get_start(ires); + if (irq > AR71XX_PCI_IRQ_END) + panic("%s: bad irq %d", __func__, irq); + + event = sc->sc_eventstab[irq]; + if (event == NULL) { + sc->sc_pci_irq[irq].sc = sc; + sc->sc_pci_irq[irq].irq = irq; + error = intr_event_create(&event, (void *)&sc->sc_pci_irq[irq], + 0, irq, + qca955x_pci_mask_irq, + qca955x_pci_unmask_irq, + NULL, NULL, + "pci intr%d:", irq); + + if (error == 0) { + sc->sc_eventstab[irq] = event; + sc->sc_intr_counter[irq] = + mips_intrcnt_create(event->ie_name); + } + else + return error; + } + + intr_event_add_handler(event, device_get_nameunit(child), filt, + handler, arg, intr_priority(flags), flags, cookiep); + mips_intrcnt_setname(sc->sc_intr_counter[irq], event->ie_fullname); + + qca955x_pci_unmask_irq(&sc->sc_pci_irq[irq]); + + return (0); +} + +static int +qca955x_pci_teardown_intr(device_t dev, device_t child, struct resource *ires, + void *cookie) +{ + struct ar71xx_pci_softc *sc = device_get_softc(dev); + int irq, result; + + irq = rman_get_start(ires); + if (irq > AR71XX_PCI_IRQ_END) + panic("%s: bad irq %d", __func__, irq); + + if (sc->sc_eventstab[irq] == NULL) + panic("Trying to teardown unoccupied IRQ"); + + qca955x_pci_mask_irq(&sc->sc_pci_irq[irq]); + + result = intr_event_remove_handler(cookie); + if (!result) + sc->sc_eventstab[irq] = NULL; + + return (result); +} + +static int +qca955x_pci_intr(void *arg) +{ + struct ar71xx_pci_softc *sc = arg; + struct intr_event *event; + uint32_t reg, irq, mask; + + /* XXX TODO - may need to flush a different handler? */ + ar71xx_device_ddr_flush_ip2(); + + reg = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_STATUS); + mask = ATH_READ_REG(sc->sc_pci_ctrl_base + QCA955X_PCI_INTR_MASK); + /* + * Handle only unmasked interrupts + */ + reg &= mask; + /* + * XXX TODO: handle >1 PCIe end point! + */ + if (reg & QCA955X_PCI_INTR_DEV0) { + irq = AR71XX_PCI_IRQ_START; + event = sc->sc_eventstab[irq]; + if (!event || TAILQ_EMPTY(&event->ie_handlers)) { + printf("Stray IRQ %d\n", irq); + return (FILTER_STRAY); + } + + /* TODO: frame instead of NULL? */ + intr_event_handle(event, NULL); + mips_intrcnt_inc(sc->sc_intr_counter[irq]); + } + + return (FILTER_HANDLED); +} + +static int +qca955x_pci_maxslots(device_t dev) +{ + + return (PCI_SLOTMAX); +} + +static int +qca955x_pci_route_interrupt(device_t pcib, device_t device, int pin) +{ + + return (pci_get_slot(device)); +} + +static device_method_t qca955x_pci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, qca955x_pci_probe), + DEVMETHOD(device_attach, qca955x_pci_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + + /* Bus interface */ + DEVMETHOD(bus_read_ivar, qca955x_pci_read_ivar), + DEVMETHOD(bus_write_ivar, qca955x_pci_write_ivar), + DEVMETHOD(bus_alloc_resource, qca955x_pci_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_activate_resource, qca955x_pci_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_setup_intr, qca955x_pci_setup_intr), + DEVMETHOD(bus_teardown_intr, qca955x_pci_teardown_intr), + + /* pcib interface */ + DEVMETHOD(pcib_maxslots, qca955x_pci_maxslots), + DEVMETHOD(pcib_read_config, qca955x_pci_read_config), + DEVMETHOD(pcib_write_config, qca955x_pci_write_config), + DEVMETHOD(pcib_route_interrupt, qca955x_pci_route_interrupt), + + DEVMETHOD_END +}; + +static driver_t qca955x_pci_driver = { + "pcib", + qca955x_pci_methods, + sizeof(struct ar71xx_pci_softc), +}; + +static devclass_t qca955x_pci_devclass; + +DRIVER_MODULE(qca955x_pci, nexus, qca955x_pci_driver, qca955x_pci_devclass, 0, 0); +DRIVER_MODULE(qca955x_pci, apb, qca955x_pci_driver, qca955x_pci_devclass, 0, 0); Modified: soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135 ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135 Tue May 19 05:41:00 2015 (r285692) +++ soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135 Tue May 19 06:28:42 2015 (r285693) @@ -50,7 +50,12 @@ # Used for the static uboot partition map device geom_map -# yes, this board has a PCI connected atheros device +# yes, this board has a PCIe connected atheros device +# add ath_pci so it can at least attach things when there's a +# ath(4) in there, rather than the 11ac chip we don't support. +device pci +device qca955x_pci + device ath_pci options AR71XX_ATH_EEPROM device firmware # Used by the above @@ -58,3 +63,6 @@ # Boot off of the rootfs, as defined in the geom_map setup. options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\" + +# Default to accept +options IPFIREWALL_DEFAULT_TO_ACCEPT Modified: soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135.hints ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135.hints Tue May 19 05:41:00 2015 (r285692) +++ soc2015/pratiksinghal/cubie-head/sys/mips/conf/AP135.hints Tue May 19 06:28:42 2015 (r285693) @@ -117,11 +117,11 @@ # to find it. # ath1 hint - pcie slot 0 -hint.pcib.0.bus.0.0.0.ath_fixup_addr=0x1fff4000 -hint.pcib.0.bus.0.0.0.ath_fixup_size=16384 +# hint.pcib.0.bus.0.0.0.ath_fixup_addr=0x1fff4000 +# hint.pcib.0.bus.0.0.0.ath_fixup_size=16384 # ath0 - eeprom comes from here -hint.ath.1.eeprom_firmware="pcib.0.bus.0.0.0.eeprom_firmware" +# hint.ath.1.eeprom_firmware="pcib.0.bus.0.0.0.eeprom_firmware" # flash layout: # Modified: soc2015/pratiksinghal/cubie-head/sys/mips/conf/QCA955X_BASE ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/mips/conf/QCA955X_BASE Tue May 19 05:41:00 2015 (r285692) +++ soc2015/pratiksinghal/cubie-head/sys/mips/conf/QCA955X_BASE Tue May 19 06:28:42 2015 (r285693) @@ -27,7 +27,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc" -makeoptions MODULES_OVERRIDE="if_vlan ipfw if_gre if_gif if_bridge bridgestp hwpmc" +makeoptions MODULES_OVERRIDE="if_vlan ipfw if_gre if_gif if_bridge bridgestp" options DDB options KDB @@ -53,10 +53,10 @@ # Limit UMTX hash size # options UMTX_NUM_CHAINS=64 -# PMC +# PMC - fow now there's no hwpmc module for mips74k #options HWPMC_HOOKS #device hwpmc -#device hwpmc_mips24k +#device hwpmc_mips74k # options NFS_LEGACYRPC # Debugging for use in -current @@ -109,12 +109,6 @@ options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this device ehci -device pci -# XXX TODO: need to write a qca955x_pci bridge -# .. since it now handles >1 PCIe bus and the reset -# registers may have changed a bit. -# device ar724x_pci - device scbus device umass device da Modified: soc2015/pratiksinghal/cubie-head/tools/bsdbox/Makefile.base ============================================================================== --- soc2015/pratiksinghal/cubie-head/tools/bsdbox/Makefile.base Tue May 19 05:41:00 2015 (r285692) +++ soc2015/pratiksinghal/cubie-head/tools/bsdbox/Makefile.base Tue May 19 06:28:42 2015 (r285693) @@ -6,7 +6,7 @@ # CRUNCH_PROGS_sbin+= dmesg sysctl init reboot CRUNCH_PROGS_bin+= ls cat dd df cp hostname kill mkdir sleep ps -CRUNCH_PROGS_bin+= ln rm hostname kenv +CRUNCH_PROGS_bin+= ln rm hostname kenv mv expr CRUNCH_PROGS_usr.bin+= true false hexdump tail nc w head uname tset CRUNCH_PROGS_usr.sbin+= gpioctl CRUNCH_ALIAS_w= uptime From owner-svn-soc-all@FreeBSD.ORG Wed May 20 19:07:43 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBEAB911 for ; Wed, 20 May 2015 19:07:43 +0000 (UTC) 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 C156417DF for ; Wed, 20 May 2015 19:07:43 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KJ7hwW094674 for ; Wed, 20 May 2015 19:07:43 GMT (envelope-from roam@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4KJ7hfH094671 for svn-soc-all@FreeBSD.org; Wed, 20 May 2015 19:07:43 GMT (envelope-from roam@FreeBSD.org) Date: Wed, 20 May 2015 19:07:43 GMT Message-Id: <201505201907.t4KJ7hfH094671@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to roam@FreeBSD.org using -f From: roam@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r285758 - soc2015/roam 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, 20 May 2015 19:07:44 -0000 Author: roam Date: Wed May 20 19:07:42 2015 New Revision: 285758 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285758 Log: Add a simple project description for ng_ayiya. Added: soc2015/roam/ soc2015/roam/README.txt Added: soc2015/roam/README.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/roam/README.txt Wed May 20 19:07:42 2015 (r285758) @@ -0,0 +1,44 @@ +ng_ayiya - a SixXS IPv6 tunnel broker AYIYA Netgraph node +========================================================= + +Student: Peter Pentchev (roam@) +Mentor: Bjoern A. Zeeb (bz+soc@) + +Project description +------------------- + +Implement a netgraph node that connects to a netgraph kernel socket node and +a netgraph interface node and understands enough of the AYIYA protocol to +pass packets back and forth. Use a control connection to user space to +handle all other signalling. Adjust the sixxs-aiccu implementation and add +the netgraph implementation as an option for the FreeBSD port. + +The goal of this project is to create a Netgraph node that acts as a link +between a socket (TCP, UDP, SCTP, ...) connection to an AYIYA server +(for a start, the SixXS POPs) and a local network interface (for a start, +one that can route IPv6 traffic). The operation of the node should be +controlled via a Netgraph socket (the usual way of letting a kernel Netgraph +node communicate with a userland program) by higher-level tunnel negotiation +software like SixXS's AICCU. The scope of the project also includes +the necessary changes to SixXS's AICCU software to use the Netgraph +framework instead of tunneling the packets by itself, as it does in its +standard mode of operation. + +The initial design of the Netgraph node is as follows: +- a "ayiya" hook to a ng_ksocket node for the "uplink" connection to the + AYIYA POP of the tunnel broker +- an "inet6" hook to a ng_iface node +- a "control" hook to a ng_socket node for configuration from userland +- a "secrethash" control message to set the pre-hashed shared secret for + the AYIYA protocol, so that the node need not know the actual secret +- possibly more control messages to set the node's mode of operation in + additional ways (possibly reconnect to the AYIYA POP by itself, etc.) +- possibly two-way data communication with the userland utility through + the control hook for e.g. responding to AYIYA queries, passing on + the POP's message of the day, etc. + +The hook names should either be the exact strings "ayiya", "control" and +"secret" or strings that start with those tags followed by a slash ("/") and +additional data that the node will ignore. This allows the administrator or +the userland utility to keep more information for clarity, documentation and +so on, without interfering with the operation of the node. From owner-svn-soc-all@FreeBSD.ORG Sat May 23 02:25:22 2015 Return-Path: Delivered-To: svn-soc-all@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 5A95267E for ; Sat, 23 May 2015 02:25:22 +0000 (UTC) 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 44C5C1E0B for ; Sat, 23 May 2015 02:25:22 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4N2PMvD047269 for ; Sat, 23 May 2015 02:25:22 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4N2P4AA043116 for svn-soc-all@FreeBSD.org; Sat, 23 May 2015 02:25:04 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Sat, 23 May 2015 02:25:04 GMT Message-Id: <201505230225.t4N2P4AA043116@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: r285909 - in soc2015/pratiksinghal/cubie-head: . bin/pax cddl cddl/lib cddl/lib/libdtrace cddl/sbin cddl/usr.bin cddl/usr.bin/ctfconvert cddl/usr.bin/ctfdump cddl/usr.sbin cddl/usr.s... 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, 23 May 2015 02:25:22 -0000 Author: pratiksinghal Date: Sat May 23 02:25:03 2015 New Revision: 285909 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285909 Log: Merged with ~head Added: soc2015/pratiksinghal/cubie-head/lib/csu/i386/ - copied from r285886, mirror/FreeBSD/head/lib/csu/i386/ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.h soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_ecap.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_ecap.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_ehrpwm.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_ehrpwm.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_musb.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_musb.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pwmss.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/am335x/am335x_pwmss.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_hwmods.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_hwmods.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_hwmods.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_hwmods.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pinmux.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_pinmux.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pinmux.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/ti_pinmux.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_host.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/usb/omap_host.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_tll.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/arm/ti/usb/omap_tll.c soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi - copied unchanged from r285886, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/beaglebone-common.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi - copied unchanged from r285886, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/pandaboard-common.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/pandaboard-es.dts - copied unchanged from r285886, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/pandaboard-es.dts soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_arm64.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/dev/hwpmc/hwpmc_arm64.c soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_arm64.h - copied unchanged from r285886, mirror/FreeBSD/head/sys/dev/hwpmc/hwpmc_arm64.h soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_arm64_md.c - copied unchanged from r285886, mirror/FreeBSD/head/sys/dev/hwpmc/hwpmc_arm64_md.c soc2015/pratiksinghal/cubie-head/tests/sys/kern/ptrace_test.c - copied unchanged from r285886, mirror/FreeBSD/head/tests/sys/kern/ptrace_test.c Deleted: soc2015/pratiksinghal/cubie-head/kerberos5/lib/libheimsqlite/ soc2015/pratiksinghal/cubie-head/lib/csu/i386-elf/ soc2015/pratiksinghal/cubie-head/lib/libmandoc/ soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pwm.c soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/am335x.dtsi soc2015/pratiksinghal/cubie-head/usr.bin/demandoc/ Modified: soc2015/pratiksinghal/cubie-head/ (props changed) soc2015/pratiksinghal/cubie-head/Makefile.inc1 soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc soc2015/pratiksinghal/cubie-head/UPDATING soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/cache.c soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c soc2015/pratiksinghal/cubie-head/bin/pax/pax.c soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c soc2015/pratiksinghal/cubie-head/bin/pax/tar.c soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c soc2015/pratiksinghal/cubie-head/cddl/ (props changed) soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile soc2015/pratiksinghal/cubie-head/contrib/atf/ (props changed) soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh soc2015/pratiksinghal/cubie-head/include/ (props changed) soc2015/pratiksinghal/cubie-head/include/stringlist.h soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile soc2015/pratiksinghal/cubie-head/lib/Makefile soc2015/pratiksinghal/cubie-head/lib/csu/Makefile soc2015/pratiksinghal/cubie-head/lib/libc/ (props changed) soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors soc2015/pratiksinghal/cubie-head/sbin/ (props changed) soc2015/pratiksinghal/cubie-head/sbin/ipfw/ (props changed) soc2015/pratiksinghal/cubie-head/sbin/ipfw/tables.c soc2015/pratiksinghal/cubie-head/share/ (props changed) soc2015/pratiksinghal/cubie-head/share/man/man4/ (props changed) soc2015/pratiksinghal/cubie-head/share/man/man4/ctl.4 soc2015/pratiksinghal/cubie-head/share/man/man9/psignal.9 soc2015/pratiksinghal/cubie-head/share/mk/src.libnames.mk soc2015/pratiksinghal/cubie-head/sys/ (props changed) soc2015/pratiksinghal/cubie-head/sys/amd64/amd64/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/amd64/vmm/ (props changed) soc2015/pratiksinghal/cubie-head/sys/amd64/vmm/vmm_instruction_emul.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_clk.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_clk.h soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_ccm.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_rtc.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c soc2015/pratiksinghal/cubie-head/sys/arm/amlogic/aml8726/files.aml8726 soc2015/pratiksinghal/cubie-head/sys/arm/arm/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/arm/arm/pmap.c soc2015/pratiksinghal/cubie-head/sys/arm/arm/pmu.c soc2015/pratiksinghal/cubie-head/sys/arm/at91/at91_pio.c soc2015/pratiksinghal/cubie-head/sys/arm/conf/BEAGLEBONE soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD2 soc2015/pratiksinghal/cubie-head/sys/arm/conf/ODROIDC1 soc2015/pratiksinghal/cubie-head/sys/arm/conf/PANDABOARD soc2015/pratiksinghal/cubie-head/sys/arm/conf/SAM9G20EK soc2015/pratiksinghal/cubie-head/sys/arm/conf/VSATV102 soc2015/pratiksinghal/cubie-head/sys/arm/ti/aintc.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_dmtimer.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_gpio.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_lcd.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_lcd.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pmic.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_prcm.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_pwm.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_scm_padconf.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/am335x_usbss.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/am335x/files.am335x soc2015/pratiksinghal/cubie-head/sys/arm/ti/cpsw/if_cpsw.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/cpsw/if_cpswreg.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/cpsw/if_cpswvar.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/files.ti soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/files.omap4 soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/omap4_gpio.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/omap4_prcm_clks.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/omap4/omap4_scm_padconf.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_adc.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_common.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_edma3.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_gpio.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_gpio.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_i2c.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_mbox.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_prcm.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pruss.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_pruss.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_scm.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_scm.h soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_sdhci.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/ti_sdma.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_ehci.c soc2015/pratiksinghal/cubie-head/sys/arm/ti/usb/omap_usb.h soc2015/pratiksinghal/cubie-head/sys/arm64/arm64/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/arm64/arm64/intr_machdep.c soc2015/pratiksinghal/cubie-head/sys/arm64/include/armreg.h soc2015/pratiksinghal/cubie-head/sys/arm64/include/pmc_mdep.h soc2015/pratiksinghal/cubie-head/sys/boot/ (props changed) soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/am335x-evm.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/beaglebone-black.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/beaglebone.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard2.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/odroidc1.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/pandaboard.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/vsatv102-m6.dts soc2015/pratiksinghal/cubie-head/sys/conf/ (props changed) soc2015/pratiksinghal/cubie-head/sys/conf/files.arm64 soc2015/pratiksinghal/cubie-head/sys/ddb/db_access.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_access.h soc2015/pratiksinghal/cubie-head/sys/ddb/db_break.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_capture.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_command.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_examine.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_expr.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_main.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_print.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_ps.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_run.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_script.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_sym.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_sym.h soc2015/pratiksinghal/cubie-head/sys/ddb/db_textdump.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_thread.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_variables.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_watch.c soc2015/pratiksinghal/cubie-head/sys/ddb/db_write_cmd.c soc2015/pratiksinghal/cubie-head/sys/ddb/ddb.h soc2015/pratiksinghal/cubie-head/sys/dev/acpica/acpi_cpu.c soc2015/pratiksinghal/cubie-head/sys/dev/acpica/acpi_throttle.c soc2015/pratiksinghal/cubie-head/sys/dev/bxe/bxe.c soc2015/pratiksinghal/cubie-head/sys/dev/bxe/bxe_stats.c soc2015/pratiksinghal/cubie-head/sys/dev/bxe/bxe_stats.h soc2015/pratiksinghal/cubie-head/sys/dev/fdt/fdt_common.c soc2015/pratiksinghal/cubie-head/sys/dev/fdt/fdt_common.h soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_core.c soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/hwpmc_mod.c soc2015/pratiksinghal/cubie-head/sys/dev/hwpmc/pmc_events.h soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_adminq.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_adminq.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_adminq_cmd.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_alloc.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_common.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_hmc.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_hmc.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_lan_hmc.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_lan_hmc.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_nvm.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_osdep.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_osdep.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_prototype.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_register.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_status.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_type.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/i40e_virtchnl.h (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/if_ixl.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/ixl/ixl_txrx.c (props changed) soc2015/pratiksinghal/cubie-head/sys/dev/mmc/mmc.c soc2015/pratiksinghal/cubie-head/sys/dev/sdhci/sdhci.c soc2015/pratiksinghal/cubie-head/sys/dev/sdhci/sdhci.h soc2015/pratiksinghal/cubie-head/sys/dev/sfxge/sfxge_tx.c soc2015/pratiksinghal/cubie-head/sys/dev/uart/uart_dev_ti8250.c soc2015/pratiksinghal/cubie-head/sys/dev/usb/controller/dwc_otg.c soc2015/pratiksinghal/cubie-head/sys/fs/nfsclient/nfs_clvnops.c soc2015/pratiksinghal/cubie-head/sys/fs/procfs/procfs_ctl.c soc2015/pratiksinghal/cubie-head/sys/geom/uncompress/g_uncompress.c soc2015/pratiksinghal/cubie-head/sys/i386/i386/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_condvar.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_exit.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_ktr.c soc2015/pratiksinghal/cubie-head/sys/kern/kern_shutdown.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_nvlist.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_nvpair.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_turnstile.c soc2015/pratiksinghal/cubie-head/sys/kern/subr_witness.c soc2015/pratiksinghal/cubie-head/sys/mips/conf/ROUTERSTATION soc2015/pratiksinghal/cubie-head/sys/mips/conf/RSPRO soc2015/pratiksinghal/cubie-head/sys/mips/mips/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/mips/mips/pmap.c soc2015/pratiksinghal/cubie-head/sys/mips/mips/vm_machdep.c soc2015/pratiksinghal/cubie-head/sys/modules/Makefile soc2015/pratiksinghal/cubie-head/sys/net80211/ieee80211_freebsd.c soc2015/pratiksinghal/cubie-head/sys/netinet/tcp_hostcache.c soc2015/pratiksinghal/cubie-head/sys/netinet/tcp_input.c soc2015/pratiksinghal/cubie-head/sys/netipsec/key.c soc2015/pratiksinghal/cubie-head/sys/netipsec/keysock.c soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/dn_sched.h soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/ip_dn_private.h soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/ip_fw_pfil.c soc2015/pratiksinghal/cubie-head/sys/netpfil/ipfw/ip_fw_sockopt.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf_if.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf_ioctl.c soc2015/pratiksinghal/cubie-head/sys/netpfil/pf/pf_norm.c soc2015/pratiksinghal/cubie-head/sys/powerpc/powerpc/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/sparc64/sparc64/db_disasm.c soc2015/pratiksinghal/cubie-head/sys/sys/condvar.h soc2015/pratiksinghal/cubie-head/sys/sys/elf_common.h soc2015/pratiksinghal/cubie-head/sys/sys/ktr.h soc2015/pratiksinghal/cubie-head/sys/sys/module.h soc2015/pratiksinghal/cubie-head/sys/sys/nvpair_impl.h soc2015/pratiksinghal/cubie-head/sys/sys/pmc.h soc2015/pratiksinghal/cubie-head/sys/sys/systm.h soc2015/pratiksinghal/cubie-head/sys/vm/vm_page.c soc2015/pratiksinghal/cubie-head/sys/x86/x86/cpu_machdep.c soc2015/pratiksinghal/cubie-head/tests/sys/kern/Makefile soc2015/pratiksinghal/cubie-head/tools/build/mk/OptionalObsoleteFiles.inc soc2015/pratiksinghal/cubie-head/usr.bin/Makefile soc2015/pratiksinghal/cubie-head/usr.bin/ctlstat/ctlstat.8 soc2015/pratiksinghal/cubie-head/usr.bin/mandoc/Makefile soc2015/pratiksinghal/cubie-head/usr.bin/procstat/ (props changed) soc2015/pratiksinghal/cubie-head/usr.bin/procstat/procstat.1 soc2015/pratiksinghal/cubie-head/usr.bin/soelim/soelim.1 soc2015/pratiksinghal/cubie-head/usr.bin/soelim/soelim.c soc2015/pratiksinghal/cubie-head/usr.bin/tar/Makefile soc2015/pratiksinghal/cubie-head/usr.sbin/bhyve/ (props changed) soc2015/pratiksinghal/cubie-head/usr.sbin/bhyve/block_if.h soc2015/pratiksinghal/cubie-head/usr.sbin/bhyve/pci_hostbridge.c soc2015/pratiksinghal/cubie-head/usr.sbin/bhyvectl/ (props changed) soc2015/pratiksinghal/cubie-head/usr.sbin/bhyvectl/bhyvectl.c soc2015/pratiksinghal/cubie-head/usr.sbin/bluetooth/bthidd/Makefile soc2015/pratiksinghal/cubie-head/usr.sbin/ctladm/ctladm.8 soc2015/pratiksinghal/cubie-head/usr.sbin/ctld/ctld.8 soc2015/pratiksinghal/cubie-head/usr.sbin/iostat/iostat.8 soc2015/pratiksinghal/cubie-head/usr.sbin/uefisign/pe.c Modified: soc2015/pratiksinghal/cubie-head/Makefile.inc1 ============================================================================== --- soc2015/pratiksinghal/cubie-head/Makefile.inc1 Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/Makefile.inc1 Sat May 23 02:25:03 2015 (r285909) @@ -1297,7 +1297,9 @@ _lex= usr.bin/lex .endif -.if ${BOOTSTRAPPING} < 1001507 +# r277259 crunchide: Correct 64-bit section header offset +# r281674 crunchide: always include both 32- and 64-bit ELF support +.if ${BOOTSTRAPPING} < 1100071 _crunch= usr.sbin/crunch .endif @@ -1466,11 +1468,6 @@ _btxld= usr.sbin/btxld .endif .endif -.if ${TARGET_ARCH} != ${MACHINE_ARCH} -.if ${MK_RESCUE} != "no" -_crunchide= usr.sbin/crunch/crunchide -.endif -.endif # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" @@ -1505,6 +1502,9 @@ _cc= gnu/usr.bin/cc .endif .endif +.if ${MK_USB} != "no" +_usb_tools= sys/boot/usb/tools +.endif cross-tools: .MAKE .for _tool in \ @@ -1515,7 +1515,7 @@ ${_cc} \ ${_btxld} \ ${_crunchide} \ - sys/boot/usb/tools + ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ @@ -1679,7 +1679,7 @@ ${_kerberos5_lib_libhdb} \ ${_kerberos5_lib_libheimbase} \ ${_kerberos5_lib_libheimntlm} \ - ${_kerberos5_lib_libheimsqlite} \ + ${_libsqlite3} \ ${_kerberos5_lib_libheimipcc} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1755,6 +1755,13 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libzfs__L: lib/libgeom__L cddl/lib/libctf__L: lib/libz__L +# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built +# on select architectures though (see cddl/lib/Makefile) +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "arm" +_prebuild_libs+= lib/libproc lib/librtld_db +.endif .endif .if ${MK_CRYPT} != "no" @@ -1786,7 +1793,7 @@ kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \ - kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L + kerberos5/lib/libwind__L lib/libsqlite3__L kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ @@ -1799,7 +1806,7 @@ kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libheimbase__L: lib/libthr__L kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L -kerberos5/lib/libheimsqlite__L: lib/libthr__L +lib/libsqlite3__L: lib/libthr__L .endif .if ${MK_GSSAPI} != "no" @@ -1815,7 +1822,7 @@ _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite +_libsqlite3= lib/libsqlite3 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind _libcom_err= lib/libcom_err @@ -1829,6 +1836,16 @@ lib/libradius__L: lib/libmd__L .endif +lib/libproc__L: \ + ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L +.if ${MK_CXX} != "no" +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libproc__L: lib/libcxxrt__L +.else # This implies MK_GNUCXX != "no"; see lib/libproc +lib/libproc__L: gnu/lib/libsupc++__L +.endif +.endif + gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L .for _lib in ${_prereq_libs} Modified: soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc ============================================================================== --- soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/ObsoleteFiles.inc Sat May 23 02:25:03 2015 (r285909) @@ -38,6 +38,20 @@ # xargs -n1 | sort | uniq -d; # done +# 20150521 +OLD_FILES+=usr/bin/demandoc +OLD_FILES+=usr/share/man/man1/demandoc.1.gz +OLD_FILES+=usr/share/man/man3/mandoc.3.gz +OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz +# 20150520 +OLD_FILES+=usr/lib/libheimsqlite.a +OLD_FILES+=usr/lib/libheimsqlite.so +OLD_LIBS+=usr/lib/libheimsqlite.so.11 +OLD_FILES+=usr/lib/libheimsqlite_p.a +OLD_FILES+=usr/lib32/libheimsqlite.a +OLD_FILES+=usr/lib32/libheimsqlite.so +OLD_LIBS+=usr/lib32/libheimsqlite.so.11 +OLD_FILES+=usr/lib32/libheimsqlite_p.a # 20150506 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 Modified: soc2015/pratiksinghal/cubie-head/UPDATING ============================================================================== --- soc2015/pratiksinghal/cubie-head/UPDATING Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/UPDATING Sat May 23 02:25:03 2015 (r285909) @@ -31,6 +31,19 @@ disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150521: + TI platform code switched to using vendor DTS files and this update + may break existing systems running on Beaglebone, Beaglebone Black, + and Pandaboard: + + - dtb files should be regenerated/reinstalled. Filenames are the + same but content is different now + - GPIO addressing was changed, now each GPIO bank (32 pins per bank) + has its own /dev/gpiocX device, e.g. pin 121 on /dev/gpioc0 in old + addressing scheme is now pin 25 on /dev/gpioc3. + - Pandaboard: /etc/ttys should be updated, serial console device is + now /dev/ttyu2, not /dev/ttyu0 + 20150501: soelim(1) from gnu/usr.bin/groff has been replaced by usr.bin/soelim. If you need the GNU extension from groff soelim(1), install groff Modified: soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/ar_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -48,7 +48,6 @@ #include #include #include -#include #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/buf_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -44,7 +44,6 @@ #include #include #include -#include #include #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/cache.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/cache.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/cache.c Sat May 23 02:25:03 2015 (r285909) @@ -45,7 +45,6 @@ #include #include #include -#include #include #include "pax.h" #include "cache.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/cpio.c Sat May 23 02:25:03 2015 (r285909) @@ -45,8 +45,6 @@ #include #include #include -#include -#include #include "pax.h" #include "cpio.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/file_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -48,7 +48,6 @@ #include #include #include -#include #include "pax.h" #include "options.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/gen_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -45,8 +45,6 @@ #include #include #include -#include -#include #include #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/getoldopt.c Sat May 23 02:25:03 2015 (r285909) @@ -19,8 +19,7 @@ #include #include -#include "pax.h" -#include "extern.h" +int getoldopt(int, char **, const char *); int getoldopt(int argc, char **argv, const char *optstring) Modified: soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/pat_rep.c Sat May 23 02:25:03 2015 (r285909) @@ -43,9 +43,7 @@ #include #include #include -#include #include -#include #ifdef NET2_REGEX #include #else Modified: soc2015/pratiksinghal/cubie-head/bin/pax/pax.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/pax.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/pax.c Sat May 23 02:25:03 2015 (r285909) @@ -58,7 +58,6 @@ #include #include #include -#include #include "pax.h" #include "extern.h" static int gen_init(void); Modified: soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/sel_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -47,7 +47,6 @@ #include #include #include -#include #include #include "pax.h" #include "sel_subs.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/tar.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/tar.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/tar.c Sat May 23 02:25:03 2015 (r285909) @@ -44,8 +44,6 @@ #include #include #include -#include -#include #include "pax.h" #include "extern.h" #include "tar.h" Modified: soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/bin/pax/tty_subs.c Sat May 23 02:25:03 2015 (r285909) @@ -44,7 +44,6 @@ #include #include #include -#include #include #include "pax.h" #include "extern.h" Modified: soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/lib/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -33,4 +33,11 @@ _libdtrace= libdtrace .endif +SUBDIR_DEPEND_libdtrace= libctf +SUBDIR_DEPEND_libzfs_core= libnvpair +SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core +SUBDIR_DEPEND_libzpool= libavl libnvpair libumem + +SUBDIR_PARALLEL= + .include Modified: soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/lib/libdtrace/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -104,6 +104,8 @@ YFLAGS+=-d +LIBADD= ctf elf proc pthread rtld_db + CLEANFILES= dt_errtags.c dt_names.c dt_errtags.c: Modified: soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/sbin/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -13,4 +13,6 @@ _zpool= zpool .endif +SUBDIR_PARALLEL= + .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.bin/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -26,4 +26,6 @@ .endif .endif +SUBDIR_PARALLEL= + .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfconvert/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -3,8 +3,6 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt -DEBUG_FLAGS= -g - PROG= ctfconvert SRCS= alist.c \ ctf.c \ @@ -36,7 +34,6 @@ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= dwarf elf z pthread .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.bin/ctfdump/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -17,7 +17,6 @@ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ} -LDADD= -lpthread -lelf -lz +LIBADD= elf z .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -46,4 +46,6 @@ _lockstat= lockstat .endif +SUBDIR_PARALLEL= + .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/dtrace/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -20,9 +20,6 @@ #CFLAGS+= -DNEED_ERRLOC #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ - -lrtld_db +LIBADD= dtrace .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/lockstat/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -21,10 +21,6 @@ #YFLAGS+= -d -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBRT} ${LIBUTIL} \ - ${LIBRTLD_DB} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt -lutil \ - -lrtld_db +LIBADD= elf dtrace rt .include Modified: soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/cddl/usr.sbin/plockstat/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -18,9 +18,6 @@ -I${.CURDIR}/../../../cddl/lib/libdtrace \ -I${.CURDIR}/../../../sys -DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}\ - ${LIBELF} ${LIBZ} ${LIBRT} ${LIBRTLD_DB} ${LIBUTIL} -LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt \ - -lrtld_db -lutil +LIBADD= dtrace proc .include Modified: soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh ============================================================================== --- soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/atf_check_test.sh Sat May 23 02:25:03 2015 (r285909) @@ -164,18 +164,22 @@ grep '^failed: \${x} != \${y} (a != b)$' resfile } -atf_test_case flush_stdout_on_timeout -flush_stdout_on_timeout_body() +atf_test_case flush_stdout_on_death +flush_stdout_on_death_body() { - "$(atf_get_srcdir)/misc_helpers" -s "$(atf_get_srcdir)" atf_check_timeout \ - >out 2>err & + CONTROL_FILE="$(pwd)/done" "$(atf_get_srcdir)/misc_helpers" \ + -s "$(atf_get_srcdir)" atf_check_flush_stdout >out 2>err & pid="${!}" - sleep 1 - kill "${pid}" + while [ ! -f ./done ]; do + echo "Still waiting for helper to create control file" + ls + sleep 1 + done + kill -9 "${pid}" grep 'Executing command.*true' out \ || atf_fail 'First command not in output' - grep 'Executing command.*sleep 42' out \ + grep 'Executing command.*false' out \ || atf_fail 'Second command not in output' } @@ -187,7 +191,7 @@ atf_add_test_case null_stdout atf_add_test_case null_stderr atf_add_test_case equal - atf_add_test_case flush_stdout_on_timeout + atf_add_test_case flush_stdout_on_death } # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 Modified: soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh ============================================================================== --- soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/contrib/atf/atf-sh/misc_helpers.sh Sat May 23 02:25:03 2015 (r285909) @@ -139,16 +139,20 @@ atf_check_equal '${x}' '${y}' } -atf_test_case atf_check_timeout -atf_check_timeout_head() +atf_test_case atf_check_flush_stdout +atf_check_flush_stdout_head() { atf_set "descr" "Helper test case for the t_atf_check test program" - atf_set "timeout" 1 + atf_set "timeout" "30" } -atf_check_timeout_body() +atf_check_flush_stdout_body() { atf_check true - atf_check sleep 42 + atf_check -s exit:1 false + touch "${CONTROL_FILE:-done}" + while :; do + sleep 1 + done } # ------------------------------------------------------------------------- @@ -281,7 +285,7 @@ atf_add_test_case atf_check_equal_fail atf_add_test_case atf_check_equal_eval_ok atf_add_test_case atf_check_equal_eval_fail - atf_add_test_case atf_check_timeout + atf_add_test_case atf_check_flush_stdout # Add helper tests for t_config. atf_add_test_case config_get Modified: soc2015/pratiksinghal/cubie-head/include/stringlist.h ============================================================================== --- soc2015/pratiksinghal/cubie-head/include/stringlist.h Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/include/stringlist.h Sat May 23 02:25:03 2015 (r285909) @@ -12,11 +12,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED Modified: soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/kerberos5/lib/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -3,7 +3,7 @@ SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \ libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \ - libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs + libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs SUBDIR+= libkafs5 # requires krb_err.h from libkrb5 Modified: soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/kerberos5/lib/libhdb/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -3,7 +3,7 @@ LIB= hdb LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LIBADD= asn1 com_err krb5 roken heimsqlite +LIBADD= asn1 com_err krb5 roken sqlite3 DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 @@ -56,7 +56,7 @@ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \ + -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ -I${KRB5DIR}/lib/krb5 \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" Modified: soc2015/pratiksinghal/cubie-head/lib/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -65,7 +65,6 @@ ${_libldns} \ liblzma \ ${_libmagic} \ - libmandoc \ libmemstat \ libmd \ ${_libmilter} \ Modified: soc2015/pratiksinghal/cubie-head/lib/csu/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/csu/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/csu/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -1,8 +1,7 @@ # $FreeBSD$ -ARCH= ${MACHINE_ARCH:S/i386/i386-elf/} -.if exists(${.CURDIR}/${ARCH}) -SUBDIR+= ${ARCH} +.if exists(${.CURDIR}/${MACHINE_ARCH}) +SUBDIR+= ${MACHINE_ARCH} .else SUBDIR+= ${MACHINE_CPUARCH} .endif Modified: soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libc/gen/dlfcn.c Sat May 23 02:25:03 2015 (r285909) @@ -149,10 +149,8 @@ dl_init_phdr_info(void) { Elf_Auxinfo *auxp; - size_t phent; unsigned int i; - phent = 0; for (auxp = __elf_aux_vector; auxp->a_type != AT_NULL; auxp++) { switch (auxp->a_type) { case AT_BASE: @@ -165,9 +163,6 @@ phdr_info.dlpi_phdr = (const Elf_Phdr *)auxp->a_un.a_ptr; break; - case AT_PHENT: - phent = auxp->a_un.a_val; - break; case AT_PHNUM: phdr_info.dlpi_phnum = (Elf_Half)auxp->a_un.a_val; break; Modified: soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libc/gen/stringlist.c Sat May 23 02:25:03 2015 (r285909) @@ -10,8 +10,6 @@ * 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. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED Modified: soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libpmc/libpmc.c Sat May 23 02:25:03 2015 (r285909) @@ -82,6 +82,10 @@ static int armv7_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif +#if defined(__aarch64__) +static int arm64_allocate_pmc(enum pmc_event _pe, char *_ctrspec, + struct pmc_op_pmcallocate *_pmc_config); +#endif #if defined(__mips__) static int mips_allocate_pmc(enum pmc_event _pe, char* ctrspec, struct pmc_op_pmcallocate *_pmc_config); @@ -158,6 +162,7 @@ PMC_CLASSDEP_TABLE(p6, P6); PMC_CLASSDEP_TABLE(xscale, XSCALE); PMC_CLASSDEP_TABLE(armv7, ARMV7); +PMC_CLASSDEP_TABLE(armv8, ARMV8); PMC_CLASSDEP_TABLE(mips24k, MIPS24K); PMC_CLASSDEP_TABLE(mips74k, MIPS74K); PMC_CLASSDEP_TABLE(octeon, OCTEON); @@ -263,6 +268,16 @@ __PMC_EV_ALIAS_WESTMEREUC() }; +static const struct pmc_event_descr cortex_a53_event_table[] = +{ + __PMC_EV_ALIAS_ARMV8_CORTEX_A53() +}; + +static const struct pmc_event_descr cortex_a57_event_table[] = +{ + __PMC_EV_ALIAS_ARMV8_CORTEX_A57() +}; + /* * PMC_MDEP_TABLE(NAME, PRIMARYCLASS, ADDITIONAL_CLASSES...) * @@ -294,6 +309,8 @@ PMC_MDEP_TABLE(p6, P6, PMC_CLASS_SOFT, PMC_CLASS_TSC); PMC_MDEP_TABLE(xscale, XSCALE, PMC_CLASS_SOFT, PMC_CLASS_XSCALE); PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7); +PMC_MDEP_TABLE(cortex_a53, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8); +PMC_MDEP_TABLE(cortex_a57, ARMV8, PMC_CLASS_SOFT, PMC_CLASS_ARMV8); PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K); PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K); PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON); @@ -362,6 +379,10 @@ #endif PMC_CLASS_TABLE_DESC(armv7, ARMV7, armv7, armv7); #endif +#if defined(__aarch64__) +PMC_CLASS_TABLE_DESC(cortex_a53, ARMV8, cortex_a53, arm64); +PMC_CLASS_TABLE_DESC(cortex_a57, ARMV8, cortex_a57, arm64); +#endif #if defined(__mips__) PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips); PMC_CLASS_TABLE_DESC(mips74k, MIPS74K, mips74k, mips); @@ -402,9 +423,14 @@ __PMC_CAPS() }; -static const char * pmc_class_names[] = { +struct pmc_class_map { + enum pmc_class pm_class; + const char *pm_name; +}; + +static const struct pmc_class_map pmc_class_names[] = { #undef __PMC_CLASS -#define __PMC_CLASS(C) #C , +#define __PMC_CLASS(S,V,D) { .pm_class = PMC_CLASS_##S, .pm_name = #S } , __PMC_CLASSES() }; @@ -2429,6 +2455,26 @@ } #endif +#if defined(__aarch64__) +static struct pmc_event_alias cortex_a53_aliases[] = { + EV_ALIAS(NULL, NULL) +}; +static struct pmc_event_alias cortex_a57_aliases[] = { + EV_ALIAS(NULL, NULL) +}; +static int +arm64_allocate_pmc(enum pmc_event pe, char *ctrspec __unused, + struct pmc_op_pmcallocate *pmc_config __unused) +{ + switch (pe) { + default: + break; + } + + return (0); +} +#endif + #if defined(__mips__) static struct pmc_event_alias mips24k_aliases[] = { @@ -2938,6 +2984,19 @@ ev = armv7_event_table; count = PMC_EVENT_TABLE_SIZE(armv7); break; + case PMC_CLASS_ARMV8: + switch (cpu_info.pm_cputype) { + default: + case PMC_CPU_ARMV8_CORTEX_A53: + ev = cortex_a53_event_table; + count = PMC_EVENT_TABLE_SIZE(cortex_a53); + break; + case PMC_CPU_ARMV8_CORTEX_A57: + ev = cortex_a57_event_table; + count = PMC_EVENT_TABLE_SIZE(cortex_a57); + break; + } + break; case PMC_CLASS_MIPS24K: ev = mips24k_event_table; count = PMC_EVENT_TABLE_SIZE(mips24k); @@ -3235,6 +3294,16 @@ pmc_class_table[n] = &armv7_class_table_descr; break; #endif +#if defined(__aarch64__) + case PMC_CPU_ARMV8_CORTEX_A53: + PMC_MDEP_INIT(cortex_a53); + pmc_class_table[n] = &cortex_a53_class_table_descr; + break; + case PMC_CPU_ARMV8_CORTEX_A57: + PMC_MDEP_INIT(cortex_a57); + pmc_class_table[n] = &cortex_a57_class_table_descr; + break; +#endif #if defined(__mips__) case PMC_CPU_MIPS_24K: PMC_MDEP_INIT(mips24k); @@ -3298,9 +3367,11 @@ const char * pmc_name_of_class(enum pmc_class pc) { - if ((int) pc >= PMC_CLASS_FIRST && - pc <= PMC_CLASS_LAST) - return (pmc_class_names[pc]); + size_t n; + + for (n = 0; n < PMC_TABLE_SIZE(pmc_class_names); n++) + if (pc == pmc_class_names[n].pm_class) + return (pmc_class_names[n].pm_name); errno = EINVAL; return (NULL); @@ -3446,6 +3517,19 @@ } else if (pe >= PMC_EV_ARMV7_FIRST && pe <= PMC_EV_ARMV7_LAST) { ev = armv7_event_table; evfence = armv7_event_table + PMC_EVENT_TABLE_SIZE(armv7); + } else if (pe >= PMC_EV_ARMV8_FIRST && pe <= PMC_EV_ARMV8_LAST) { + switch (cpu) { + case PMC_CPU_ARMV8_CORTEX_A53: + ev = cortex_a53_event_table; + evfence = cortex_a53_event_table + PMC_EVENT_TABLE_SIZE(cortex_a53); + break; + case PMC_CPU_ARMV8_CORTEX_A57: + ev = cortex_a57_event_table; + evfence = cortex_a57_event_table + PMC_EVENT_TABLE_SIZE(cortex_a57); + break; + default: /* Unknown CPU type. */ + break; + } } else if (pe >= PMC_EV_MIPS24K_FIRST && pe <= PMC_EV_MIPS24K_LAST) { ev = mips24k_event_table; evfence = mips24k_event_table + PMC_EVENT_TABLE_SIZE(mips24k); Modified: soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libproc/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -23,6 +23,8 @@ LIBADD+= supcplusplus .endif +LIBADD+= elf rtld_db util + .if ${MK_CDDL} != "no" LIBADD+= ctf IGNORE_PRAGMA= YES Modified: soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libprocstat/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -22,6 +22,36 @@ LIBADD= elf kvm util MAN= libprocstat.3 +MLINKS+=libprocstat.3 procstat_close.3 \ + libprocstat.3 procstat_freeargv.3 \ + libprocstat.3 procstat_freeauxv.3 \ + libprocstat.3 procstat_freeenvv.3 \ + libprocstat.3 procstat_freefiles.3 \ + libprocstat.3 procstat_freegroups.3 \ + libprocstat.3 procstat_freekstack.3 \ + libprocstat.3 procstat_freeprocs.3 \ + libprocstat.3 procstat_freevmmap.3 \ + libprocstat.3 procstat_get_pipe_info.3 \ + libprocstat.3 procstat_get_pts_info.3 \ + libprocstat.3 procstat_get_sem_info.3 \ + libprocstat.3 procstat_get_shm_info.3 \ + libprocstat.3 procstat_get_socket_info.3 \ + libprocstat.3 procstat_get_vnode_info.3 \ + libprocstat.3 procstat_getargv.3 \ + libprocstat.3 procstat_getauxv.3 \ + libprocstat.3 procstat_getenvv.3 \ + libprocstat.3 procstat_getfiles.3 \ + libprocstat.3 procstat_getgroups.3 \ + libprocstat.3 procstat_getkstack.3 \ + libprocstat.3 procstat_getosrel.3 \ + libprocstat.3 procstat_getpathname.3 \ + libprocstat.3 procstat_getprocs.3 \ + libprocstat.3 procstat_getrlimit.3 \ + libprocstat.3 procstat_getumask.3 \ + libprocstat.3 procstat_getvmmap.3 \ + libprocstat.3 procstat_open_core.3 \ + libprocstat.3 procstat_open_kvm.3 \ + libprocstat.3 procstat_open_sysctl.3 # XXX This is a hack. .if ${MK_CDDL} != "no" Modified: soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libprocstat/libprocstat.3 Sat May 23 02:25:03 2015 (r285909) @@ -24,25 +24,11 @@ .\" .\" $FreeBSD$ .\" -.Dd May 3, 2013 +.Dd May 18, 2015 .Dt LIBPROCSTAT 3 .Os .Sh NAME -.Nm procstat_open_core , -.Nm procstat_open_kvm , -.Nm procstat_open_sysctl , .Nm procstat_close , -.Nm procstat_getargv , -.Nm procstat_getauxv , -.Nm procstat_getenvv , -.Nm procstat_getfiles , -.Nm procstat_getgroups , -.Nm procstat_getkstack , -.Nm procstat_getosrel , -.Nm procstat_getpathname , -.Nm procstat_getprocs , -.Nm procstat_getumask , -.Nm procstat_getvmmap , .Nm procstat_freeargv , .Nm procstat_freeauxv , .Nm procstat_freeenvv , @@ -56,7 +42,22 @@ .Nm procstat_get_sem_info , .Nm procstat_get_shm_info , .Nm procstat_get_socket_info , -.Nm procstat_get_vnode_info +.Nm procstat_get_vnode_info , +.Nm procstat_getargv , +.Nm procstat_getauxv , +.Nm procstat_getenvv , +.Nm procstat_getfiles , +.Nm procstat_getgroups , +.Nm procstat_getkstack , +.Nm procstat_getosrel , +.Nm procstat_getpathname , +.Nm procstat_getprocs , +.Nm procstat_getrlimit , +.Nm procstat_getumask , +.Nm procstat_getvmmap , +.Nm procstat_open_core , +.Nm procstat_open_kvm , +.Nm procstat_open_sysctl .Nd library interface for file and process information retrieval .Sh LIBRARY .Lb libprocstat @@ -175,17 +176,24 @@ .Fa "struct kinfo_proc *kp" .Fa "unsigned int *count" .Fc +.Ft "struct kinfo_kstack *" +.Fo procstat_getkstack +.Fa "struct procstat *procstat" +.Fa "struct kinfo_proc *kp" +.Fa "unsigned int *count" +.Fc .Ft int .Fo procstat_getosrel .Fa "struct procstat *procstat" .Fa "struct kinfo_proc *kp" .Fa "int *osrelp" .Fc -.Ft "struct kinfo_kstack *" -.Fo procstat_getkstack +.Ft "int" +.Fo procstat_getpathname .Fa "struct procstat *procstat" .Fa "struct kinfo_proc *kp" -.Fa "unsigned int *count" +.Fa "char *pathname" +.Fa "size_t maxlen" .Fc .Ft "struct kinfo_proc *" .Fo procstat_getprocs @@ -195,13 +203,6 @@ .Fa "unsigned int *count" .Fc .Ft "int" -.Fo procstat_getpathname -.Fa "struct procstat *procstat" -.Fa "struct kinfo_proc *kp" -.Fa "char *pathname" -.Fa "size_t maxlen" -.Fc -.Ft "int" .Fo procstat_getrlimit .Fa "struct procstat *procstat" .Fa "struct kinfo_proc *kp" Modified: soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile ============================================================================== --- soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/lib/libufs/Makefile Sat May 23 02:25:03 2015 (r285909) @@ -21,7 +21,6 @@ WARNS?= 2 -DEBUG_FLAGS = -g CFLAGS+= -D_LIBUFS .if defined(LIBUFS_DEBUG) CFLAGS+= -D_LIBUFS_DEBUGGING Modified: soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 ============================================================================== --- soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/release/Makefile.ec2 Sat May 23 02:25:03 2015 (r285909) @@ -53,7 +53,7 @@ .endif /usr/local/bin/bsdec2-image-upload ${PUBLISH} \ ${.OBJDIR}/ec2.raw \ - "${TYPE} ${REVISION}-${BRANCH}${AMINAMESUFFIX}" \ - "${TYPE} ${REVISION}-${BRANCH}" \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} @touch ${.TARGET} Modified: soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors ============================================================================== --- soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors Sat May 23 01:17:50 2015 (r285908) +++ soc2015/pratiksinghal/cubie-head/release/Makefile.mirrors Sat May 23 02:25:03 2015 (r285909) @@ -18,19 +18,16 @@ FTPDIR?= ${RELEASEDIR}/ftp-stage STAGE_TARGETS?= iso-images-stage +.if defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET) +. if ${TARGET} == "arm" || ${EMBEDDED_TARGET} == "arm" +EMBEDDED= 1 +. endif +.endif + # snapshot .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" SNAPSHOT= 1 TLD?= ${FTPDIR}/snapshots -BUILDDATE!= date -j -f '%s' $$(stat -f "%c" ${.OBJDIR}/dist/base/bin/sh) +%Y%m%d -. if ${TARGET} == "arm" && ${TARGET_ARCH} == "armv6" -. if !defined(BOARDNAME) || empty(BOARDNAME) -BOARDNAME= ${KERNCONF} -. endif -_SNAP_SUFFIX:= -${BOARDNAME}-${BUILDDATE} -. else # not arm/armv6 -_SNAP_SUFFIX:= -${BUILDDATE} -. endif . for _D in /usr/bin /usr/local/bin . for _S in svnversion svnliteversion . if exists(${_D}/${_S}) @@ -38,9 +35,16 @@ . endif . endfor . endfor +. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh) +BUILDDATE!= cd ${.CURDIR} && date -j -f '%s' $$(stat -f "%c" ${.OBJDIR}/dist/base/bin/sh) +%Y%m%d +. else +BUILDDATE!= date +%Y%m%d +. endif . if exists(${SVNVERSION}) && !empty(SVNVERSION) SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile -_SNAP_SUFFIX:= ${_SNAP_SUFFIX}-r${SVNREVISION} +_SNAP_SUFFIX:= -r${SVNREVISION}-${BUILDDATE} +. else +_SNAP_SUFFIX:= -${BUILDDATE} . endif .else # release @@ -48,6 +52,20 @@ TLD?= ${FTPDIR}/releases .endif +.if defined(EMBEDDED) && !empty(EMBEDDED) +. if ${TARGET} == "arm" && ${TARGET_ARCH} == "armv6" +. if !defined(BOARDNAME) && empty(BOARDNAME) +BOARDNAME:= ${KERNCONF} +. else +OLDNAME:= ${KERNCONF} +. endif +. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" +SNAPSHOT= 1 +. endif +IMAGES:= ${BOARDNAME}.img +. endif # arm/armv6 +.endif # embedded + .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) STAGE_TARGETS+= vm-images-stage VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} @@ -68,8 +86,15 @@ .if exists(${RELEASEDIR}) @# Assume we have images to copy. . for IMAGE in ${IMAGES} + @# arm/armv6 IMX6 -> WANDBOARD, for example. +. if defined(OLDNAME) && !empty(OLDNAME) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Sat May 23 04:51:08 2015 Return-Path: Delivered-To: svn-soc-all@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 5614F6F6 for ; Sat, 23 May 2015 04:51:08 +0000 (UTC) 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 37E271E3E for ; Sat, 23 May 2015 04:51:08 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4N4p8vM022978 for ; Sat, 23 May 2015 04:51:08 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4N4p5xo022742 for svn-soc-all@FreeBSD.org; Sat, 23 May 2015 04:51:05 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Sat, 23 May 2015 04:51:05 GMT Message-Id: <201505230451.t4N4p5xo022742@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: r285910 - in soc2015/pratiksinghal/cubie-head/sys: arm/allwinner arm/conf 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: Sat, 23 May 2015 04:51:08 -0000 Author: pratiksinghal Date: Sat May 23 04:51:01 2015 New Revision: 285910 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285910 Log: Added the dma files with preliminary code Added: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.h Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard.dts soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Added: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c Sat May 23 04:51:01 2015 (r285910) @@ -0,0 +1,210 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include "a10_dma.h" + +/*Total no of channels for Dedicated and Nomal DMA */ +#define NNDMA 8 +#define NDDMA 8 + +enum a10_dma_channel_type { + NDMA, + DDMA +} ; + + +struct a10_dma_softc { + device_t a10_dma_dev ; + struct mtx a10_dma_mtx ; + bus_space_tag_t a10_dma_bst ; + bus_space_handle_t a10_dma_bsh ; + struct resource* a10_dma_mem_resource ; + struct resource* a10_dma_irq_resource ; + int a10_dma_mem_rid ; + int a10_dma_irq_rid ; + void* a10_dma_intrhand ; + #define BUFF_SIZE 64 +} ; + +struct a10_dma_channel { + bus_dma_tag_t a10_dma_tag ; + bus_dmamap_t a10_dma_map ; + uint32_t buff ; + uint32_t a10_dma_busaddr ; + enum a10_dma_channel_type a10_dma_channel_type ; + uint8_t in_use ; +} ; + +struct a10_dma_controller { + struct a10_dma_softc* sc ; + struct a10_dma_channel ddma_channels[NDDMA] ; + struct a10_dma_channel ndma_channels[NNDMA] ; + uint32_t nndma_channels_in_use ; + uint32_t nddma_channels_in_use ; +} ; + +static struct a10_dma_controller* a10_dma_cnt; + +static MALLOC_DEFINE(M_DMA_CONT, "memory for dma controller", "memory for dma controller") ; + +static int a10_dma_probe(device_t) ; +static int a10_dma_attach(device_t) ; +static int a10_dma_detach(device_t) ; +static void a10_dma_release_resources(device_t) ; + +static void a10_dma_intr(void*) ; + +/* Currently these two methods are implemented for only DDMA */ +uint8_t a10_get_dma_channel(void *fp(bus_space_tag_t, bus_space_handle_t, uint8_t)) ; +void a10_free_dma_channel(uint8_t, void *fp(bus_space_tag_t, bus_space_handle_t, uint8_t)) ; + +static int a10_dma_probe(device_t dev) +{ + if(!ofw_bus_status_okay(dev)) + return (ENXIO) ; + if(!ofw_bus_is_compatible(dev, "allwinner,sun4i-a10-dma")) + return (ENXIO) ; + + device_set_desc(dev, "Allwinner DMA Controller") ; + + return (BUS_PROBE_DEFAULT) ; +} + +static int a10_dma_attach(device_t dev) +{ + struct a10_dma_softc* sc; + sc = device_get_softc(dev) ; + sc->a10_dma_dev = dev ; + + mtx_init(&sc->a10_dma_mtx, device_get_nameunit(sc->a10_dma_dev),"a10_dma", MTX_DEF) ; + + sc->a10_dma_mem_resource = bus_alloc_resource_any(sc->a10_dma_dev, SYS_RES_MEMORY, &sc->a10_dma_mem_rid, RF_ACTIVE) ; + + if(sc->a10_dma_mem_resource == NULL) { + device_printf(dev, "Cannot allocate memory resource !\n") ; + a10_dma_release_resources(dev) ; + return (ENXIO) ; + } + + sc->a10_dma_bst = rman_get_bustag(sc->a10_dma_mem_resource) ; + sc->a10_dma_bsh = rman_get_bushandle(sc->a10_dma_mem_resource) ; + + sc->a10_dma_irq_resource = bus_alloc_resource_any(sc->a10_dma_dev, SYS_RES_IRQ, &sc->a10_dma_irq_rid, RF_ACTIVE | RF_SHAREABLE) ; + + if(sc->a10_dma_irq_resource == NULL) { + device_printf(dev, "Cannot allocate irq resource!\n") ; + a10_dma_release_resources(dev) ; + return (ENXIO) ; + } + + if(bus_setup_intr(sc->a10_dma_dev, sc->a10_dma_irq_resource, INTR_MPSAFE | INTR_TYPE_MISC, NULL,a10_dma_intr, sc, &sc->a10_dma_intrhand)) { + device_printf(dev, "Cannot setup interrupt handler!\n") ; + a10_dma_release_resources(dev) ; + return (ENXIO) ; + } + + + sc->a10_dma_intrhand = a10_dma_intr ; + + a10_dma_cnt = malloc(sizeof(struct a10_dma_controller), M_DMA_CONT, M_ZERO | M_WAITOK ) ; + a10_dma_cnt->sc = sc ; + + return (0) ; +} + +/* It is the responsibility of the allocater of DMA channel to deallocate its resources by making a call to the functions provided by our interface. +*/ + +static int a10_dma_detach(device_t dev) +{ + a10_dma_release_resources(dev) ; + return (0) ; +} + +static void a10_dma_release_resources(device_t dev) +{ + struct a10_dma_softc* sc = device_get_softc(dev) ; + + if(sc->a10_dma_mem_resource != NULL) + bus_release_resource(dev, SYS_RES_MEMORY,sc->a10_dma_mem_rid, sc->a10_dma_mem_resource) ; + + if(sc->a10_dma_irq_resource != NULL) { + bus_teardown_intr(dev, sc->a10_dma_mem_resource, sc->a10_dma_intrhand) ; + bus_release_resource(dev, SYS_RES_IRQ, sc->a10_dma_irq_rid, sc->a10_dma_irq_resource) ; + } + + free(a10_dma_cnt, M_DMA_CONT) ; +} + +/* Not implemented yet. */ +static void a10_dma_intr(void* ptr) +{ + //struct a10_dma_softc* sc = (struct a10_dma_softc*) ptr ; + return ; +} + +uint8_t a10_get_dma_channel(void *auto_config(bus_space_tag_t, bus_space_handle_t, uint8_t)) +{ + if(a10_dma_cnt->nddma_channels_in_use >= NDDMA) + return (NDDMA + 1) ; + uint8_t pos = NDDMA+1 ; + for(int i=0; iddma_channels[i].in_use == 0) + pos = i ; + } + if(pos > NDDMA) + return (pos) ; + + auto_config(a10_dma_cnt->sc->a10_dma_bst, a10_dma_cnt->sc->a10_dma_bsh,pos) ; + a10_dma_cnt->ddma_channels[pos].in_use = 1 ; + a10_dma_cnt->nddma_channels_in_use++ ; + a10_dma_cnt->ddma_channels[pos].a10_dma_channel_type = DDMA ; + device_printf(a10_dma_cnt->sc->a10_dma_dev, "Autoconfiguring of DDMA channel %u done.\n", pos) ; + return pos ; +} + +void a10_free_dma_channel(uint8_t pos, void* auto_config(bus_space_tag_t, bus_space_handle_t, uint8_t)) +{ + if((pos >= 8) || (pos < 0)) { + device_printf(a10_dma_cnt->sc->a10_dma_dev, "Invalid position %u while freeing dma channel!\n",pos) ; + return ; + } + + auto_config(a10_dma_cnt->sc->a10_dma_bst, a10_dma_cnt->sc->a10_dma_bsh, pos) ; + + a10_dma_cnt->ddma_channels[pos].in_use = 0 ; + a10_dma_cnt->nddma_channels_in_use-- ; + device_printf(a10_dma_cnt->sc->a10_dma_dev, "Freed DDMA Channel no %u\n", pos) ; +} + +static device_method_t a10_dma_methods[] = { + DEVMETHOD(device_probe, a10_dma_probe), + DEVMETHOD(device_attach, a10_dma_attach), + DEVMETHOD(device_detach, a10_dma_detach), + + DEVMETHOD_END +} ; + +static devclass_t a10_dma_devclass ; + +static driver_t a10_dma_driver = { + "a10_dma", + a10_dma_methods, + sizeof(struct a10_dma_softc) +} ; + +DRIVER_MODULE(a10_dma, simplebus, a10_dma_driver ,a10_dma_devclass,0,0) ; Added: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.h Sat May 23 04:51:01 2015 (r285910) @@ -0,0 +1,49 @@ +#ifndef AWIN_DMA_H +#define AWIN_DMA_H + +#include +#include + +#include + +/* module base address. */ +#define DMA (0x01C02000) + + +/* These are macros of Normal DMA. */ +#define DMA_IRQ_EN_REG (0x0000) +#define DMA_IRQ_PEND_STA_REG (0x0004) +#define NDMA_CTRL_REG(n) (0x100 + ((n)*0x20)) +#define NDMA_SRC_ADDR_REG(n) (0x100 + ((n)*0x20) + 4) +#define NDMA_DEST_ADDR_REG(n) (0x100 + ((n)*0x20) + 8) +#define NDMA_BC_REG(n) (0x100 + ((n)*0x20) + 0x0C ) + +/* These are macros of Dedicated DMA */ +#define DDMA_CFG_REG(n) (0x300 + ((n)*0x20) ) +#define DDMA_SRC_START_ADDR_REG(n) (0x300 + ((n)*0x20) + 4) +#define DDMA_DEST_START_ADDR_REG(n) (0x300 + ((n)*0x20) + 8) +#define DDMA_BC_REG(n) (0x300 + ((n)*0x20 ) + 0x0C ) +#define DDMA_PARA_REG(n) (0x300 + ((n)*0x20) + 0x18) + + +/* Macros to manipulate DMA_IRQ_EN_REG */ + +#define DDMA_IRQ_FULL_ENABLE(n) (1 << (17 + (2*(n)))) +#define DDMA_IRQ_FULL_DISABLE(n) (~(1 << (17 + (2*(n))))) +#define DDMA_IRQ_HALF_ENABLE(n) (1 << (16 + (2*(n)))) +#define DDMA_IRQ_HALF_DISABLE(n) (~(1 << (16 + (2*(n))))) + +#define NDMA_IRQ_FULL_ENABLE(n) (1 << (1 + (2*(n)))) +#define NDMA_IRQ_FULL_DISABLE(n) (~(1 << (1 + (2*(n))))) +#define NDMA_IRQ_HALF_ENABLE(n) (1 << (16 + (2*(n)))) +#define NDMA_IRQ_HALF_DISABLE(n) (~(1 << (16 + 2*(n)))) + +#define DMA_READ(_sc, reg) \ + bus_space_read_4((_sc)->a10_dma_bst, (_sc)->a10_dma_bsh, (reg)) +#define DMA_WRITE(_sc, reg, val) \ + bus_space_write_4((_sc)->a10_dma_bst, (_sc)->a10_dma_bsh, (reg), (val)) + +#define a10_dma_lock(_sc) mtx_lock(&(_sc)->a10_dma_mtx) +#define a10_dma_unlock(_sc) mtx_unlock(&(_sc)->a10_dma_mtx) + +#endif Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner Sat May 23 02:25:03 2015 (r285909) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/files.allwinner Sat May 23 04:51:01 2015 (r285910) @@ -7,6 +7,7 @@ arm/allwinner/a10_clk.c standard arm/allwinner/a10_common.c standard +arm/allwinner/a10_dma.c optional dma arm/allwinner/a10_ehci.c optional ehci arm/allwinner/a10_gpio.c optional gpio arm/allwinner/a10_machdep.c standard Modified: soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Sat May 23 02:25:03 2015 (r285909) +++ soc2015/pratiksinghal/cubie-head/sys/arm/conf/CUBIEBOARD Sat May 23 04:51:01 2015 (r285910) @@ -100,6 +100,9 @@ device emac +#DMA controller +device dma + # USB ethernet support, requires miibus device miibus Modified: soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard.dts ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard.dts Sat May 23 02:25:03 2015 (r285909) +++ soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/cubieboard.dts Sat May 23 04:51:01 2015 (r285910) @@ -61,7 +61,11 @@ status = "okay"; }; - emac@01c0b000 { + dma0: dma@01c02000 { + status = "okay" ; + } ; + +emac@01c0b000 { status = "okay"; }; }; 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 Sat May 23 02:25:03 2015 (r285909) +++ soc2015/pratiksinghal/cubie-head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi Sat May 23 04:51:01 2015 (r285910) @@ -111,6 +111,14 @@ status = "disabled"; }; + dma0: dma@01c02000 { + compatible = "allwinner,sun4i-a10-dma"; + reg = <0x01c02000 0x418>; + interrupts = <27>; + interrupt-parent = <&AINTC>; + status = "disabled"; + } ; + sata@01c18000 { compatible = "allwinner,sun4i-ahci"; reg = <0x01c18000 0x1000>; From owner-svn-soc-all@FreeBSD.ORG Sat May 23 10:08:59 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90905189 for ; Sat, 23 May 2015 10:08:59 +0000 (UTC) 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 7E2AC1C44 for ; Sat, 23 May 2015 10:08:59 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4NA8x9W036651 for ; Sat, 23 May 2015 10:08:59 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t4NA8wH4036647 for svn-soc-all@FreeBSD.org; Sat, 23 May 2015 10:08:58 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Sat, 23 May 2015 10:08:58 GMT Message-Id: <201505231008.t4NA8wH4036647@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: r285916 - 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: Sat, 23 May 2015 10:08:59 -0000 Author: pratiksinghal Date: Sat May 23 10:08:58 2015 New Revision: 285916 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=285916 Log: Fixed a typo and added some useful comments Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c Sat May 23 09:49:40 2015 (r285915) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_dma.c Sat May 23 10:08:58 2015 (r285916) @@ -17,7 +17,7 @@ #include "a10_dma.h" -/*Total no of channels for Dedicated and Nomal DMA */ +/*Total no of channels for Dedicated and Normal DMA */ #define NNDMA 8 #define NDDMA 8 @@ -65,6 +65,7 @@ static int a10_dma_attach(device_t) ; static int a10_dma_detach(device_t) ; static void a10_dma_release_resources(device_t) ; +static void a10_temp_setup_dma() ; static void a10_dma_intr(void*) ; @@ -153,7 +154,11 @@ /* Not implemented yet. */ static void a10_dma_intr(void* ptr) { - //struct a10_dma_softc* sc = (struct a10_dma_softc*) ptr ; + struct a10_dma_softc* sc = (struct a10_dma_softc*) ptr ; + if(DMA_READ(sc, DMA_IRQ_PEND_STA_REG)&DDMA_IRQ_FULL_ENABLE(0)) + device_printf(sc->a10_dma_dev, "DDMA channel 0 end transfer interrupt received on the dma controller.") ; + else + device_printf(sc->a10_dma_dev, "Unexpected interrupt received in a10_dma_intr") ; return ; } @@ -191,6 +196,11 @@ device_printf(a10_dma_cnt->sc->a10_dma_dev, "Freed DDMA Channel no %u\n", pos) ; } +void a10_temp_setup_dma() +{ + struct a10_dma_softc* sc = a10_dma_cnt->sc ; + DMA_WRITE(sc, DMA_IRQ_EN_REG,DDMA_IRQ_FULL_ENABLE(0)) ; +} static device_method_t a10_dma_methods[] = { DEVMETHOD(device_probe, a10_dma_probe), DEVMETHOD(device_attach, a10_dma_attach), @@ -208,3 +218,6 @@ } ; DRIVER_MODULE(a10_dma, simplebus, a10_dma_driver ,a10_dma_devclass,0,0) ; + +/* The application which wants to use the DMA needs to request a DMA channel and "autoconfigure" it and then handle its interrupts. */ +/* Specifically, (wrt MMC) the MMC driver will start the DMA transfer and then wait for the interrupt to occur. */ Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Sat May 23 09:49:40 2015 (r285915) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Sat May 23 10:08:58 2015 (r285916) @@ -310,6 +310,7 @@ "Spurious timeout - no active request\n"); } +/* We have to request the dma controller to transfer data in this function. */ static int a10_mmc_pio_transfer(struct a10_mmc_softc *sc, struct mmc_data *data) { @@ -319,6 +320,7 @@ buf = (uint32_t *)data->data; write = (data->flags & MMC_DATA_WRITE) ? 1 : 0; bit = write ? A10_MMC_FIFO_FULL : A10_MMC_FIFO_EMPTY; + uint32_t old_resid = sc->a10_resid ; for (i = sc->a10_resid; i < (data->len >> 2); i++) { if ((A10_MMC_READ_4(sc, A10_MMC_STAS) & bit)) return (1); @@ -328,7 +330,14 @@ buf[i] = A10_MMC_READ_4(sc, A10_MMC_FIFO); sc->a10_resid = i + 1; } - + if(!write) + { + device_printf(sc->a10_dev, "Transferred %d bytes from the card\n", (i-old_resid)*4 ) ; + } + else + { + device_printf(sc->a10_dev, "Wrote %d bytes to the card\n", (i-old_resid)*4 ) ; + } return (0); }