 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iwm.c,v 1.16 2015/03/02 12:07:27 nonaka Exp $	*/
+/*	$NetBSD: if_iwm.c,v 1.17 2015/03/03 09:10:45 nonaka Exp $	*/
 /*	OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp	*/
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 @@ -95,27 +95,27 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.16 2015/03/02 12:07:27 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.17 2015/03/03 09:10:45 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 @@ -1479,45 +1479,47 @@ iwm_apm_init(struct iwm_softc *sc)
 	/*
 	 * Wait for clock stabilization; once stabilized, access to
 	 * device-internal resources is supported, e.g. iwm_write_prph()
 	 * and accesses to uCode SRAM.
 	 */
 	if (!iwm_poll_bit(sc, IWM_CSR_GP_CNTRL,
 	    IWM_CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
 	    IWM_CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000)) {
 		aprint_error_dev(sc->sc_dev,
 		    "timeout waiting for clock stabilization\n");
 		goto out;
+	}
-	/*
+	if (sc->host_interrupt_operation_mode) {
-	 * This is a bit of an abuse - This is needed for 7260 / 3160
+		/*
-	 * only check host_interrupt_operation_mode even if this is
+		 * This is a bit of an abuse - This is needed for 7260 / 3160
-	 * not related to host_interrupt_operation_mode.
+		 * only check host_interrupt_operation_mode even if this is
 		 * not related to host_interrupt_operation_mode.
 	 * Enable the oscillator to count wake up time for L1 exit. This
-	 * consumes slightly more power (100uA) - but allows to be sure
+		 * Enable the oscillator to count wake up time for L1 exit. This
-	 * that we wake up from L1 on time.
+		 * consumes slightly more power (100uA) - but allows to be sure
 		 * that we wake up from L1 on time.
 	 * This looks weird: read twice the same register, discard the
-	 * value, set a bit, and yet again, read that same register
+		 * This looks weird: read twice the same register, discard the
-	 * just to discard the value. But that's the way the hardware
+		 * value, set a bit, and yet again, read that same register
-	 * seems to like it.
+		 * just to discard the value. But that's the way the hardware
-	 */
+		 * seems to like it.
-	iwm_read_prph(sc, IWM_OSC_CLK);
+		 */
-	iwm_read_prph(sc, IWM_OSC_CLK);
+		iwm_read_prph(sc, IWM_OSC_CLK);
-	iwm_set_bits_prph(sc, IWM_OSC_CLK, IWM_OSC_CLK_FORCE_CONTROL);
+		iwm_read_prph(sc, IWM_OSC_CLK);
-	iwm_read_prph(sc, IWM_OSC_CLK);
+		iwm_set_bits_prph(sc, IWM_OSC_CLK, IWM_OSC_CLK_FORCE_CONTROL);
-	iwm_read_prph(sc, IWM_OSC_CLK);
+		iwm_read_prph(sc, IWM_OSC_CLK);
 		iwm_read_prph(sc, IWM_OSC_CLK);
+	}
 	/*
 	 * Enable DMA clock and wait for it to stabilize.
+	 *
 	 * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits
 	 * do not disable clocks.  This preserves any hardware bits already
 	 * set by default in "CLK_CTRL_REG" after reset.
 	 */
 	iwm_write_prph(sc, IWM_APMG_CLK_EN_REG, IWM_APMG_CLK_VAL_DMA_CLK_RQT);
 	//kpause("iwmapm", 0, mstohz(20), NULL);
 	DELAY(20);
 	/* Disable L1-Active */
 @@ -1722,27 +1724,30 @@ iwm_nic_rx_init(struct iwm_softc *sc)
 	 * Note: Linux driver also sets this:
 	 *  (IWM_RX_RB_TIMEOUT << IWM_FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) |
