From owner-svn-src-head@FreeBSD.ORG Tue Jan 6 07:43:10 2015 Return-Path: Delivered-To: svn-src-head@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 0D33AD44; Tue, 6 Jan 2015 07:43:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED3DF6430F; Tue, 6 Jan 2015 07:43:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t067h94D044422; Tue, 6 Jan 2015 07:43:09 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t067h8oT044415; Tue, 6 Jan 2015 07:43:08 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201501060743.t067h8oT044415@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 6 Jan 2015 07:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276741 - in head/sys/mips: atheros conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jan 2015 07:43:10 -0000 Author: adrian Date: Tue Jan 6 07:43:07 2015 New Revision: 276741 URL: https://svnweb.freebsd.org/changeset/base/276741 Log: Make the apb.c code optional behind ar71xx_apb rather than standard. The QCA955x has more mux interrupts going on - and the AR934x actually does, but I cheated and assigned wlan and pcie to the same interrupt line. They are, there's just a status register mux that I should've been using. Luckily this isn't too bad a change in itself - almost all of the Atheros MIPS configurations use a _BASE file to inherit from. Except PB92, which I should really fix up at some point. The AR934x will use the legacy apb for now until I write its replacement. The QCA955x SoC I'm doing bring-up on will have a separate qca955x_apb.c implementation that includes hooking into IP2/IP3 and doing further interrupt demuxing as appropriate. Modified: head/sys/mips/atheros/files.ar71xx head/sys/mips/conf/AR71XX_BASE head/sys/mips/conf/AR724X_BASE head/sys/mips/conf/AR91XX_BASE head/sys/mips/conf/AR933X_BASE head/sys/mips/conf/AR934X_BASE head/sys/mips/conf/PB92 Modified: head/sys/mips/atheros/files.ar71xx ============================================================================== --- head/sys/mips/atheros/files.ar71xx Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/atheros/files.ar71xx Tue Jan 6 07:43:07 2015 (r276741) @@ -1,6 +1,6 @@ # $FreeBSD$ -mips/atheros/apb.c standard +mips/atheros/apb.c optional ar71xx_apb mips/atheros/ar71xx_gpio.c optional gpio mips/atheros/ar71xx_machdep.c standard mips/atheros/ar71xx_ehci.c optional ehci Modified: head/sys/mips/conf/AR71XX_BASE ============================================================================== --- head/sys/mips/conf/AR71XX_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR71XX_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -110,6 +110,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR724X_BASE ============================================================================== --- head/sys/mips/conf/AR724X_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR724X_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -119,6 +119,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR91XX_BASE ============================================================================== --- head/sys/mips/conf/AR91XX_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR91XX_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -108,6 +108,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR933X_BASE ============================================================================== --- head/sys/mips/conf/AR933X_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR933X_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -113,6 +113,8 @@ device ar71xx_wdog device uart device uart_ar933x +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/AR934X_BASE ============================================================================== --- head/sys/mips/conf/AR934X_BASE Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/AR934X_BASE Tue Jan 6 07:43:07 2015 (r276741) @@ -117,6 +117,9 @@ device ar71xx_wdog device uart device uart_ar71xx +# XXX for now; later a separate APB mux is needed to demux PCI/WLAN interrupts. +device ar71xx_apb + device loop device ether device md Modified: head/sys/mips/conf/PB92 ============================================================================== --- head/sys/mips/conf/PB92 Tue Jan 6 07:41:30 2015 (r276740) +++ head/sys/mips/conf/PB92 Tue Jan 6 07:43:07 2015 (r276741) @@ -126,6 +126,8 @@ device ar71xx_wdog device uart device uart_ar71xx +device ar71xx_apb + # Network twiddling device loop device ether