Commit fb70d49f authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove references to unsupported HW 



There are still some references to 3945 and 4965 HW, which were never
supported in iwlwifi.  These references were inherited from a previous
project and are irrelevant here.  Additionally, remove some irrelevant
references to 5100 HW.  Remove all these.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f4ca70ef

drivers/net/wireless/intel/iwlwifi/dvm/commands.h

+1 −7
Original line number Diff line number Diff line
@@ -311,11 +311,6 @@ enum { 


/**

 * rate_n_flags Tx antenna masks

 * 4965 has 2 transmitters

 * 5100 has 1 transmitter B

 * 5150 has 1 transmitter A

 * 5300 has 3 transmitters

 * 5350 has 3 transmitters

 * bit14:16

 */

#define RATE_MCS_ANT_POS	14
@@ -1230,7 +1225,6 @@ struct iwl_rx_mpdu_res_start { 
 */



/*

 * 4965 uCode updates these Tx attempt count values in host DRAM.

 * Used for managing Tx retries when expecting block-acks.

 * Driver should set these fields to 0.

 */
@@ -1540,7 +1534,7 @@ struct iwl_link_qual_general_params { 
	/* Best single antenna to use for single stream (legacy, SISO). */

	u8 single_stream_ant_msk;	/* LINK_QUAL_ANT_* */



	/* Best antennas to use for MIMO (unused for 4965, assumes both). */

	/* Best antennas to use for MIMO */

	u8 dual_stream_ant_msk;		/* LINK_QUAL_ANT_* */



	/*

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 


/*

 * CSR Hardware Revision Workaround Register.  Indicates hardware rev;

 * "step" determines CCK backoff for txpower calculation.  Used for 4965 only.

 * "step" determines CCK backoff for txpower calculation.

 * See also CSR_HW_REV register.

 * Bit fields:

 *  3-2:  0 = A, 1 = B, 2 = C, 3 = D step

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+5 −4
Original line number Diff line number Diff line
@@ -1842,8 +1842,8 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, 
	 * These bits say the device is running, and should keep running for

	 * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),

	 * but they do not indicate that embedded SRAM is restored yet;

	 * 3945 and 4965 have volatile SRAM, and must save/restore contents

	 * to/from host DRAM when sleeping/waking for power-saving.

	 * HW with volatile SRAM must save/restore contents to/from

	 * host DRAM when sleeping/waking for power-saving.

	 * Each direction takes approximately 1/4 millisecond; with this

	 * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a

	 * series of register accesses are expected (e.g. reading Event Log),
@@ -1851,8 +1851,9 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, 
	 *

	 * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that

	 * SRAM is okay/restored.  We don't check that here because this call

	 * is just for hardware register access; but GP1 MAC_SLEEP check is a

	 * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).

	 * is just for hardware register access; but GP1 MAC_SLEEP

	 * check is a good idea before accessing the SRAM of HW with

	 * volatile SRAM (e.g. reading Event Log).

	 *

	 * 5000 series and later (including 1000 series) have non-volatile SRAM,

	 * and do not save/restore SRAM when power cycling.