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

Commit 241ff88b authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Refactor registers dump APIs 



cnss_pci_dump_misc_reg() is meant to dump WLAN related registers, so
move dumping MHI registers out of it. Rename cnss_pci_dump_registers()
to cnss_pci_dump_debug_reg() for better understanding and consistency
with other registers dump APIs.

Change-Id: Ibf1e59f34eac78ae1cd375ac13170917f7ea05d3
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent d32d40d9

drivers/net/wireless/cnss2/pci.c

+9 −6
Original line number Diff line number Diff line
@@ -2340,7 +2340,6 @@ static void cnss_pci_dump_misc_reg(struct cnss_pci_data *pci_priv) 
	if (cnss_pci_check_link_status(pci_priv))

		return;



	mhi_debug_reg_dump(pci_priv->mhi_ctrl);

	cnss_pci_misc_reg_dump(pci_priv, pci_priv->wcss_reg,

			       WCSS_REG_SIZE, "wcss");

	cnss_pci_misc_reg_dump(pci_priv, pci_priv->pcie_reg,
@@ -4644,6 +4643,8 @@ static void cnss_pci_dump_qdss_reg(struct cnss_pci_data *pci_priv) 
			return;

	}



	cnss_pr_dbg("Start to dump qdss registers\n");



	for (i = 0; qdss_csr[i].name; i++) {

		reg_offset = QDSS_APB_DEC_CSR_BASE + qdss_csr[i].offset;

		if (cnss_pci_reg_read(pci_priv, reg_offset,
@@ -4697,13 +4698,13 @@ static void cnss_pci_dump_ce_reg(struct cnss_pci_data *pci_priv, 
	}

}



static void cnss_pci_dump_registers(struct cnss_pci_data *pci_priv)

static void cnss_pci_dump_debug_reg(struct cnss_pci_data *pci_priv)

{

	cnss_pr_dbg("Start to dump debug registers\n");



	if (cnss_pci_check_link_status(pci_priv))

		return;



	cnss_pr_dbg("Start to dump debug registers\n");



	mhi_debug_reg_dump(pci_priv->mhi_ctrl);

	cnss_pci_dump_ce_reg(pci_priv, CNSS_CE_COMMON);

	cnss_pci_dump_ce_reg(pci_priv, CNSS_CE_09);
@@ -4734,6 +4735,7 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv) 
		return 0;

	}



	mhi_debug_reg_dump(pci_priv->mhi_ctrl);

	cnss_pci_dump_misc_reg(pci_priv);

	cnss_pci_dump_shadow_reg(pci_priv);
@@ -4745,7 +4747,7 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv) 
			return 0;

		}

		cnss_fatal_err("Failed to trigger RDDM, err = %d\n", ret);

		cnss_pci_dump_registers(pci_priv);

		cnss_pci_dump_debug_reg(pci_priv);

		cnss_schedule_recovery(&pci_priv->pci_dev->dev,

				       CNSS_REASON_DEFAULT);

		return ret;
@@ -4907,6 +4909,7 @@ void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic) 
			return;

	}



	mhi_debug_reg_dump(pci_priv->mhi_ctrl);

	cnss_pci_dump_misc_reg(pci_priv);

	cnss_pci_dump_shadow_reg(pci_priv);

	cnss_pci_dump_qdss_reg(pci_priv);
@@ -4915,7 +4918,7 @@ void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic) 
	if (ret) {

		cnss_fatal_err("Failed to download RDDM image, err = %d\n",

			       ret);

		cnss_pci_dump_registers(pci_priv);

		cnss_pci_dump_debug_reg(pci_priv);

		return;

	}