From owner-svn-src-all@FreeBSD.ORG Tue Jan 6 07:37:35 2015 Return-Path: Delivered-To: svn-src-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 160ADAD2; Tue, 6 Jan 2015 07:37:35 +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 02B8766340; Tue, 6 Jan 2015 07:37:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t067bYch040264; Tue, 6 Jan 2015 07:37:34 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t067bYq8040262; Tue, 6 Jan 2015 07:37:34 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201501060737.t067bYq8040262@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:37:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276739 - head/sys/mips/atheros 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.18-1 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: Tue, 06 Jan 2015 07:37:35 -0000 Author: adrian Date: Tue Jan 6 07:37:33 2015 New Revision: 276739 URL: https://svnweb.freebsd.org/changeset/base/276739 Log: Add an APB base/size for the QCA955X for an upcoming QCA955x specific APB mux. It's larger than the AR71xx because it needs to replace the nexus for some devices (notably wifi) and the wifi driver (if_ath_ahb.c) reads the SPI data directly at early boot whilst it's memory mapped in. I'm eventually going to rip it out and replace it with a firmware interface similar to what exists for the if_ath_pci.c path - something early on (likely something new that I'll write) will suck in the calibration data into a firmware API blob and that'll be accessed from if_ath_ahb.c. But, one thing at a time. Tested: * QCA955x SoC, AP135 development board Modified: head/sys/mips/atheros/qca955xreg.h Modified: head/sys/mips/atheros/qca955xreg.h ============================================================================== --- head/sys/mips/atheros/qca955xreg.h Tue Jan 6 07:35:05 2015 (r276738) +++ head/sys/mips/atheros/qca955xreg.h Tue Jan 6 07:37:33 2015 (r276739) @@ -35,6 +35,19 @@ #define REV_ID_MAJOR_QCA9558 0x1130 #define QCA955X_REV_ID_REVISION_MASK 0xf +/* Big enough to cover APB and SPI, and most peripherals */ +/* + * it needs to cover SPI because right now the if_ath_ahb + * code uses rman to map in the SPI address into memory + * to read data instead of us squirreling it away at early + * boot-time and using the firmware interface. + * + * if_ath_ahb.c should use the same firmware interface + * that if_ath_pci.c uses. + */ +#define QCA955X_APB_BASE 0x18000000 +#define QCA955X_APB_SIZE 0x08000000 + #define QCA955X_PCI_MEM_BASE0 0x10000000 #define QCA955X_PCI_MEM_BASE1 0x12000000 #define QCA955X_PCI_MEM_SIZE 0x02000000