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

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

Merge "cnss2: Check if firmware asserts before power off for CBC"

parents 82ef5871 bba33b35

drivers/net/wireless/cnss2/pci.c

+7 −1
Original line number Diff line number Diff line
@@ -2159,7 +2159,8 @@ static int cnss_qca6290_shutdown(struct cnss_pci_data *pci_priv) 
	if ((test_bit(CNSS_DRIVER_LOADING, &plat_priv->driver_state) ||

	     test_bit(CNSS_DRIVER_UNLOADING, &plat_priv->driver_state) ||

	     test_bit(CNSS_DRIVER_IDLE_RESTART, &plat_priv->driver_state) ||

	     test_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state)) &&

	     test_bit(CNSS_DRIVER_IDLE_SHUTDOWN, &plat_priv->driver_state) ||

	     test_bit(CNSS_IN_COLD_BOOT_CAL, &plat_priv->driver_state)) &&

	    test_bit(CNSS_DEV_ERR_NOTIFY, &plat_priv->driver_state)) {

		del_timer(&pci_priv->dev_rddm_timer);

		cnss_pci_collect_dump(pci_priv);
@@ -4326,6 +4327,11 @@ void cnss_pci_collect_dump_info(struct cnss_pci_data *pci_priv, bool in_panic) 
		return;

	}



	if (!cnss_is_device_powered_on(plat_priv)) {

		cnss_pr_dbg("Device is already powered off, skip\n");

		return;

	}



	if (!in_panic) {

		mutex_lock(&pci_priv->bus_lock);

		ret = cnss_pci_check_link_status(pci_priv);