From owner-svn-src-all@freebsd.org Thu Feb 1 21:58:53 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5DE9BECD61B; Thu, 1 Feb 2018 21:58:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1189569C75; Thu, 1 Feb 2018 21:58:53 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0813212D53; Thu, 1 Feb 2018 21:58:53 +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 w11LwqHb000543; Thu, 1 Feb 2018 21:58:52 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w11Lwqwg000540; Thu, 1 Feb 2018 21:58:52 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201802012158.w11Lwqwg000540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 1 Feb 2018 21:58:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328754 - head/sys/mips/conf X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/mips/conf X-SVN-Commit-Revision: 328754 X-SVN-Commit-Repository: base 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.25 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: Thu, 01 Feb 2018 21:58:53 -0000 Author: adrian Date: Thu Feb 1 21:58:52 2018 New Revision: 328754 URL: https://svnweb.freebsd.org/changeset/base/328754 Log: [atheros] Fix-up the base address stuff after I did a drive-by with the calibration data location. The old way required the data to be present really early and copied it from memory mapped NOR flash; this only worked during kernel boot but not for ath/ath_hal modules. Tested: * AR9331, Carambola2, ath/hal modules. Modified: head/sys/mips/conf/AR933X_BASE.hints head/sys/mips/conf/std.AR933X Modified: head/sys/mips/conf/AR933X_BASE.hints ============================================================================== --- head/sys/mips/conf/AR933X_BASE.hints Thu Feb 1 21:41:15 2018 (r328753) +++ head/sys/mips/conf/AR933X_BASE.hints Thu Feb 1 21:58:52 2018 (r328754) @@ -9,6 +9,10 @@ hint.apb.0.at="nexus0" hint.apb.0.irq=4 +# ART calibration data mapping device +hint.ar71xx_caldata.0.at="nexus0" +hint.ar71xx_caldata.0.order=0 + # uart0 hint.uart.0.at="apb0" # NB: This isn't an ns8250 UART @@ -39,9 +43,13 @@ hint.ath.0.msize=0x20000 hint.ath.0.irq=0 hint.ath.0.vendor_id=0x168c hint.ath.0.device_id=0x0035 -# Set this to define where the ath calibration data -# should be fetched from in physical memory. -# hint.ath.0.eepromaddr=0x1fff1000 + +# Where the ART is - last 64k in the first 8MB of flash +#hint.ar71xx_caldata.0.map.0.ath_fixup_addr=0x1fff0000 +#hint.ar71xx_caldata.0.map.0.ath_fixup_size=16384 + +# And now tell the ath(4) driver where to look! +#hint.ath.0.eeprom_firmware="ar71xx_caldata.0.map.0.eeprom_firmware" # SPI flash hint.spi.0.at="nexus0" Modified: head/sys/mips/conf/std.AR933X ============================================================================== --- head/sys/mips/conf/std.AR933X Thu Feb 1 21:41:15 2018 (r328753) +++ head/sys/mips/conf/std.AR933X Thu Feb 1 21:58:52 2018 (r328754) @@ -62,6 +62,9 @@ makeoptions MODULES_OVERRIDE+="hwpmc_mips24k" option AH_SUPPORT_AR9330 # Chipset support option ATH_EEPROM_FIRMWARE # Use EEPROM from flash +# Support EEPROM caldata in AHB devices +options ATH_EEPROM_FIRMWARE + device usb device ehci