Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16db88ba authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: move dump_csr and dump_fh to transport layer 



These are transport layer related. Move also the corresponding debugfs handlers.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 72012474

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+0 −130
Original line number Diff line number Diff line
@@ -1395,136 +1395,6 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid) 
	return ant;

}



static const char *get_csr_string(int cmd)

{

	switch (cmd) {

	IWL_CMD(CSR_HW_IF_CONFIG_REG);

	IWL_CMD(CSR_INT_COALESCING);

	IWL_CMD(CSR_INT);

	IWL_CMD(CSR_INT_MASK);

	IWL_CMD(CSR_FH_INT_STATUS);

	IWL_CMD(CSR_GPIO_IN);

	IWL_CMD(CSR_RESET);

	IWL_CMD(CSR_GP_CNTRL);

	IWL_CMD(CSR_HW_REV);

	IWL_CMD(CSR_EEPROM_REG);

	IWL_CMD(CSR_EEPROM_GP);

	IWL_CMD(CSR_OTP_GP_REG);

	IWL_CMD(CSR_GIO_REG);

	IWL_CMD(CSR_GP_UCODE_REG);

	IWL_CMD(CSR_GP_DRIVER_REG);

	IWL_CMD(CSR_UCODE_DRV_GP1);

	IWL_CMD(CSR_UCODE_DRV_GP2);

	IWL_CMD(CSR_LED_REG);

	IWL_CMD(CSR_DRAM_INT_TBL_REG);

	IWL_CMD(CSR_GIO_CHICKEN_BITS);

	IWL_CMD(CSR_ANA_PLL_CFG);

	IWL_CMD(CSR_HW_REV_WA_REG);

	IWL_CMD(CSR_DBG_HPET_MEM_REG);

	default:

		return "UNKNOWN";

	}

}



void iwl_dump_csr(struct iwl_priv *priv)

{

	int i;

	static const u32 csr_tbl[] = {

		CSR_HW_IF_CONFIG_REG,

		CSR_INT_COALESCING,

		CSR_INT,

		CSR_INT_MASK,

		CSR_FH_INT_STATUS,

		CSR_GPIO_IN,

		CSR_RESET,

		CSR_GP_CNTRL,

		CSR_HW_REV,

		CSR_EEPROM_REG,

		CSR_EEPROM_GP,

		CSR_OTP_GP_REG,

		CSR_GIO_REG,

		CSR_GP_UCODE_REG,

		CSR_GP_DRIVER_REG,

		CSR_UCODE_DRV_GP1,

		CSR_UCODE_DRV_GP2,

		CSR_LED_REG,

		CSR_DRAM_INT_TBL_REG,

		CSR_GIO_CHICKEN_BITS,

		CSR_ANA_PLL_CFG,

		CSR_HW_REV_WA_REG,

		CSR_DBG_HPET_MEM_REG

	};

	IWL_ERR(priv, "CSR values:\n");

	IWL_ERR(priv, "(2nd byte of CSR_INT_COALESCING is "

		"CSR_INT_PERIODIC_REG)\n");

	for (i = 0; i <  ARRAY_SIZE(csr_tbl); i++) {

		IWL_ERR(priv, "  %25s: 0X%08x\n",

			get_csr_string(csr_tbl[i]),

			iwl_read32(priv, csr_tbl[i]));

	}

}



static const char *get_fh_string(int cmd)

{

	switch (cmd) {

	IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG);

	IWL_CMD(FH_RSCSR_CHNL0_RBDCB_BASE_REG);

	IWL_CMD(FH_RSCSR_CHNL0_WPTR);

	IWL_CMD(FH_MEM_RCSR_CHNL0_CONFIG_REG);

	IWL_CMD(FH_MEM_RSSR_SHARED_CTRL_REG);

	IWL_CMD(FH_MEM_RSSR_RX_STATUS_REG);

	IWL_CMD(FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV);

	IWL_CMD(FH_TSSR_TX_STATUS_REG);

	IWL_CMD(FH_TSSR_TX_ERROR_REG);

	default:

		return "UNKNOWN";

	}

}



int iwl_dump_fh(struct iwl_priv *priv, char **buf, bool display)

{

	int i;

#ifdef CONFIG_IWLWIFI_DEBUG

	int pos = 0;

	size_t bufsz = 0;

#endif

	static const u32 fh_tbl[] = {

		FH_RSCSR_CHNL0_STTS_WPTR_REG,

		FH_RSCSR_CHNL0_RBDCB_BASE_REG,

		FH_RSCSR_CHNL0_WPTR,

		FH_MEM_RCSR_CHNL0_CONFIG_REG,

		FH_MEM_RSSR_SHARED_CTRL_REG,

		FH_MEM_RSSR_RX_STATUS_REG,

		FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV,

		FH_TSSR_TX_STATUS_REG,

		FH_TSSR_TX_ERROR_REG

	};

#ifdef CONFIG_IWLWIFI_DEBUG

	if (display) {

		bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;

		*buf = kmalloc(bufsz, GFP_KERNEL);

		if (!*buf)

			return -ENOMEM;

		pos += scnprintf(*buf + pos, bufsz - pos,

				"FH register values:\n");

		for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) {

			pos += scnprintf(*buf + pos, bufsz - pos,

				"  %34s: 0X%08x\n",

				get_fh_string(fh_tbl[i]),

				iwl_read_direct32(priv, fh_tbl[i]));

		}

		return pos;

	}

