diff --git a/dp/wifi3.0/be/dp_be.c b/dp/wifi3.0/be/dp_be.c
index 9ae2bb8154..5c261ab624 100644
--- a/dp/wifi3.0/be/dp_be.c
+++ b/dp/wifi3.0/be/dp_be.c
@@ -130,6 +130,8 @@ static void dp_cc_reg_cfg_init(struct dp_soc *soc,
 	/* 36th bit should be 1 then HW know this is CMEM address */
 	cc_cfg.lut_base_addr_39_32 = 0x10;
 
+	cc_cfg.error_path_cookie_conv_en = true;
+	cc_cfg.release_path_cookie_conv_en = true;
 	dp_cc_wbm_sw_en_cfg(&cc_cfg);
 
 	hal_cookie_conversion_reg_cfg_be(soc->hal_soc, &cc_cfg);
diff --git a/hal/wifi3.0/be/hal_be_api.h b/hal/wifi3.0/be/hal_be_api.h
index 4ac1490607..ee0f2c21b3 100644
--- a/hal/wifi3.0/be/hal_be_api.h
+++ b/hal/wifi3.0/be/hal_be_api.h
@@ -37,7 +37,9 @@ struct hal_hw_cc_config {
 		 wbm2sw1_cc_en:1,
 		 wbm2sw0_cc_en:1,
 		 wbm2fw_cc_en:1,
-		 reserved:4;
+		 error_path_cookie_conv_en:1,
+		 release_path_cookie_conv_en:1,
+		 reserved:2;
 };
 
 #define HAL_RX_MSDU_EXT_DESC_INFO_GET(msdu_details_ptr) \
diff --git a/hal/wifi3.0/be/hal_be_generic_api.c b/hal/wifi3.0/be/hal_be_generic_api.c
index 12f5830edf..b85fea5e62 100644
--- a/hal/wifi3.0/be/hal_be_generic_api.c
+++ b/hal/wifi3.0/be/hal_be_generic_api.c
@@ -824,6 +824,27 @@ void hal_cookie_conversion_reg_cfg_be(hal_soc_handle_t hal_soc_hdl,
 			  cc_cfg->wbm2fw_cc_en);
 	HAL_REG_WRITE(soc, reg_addr, reg_val);
 
+#ifdef HWIO_WBM_R0_WBM_CFG_2_COOKIE_DEBUG_SEL_BMSK
+	reg_addr = HWIO_WBM_R0_WBM_CFG_2_ADDR(WBM_REG_REG_BASE);
+	reg_val = 0;
+	reg_val |= HAL_SM(HWIO_WBM_R0_WBM_CFG_2,
+			  COOKIE_DEBUG_SEL,
+			  cc_cfg->cc_global_en);
+
+	reg_val |= HAL_SM(HWIO_WBM_R0_WBM_CFG_2,
+			  COOKIE_CONV_INDICATION_EN,
+			  cc_cfg->cc_global_en);
+
+	reg_val |= HAL_SM(HWIO_WBM_R0_WBM_CFG_2,
+			  ERROR_PATH_COOKIE_CONV_EN,
+			  cc_cfg->error_path_cookie_conv_en);
+
+	reg_val |= HAL_SM(HWIO_WBM_R0_WBM_CFG_2,
+			  RELEASE_PATH_COOKIE_CONV_EN,
+			  cc_cfg->release_path_cookie_conv_en);
+
+	HAL_REG_WRITE(soc, reg_addr, reg_val);
+#endif
 #ifdef DP_HW_COOKIE_CONVERT_EXCEPTION
 	/*
 	 * To enable indication for HW cookie conversion done or not for
diff --git a/hal/wifi3.0/hal_api.h b/hal/wifi3.0/hal_api.h
index a02894fe90..24bdf86b75 100644
--- a/hal/wifi3.0/hal_api.h
+++ b/hal/wifi3.0/hal_api.h
@@ -2950,12 +2950,15 @@ uint32_t hal_get_ring_usage(
  *
  * Return: None.
  */
-static inline void hal_cmem_write(hal_soc_handle_t hal_soc_hdl,
-				  uint32_t offset,
-				  uint32_t value)
+static inline void
+hal_cmem_write(hal_soc_handle_t hal_soc_hdl, uint32_t offset,
+	       uint32_t value)
 {
-	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
+	struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
 
-	hal_write32_mb(hal, offset, value);
+	if (hal_soc->ops->hal_cmem_write)
+		hal_soc->ops->hal_cmem_write(hal_soc_hdl, offset, value);
+
+	return;
 }
 #endif /* _HAL_APIH_ */
diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h
index e534b38c1f..29801a0cef 100644
--- a/hal/wifi3.0/hal_internal.h
+++ b/hal/wifi3.0/hal_internal.h
@@ -915,6 +915,10 @@ struct hal_hw_txrx_ops {
 	void (*hal_rx_flow_get_cmem_fse)(struct hal_soc *soc,
 					 uint32_t fse_offset,
 					 uint32_t *fse, qdf_size_t len);
+
+	void (*hal_cmem_write)(hal_soc_handle_t hal_soc_hdl, uint32_t offset,
+			       uint32_t value);
+
 	void (*hal_rx_msdu_get_reo_destination_indication)(uint8_t *buf,
 							   uint32_t *reo_destination_indication);
 	uint8_t (*hal_tx_get_num_tcl_banks)(void);
diff --git a/hal/wifi3.0/qcn9224/hal_9224.c b/hal/wifi3.0/qcn9224/hal_9224.c
index 683e5b4008..80131a81ee 100644
--- a/hal/wifi3.0/qcn9224/hal_9224.c
+++ b/hal/wifi3.0/qcn9224/hal_9224.c
@@ -121,16 +121,31 @@
 #define UNIFIED_WBM_RELEASE_RING_6_TX_RATE_STATS_INFO_TX_RATE_STATS_LSB \
 	WBM_RELEASE_RING_TX_TX_RATE_STATS_PPDU_TRANSMISSION_TSF_LSB
 
+#ifdef CONFIG_WIFI_EMULATION_WIFI_3_0
+#define CMEM_REG_BASE 0x0010e000
+
+#define CMEM_WINDOW_ADDRESS_9224 \
+		((CMEM_REG_BASE >> WINDOW_SHIFT) & WINDOW_VALUE_MASK)
+#endif
+
 #define CE_WINDOW_ADDRESS_9224 \
 		((CE_WFSS_CE_REG_BASE >> WINDOW_SHIFT) & WINDOW_VALUE_MASK)
 
 #define UMAC_WINDOW_ADDRESS_9224 \
 		((UMAC_BASE >> WINDOW_SHIFT) & WINDOW_VALUE_MASK)
 
+#ifdef CONFIG_WIFI_EMULATION_WIFI_3_0
+#define WINDOW_CONFIGURATION_VALUE_9224 \
+		((CE_WINDOW_ADDRESS_9224 << 6) |\
+		 (UMAC_WINDOW_ADDRESS_9224 << 12) | \
+		 CMEM_WINDOW_ADDRESS_9224 | \
+		 WINDOW_ENABLE_BIT)
+#else
 #define WINDOW_CONFIGURATION_VALUE_9224 \
 		((CE_WINDOW_ADDRESS_9224 << 6) |\
 		 (UMAC_WINDOW_ADDRESS_9224 << 12) | \
 		 WINDOW_ENABLE_BIT)
+#endif
 
 /* For Berryllium sw2rxdma ring size increased to 20 bits */
 #define HAL_RXDMA_MAX_RING_SIZE_BE 0xFFFFF
@@ -1230,6 +1245,23 @@ static void hal_rx_dump_pkt_tlvs_9224(hal_soc_handle_t hal_soc_hdl,
 
 #define HAL_NUM_TCL_BANKS_9224 48
 
+/**
+ * hal_cmem_write_9224() - function for CMEM buffer writing
+ * @hal_soc_hdl: HAL SOC handle
+ * @offset: CMEM address
+ * @value: value to write
+ *
+ * Return: None.
+ */
+static void hal_cmem_write_9224(hal_soc_handle_t hal_soc_hdl,
+				uint32_t offset,
+				uint32_t value)
+{
+	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
+
+	pld_reg_write(hal->qdf_dev->dev, offset, value);
+}
+
 /**
  * hal_tx_get_num_tcl_banks_9224() - Get number of banks in target
  *
@@ -1247,6 +1279,7 @@ static void hal_hw_txrx_ops_attach_qcn9224(struct hal_soc *hal_soc)
 	hal_soc->ops->hal_srng_src_hw_init = hal_srng_src_hw_init_generic;
 	hal_soc->ops->hal_get_hw_hptp = hal_get_hw_hptp_generic;
 	hal_soc->ops->hal_get_window_address = hal_get_window_address_9224;
+	hal_soc->ops->hal_cmem_write = hal_cmem_write_9224;
 
 	/* tx */
 	hal_soc->ops->hal_tx_set_dscp_tid_map = hal_tx_set_dscp_tid_map_9224;
diff --git a/hal/wifi3.0/wcn7850/hal_7850.c b/hal/wifi3.0/wcn7850/hal_7850.c
index 7e928a2c7d..350bd0f64f 100644
--- a/hal/wifi3.0/wcn7850/hal_7850.c
+++ b/hal/wifi3.0/wcn7850/hal_7850.c
@@ -1285,6 +1285,23 @@ static void hal_rx_reo_prev_pn_get_7850(void *ring_desc,
 	*prev_pn |= ((uint64_t)reo_desc->prev_pn_55_24 << 24);
 }
 
+/**
+ * hal_cmem_write_7850() - function for CMEM buffer writing
+ * @hal_soc_hdl: HAL SOC handle
+ * @offset: CMEM address
+ * @value: value to write
+ *
+ * Return: None.
+ */
+static inline void hal_cmem_write_7850(hal_soc_handle_t hal_soc_hdl,
+				       uint32_t offset,
+				       uint32_t value)
+{
+	struct hal_soc *hal = (struct hal_soc *)hal_soc_hdl;
+
+	hal_write32_mb(hal, offset, value);
+}
+
 static void hal_hw_txrx_ops_attach_wcn7850(struct hal_soc *hal_soc)
 {
 	/* init and setup */
@@ -1450,6 +1467,7 @@ static void hal_hw_txrx_ops_attach_wcn7850(struct hal_soc *hal_soc)
 	hal_soc->ops->hal_rx_flow_setup_cmem_fse = NULL;
 	hal_soc->ops->hal_rx_flow_get_cmem_fse_ts = NULL;
 	hal_soc->ops->hal_rx_flow_get_cmem_fse = NULL;
+	hal_soc->ops->hal_cmem_write = hal_cmem_write_7850;
 	hal_soc->ops->hal_rx_msdu_get_reo_destination_indication =
 		hal_rx_msdu_get_reo_destination_indication_be;
 	hal_soc->ops->hal_tx_get_num_tcl_banks = hal_tx_get_num_tcl_banks_7850;