From owner-svn-src-head@FreeBSD.ORG  Wed Jun 26 04:53:34 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 30C1AEE8;
 Wed, 26 Jun 2013 04:53:34 +0000 (UTC)
 (envelope-from adrian@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 231541DA9;
 Wed, 26 Jun 2013 04:53:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5Q4rYIQ089692;
 Wed, 26 Jun 2013 04:53:34 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5Q4rY0s089691;
 Wed, 26 Jun 2013 04:53:34 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306260453.r5Q4rY0s089691@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 26 Jun 2013 04:53:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252238 - head/sys/contrib/dev/ath/ath_hal/ar9300
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jun 2013 04:53:34 -0000

Author: adrian
Date: Wed Jun 26 04:53:33 2013
New Revision: 252238
URL: http://svnweb.freebsd.org/changeset/base/252238

Log:
  If EEPROM data is provided by the AHB layer, copy it in.
  
  This is required for the flash layer code to correctly work.
  
  Tested:
  
  * AR9330 SoC (carambola 2)

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Wed Jun 26 04:46:43 2013	(r252237)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Wed Jun 26 04:53:33 2013	(r252238)
@@ -640,6 +640,12 @@ ar9300_attach(u_int16_t devid, HAL_SOFTC
     /* FreeBSD: to make OTP work for now, provide this.. */
     AH9300(ah)->ah_cal_mem = ath_hal_malloc(HOST_CALDATA_SIZE);
 
+    /*
+     * If eepromdata is not NULL, copy it it into ah_cal_mem.
+     */
+    if (eepromdata != NULL)
+        OS_MEMCPY(AH9300(ah)->ah_cal_mem, eepromdata, HOST_CALDATA_SIZE);
+
     /* XXX FreeBSD: enable RX mitigation */
     ah->ah_config.ath_hal_intr_mitigation_rx = 1;