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

Commit 729d9587 authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Trigger recovery when link is down before force RDDM 



If link is still down before force firmware assert, directly trigger
link down recovery instead of forcing RDDM.

Change-Id: Ie3e4c97c2ab42a1c426c6048ed839dfdd7f02462
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent 9fdd8ec8

drivers/net/wireless/cnss2/pci.c

+12 −4
Original line number Diff line number Diff line
@@ -366,19 +366,20 @@ int cnss_pci_check_link_status(struct cnss_pci_data *pci_priv) 
	u16 device_id;



	if (pci_priv->pci_link_state == PCI_LINK_DOWN) {

		cnss_pr_dbg("PCIe link is suspended\n");

		cnss_pr_dbg("%ps: PCIe link is suspended\n", (void *)_RET_IP_);

		return -EIO;

	}



	if (pci_priv->pci_link_down_ind) {

		cnss_pr_err("PCIe link is down\n");

		cnss_pr_err("%ps: PCIe link is down\n", (void *)_RET_IP_);

		return -EIO;

	}



	pci_read_config_word(pci_priv->pci_dev, PCI_DEVICE_ID, &device_id);

	if (device_id != pci_priv->device_id)  {

		cnss_fatal_err("PCI device ID mismatch, link possibly down, current read ID: 0x%x, record ID: 0x%x\n",

			       device_id, pci_priv->device_id);

		cnss_fatal_err("%ps: PCI device ID mismatch, link possibly down, current read ID: 0x%x, record ID: 0x%x\n",

			       (void *)_RET_IP_, device_id,

			       pci_priv->device_id);

		return -EIO;

	}
@@ -3918,6 +3919,13 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv) 
		return -EINVAL;



	cnss_auto_resume(&pci_priv->pci_dev->dev);

	/* If link is still down here, directly trigger link down recovery */

	ret = cnss_pci_check_link_status(pci_priv);

	if (ret) {

		cnss_pci_link_down(&pci_priv->pci_dev->dev);

		return 0;

	}



	cnss_pci_dump_misc_reg(pci_priv);

	cnss_pci_dump_shadow_reg(pci_priv);

	cnss_pci_dump_bl_sram_mem(pci_priv);