From 3bd69d296d299bedc30a9e10fe5bf202cd5fa9b2 Mon Sep 17 00:00:00 2001 From: Christian Fischerauer Date: Thu, 16 Sep 2021 14:48:33 +0200 Subject: [PATCH 1/2] esp_eth: adapt ksz8041.c to changes from commit 03a6c49 Closes https://github.com/espressif/esp-idf/issues/7570 Merges https://github.com/espressif/esp-idf/pull/7573 --- components/esp_eth/src/esp_eth_phy_ksz8041.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_eth/src/esp_eth_phy_ksz8041.c b/components/esp_eth/src/esp_eth_phy_ksz8041.c index 046b7eff76..61031cbf75 100644 --- a/components/esp_eth/src/esp_eth_phy_ksz8041.c +++ b/components/esp_eth/src/esp_eth_phy_ksz8041.c @@ -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; From eaebc58e6173fc6ded2eef5da3f14099186c1d1e Mon Sep 17 00:00:00 2001 From: morris Date: Fri, 17 Sep 2021 11:08:32 +0800 Subject: [PATCH 2/2] ci: bump up s2 ut parallels --- tools/ci/config/target-test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 0d007e22f8..18f44d62ad 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -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