diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 201 | 
1 files changed, 160 insertions, 41 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index dd57a36ecb1..34d49e171fb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h @@ -5,7 +5,7 @@   *   * GPL LICENSE SUMMARY   * - * Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved. + * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of version 2 of the GNU General Public License as @@ -30,7 +30,7 @@   *   * BSD LICENSE   * - * Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved. + * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.   * All rights reserved.   *   * Redistribution and use in source and binary forms, with or without @@ -70,6 +70,7 @@  #include "iwl-debug.h"  #include "iwl-config.h"  #include "iwl-fw.h" +#include "iwl-op-mode.h"  /**   * DOC: Transport layer - what is it ? @@ -100,8 +101,7 @@   *	   start_fw   *   *	5) Then when finished (or reset): - *	   stop_fw (a.k.a. stop device for the moment) - *	   stop_hw + *	   stop_device   *   *	6) Eventually, the free function will be called.   */ @@ -176,19 +176,38 @@ struct iwl_rx_packet {  	u8 data[];  } __packed; +static inline u32 iwl_rx_packet_len(const struct iwl_rx_packet *pkt) +{ +	return le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; +} + +static inline u32 iwl_rx_packet_payload_len(const struct iwl_rx_packet *pkt) +{ +	return iwl_rx_packet_len(pkt) - sizeof(pkt->hdr); +} +  /**   * enum CMD_MODE - how to send the host commands ?   * - * @CMD_SYNC: The caller will be stalled until the fw responds to the command   * @CMD_ASYNC: Return right away and don't wait for the response - * @CMD_WANT_SKB: valid only with CMD_SYNC. The caller needs the buffer of the - *	response. The caller needs to call iwl_free_resp when done. + * @CMD_WANT_SKB: Not valid with CMD_ASYNC. The caller needs the buffer of + *	the response. The caller needs to call iwl_free_resp when done. + * @CMD_HIGH_PRIO: The command is high priority - it goes to the front of the + *	command queue, but after other high priority commands. valid only + *	with CMD_ASYNC. + * @CMD_SEND_IN_IDLE: The command should be sent even when the trans is idle. + * @CMD_MAKE_TRANS_IDLE: The command response should mark the trans as idle. + * @CMD_WAKE_UP_TRANS: The command response should wake up the trans + *	(i.e. mark it as non-idle).   */  enum CMD_MODE { -	CMD_SYNC		= 0,  	CMD_ASYNC		= BIT(0),  	CMD_WANT_SKB		= BIT(1),  	CMD_SEND_IN_RFKILL	= BIT(2), +	CMD_HIGH_PRIO		= BIT(3), +	CMD_SEND_IN_IDLE	= BIT(4), +	CMD_MAKE_TRANS_IDLE	= BIT(5), +	CMD_WAKE_UP_TRANS	= BIT(6),  };  #define DEF_CMD_PAYLOAD_SIZE 320 @@ -318,6 +337,29 @@ enum iwl_d3_status {  };  /** + * enum iwl_trans_status: transport status flags + * @STATUS_SYNC_HCMD_ACTIVE: a SYNC command is being processed + * @STATUS_DEVICE_ENABLED: APM is enabled + * @STATUS_TPOWER_PMI: the device might be asleep (need to wake it up) + * @STATUS_INT_ENABLED: interrupts are enabled + * @STATUS_RFKILL: the HW RFkill switch is in KILL position + * @STATUS_FW_ERROR: the fw is in error state + * @STATUS_TRANS_GOING_IDLE: shutting down the trans, only special commands + *	are sent + * @STATUS_TRANS_IDLE: the trans is idle - general commands are not to be sent + */ +enum iwl_trans_status { +	STATUS_SYNC_HCMD_ACTIVE, +	STATUS_DEVICE_ENABLED, +	STATUS_TPOWER_PMI, +	STATUS_INT_ENABLED, +	STATUS_RFKILL, +	STATUS_FW_ERROR, +	STATUS_TRANS_GOING_IDLE, +	STATUS_TRANS_IDLE, +}; + +/**   * struct iwl_trans_config - transport configuration   *   * @op_mode: pointer to the upper layer. @@ -344,12 +386,12 @@ struct iwl_trans_config {  	u8 cmd_queue;  	u8 cmd_fifo;  	const u8 *no_reclaim_cmds; -	int n_no_reclaim_cmds; +	unsigned int n_no_reclaim_cmds;  	bool rx_buf_size_8k;  	bool bc_table_dword;  	unsigned int queue_watchdog_timeout; -	const char **command_names; +	const char *const *command_names;  };  struct iwl_trans; @@ -361,9 +403,7 @@ struct iwl_trans;   *   * @start_hw: starts the HW- from that point on, the HW can send interrupts   *	May sleep - * @stop_hw: stops the HW- from that point on, the HW will be in low power but - *	will still issue interrupt if the HW RF kill is triggered unless - *	op_mode_leaving is true. + * @op_mode_leave: Turn off the HW RF kill indication if on   *	May sleep   * @start_fw: allocates and inits all the resources for the transport   *	layer. Also kick a fw image. @@ -371,8 +411,11 @@ struct iwl_trans;   * @fw_alive: called when the fw sends alive notification. If the fw provides   *	the SCD base address in SRAM, then provide it here, or 0 otherwise.   *	May sleep - * @stop_device:stops the whole device (embedded CPU put to reset) - *	May sleep + * @stop_device: stops the whole device (embedded CPU put to reset) and stops + *	the HW. From that point on, the HW will be in low power but will still + *	issue interrupt if the HW RF kill is triggered. This callback must do + *	the right thing and not crash even if start_hw() was called but not + *	start_fw(). May sleep   * @d3_suspend: put the device into the correct mode for WoWLAN during   *	suspend. This is optional, if not implemented WoWLAN will not be   *	supported. This callback may sleep. @@ -382,7 +425,7 @@ struct iwl_trans;   * @send_cmd:send a host command. Must return -ERFKILL if RFkill is asserted.   *	If RFkill is asserted in the middle of a SYNC host command, it must   *	return -ERFKILL straight away. - *	May sleep only if CMD_SYNC is set + *	May sleep only if CMD_ASYNC is not set   * @tx: send an skb   *	Must be atomic   * @reclaim: free packet until ssn. Returns a list of freed packets. @@ -392,8 +435,7 @@ struct iwl_trans;   *	this one. The op_mode must not configure the HCMD queue. May sleep.   * @txq_disable: de-configure a Tx queue to send AMPDUs   *	Must be atomic - * @wait_tx_queue_empty: wait until all tx queues are empty - *	May sleep + * @wait_tx_queue_empty: wait until tx queues are empty. May sleep.   * @dbgfs_register: add the dbgfs files under this directory. Files will be   *	automatically deleted.   * @write8: write a u8 to a register at offset ofs from the BAR @@ -414,13 +456,25 @@ struct iwl_trans;   * @release_nic_access: let the NIC go to sleep. The "flags" parameter   *	must be the same one that was sent before to the grab_nic_access.   * @set_bits_mask - set SRAM register according to value and mask. + * @ref: grab a reference to the transport/FW layers, disallowing + *	certain low power states + * @unref: release a reference previously taken with @ref. Note that + *	initially the reference count is 1, making an initial @unref + *	necessary to allow low power states. + * @dump_data: fill a data dump with debug data, maybe containing last + *	TX'ed commands and similar. When called with a NULL buffer and + *	zero buffer length, provide only the (estimated) required buffer + *	length. Return the used buffer length. + *	Note that the transport must fill in the proper file headers.   */  struct iwl_trans_ops {  	int (*start_hw)(struct iwl_trans *iwl_trans); -	void (*stop_hw)(struct iwl_trans *iwl_trans, bool op_mode_leaving); +	void (*op_mode_leave)(struct iwl_trans *iwl_trans);  	int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw,  			bool run_in_rfkill); +	int (*update_sf)(struct iwl_trans *trans, +			 struct iwl_sf_region *st_fwrd_space);  	void (*fw_alive)(struct iwl_trans *trans, u32 scd_addr);  	void (*stop_device)(struct iwl_trans *trans); @@ -440,7 +494,7 @@ struct iwl_trans_ops {  	void (*txq_disable)(struct iwl_trans *trans, int queue);  	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir); -	int (*wait_tx_queue_empty)(struct iwl_trans *trans); +	int (*wait_tx_queue_empty)(struct iwl_trans *trans, u32 txq_bm);  	void (*write8)(struct iwl_trans *trans, u32 ofs, u8 val);  	void (*write32)(struct iwl_trans *trans, u32 ofs, u32 val); @@ -460,6 +514,12 @@ struct iwl_trans_ops {  				   unsigned long *flags);  	void (*set_bits_mask)(struct iwl_trans *trans, u32 reg, u32 mask,  			      u32 value); +	void (*ref)(struct iwl_trans *trans); +	void (*unref)(struct iwl_trans *trans); + +#ifdef CONFIG_IWLWIFI_DEBUGFS +	u32 (*dump_data)(struct iwl_trans *trans, void *buf, u32 buflen); +#endif  };  /** @@ -479,6 +539,7 @@ enum iwl_trans_state {   * @ops - pointer to iwl_trans_ops   * @op_mode - pointer to the op_mode   * @cfg - pointer to the configuration + * @status: a bit-mask of transport status flags   * @dev - pointer to struct device * that represents the device   * @hw_id: a u32 with the ID of the device / subdevice.   *	Set during transport allocation. @@ -493,12 +554,14 @@ enum iwl_trans_state {   *	starting the firmware, used for tracing   * @rx_mpdu_cmd_hdr_size: used for tracing, amount of data before the   *	start of the 802.11 header in the @rx_mpdu_cmd + * @dflt_pwr_limit: default power limit fetched from the platform (ACPI)   */  struct iwl_trans {  	const struct iwl_trans_ops *ops;  	struct iwl_op_mode *op_mode;  	const struct iwl_cfg *cfg;  	enum iwl_trans_state state; +	unsigned long status;  	struct device *dev;  	u32 hw_rev; @@ -520,6 +583,8 @@ struct iwl_trans {  	struct lockdep_map sync_cmd_lockdep_map;  #endif +	u64 dflt_pwr_limit; +  	/* pointer to trans specific struct */  	/*Ensure that this pointer will always be aligned to sizeof pointer */  	char trans_specific[0] __aligned(sizeof(void *)); @@ -540,15 +605,14 @@ static inline int iwl_trans_start_hw(struct iwl_trans *trans)  	return trans->ops->start_hw(trans);  } -static inline void iwl_trans_stop_hw(struct iwl_trans *trans, -				     bool op_mode_leaving) +static inline void iwl_trans_op_mode_leave(struct iwl_trans *trans)  {  	might_sleep(); -	trans->ops->stop_hw(trans, op_mode_leaving); +	if (trans->ops->op_mode_leave) +		trans->ops->op_mode_leave(trans); -	if (op_mode_leaving) -		trans->op_mode = NULL; +	trans->op_mode = NULL;  	trans->state = IWL_TRANS_NO_FW;  } @@ -570,9 +634,21 @@ static inline int iwl_trans_start_fw(struct iwl_trans *trans,  	WARN_ON_ONCE(!trans->rx_mpdu_cmd); +	clear_bit(STATUS_FW_ERROR, &trans->status);  	return trans->ops->start_fw(trans, fw, run_in_rfkill);  } +static inline int iwl_trans_update_sf(struct iwl_trans *trans, +				      struct iwl_sf_region *st_fwrd_space) +{ +	might_sleep(); + +	if (trans->ops->update_sf) +		return trans->ops->update_sf(trans, st_fwrd_space); + +	return 0; +} +  static inline void iwl_trans_stop_device(struct iwl_trans *trans)  {  	might_sleep(); @@ -596,13 +672,44 @@ static inline int iwl_trans_d3_resume(struct iwl_trans *trans,  	return trans->ops->d3_resume(trans, status, test);  } +static inline void iwl_trans_ref(struct iwl_trans *trans) +{ +	if (trans->ops->ref) +		trans->ops->ref(trans); +} + +static inline void iwl_trans_unref(struct iwl_trans *trans) +{ +	if (trans->ops->unref) +		trans->ops->unref(trans); +} + +#ifdef CONFIG_IWLWIFI_DEBUGFS +static inline u32 iwl_trans_dump_data(struct iwl_trans *trans, +				      void *buf, u32 buflen) +{ +	if (!trans->ops->dump_data) +		return 0; +	return trans->ops->dump_data(trans, buf, buflen); +} +#endif +  static inline int iwl_trans_send_cmd(struct iwl_trans *trans,  				     struct iwl_host_cmd *cmd)  {  	int ret; -	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, -		  "%s bad state = %d", __func__, trans->state); +	if (unlikely(!(cmd->flags & CMD_SEND_IN_RFKILL) && +		     test_bit(STATUS_RFKILL, &trans->status))) +		return -ERFKILL; + +	if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status))) +		return -EIO; + +	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE)) { +		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state); +		return -EIO; +	}  	if (!(cmd->flags & CMD_ASYNC))  		lock_map_acquire_read(&trans->sync_cmd_lockdep_map); @@ -638,8 +745,11 @@ static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans,  static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,  			       struct iwl_device_cmd *dev_cmd, int queue)  { -	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, -		  "%s bad state = %d", __func__, trans->state); +	if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status))) +		return -EIO; + +	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE)) +		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);  	return trans->ops->tx(trans, skb, dev_cmd, queue);  } @@ -647,17 +757,14 @@ static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,  static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,  				     int ssn, struct sk_buff_head *skbs)  { -	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, -		  "%s bad state = %d", __func__, trans->state); +	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE)) +		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);  	trans->ops->reclaim(trans, queue, ssn, skbs);  }  static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue)  { -	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, -		  "%s bad state = %d", __func__, trans->state); -  	trans->ops->txq_disable(trans, queue);  } @@ -667,8 +774,8 @@ static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,  {  	might_sleep(); -	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, -		  "%s bad state = %d", __func__, trans->state); +	if (unlikely((trans->state != IWL_TRANS_FW_ALIVE))) +		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);  	trans->ops->txq_enable(trans, queue, fifo, sta_id, tid,  				 frame_limit, ssn); @@ -681,12 +788,13 @@ static inline void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue,  			     IWL_MAX_TID_COUNT, IWL_FRAME_LIMIT, 0);  } -static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans) +static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans, +						u32 txq_bm)  { -	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, -		  "%s bad state = %d", __func__, trans->state); +	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE)) +		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state); -	return trans->ops->wait_tx_queue_empty(trans); +	return trans->ops->wait_tx_queue_empty(trans, txq_bm);  }  static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans, @@ -758,7 +866,8 @@ static inline u32 iwl_trans_write_mem32(struct iwl_trans *trans, u32 addr,  static inline void iwl_trans_set_pmi(struct iwl_trans *trans, bool state)  { -	trans->ops->set_pmi(trans, state); +	if (trans->ops->set_pmi) +		trans->ops->set_pmi(trans, state);  }  static inline void @@ -778,6 +887,16 @@ iwl_trans_release_nic_access(struct iwl_trans *trans, unsigned long *flags)  	__release(nic_access);  } +static inline void iwl_trans_fw_error(struct iwl_trans *trans) +{ +	if (WARN_ON_ONCE(!trans->op_mode)) +		return; + +	/* prevent double restarts due to the same erroneous FW */ +	if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status)) +		iwl_op_mode_nic_error(trans->op_mode); +} +  /*****************************************************  * driver (transport) register/unregister functions  ******************************************************/  | 
