Merge "cnss2: Add pci link recovery check after the register dumps" (97f97fed) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/cnss2/pci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -4757,6 +4757,10 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
		return -EINVAL;

		cnss_auto_resume(&pci_priv->pci_dev->dev);
		mhi_debug_reg_dump(pci_priv->mhi_ctrl);
		cnss_pci_dump_misc_reg(pci_priv);
		cnss_pci_dump_shadow_reg(pci_priv);

		/* If link is still down here, directly trigger link down recovery */
		ret = cnss_pci_check_link_status(pci_priv);
		if (ret) {
		@@ -4764,10 +4768,6 @@ 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);

		ret = cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_TRIGGER_RDDM);
		if (ret) {
		if (!test_bit(CNSS_MHI_POWER_ON, &pci_priv->mhi_state) \|\|