Merge "cnss2: Dump MHI and CE registers when force RDDM fails" (6141d14f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/cnss2/pci.c

+33 −32

Original line number	Diff line number	Diff line
		@@ -2765,38 +2765,6 @@ static void cnss_pci_free_m3_mem(struct cnss_pci_data *pci_priv)
		m3_mem->size = 0;
		}

		int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
		{
		int ret;
		struct cnss_plat_data *plat_priv;

		if (!pci_priv)
		return -ENODEV;

		plat_priv = pci_priv->plat_priv;
		if (!plat_priv)
		return -ENODEV;

		cnss_auto_resume(&pci_priv->pci_dev->dev);
		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) {
		cnss_fatal_err("Failed to trigger RDDM, err = %d\n", ret);
		cnss_schedule_recovery(&pci_priv->pci_dev->dev,
		CNSS_REASON_DEFAULT);
		return ret;
		}

		if (!test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state)) {
		mod_timer(&plat_priv->fw_boot_timer,
		jiffies + msecs_to_jiffies(FW_ASSERT_TIMEOUT));
		}

		return 0;
		}

		void cnss_pci_fw_boot_timeout_hdlr(struct cnss_pci_data *pci_priv)
		{
		if (!pci_priv)
		@@ -3317,6 +3285,39 @@ static void cnss_pci_dump_registers(struct cnss_pci_data *pci_priv)
		cnss_pci_dump_ce_reg(pci_priv, CNSS_CE_10);
		}

		int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
		{
		int ret;
		struct cnss_plat_data *plat_priv;

		if (!pci_priv)
		return -ENODEV;

		plat_priv = pci_priv->plat_priv;
		if (!plat_priv)
		return -ENODEV;

		cnss_auto_resume(&pci_priv->pci_dev->dev);
		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) {
		cnss_fatal_err("Failed to trigger RDDM, err = %d\n", ret);
		cnss_pci_dump_registers(pci_priv);
		cnss_schedule_recovery(&pci_priv->pci_dev->dev,
		CNSS_REASON_DEFAULT);
		return ret;
		}

		if (!test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state)) {
		mod_timer(&plat_priv->fw_boot_timer,
		jiffies + msecs_to_jiffies(FW_ASSERT_TIMEOUT));
		}

		return 0;
		}

		void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic)
		{
		struct cnss_plat_data *plat_priv = pci_priv->plat_priv;