Merge "cnss2: Add support to handle new MHI status events" (0c7c276f) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/wireless/cnss2/pci.c

+52 −4

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#define WAKE_MSI_NAME "WAKE"

		#define FW_ASSERT_TIMEOUT 5000
		#define DEV_RDDM_TIMEOUT 5000

		#ifdef CONFIG_CNSS_EMULATION
		#define EMULATION_HW 1
		@@ -2008,6 +2009,34 @@ void cnss_pci_clear_dump_info(struct cnss_pci_data *pci_priv)
		plat_priv->ramdump_info_v2.dump_data_valid = false;
		}

		static char *cnss_mhi_notify_status_to_str(enum MHI_CB status)
		{
		switch (status) {
		case MHI_CB_IDLE:
		return "IDLE";
		case MHI_CB_EE_RDDM:
		return "RDDM";
		case MHI_CB_SYS_ERROR:
		return "SYS_ERROR";
		case MHI_CB_FATAL_ERROR:
		return "FATAL_ERROR";
		default:
		return "UNKNOWN";
		}
		};

		static void cnss_dev_rddm_timeout_hdlr(unsigned long data)
		{
		struct cnss_pci_data pci_priv = (struct cnss_pci_data )data;

		if (!pci_priv)
		return;

		cnss_pr_err("Timeout waiting for RDDM notification\n");

		cnss_schedule_recovery(&pci_priv->pci_dev->dev, CNSS_REASON_TIMEOUT);
		}

		static int cnss_mhi_link_status(struct mhi_controller mhi_ctrl, void priv)
		{
		struct cnss_pci_data *pci_priv = priv;
		@@ -2042,7 +2071,8 @@ static void cnss_mhi_notify_status(struct mhi_controller mhi_ctrl, void priv,

		plat_priv = pci_priv->plat_priv;

		cnss_pr_dbg("MHI status cb is called with reason %d\n", reason);
		cnss_pr_dbg("MHI status cb is called with reason %s(%d)\n",
		cnss_mhi_notify_status_to_str(reason), reason);

		if (test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state)) {
		cnss_pr_dbg("Driver unload is in progress, ignore device error\n");
		@@ -2050,7 +2080,23 @@ static void cnss_mhi_notify_status(struct mhi_controller mhi_ctrl, void priv,
		}

		switch (reason) {
		case MHI_CB_IDLE:
		return;
		case MHI_CB_FATAL_ERROR:
		set_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);
		del_timer(&plat_priv->fw_boot_timer);
		cnss_pci_update_status(pci_priv, CNSS_FW_DOWN);
		cnss_reason = CNSS_REASON_DEFAULT;
		break;
		case MHI_CB_SYS_ERROR:
		set_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);
		del_timer(&plat_priv->fw_boot_timer);
		mod_timer(&pci_priv->dev_rddm_timer,
		jiffies + msecs_to_jiffies(DEV_RDDM_TIMEOUT));
		cnss_pci_update_status(pci_priv, CNSS_FW_DOWN);
		return;
		case MHI_CB_EE_RDDM:
		del_timer(&pci_priv->dev_rddm_timer);
		cnss_reason = CNSS_REASON_RDDM;
		break;
		default:
		@@ -2058,9 +2104,6 @@ static void cnss_mhi_notify_status(struct mhi_controller mhi_ctrl, void priv,
		return;
		}

		set_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state);
		del_timer(&plat_priv->fw_boot_timer);

		cnss_schedule_recovery(&pci_priv->pci_dev->dev, cnss_reason);
		}

		@@ -2474,6 +2517,10 @@ static int cnss_pci_probe(struct pci_dev *pci_dev,
		break;
		case QCA6290_DEVICE_ID:
		case QCA6390_DEVICE_ID:
		setup_timer(&pci_priv->dev_rddm_timer,
		cnss_dev_rddm_timeout_hdlr,
		(unsigned long)pci_priv);

		ret = cnss_pci_enable_msi(pci_priv);
		if (ret)
		goto disable_bus;
		@@ -2530,6 +2577,7 @@ static void cnss_pci_remove(struct pci_dev *pci_dev)
		case QCA6390_DEVICE_ID:
		cnss_pci_unregister_mhi(pci_priv);
		cnss_pci_disable_msi(pci_priv);
		del_timer(&pci_priv->dev_rddm_timer);
		break;
		default:
		break;

drivers/net/wireless/cnss2/pci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ struct cnss_pci_data {
		u32 msi_ep_base_data;
		struct mhi_controller *mhi_ctrl;
		unsigned long mhi_state;
		struct timer_list dev_rddm_timer;
		bool disable_pc;
		};