diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
index 9f593464c0..49a90d0ad5 160000
--- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
+++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
@@ -1 +1 @@
-Subproject commit 9f593464c0593db5100b426d1a6a9a1ce4a55beb
+Subproject commit 49a90d0ad509a1ec95fcacfc67d578a97de4c1ee
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
index 6ee69d336a..6222dca02f 100644
--- a/components/esp_hw_support/sleep_modes.c
+++ b/components/esp_hw_support/sleep_modes.c
@@ -860,6 +860,12 @@ static esp_err_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags, esp_sleep_mode_t m
             resume_cache();
         }
 
+#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
+            if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
+                rtc_sleep_systimer_enable(true);
+            }
+#endif
+    }
 #if CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION
     if (pd_flags & RTC_SLEEP_PD_VDDSDIO) {
         /* Cache Suspend 2: If previous sleep powerdowned the flash, suspend cache here so that the
@@ -867,14 +873,6 @@ static esp_err_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags, esp_sleep_mode_t m
         suspend_cache();
     }
 #endif
-
-#if CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND
-            if (!(pd_flags & RTC_SLEEP_PD_XTAL)) {
-                rtc_sleep_systimer_enable(true);
-            }
-#endif
-    }
-
     // Restore CPU frequency
 #if SOC_PM_SUPPORT_PMU_MODEM_STATE
     if (pmu_sleep_pll_already_enabled()) {
diff --git a/components/esp_phy/lib b/components/esp_phy/lib
index bf6003e60c..b5d8d9b52c 160000
--- a/components/esp_phy/lib
+++ b/components/esp_phy/lib
@@ -1 +1 @@
-Subproject commit bf6003e60c8bf7205ff16db660df7d7022a284d1
+Subproject commit b5d8d9b52c547d789d82108a463c647671744af5
diff --git a/components/hal/esp32c6/include/hal/ieee802154_ll.h b/components/hal/esp32c6/include/hal/ieee802154_ll.h
index eec479e96a..14e548a1d3 100644
--- a/components/hal/esp32c6/include/hal/ieee802154_ll.h
+++ b/components/hal/esp32c6/include/hal/ieee802154_ll.h
@@ -12,3 +12,5 @@
 #define IEEE802154_TXPOWER_VALUE_MAX  20
 #define IEEE802154_TXPOWER_VALUE_MIN -15
 #define IEEE802154_TXPOWER_INDEX_MIN   3
+
+#define IEEE802154_RSSI_COMPENSATION_VALUE 0
diff --git a/components/hal/esp32h2/include/hal/ieee802154_ll.h b/components/hal/esp32h2/include/hal/ieee802154_ll.h
index fdc212b582..c873c5515e 100644
--- a/components/hal/esp32h2/include/hal/ieee802154_ll.h
+++ b/components/hal/esp32h2/include/hal/ieee802154_ll.h
@@ -12,3 +12,5 @@
 #define IEEE802154_TXPOWER_VALUE_MAX  20
 #define IEEE802154_TXPOWER_VALUE_MIN -24
 #define IEEE802154_TXPOWER_INDEX_MIN   0
+
+#define IEEE802154_RSSI_COMPENSATION_VALUE 10
diff --git a/components/ieee802154/driver/esp_ieee802154_dev.c b/components/ieee802154/driver/esp_ieee802154_dev.c
index 5dc35d56ba..172f51532d 100644
--- a/components/ieee802154/driver/esp_ieee802154_dev.c
+++ b/components/ieee802154/driver/esp_ieee802154_dev.c
@@ -151,7 +151,7 @@ static void ieee802154_rx_frame_info_update(void)
     uint8_t lqi = s_rx_frame[s_rx_index][len];
 
     s_rx_frame_info[s_rx_index].channel = ieee802154_freq_to_channel(ieee802154_ll_get_freq());
-    s_rx_frame_info[s_rx_index].rssi = rssi;
+    s_rx_frame_info[s_rx_index].rssi = rssi + IEEE802154_RSSI_COMPENSATION_VALUE;
     s_rx_frame_info[s_rx_index].lqi = lqi;
 
     s_recent_rx_frame_info_index = s_rx_index;