diff --git a/components/bt/bluedroid/stack/include/stack/hcidefs.h b/components/bt/bluedroid/stack/include/stack/hcidefs.h
index 7fab1d830..31542e5c2 100644
--- a/components/bt/bluedroid/stack/include/stack/hcidefs.h
+++ b/components/bt/bluedroid/stack/include/stack/hcidefs.h
@@ -1521,8 +1521,7 @@ typedef struct {
 
 #define HCI_FEATURE_SWITCH_MASK         0x20
 #define HCI_FEATURE_SWITCH_OFF          0
-// temporarily disable ROLE_SWITCH since there is an issue to be fixed
-#define HCI_SWITCH_SUPPORTED(x)         (0 & ((x)[HCI_FEATURE_SWITCH_OFF] & HCI_FEATURE_SWITCH_MASK))
+#define HCI_SWITCH_SUPPORTED(x)         ((x)[HCI_FEATURE_SWITCH_OFF] & HCI_FEATURE_SWITCH_MASK)
 
 #define HCI_FEATURE_HOLD_MODE_MASK      0x40
 #define HCI_FEATURE_HOLD_MODE_OFF       0
diff --git a/components/bt/lib b/components/bt/lib
index 33d26d566..6c0ad5aea 160000
--- a/components/bt/lib
+++ b/components/bt/lib
@@ -1 +1 @@
-Subproject commit 33d26d5668cef37767b9b8457224e12b22e02928
+Subproject commit 6c0ad5aea73ad281d5ec99adb7f2e35c062ab21d
diff --git a/components/esp32/ld/esp32.rom.ld b/components/esp32/ld/esp32.rom.ld
index 34792d867..f8310993d 100644
--- a/components/esp32/ld/esp32.rom.ld
+++ b/components/esp32/ld/esp32.rom.ld
@@ -665,6 +665,7 @@ PROVIDE ( lmp_dhkey_chk_handler = 0x4002ab48 );
 PROVIDE ( lmp_pause_enc_aes_req_handler = 0x400279a4 );
 PROVIDE ( lmp_io_cap_res_handler = 0x4002c670 );
 PROVIDE ( lmp_io_cap_req_handler = 0x4002c7a4 );
+PROVIDE ( lc_cmd_cmp_bd_addr_send = 0x4002cec4 );
 PROVIDE ( ld_acl_tx_packet_type_select = 0x4002fb40 );
 PROVIDE ( ld_acl_sched = 0x40033268 );
 PROVIDE ( ld_acl_sniff_sched = 0x4003340c );
@@ -674,6 +675,7 @@ PROVIDE ( ld_acl_rx_sync = 0x4002fbec );
 PROVIDE ( ld_acl_rx_sync2 = 0x4002fd8c );
 PROVIDE ( ld_acl_rx_no_sync = 0x4002fe78 );
 PROVIDE ( ld_acl_clk_isr = 0x40030cf8 );
+PROVIDE ( ld_acl_rsw_frm_cbk = 0x40033bb0 );
 PROVIDE ( ld_sco_modify = 0x40031778 );
 PROVIDE ( lm_cmd_cmp_send = 0x40051838 );
 PROVIDE ( ld_sco_frm_cbk = 0x400349dc );