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

Commit 7d8c8377 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Dump device PCIe shadow registers for debug purpose"

parents b49093e4 22efa97d

drivers/net/wireless/cnss2/pci.c

+51 −1
Original line number Diff line number Diff line
@@ -103,6 +103,14 @@ static DEFINE_SPINLOCK(pci_link_down_lock); 


#define QCA6390_CE_REG_INTERVAL			0x2000



#define SHADOW_REG_COUNT			36

#define QCA6390_PCIE_SHADOW_REG_VALUE_0		0x1E03024

#define QCA6390_PCIE_SHADOW_REG_VALUE_35	0x1E030B0



#define SHADOW_REG_INTER_COUNT			43

#define QCA6390_PCIE_SHADOW_REG_INTER_0		0x1E05000

#define QCA6390_PCIE_SHADOW_REG_HUNG		0x1E050A8



#define QDSS_APB_DEC_CSR_BASE			0x1C01000



#define QDSS_APB_DEC_CSR_ETRIRQCTRL_OFFSET	0x6C
@@ -585,6 +593,43 @@ int cnss_pci_update_status(struct cnss_pci_data *pci_priv, 
	return 0;

}



static void cnss_pci_dump_shadow_reg(struct cnss_pci_data *pci_priv)

{

	int i, j = 0, array_size = SHADOW_REG_COUNT + SHADOW_REG_INTER_COUNT;

	gfp_t gfp = GFP_KERNEL;

	u32 reg_offset;



	if (cnss_pci_check_link_status(pci_priv))

		return;



	if (in_interrupt() || irqs_disabled())

		gfp = GFP_ATOMIC;



	if (!pci_priv->debug_reg) {

		pci_priv->debug_reg = devm_kzalloc(&pci_priv->pci_dev->dev,

						   sizeof(*pci_priv->debug_reg)

						   * array_size, gfp);

		if (!pci_priv->debug_reg)

			return;

	}



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



	for (i = 0; i < SHADOW_REG_COUNT; i++, j++) {

		reg_offset = QCA6390_PCIE_SHADOW_REG_VALUE_0 + i * 4;

		pci_priv->debug_reg[j].offset = reg_offset;

		pci_priv->debug_reg[j].val = cnss_pci_reg_read(pci_priv,

							       reg_offset);

	}



	for (i = 0; i < SHADOW_REG_INTER_COUNT; i++, j++) {

		reg_offset = QCA6390_PCIE_SHADOW_REG_INTER_0 + i * 4;

		pci_priv->debug_reg[j].offset = reg_offset;

		pci_priv->debug_reg[j].val = cnss_pci_reg_read(pci_priv,

							       reg_offset);

	}

}



#ifdef CONFIG_CNSS2_DEBUG

static void cnss_pci_collect_dump(struct cnss_pci_data *pci_priv)

{
@@ -1865,6 +1910,8 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv) 
	if (!plat_priv)

		return -ENODEV;



	cnss_pci_dump_shadow_reg(pci_priv);



	ret = cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_TRIGGER_RDDM);

	if (ret) {

		cnss_fatal_err("Failed to trigger RDDM, err = %d\n", ret);
@@ -2255,10 +2302,13 @@ static void cnss_pci_dump_qdss_reg(struct cnss_pci_data *pci_priv) 
	if (in_interrupt() || irqs_disabled())

		gfp = GFP_ATOMIC;



	if (!plat_priv->qdss_reg)

	if (!plat_priv->qdss_reg) {

		plat_priv->qdss_reg = devm_kzalloc(&pci_priv->pci_dev->dev,

						   sizeof(*plat_priv->qdss_reg)

						   * array_size, gfp);

		if (!plat_priv->qdss_reg)

			return;

	}



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

		reg_offset = QDSS_APB_DEC_CSR_BASE + qdss_csr[i].offset;

drivers/net/wireless/cnss2/pci.h

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ struct cnss_pci_reg { 
	u32 offset;

};



struct cnss_pci_debug_reg {

	u32 offset;

	u32 val;

};



struct cnss_pci_data {

	struct pci_dev *pci_dev;

	struct cnss_plat_data *plat_priv;
@@ -79,6 +84,7 @@ struct cnss_pci_data { 
	u32 remap_window;

	struct timer_list dev_rddm_timer;

	bool disable_pc;

	struct cnss_pci_debug_reg *debug_reg;

};



static inline void cnss_set_pci_priv(struct pci_dev *pci_dev, void *data)