From owner-svn-src-stable-9@FreeBSD.ORG Mon Jan 14 19:31:45 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B1782233; Mon, 14 Jan 2013 19:31:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 887FA28F; Mon, 14 Jan 2013 19:31:45 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0EJVj9s001937; Mon, 14 Jan 2013 19:31:45 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0EJVjMp001935; Mon, 14 Jan 2013 19:31:45 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201301141931.r0EJVjMp001935@svn.freebsd.org> From: Dimitry Andric Date: Mon, 14 Jan 2013 19:31:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245429 - in stable/9/sys/dev/ath/ath_hal: . ar9002 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 19:31:45 -0000 Author: dim Date: Mon Jan 14 19:31:44 2013 New Revision: 245429 URL: http://svnweb.freebsd.org/changeset/base/245429 Log: Partial MFC of r234508 (by adrian): "Upgrade" the AR9285 code to support PCI/ART EEPROM on flash. I've just verified that this boots on an Atheros AP91. I haven't verified it with traffic though, so YMMV. (This is a prerequisite for the coming clang 3.2 upgrade.) Modified: stable/9/sys/dev/ath/ath_hal/ah_eeprom_v4k.c stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/ath/ath_hal/ah_eeprom_v4k.c ============================================================================== --- stable/9/sys/dev/ath/ath_hal/ah_eeprom_v4k.c Mon Jan 14 18:01:19 2013 (r245428) +++ stable/9/sys/dev/ath/ath_hal/ah_eeprom_v4k.c Mon Jan 14 19:31:44 2013 (r245429) @@ -298,12 +298,12 @@ ath_hal_v4kEepromAttach(struct ath_hal * "%s Error reading Eeprom MAGIC\n", __func__); return HAL_EEREAD; } - } - HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s Eeprom Magic = 0x%x\n", - __func__, magic); - if (magic != AR5416_EEPROM_MAGIC) { - HALDEBUG(ah, HAL_DEBUG_ANY, "Bad magic number\n"); - return HAL_EEMAGIC; + HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s Eeprom Magic = 0x%x\n", + __func__, magic); + if (magic != AR5416_EEPROM_MAGIC) { + HALDEBUG(ah, HAL_DEBUG_ANY, "Bad magic number\n"); + return HAL_EEMAGIC; + } } ee = ath_hal_malloc(sizeof(HAL_EEPROM_v4k)); Modified: stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c ============================================================================== --- stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Mon Jan 14 18:01:19 2013 (r245428) +++ stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Mon Jan 14 19:31:44 2013 (r245429) @@ -134,6 +134,18 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s ar5416InitState(AH5416(ah), devid, sc, st, sh, status); + /* + * Use the "local" EEPROM data given to us by the higher layers. + * This is a private copy out of system flash. The Linux ath9k + * commit for the initial AR9130 support mentions MMIO flash + * access is "unreliable." -adrian + */ + if (eepromdata != AH_NULL) { + AH_PRIVATE(ah)->ah_eepromRead = ath_hal_EepromDataRead; + AH_PRIVATE(ah)->ah_eepromWrite = NULL; + ah->ah_eepromdata = eepromdata; + } + /* XXX override with 9285 specific state */ /* override 5416 methods for our needs */ AH5416(ah)->ah_initPLL = ar9280InitPLL;