[Madwifi-cvs] revision 3946 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 3946
Author      : proski (Pavel Roskin)
Date        : 2009-02-12 21:58:46 +0100 (Thu, 12 Feb 2009)

Log Message :
On some platforms touching the bb registers when the phy is powered
down will cause a fault.  Check the phy power state before possibly
reading from the bb, this can happen as ar5212Reset intentionally
calls ar5212GetRfgain before bringing the bb out of reset (but we
do it here and not in the caller to guard against other possible uses).

Author: Sam Leffler
Reference: FreeBSD r187129

Affected Files:
* madwifi/branches/madwifi-free/hal/ar5212/ar5212_rfgain.c  updated             


Modified: madwifi/branches/madwifi-free/hal/ar5212/ar5212_rfgain.c
===================================================================
--- madwifi/branches/madwifi-free/hal/ar5212/ar5212_rfgain.c	2009-02-12 20:54:51 UTC (rev 3945)
+++ madwifi/branches/madwifi-free/hal/ar5212/ar5212_rfgain.c	2009-02-12 20:58:46 UTC (rev 3946)
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ar5212_rfgain.c,v 1.2 2008/11/19 21:23:01 sam Exp $
+ * $FreeBSD$
  */
 #include "opt_ah.h"
 
@@ -280,7 +280,8 @@
 	GAIN_VALUES *gv = &ahp->ah_gainValues;
 	uint32_t rddata, probeType;
 
-	if (!gv->active)
+	/* NB: beware of touching the BB when PHY is powered down */
+	if (!gv->active || !ahp->ah_phyPowerOn)
 		return HAL_RFGAIN_INACTIVE;
 
 	if (ahp->ah_rfgainState == HAL_RFGAIN_READ_REQUESTED) {