From d64553797c56c6e5db6421b1d1147f7a2dc340f4 Mon Sep 17 00:00:00 2001 From: Cao Sen Miao Date: Wed, 22 Dec 2021 12:44:00 +0800 Subject: [PATCH 1/2] usb_serial_jtag: can print when wifi enabled by default Closes https://github.com/espressif/esp-idf/issues/8131 --- components/esp_wifi/Kconfig | 9 +++++---- components/esp_wifi/src/phy_init.c | 8 +++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig index bc73ea8168..e32158072a 100644 --- a/components/esp_wifi/Kconfig +++ b/components/esp_wifi/Kconfig @@ -415,10 +415,11 @@ menu "PHY" config ESP_PHY_ENABLE_USB bool "Enable USB when phy init" - depends on ESP_CONSOLE_USB_SERIAL_JTAG - default y + 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 controller, PHY should enable USB, otherwise log will - not be displayed. But working with USB, the RF performance may be affected. + When using USB Serial/JTAG/OTG/CDC, PHY should enable USB, otherwise USB module + can not work properly. Notice: Enabling this configuration option will slightly impact wifi performance. endmenu # PHY diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c index 9e1cf4aaf5..38fd96cbe3 100644 --- a/components/esp_wifi/src/phy_init.c +++ b/components/esp_wifi/src/phy_init.c @@ -613,7 +613,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_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE From 3a628eb4702d3326e1fd8b9203bc8a3e5a1bc085 Mon Sep 17 00:00:00 2001 From: Cao Sen Miao Date: Wed, 19 Jan 2022 18:58:38 +0800 Subject: [PATCH 2/2] usb_serial_jtag: remove the strict condition check in esp_phy --- components/esp_wifi/src/phy_init.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c index 38fd96cbe3..9e1cf4aaf5 100644 --- a/components/esp_wifi/src/phy_init.c +++ b/components/esp_wifi/src/phy_init.c @@ -613,13 +613,7 @@ void esp_phy_load_cal_and_init(void) #endif #if CONFIG_ESP_PHY_ENABLE_USB -#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); - } + phy_bbpll_en_usb(true); #endif #ifdef CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE