From owner-svn-src-stable@FreeBSD.ORG Tue Jan 15 05:11:30 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F14D67E4; Tue, 15 Jan 2013 05:11:29 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mx1.freebsd.org (Postfix) with ESMTP id 0007A8AB; Tue, 15 Jan 2013 05:11:28 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id 15so2430313wgd.4 for ; Mon, 14 Jan 2013 21:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=RZRC4bynF/R8BeWlMRKjzehxP770ixMCB6ZP+9QgIC4=; b=a59G4HtvL6TKbWmCu0UanqBMFFh78tVqk2t0xBi1SkHYeB9ullBDQ9WRPDx8RNGY/4 rEaIklW5Jut2w3uAN/6qqPXoYPZPDnvXcLx8ajaFcc7m2Y9C7yZbOpo3vd4jqHZIv62Q vzs7tkmCx2fhleh6dFzqV+zE59XAwc+69l6OkhGvvjzx9m4bGkFXYie8IuMwaQ7bmwof PiZGdexVIV68DXLOyDP08y2ACdEOEQfJEaTRIHRG6JW5z8i/abwsz0Q57DM0Qux3UuL3 yCw/3wHfmXkDBzUykLQFf9DEgmi5zhPm8+UbTfCeByNKI6uHXKuNIVIJyrFHHYhTTLCl AOlA== MIME-Version: 1.0 Received: by 10.180.8.130 with SMTP id r2mr1258053wia.28.1358226687698; Mon, 14 Jan 2013 21:11:27 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.217.57.9 with HTTP; Mon, 14 Jan 2013 21:11:27 -0800 (PST) In-Reply-To: <201301141931.r0EJVjMp001935@svn.freebsd.org> References: <201301141931.r0EJVjMp001935@svn.freebsd.org> Date: Mon, 14 Jan 2013 21:11:27 -0800 X-Google-Sender-Auth: gRHHfR28jvG7bRIKYlmrCxkgs9Q Message-ID: Subject: Re: svn commit: r245429 - in stable/9/sys/dev/ath/ath_hal: . ar9002 From: Adrian Chadd To: Dimitry Andric Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 05:11:30 -0000 .. I think this may have broken STABLE-9? Have you test built it? Adrian On 14 January 2013 11:31, Dimitry Andric wrote: > 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;