+	 *
 	 * It causes weird behavior.  YMMV.
 	 */
 	IWM_WRITE(sc, IWM_FH_MEM_RCSR_CHNL0_CONFIG_REG,
 	    IWM_FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL		|
 	    IWM_FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY		|  /* HW bug */
 	    IWM_FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL	|
 	    IWM_FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K		|
 	    IWM_RX_QUEUE_SIZE_LOG << IWM_FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS);
 	IWM_WRITE_1(sc, IWM_CSR_INT_COALESCING, IWM_HOST_INT_TIMEOUT_DEF);
 	IWM_SETBITS(sc, IWM_CSR_INT_COALESCING, IWM_HOST_INT_OPER_MODE);
 	/* W/A for interrupt coalescing bug in 7260 and 3160 */
 	if (sc->host_interrupt_operation_mode)
 		IWM_SETBITS(sc, IWM_CSR_INT_COALESCING, IWM_HOST_INT_OPER_MODE);
 	/*
 	 * Thus sayeth el jefe (iwlwifi) via a comment:
+	 *
 	 * This value should initially be 0 (before preparing any
  	 * RBs), should be 8 after preparing the first 8 RBs (for example)
 	 */
 	IWM_WRITE(sc, IWM_FH_RSCSR_CHNL0_WPTR, 8);
 	iwm_nic_unlock(sc);
 	return 0;
+}
 @@ -6680,34 +6685,37 @@ iwm_attach(device_t parent, device_t sel
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);
 		aprint_error("\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	sc->sc_wantresp = -1;
 	switch (PCI_PRODUCT(sc->sc_pciid)) {
 	case PCI_PRODUCT_INTEL_WIFI_LINK_7260_1:
 	case PCI_PRODUCT_INTEL_WIFI_LINK_7260_2:
 		sc->sc_fwname = "iwlwifi-7260-9.ucode";
 		sc->host_interrupt_operation_mode = 1;
 		break;
 	case PCI_PRODUCT_INTEL_WIFI_LINK_3160_1:
 	case PCI_PRODUCT_INTEL_WIFI_LINK_3160_2:
 		sc->sc_fwname = "iwlwifi-3160-9.ucode";
 		sc->host_interrupt_operation_mode = 1;
 		break;
 	case PCI_PRODUCT_INTEL_WIFI_LINK_7265_1:
 	case PCI_PRODUCT_INTEL_WIFI_LINK_7265_2:
 		sc->sc_fwname = "iwlwifi-7265-9.ucode";
 		sc->host_interrupt_operation_mode = 0;
 		break;
 	default:
 		aprint_error_dev(self, "unknown product %#x",
 		    PCI_PRODUCT(sc->sc_pciid));
 		return;
+	}
 	DPRINTF(("%s: firmware=%s\n", DEVNAME(sc), sc->sc_fwname));
 	sc->sc_fwdmasegsz = IWM_FWDMASEGSZ;
 	/*
 	 * We now start fiddling with the hardware
 	 */

 @@ -1,15 +1,15 @@
-/*	$NetBSD: if_iwmvar.h,v 1.4 2015/02/16 13:22:19 nonaka Exp $	*/
+/*	$NetBSD: if_iwmvar.h,v 1.5 2015/03/03 09:10:45 nonaka Exp $	*/
-/*	OpenBSD: if_iwmvar.h,v 1.3 2015/02/07 07:10:44 phessler Exp 	*/
+/*	OpenBSD: if_iwmvar.h,v 1.7 2015/03/02 13:51:10 jsg Exp 	*/
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -463,26 +463,28 @@ struct iwm_softc {
 	struct work sc_eswk;
 	struct iwm_rx_phy_info sc_last_phy_info;
 	int sc_ampdu_ref;
 	struct iwm_int_sta sc_aux_sta;
 	/* phy contexts.  we only use the first one */
 	struct iwm_mvm_phy_ctxt sc_phyctxt[IWM_NUM_PHY_CTX];
 	struct iwm_notif_statistics sc_stats;
 	int sc_noise;
 	int host_interrupt_operation_mode;
 	struct bpf_if *		sc_drvbpf;
 	union {
 		struct iwm_rx_radiotap_header th;
 		uint8_t	pad[IEEE80211_RADIOTAP_HDRLEN];
 	} sc_rxtapu;
 #define sc_rxtap	sc_rxtapu.th
 	int			sc_rxtap_len;
 	union {
 		struct iwm_tx_radiotap_header th;
 		uint8_t	pad[IEEE80211_RADIOTAP_HDRLEN];
 	} sc_txtapu;