Merge branch 'bugfix/pr_ksz8041' into 'release/v4.3'

esp_eth: fix ksz8041 driver issue (PR)

See merge request espressif/esp-idf!15227
This commit is contained in:
morris 2021-09-17 06:39:52 +00:00
commit 5fd169059d
2 changed files with 8 additions and 2 deletions

View File

@ -198,6 +198,8 @@ static esp_err_t ksz8041_negotiate(esp_eth_phy_t *phy)
{
phy_ksz8041_t *ksz8041 = __containerof(phy, phy_ksz8041_t, parent);
esp_eth_mediator_t *eth = ksz8041->eth;
/* in case any link status has changed, let's assume we're in link down status */
ksz8041->link_status = ETH_LINK_DOWN;
/* Restart auto negotiation */
bmcr_reg_t bmcr = {
.speed_select = 1, /* 100Mbps */
@ -224,8 +226,6 @@ static esp_err_t ksz8041_negotiate(esp_eth_phy_t *phy)
if ((to >= ksz8041->autonego_timeout_ms / 100) && (ksz8041->link_status == ETH_LINK_UP)) {
ESP_LOGW(TAG, "auto negotiation timeout");
}
/* Updata information about link, speed, duplex */
PHY_CHECK(ksz8041_update_link_duplex_speed(ksz8041) == ESP_OK, "update link duplex speed failed", err);
return ESP_OK;
err:
return ESP_FAIL;

View File

@ -571,6 +571,12 @@ UT_046:
- ESP32_IDF
- UT_T1_GPIO
UT_047:
extends: .unit_test_s2_template
parallel: 5
tags:
- ESP32S2_IDF
- UT_T1_1
UT_C3:
extends: .unit_test_c3_template