usb_serial_jtag: can print when wifi enabled by default

Closes #8131
espressif · Dec 27, 2021 · f82ab4c · f82ab4c
1 parent d9b71e7
commit f82ab4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/components/esp_phy/Kconfig b/components/esp_phy/Kconfig
@@ -106,11 +106,11 @@ menu "PHY"
 
     config ESP_PHY_ENABLE_USB
         bool "Enable USB when phy init"
-        depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG
+        depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG || ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
         default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
         default n
         help
             When using USB Serial/JTAG/OTG/CDC, PHY should enable USB, otherwise USB module
-            can not work properly.
+            can not work properly. Notice: Enabling this configuration option will slightly impact wifi performance.
 
 endmenu  # PHY
diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
@@ -28,6 +28,10 @@
 #include "esp_rom_crc.h"
 #include "esp_rom_sys.h"
 
+#if CONFIG_ESP_PHY_ENABLE_USB
+#include "hal/usb_serial_jtag_ll.h"
+#endif
+
 #include "soc/rtc_cntl_reg.h"
 #if CONFIG_IDF_TARGET_ESP32C3
 #include "soc/syscon_reg.h"
@@ -652,7 +656,13 @@ void esp_phy_load_cal_and_init(void)
 #endif
 
 #if CONFIG_ESP_PHY_ENABLE_USB
-    phy_bbpll_en_usb(true);
+#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
+    if (usb_serial_jtag_ll_txfifo_writable() == 1)
+#endif // Only check usb_jtag status with usb_jtag related config options enabled.
+    {
+        // If the USB_SEIRAL_JTAG is really in use.
+        phy_bbpll_en_usb(true);
+    }
 #endif
 
 #ifdef CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE