From owner-svn-src-all@freebsd.org Wed May 3 05:45:44 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACF0AD5A46A; Wed, 3 May 2017 05:45:44 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E623CDF; Wed, 3 May 2017 05:45:44 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v435jhSO082765; Wed, 3 May 2017 05:45:43 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v435jhnm082762; Wed, 3 May 2017 05:45:43 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201705030545.v435jhnm082762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 3 May 2017 05:45:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317727 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2017 05:45:44 -0000 Author: adrian Date: Wed May 3 05:45:43 2017 New Revision: 317727 URL: https://svnweb.freebsd.org/changeset/base/317727 Log: [mips] default AR933x/AR934x to include mips24k hwpmc and limit umtx chain memory wastage. Tested: * AR933x SoC (Carambola2) * AR934x SoC (TP-Link WDR3600) Modified: head/sys/mips/conf/CARAMBOLA2 head/sys/mips/conf/std.AR933X head/sys/mips/conf/std.AR934X Modified: head/sys/mips/conf/CARAMBOLA2 ============================================================================== --- head/sys/mips/conf/CARAMBOLA2 Wed May 3 05:33:15 2017 (r317726) +++ head/sys/mips/conf/CARAMBOLA2 Wed May 3 05:45:43 2017 (r317727) @@ -24,6 +24,8 @@ hints "CARAMBOLA2.hints" # Board memory - 64MB options AR71XX_REALMEM=(64*1024*1024) +options EARLY_PRINTF + # i2c GPIO bus #device gpioiic #device iicbb Modified: head/sys/mips/conf/std.AR933X ============================================================================== --- head/sys/mips/conf/std.AR933X Wed May 3 05:33:15 2017 (r317726) +++ head/sys/mips/conf/std.AR933X Wed May 3 05:45:43 2017 (r317727) @@ -20,7 +20,7 @@ files "../atheros/files.ar71xx" hints "AR933X_BASE.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="gpio ar71xx if_gif if_vlan if_gre if_tap if_tun if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr hwpmc ipfw ipfw_nat libalias ipfw_nptv6 rtwn rtwn_usb rtwnfw otus otusfw" +makeoptions MODULES_OVERRIDE="gpio ar71xx if_gif if_vlan if_gre if_tap if_tun if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr hwpmc ipfw ipfw_nat libalias ipfw_nptv6 rtwn rtwn_usb rtwnfw otus otusfw hwpmc_mips24k" options DDB options KDB @@ -51,10 +51,10 @@ options VM_KMEM_SIZE_SCALE=1 options NBUF=128 # Limit UMTX hash size -# options UMTX_NUM_CHAINS=64 +options UMTX_CHAINS=64 # PMC -#options HWPMC_HOOKS +options HWPMC_HOOKS #device hwpmc #device hwpmc_mips24k Modified: head/sys/mips/conf/std.AR934X ============================================================================== --- head/sys/mips/conf/std.AR934X Wed May 3 05:33:15 2017 (r317726) +++ head/sys/mips/conf/std.AR934X Wed May 3 05:45:43 2017 (r317727) @@ -20,7 +20,7 @@ files "../atheros/files.ar71xx" hints "AR934X_BASE.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="gpio ar71xx if_gif if_vlan if_gre if_tap if_tun if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr hwpmc ipfw ipfw_nat libalias ipfw_nptv6 rtwn rtwn_usb rtwnfw otus otusfw" +makeoptions MODULES_OVERRIDE="gpio ar71xx if_gif if_vlan if_gre if_tap if_tun if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr hwpmc ipfw ipfw_nat libalias ipfw_nptv6 rtwn rtwn_usb rtwnfw otus otusfw hwpmc_mips24k" # makeoptions MODULES_OVERRIDE="" options DDB @@ -47,10 +47,10 @@ options NO_SYSCTL_DESCR options NBUF=128 # Limit UMTX hash size -# options UMTX_NUM_CHAINS=64 +options UMTX_CHAINS=64 # PMC -#options HWPMC_HOOKS +options HWPMC_HOOKS #device hwpmc #device hwpmc_mips24k