Procházet zdrojové kódy

qcacld-3.0: Disable the panic on the self-recovery ini disable

Currently once the gEnableSelfRecovery is disabled it is decided to panic
once the firmware complete firmware dump is collected, this has a 
side-effect when the normal SSR is triggered for testing purposes.
This reverts commit Ia184a265d0f76e43d1d5edc4bcc0849a05726dac.

Change-Id: Icec14a2afb902a275ffe0bf202ec75d8e58d9f58
CRs-Fixed: 2725430
Arun Kumar Khandavalli před 4 roky
rodič
revize
288bc9d412
2 změnil soubory, kde provedl 8 přidání a 14 odebrání
  1. 8 0
      core/cds/src/cds_api.c
  2. 0 14
      core/hdd/src/wlan_hdd_power.c

+ 8 - 0
core/cds/src/cds_api.c

@@ -1933,6 +1933,14 @@ static void cds_trigger_recovery_handler(const char *func, const uint32_t line)
 	cds_force_assert_target(qdf);
 	cds_set_assert_target_in_progress(false);
 
+	/*
+	 * if *wlan* recovery is disabled, once all the required registers are
+	 * read via the platform driver check and crash the system.
+	 */
+	if (qdf->bus_type == QDF_BUS_TYPE_PCI && !ssr_ini_enabled)
+		QDF_DEBUG_PANIC("WLAN recovery is not enabled (via %s:%d)",
+				func, line);
+
 	status = qdf_runtime_pm_allow_suspend(&rtl);
 	if (QDF_IS_STATUS_ERROR(status))
 		cds_err("Failed to release runtime pm lock");

+ 0 - 14
core/hdd/src/wlan_hdd_power.c

@@ -1309,8 +1309,6 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	struct hdd_context *hdd_ctx;
 	struct hdd_adapter *adapter;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
-	qdf_device_t qdf = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
-	bool ssr_ini_enabled = cds_is_self_recovery_enabled();
 
 	hdd_info("WLAN driver shutting down!");
 
@@ -1321,18 +1319,6 @@ QDF_STATUS hdd_wlan_shutdown(void)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!qdf) {
-		hdd_err("Qdf context is null");
-		return QDF_STATUS_E_INVAL;
-	}
-
-	/*
-	 * if *wlan* recovery is disabled, once all the required registers are
-	 * read via the platform driver check and crash the system.
-	 */
-	if (qdf->bus_type == QDF_BUS_TYPE_PCI && !ssr_ini_enabled)
-		QDF_DEBUG_PANIC("WLAN recovery is not enabled");
-
 	hdd_set_connection_in_progress(false);
 	policy_mgr_clear_concurrent_session_count(hdd_ctx->psoc);