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

Commit 84fac3d9 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwl_dump_fh to agn 



The iwl_dump_fh function is only used
by the agn module, so it can be there
instead of being exported by the core.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent fed73292

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

+61 −0
Original line number Diff line number Diff line
@@ -2291,3 +2291,64 @@ void iwl_dump_csr(struct iwl_priv *priv) 
			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

	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;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv); 
int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control);

void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control);

void iwl_dump_csr(struct iwl_priv *priv);

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



/* rx */

void iwlagn_rx_queue_restock(struct iwl_priv *priv);

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

+0 −63
Original line number Diff line number Diff line
@@ -2351,69 +2351,6 @@ void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len) 
EXPORT_SYMBOL(iwl_update_stats);

#endif



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

	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;

}

EXPORT_SYMBOL(iwl_dump_fh);



static void iwl_force_rf_reset(struct iwl_priv *priv)

{

	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

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

+0 −1
Original line number Diff line number Diff line
@@ -659,7 +659,6 @@ int iwl_pci_resume(struct pci_dev *pdev); 
void iwl_dump_nic_error_log(struct iwl_priv *priv);

int iwl_dump_nic_event_log(struct iwl_priv *priv,

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

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);