--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -546,6 +546,48 @@ err_firmware_stop:
 	return ret;
 }
 
+#ifdef CONFIG_QCOM_QMI_HELPERS
+
+void ath11k_core_dump_bp_stats(struct ath11k_base *ab)
+{
+	int len = 0;
+	const int size = 4096;
+	char *buf;
+
+	buf = kzalloc(size, GFP_KERNEL);
+	if (!buf)
+		return;
+
+	len = ath11k_fill_bp_stats_buf(ab, buf, len, size - 1);
+
+	buf[len] = '\0';
+
+	ath11k_info(ab, "ATH11K Driver Stats\n%s\n", buf);
+
+	kfree(buf);
+}
+
+/* Print the driver stats and crash the system on receving this notification */
+int ath11k_core_ssr_notifier_cb(struct notifier_block *nb, unsigned long event,
+				void *data)
+{
+	struct ath11k_qmi *qmi = container_of(nb, struct ath11k_qmi, ssr_nb);
+
+	if (test_bit(ATH11K_FLAG_FW_RESTART_FOR_HOST, &qmi->ab->dev_flags)) {
+		return 0;
+	}
+	/* TODO: currently wcss uses "rproc" as its name, but since this might be
+	 * changed to correspondig name, the name is not compared now. Print the stats
+	 * only if the notification is received for the expected rproc */
+
+	ath11k_core_dump_bp_stats(qmi->ab);
+	/* TODO Add more driver stats */
+
+	/* Crash the system once all the stats are dumped */
+	BUG_ON(1);
+}
+#endif
+
 int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab)
 {
 	int ret;
@@ -591,6 +633,17 @@ int ath11k_core_qmi_firmware_ready(struc
 		ath11k_err(ab, "failed to create pdev core: %d\n", ret);
 		goto err_core_stop;
 	}
+
+#ifdef CONFIG_QCOM_QMI_HELPERS
+	/* Register a notifier after mac registration
+	 * to be called on fw crash
+	 */
+	if (ab->hif.bus == ATH11K_BUS_AHB) {
+		ab->qmi.ssr_nb.notifier_call = ath11k_core_ssr_notifier_cb;
+		qcom_register_ssr_notifier(&ab->qmi.ssr_nb);
+	}
+#endif
+
 	ath11k_ahb_ext_irq_enable(ab);
 	mutex_unlock(&ab->core_lock);
 
@@ -781,6 +834,13 @@ void ath11k_core_deinit(struct ath11k_ba
 {
 	mutex_lock(&ab->core_lock);
 
+#ifdef CONFIG_QCOM_QMI_HELPERS
+	/* Unregister the ssr notifier as we are not intersted
+	 * in receving these notifications after mac is unregistered.
+	 */
+	if (ab->hif.bus == ATH11K_BUS_AHB)
+		qcom_unregister_ssr_notifier(&ab->qmi.ssr_nb);
+#endif
 	ath11k_core_pdev_destroy(ab);
 	ath11k_core_stop(ab);
 
--- a/drivers/net/wireless/ath/ath11k/debug.c
+++ b/drivers/net/wireless/ath/ath11k/debug.c
@@ -853,21 +853,12 @@ static int ath11k_fill_bp_stats(struct a
 	return len;
 }
 
-static ssize_t ath11k_debug_dump_soc_ring_stats(struct file *file,
-					      char __user *user_buf,
-					      size_t count, loff_t *ppos)
+int ath11k_fill_bp_stats_buf(struct ath11k_base *ab,
+			     char *buf, int len, int size)
 {
-	struct ath11k_base *ab = file->private_data;
 	struct ath11k_bp_stats *bp_stats;
-	int len = 0, retval;
-	u8 i, pdev_idx;
-	const int size = 4096;
 	bool stats_rxd = false;
-	char *buf;
-
-	buf = kzalloc(size, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
+	u8 i, pdev_idx;
 
 	len += scnprintf(buf + len, size - len, "\nRing Stats\n==========\n");
 	len += scnprintf(buf + len, size - len, "Backpressure Stats\n");
@@ -909,6 +900,24 @@ static ssize_t ath11k_debug_dump_soc_rin
 	if (len > size)
 		len = size;
 
+	return len;
+}
+
+static ssize_t ath11k_debug_dump_soc_ring_stats(struct file *file,
+					      char __user *user_buf,
+					      size_t count, loff_t *ppos)
+{
+	struct ath11k_base *ab = file->private_data;
+	int len = 0, retval;
+	const int size = 4096;
+	char *buf;
+
+	buf = kzalloc(size, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+
+	len = ath11k_fill_bp_stats_buf(ab, buf, len, size);
+
 	retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
 	kfree(buf);
 
--- a/drivers/net/wireless/ath/ath11k/debug.h
+++ b/drivers/net/wireless/ath/ath11k/debug.h
@@ -165,6 +165,8 @@ void ath11k_debug_fw_stats_process(struc
 
 void ath11k_debug_fw_stats_init(struct ath11k *ar);
 int ath11k_dbg_htt_stats_req(struct ath11k *ar);
+int ath11k_fill_bp_stats_buf(struct ath11k_base *ab,
+			     char *buf, int len, int size);
 
 static inline bool ath11k_debug_is_pktlog_lite_mode_enabled(struct ath11k *ar)
 {
@@ -262,6 +264,12 @@ static inline int ath11k_dbg_htt_stats_r
 {
 	return 0;
 }
+
+static inline int int ath11k_fill_bp_stats_buf(struct ath11k_base *ab,
+					       char *buf, int len, int size)
+{
+	return 0;
+}
 
 static inline bool ath11k_debug_is_pktlog_lite_mode_enabled(struct ath11k *ar)
 {
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -7,7 +7,9 @@
 #define ATH11K_QMI_H
 
 #include <linux/mutex.h>
+#include <linux/notifier.h>
 #include <linux/soc/qcom/qmi.h>
+#include <linux/remoteproc/qcom_rproc.h>
 
 #define ATH11K_HOST_VERSION_STRING		"WIN"
 #define ATH11K_QMI_WLANFW_TIMEOUT_MS		5000
@@ -111,6 +113,7 @@ struct ath11k_qmi {
 	struct workqueue_struct *event_wq;
 	struct list_head event_list;
 	spinlock_t event_lock; /* spinlock for qmi event list */
+	struct notifier_block ssr_nb;
 	struct ath11k_qmi_ce_cfg ce_cfg;
 	struct target_mem_chunk target_mem[ATH11K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01];
 	u32 mem_seg_count;