svn commit: r227967 - stable/9/sys/dev/iwn

[Bernhard Schmidt]

Author: bschmidt
Date: Fri Nov 25 12:19:13 2011
New Revision: 227967
URL: http://svn.freebsd.org/changeset/base/227967

Log:
  MFC r227805:
  The DC calibration result obtained during initialization can't be
  passed over to the runtime firmware on 6050 devices. Instead let
  the runtime firmware do the calibration itself. This fixes support
  for the 6050 series devices.
  
  Submitted by:	kevlo
  Approved by:	re (kib)
  Obtained from:	OpenBSD
  Tested by:	lx, Tz-Huan Huang(earlier version)

Modified:
  stable/9/sys/dev/iwn/if_iwn.c
  stable/9/sys/dev/iwn/if_iwnreg.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/9/sys/dev/iwn/if_iwn.c	Fri Nov 25 10:30:29 2011	(r227966)
+++ stable/9/sys/dev/iwn/if_iwn.c	Fri Nov 25 12:19:13 2011	(r227967)
@@ -246,6 +246,7 @@ static int	iwn_send_sensitivity(struct i
 static int	iwn_set_pslevel(struct iwn_softc *, int, int, int);
 static int	iwn_send_btcoex(struct iwn_softc *);
 static int	iwn_send_advanced_btcoex(struct iwn_softc *);
+static int	iwn5000_runtime_calib(struct iwn_softc *);
 static int	iwn_config(struct iwn_softc *);
 static uint8_t	*ieee80211_add_ssid(uint8_t *, const uint8_t *, u_int);
 static int	iwn_scan(struct iwn_softc *);
@@ -2505,7 +2506,8 @@ iwn5000_rx_calib_results(struct iwn_soft
 	case IWN5000_PHY_CALIB_DC:
 		if ((sc->sc_flags & IWN_FLAG_INTERNAL_PA) == 0 &&
 		    (sc->hw_type == IWN_HW_REV_TYPE_5150 ||
-		     sc->hw_type >= IWN_HW_REV_TYPE_6000))
+		     sc->hw_type >= IWN_HW_REV_TYPE_6000) &&
+		     sc->hw_type != IWN_HW_REV_TYPE_6050)
 			idx = 0;
 		break;
 	case IWN5000_PHY_CALIB_LO:
@@ -4996,6 +4998,19 @@ iwn_send_advanced_btcoex(struct iwn_soft
 }
 
 static int
+iwn5000_runtime_calib(struct iwn_softc *sc)
+{
+	struct iwn5000_calib_config cmd;
+
+	memset(&cmd, 0, sizeof cmd);
+	cmd.ucode.once.enable = 0xffffffff;
+	cmd.ucode.once.start = IWN5000_CALIB_DC;
+	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
+	    "%s: configuring runtime calibration\n", __func__);
+	return iwn_cmd(sc, IWN5000_CMD_CALIB_CONFIG, &cmd, sizeof(cmd), 0);
+}
+
+static int
 iwn_config(struct iwn_softc *sc)
 {
 	struct iwn_ops *ops = &sc->ops;
@@ -5015,6 +5030,17 @@ iwn_config(struct iwn_softc *sc)
 		}
 	}
 
+	if (sc->hw_type == IWN_HW_REV_TYPE_6050) {
+		/* Configure runtime DC calibration. */
+		error = iwn5000_runtime_calib(sc);
+		if (error != 0) {
+			device_printf(sc->sc_dev,
+			    "%s: could not configure runtime calibration\n",
+			    __func__);
+			return error;
+		}
+	}
+
 	/* Configure valid TX chains for >=5000 Series. */
 	if (sc->hw_type != IWN_HW_REV_TYPE_4965) {
 		txmask = htole32(sc->txchainmask);

Modified: stable/9/sys/dev/iwn/if_iwnreg.h
==============================================================================
--- stable/9/sys/dev/iwn/if_iwnreg.h	Fri Nov 25 10:30:29 2011	(r227966)
+++ stable/9/sys/dev/iwn/if_iwnreg.h	Fri Nov 25 12:19:13 2011	(r227967)
@@ -739,6 +739,8 @@ struct iwn5000_wimax_coex {
 struct iwn5000_calib_elem {
 	uint32_t	enable;
 	uint32_t	start;
+#define	IWN5000_CALIB_DC	(1 << 1)
+
 	uint32_t	send;
 	uint32_t	apply;
 	uint32_t	reserved;