Commit 13f028b4 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: tx: move handing sync/async host command to trans 



Handling host commands in a sync way is not directly related to PCIe
transport, and can serve as common logic for any transport, so move
it to trans layer.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210117164916.fde99af4e0f7.I4cab95919eb35cc5bfb26d32dcf5e15419d0e0ef@changeid


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

drivers/net/wireless/intel/iwlwifi/iwl-trans.c

+4 −1
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size, 
		return NULL;

	}



	/* Initialize the wait queue for commands */

	init_waitqueue_head(&trans->wait_command_queue);



	return trans;

}
@@ -161,7 +164,7 @@ int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
	if (trans->wide_cmd_header && !iwl_cmd_groupid(cmd->id))

		cmd->id = DEF_ID(cmd->id);



	ret = trans->ops->send_cmd(trans, cmd);

	ret = iwl_trans_txq_send_hcmd(trans, cmd);



	if (!(cmd->flags & CMD_ASYNC))

		lock_map_release(&trans->sync_cmd_lockdep_map);

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

+2 −0
Original line number Diff line number Diff line
@@ -918,6 +918,7 @@ struct iwl_trans_txqs { 
 * @pm_support: set to true in start_hw if link pm is supported

 * @ltr_enabled: set to true if the LTR is enabled

 * @wide_cmd_header: true when ucode supports wide command header format

 * @wait_command_queue: wait queue for sync commands

 * @num_rx_queues: number of RX queues allocated by the transport;

 *	the transport must set this before calling iwl_drv_start()

 * @iml_len: the length of the image loader
@@ -961,6 +962,7 @@ struct iwl_trans { 
	int command_groups_size;

	bool wide_cmd_header;



	wait_queue_head_t wait_command_queue;

	u8 num_rx_queues;



	size_t iml_len;

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+4 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ struct iwl_trans_pcie { 
	bool ucode_write_complete;

	bool sx_complete;

	wait_queue_head_t ucode_write_waitq;

	wait_queue_head_t wait_command_queue;

	wait_queue_head_t sx_waitq;



	u8 def_rx_queue;
@@ -797,4 +796,8 @@ void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans); 
void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);

void iwl_pcie_d3_complete_suspend(struct iwl_trans *trans,

				  bool test, bool reset);

int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,

			       struct iwl_host_cmd *cmd);

int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,

			  struct iwl_host_cmd *cmd);

#endif /* __iwl_trans_int_pcie_h__ */

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

+3 −4
Original line number Diff line number Diff line
@@ -1676,7 +1676,6 @@ irqreturn_t iwl_pcie_irq_rx_msix_handler(int irq, void *dev_id) 
 */

static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	int i;



	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */
@@ -1688,7 +1687,7 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans) 
			    APMG_PS_CTRL_VAL_RESET_REQ))) {

		clear_bit(STATUS_SYNC_HCMD_ACTIVE, &trans->status);

		iwl_op_mode_wimax_active(trans->op_mode);

		wake_up(&trans_pcie->wait_command_queue);

		wake_up(&trans->wait_command_queue);

		return;

	}
@@ -1703,7 +1702,7 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans) 
	iwl_trans_fw_error(trans);



	clear_bit(STATUS_SYNC_HCMD_ACTIVE, &trans->status);

	wake_up(&trans_pcie->wait_command_queue);

	wake_up(&trans->wait_command_queue);

}



static u32 iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
@@ -1818,7 +1817,7 @@ void iwl_pcie_handle_rfkill_irq(struct iwl_trans *trans) 
				       &trans->status))

			IWL_DEBUG_RF_KILL(trans,

					  "Rfkill while SYNC HCMD in flight\n");

		wake_up(&trans_pcie->wait_command_queue);

		wake_up(&trans->wait_command_queue);

	} else {

		clear_bit(STATUS_RFKILL_HW, &trans->status);

		if (trans_pcie->opmode_down)

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

+2 −5
Original line number Diff line number Diff line
@@ -3337,7 +3337,7 @@ static const struct iwl_trans_ops trans_ops_pcie = { 
	.start_fw = iwl_trans_pcie_start_fw,

	.stop_device = iwl_trans_pcie_stop_device,



	.send_cmd = iwl_trans_pcie_send_hcmd,

	.send_cmd = iwl_pcie_enqueue_hcmd,



	.tx = iwl_trans_pcie_tx,

	.reclaim = iwl_txq_reclaim,
@@ -3363,7 +3363,7 @@ static const struct iwl_trans_ops trans_ops_pcie_gen2 = { 
	.start_fw = iwl_trans_pcie_gen2_start_fw,

	.stop_device = iwl_trans_pcie_gen2_stop_device,



	.send_cmd = iwl_trans_pcie_gen2_send_hcmd,

	.send_cmd = iwl_pcie_gen2_enqueue_hcmd,



	.tx = iwl_txq_gen2_tx,

	.reclaim = iwl_txq_reclaim,
@@ -3498,9 +3498,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
	snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),

		 "PCI ID: 0x%04X:0x%04X", pdev->device, pdev->subsystem_device);



	/* Initialize the wait queue for commands */

	init_waitqueue_head(&trans_pcie->wait_command_queue);



	init_waitqueue_head(&trans_pcie->sx_waitq);