#endif

	IWL_ERR(priv, "FH register values:\n");

	for (i = 0; i <  ARRAY_SIZE(fh_tbl); i++) {

		IWL_ERR(priv, "  %34s: 0X%08x\n",

			get_fh_string(fh_tbl[i]),

			iwl_read_direct32(priv, fh_tbl[i]));

	}

	return 0;

}



/* notification wait support */

void iwlagn_init_notification_wait(struct iwl_priv *priv,

				   struct iwl_notification_wait *wait_entry,

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −2
Original line number Diff line number Diff line
@@ -375,8 +375,6 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, 
/*****************************************************

*  Error Handling Debugging

******************************************************/

void iwl_dump_csr(struct iwl_priv *priv);

int iwl_dump_fh(struct iwl_priv *priv, char **buf, bool display);

#ifdef CONFIG_IWLWIFI_DEBUG

void iwl_print_rx_config_cmd(struct iwl_priv *priv,

			     struct iwl_rxon_context *ctx);

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+0 −44
Original line number Diff line number Diff line
@@ -1991,27 +1991,6 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file, 
	return count;

}



static ssize_t iwl_dbgfs_csr_write(struct file *file,

					 const char __user *user_buf,

					 size_t count, loff_t *ppos)

{

	struct iwl_priv *priv = file->private_data;

	char buf[8];

	int buf_size;

	int csr;



	memset(buf, 0, sizeof(buf));

	buf_size = min(count, sizeof(buf) -  1);

	if (copy_from_user(buf, user_buf, buf_size))

		return -EFAULT;

	if (sscanf(buf, "%d", &csr) != 1)

		return -EFAULT;



	iwl_dump_csr(priv);



	return count;

}



static ssize_t iwl_dbgfs_ucode_tracing_read(struct file *file,

					char __user *user_buf,

					size_t count, loff_t *ppos) {
@@ -2088,25 +2067,6 @@ static ssize_t iwl_dbgfs_rxon_filter_flags_read(struct file *file, 
	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}



static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,

					 char __user *user_buf,

					 size_t count, loff_t *ppos)

{

	struct iwl_priv *priv = file->private_data;

	char *buf;

	int pos = 0;

	ssize_t ret = -EFAULT;



	ret = pos = iwl_dump_fh(priv, &buf, true);

	if (buf) {

		ret = simple_read_from_buffer(user_buf,

					      count, ppos, buf, pos);

		kfree(buf);

	}



	return ret;

}



static ssize_t iwl_dbgfs_missed_beacon_read(struct file *file,

					char __user *user_buf,

					size_t count, loff_t *ppos) {
@@ -2391,9 +2351,7 @@ DEBUGFS_READ_FILE_OPS(chain_noise); 
DEBUGFS_READ_FILE_OPS(power_save_status);

DEBUGFS_WRITE_FILE_OPS(clear_ucode_statistics);

DEBUGFS_WRITE_FILE_OPS(clear_traffic_statistics);

DEBUGFS_WRITE_FILE_OPS(csr);

DEBUGFS_READ_WRITE_FILE_OPS(ucode_tracing);

DEBUGFS_READ_FILE_OPS(fh_reg);

DEBUGFS_READ_WRITE_FILE_OPS(missed_beacon);

DEBUGFS_READ_WRITE_FILE_OPS(plcp_delta);

DEBUGFS_READ_WRITE_FILE_OPS(force_reset);
@@ -2448,8 +2406,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) 
	DEBUGFS_ADD_FILE(power_save_status, dir_debug, S_IRUSR);

	DEBUGFS_ADD_FILE(clear_ucode_statistics, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(clear_traffic_statistics, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(csr, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(fh_reg, dir_debug, S_IRUSR);

	DEBUGFS_ADD_FILE(missed_beacon, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(plcp_delta, dir_debug, S_IWUSR | S_IRUSR);

	DEBUGFS_ADD_FILE(force_reset, dir_debug, S_IWUSR | S_IRUSR);

drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ void iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index, 
******************************************************/

int iwl_dump_nic_event_log(struct iwl_priv *priv,

			   bool full_log, char **buf, bool display);

int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display);

void iwl_dump_csr(struct iwl_trans *trans);





static inline void iwl_disable_interrupts(struct iwl_trans *trans)

{

drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c

+2 −2
Original line number Diff line number Diff line
@@ -655,8 +655,8 @@ static void iwl_irq_handle_error(struct iwl_priv *priv) 
		priv->hw->wiphy->fw_version);



	iwl_dump_nic_error_log(priv);

	iwl_dump_csr(priv);

	iwl_dump_fh(priv, NULL, false);

	iwl_dump_csr(trans(priv));

	iwl_dump_fh(trans(priv), NULL, false);

	iwl_dump_nic_event_log(priv, false, NULL, false);

#ifdef CONFIG_IWLWIFI_DEBUG

	if (iwl_get_debug_level(priv->shrd) & IWL_DL_FW_ERRORS)