drivers: ethernet: stm32: Fix the init call order #97097
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zephyrbot
requested review from
decsny,
djiatsaf-st,
erwango,
etienne-lms,
FRASTM,
gautierg-st,
GeorgeCGV,
lmajewski,
maass-hamburg,
marwaiehm-st,
mathieuchopstm and
pdgendt
etienne-lms
reviewed
Oct 7, 2025
drivers/ethernet/eth_stm32_hal.c
Outdated
| * properly initialized. In auto-negotiation mode, it reads the speed | ||
| * and duplex settings to configure the driver accordingly. | ||
| */ | ||
| eth_init_api_v2(dev); |
There was a problem hiding this comment.
Could you test the return value?
By the way, would it make sense to move thee API_V1 also into a eth_init_api_v1() helper function?
There was a problem hiding this comment.
I added a check and moved the v1 init in its own function
etienne-lms
reviewed
Oct 7, 2025
juickar
force-pushed
the
v4.2-branch
branch
2 times, most recently
from
60c59d4 to
558de73
Compare
etienne-lms
reviewed
Oct 7, 2025
drivers/ethernet/eth_stm32_hal.c
Outdated
Comment on lines
874
to
876
| /* HAL Init time out. This could be linked to */ | ||
| /* a recoverable error. Log the issue and continue */ | ||
| /* driver initialisation */ |
There was a problem hiding this comment.
By the way, I think it would be nice to fix the inline comment style:
/* HAL Init time out. This could be linked to
* a recoverable error. Log the issue and continue
* driver initialization.
*/There was a problem hiding this comment.
(feel free to discard my comment if you prefer)
There was a problem hiding this comment.
I also fixed it in the v2 function
Fix the init call order for V2 API to be able to configure PTP as PTP initialization happens before iface initialization. Signed-off-by: Julien Racki <julien.racki-ext@st.com>
Move the Ethernet API v1 Initialization in eth_init_api_v1() helper function to match the V2 implementation. Signed-off-by: Julien Racki <julien.racki-ext@st.com>
etienne-lms
approved these changes
Oct 7, 2025
|
maass-hamburg
approved these changes
Oct 7, 2025
Comment on lines
1001
to
+1004
| #if defined(CONFIG_ETH_STM32_HAL_API_V1) | ||
| HAL_StatusTypeDef hal_ret = HAL_OK; | ||
|
|
||
| if (!ETH_STM32_AUTO_NEGOTIATION_ENABLE) { | ||
| struct phy_link_state state; | ||
|
|
||
| phy_get_link_state(eth_stm32_phy_dev, &state); | ||
|
|
||
| heth->Init.DuplexMode = PHY_LINK_IS_FULL_DUPLEX(state.speed) ? ETH_MODE_FULLDUPLEX | ||
| : ETH_MODE_HALFDUPLEX; | ||
| heth->Init.Speed = | ||
| PHY_LINK_IS_SPEED_100M(state.speed) ? ETH_SPEED_100M : ETH_SPEED_10M; | ||
| } | ||
| ret = eth_init_api_v1(dev); | ||
| #elif defined(CONFIG_ETH_STM32_HAL_API_V2) | ||
| ret = eth_init_api_v2(dev); |
There was a problem hiding this comment.
could share a common function name
|
@dkalowsk, @danieldegrasse FYI, this one is a bit specific as no backport possible. |
erwango
approved these changes
Oct 7, 2025
danieldegrasse
approved these changes
Oct 7, 2025
danieldegrasse
merged commit 6da1cbc
into
zephyrproject-rtos:v4.2-branch
25 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the init call order for V2 API to be able to configure PTP as PTP initialization happens before iface initialization.
Fixes #96197
This solution is the equivalent to the one used in the main branch at this commit: ca6e25a, but it can't be directly applied in the v4.2 branch, as the Ethernet driver is not split between v1 and v2 yet in this version.