Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ethernet: Add support stm32n6570_dk #87562

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+71 −6
Open

Ethernet: Add support stm32n6570_dk #87562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5a4f9d
boards: st: stm32n6570_dk: Add ethernet node
marwaiehm-st Feb 12, 2025
51bdac7
drivers: ethernet: Integrate GRMII and RMII interfaces
marwaiehm-st Mar 26, 2025
09b9496
drivers: ethernet: Update STM32 Ethernet API v1 media interface defin…
marwaiehm-st Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions boards/st/stm32n6570_dk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# STM32N6570 DISCOVERY board configuration

# Copyright (c) 2025 STMicroelectronics
# SPDX-License-Identifier: Apache-2.0

if BOARD_STM32N6570_DK

if NETWORKING

config NET_L2_ETHERNET
default y

endif # NETWORKING

endif # BOARD_STM32N6570_DK
32 changes: 32 additions & 0 deletions boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,35 @@
};
};
};

&mac {
status = "okay";
pinctrl-0 = <&eth1_rgmii_gtx_clk_pf0
&eth1_rgmii_clk125_pf2
&eth1_rgmii_rx_clk_pf7
&eth1_rgmii_rxd2_pf8
&eth1_rgmii_rxd3_pf9
&eth1_rgmii_rx_ctl_pf10
&eth1_rgmii_tx_ctl_pf11
&eth1_rgmii_txd1_pf13
&eth1_rgmii_txd0_pf12
&eth1_rgmii_rxd0_pf14
&eth1_rgmii_rxd1_pf15
&eth1_rgmii_txd2_pg3
&eth1_rgmii_txd3_pg4
&eth1_phy_intn_pd3>;
pinctrl-names = "default";
phy-connection-type = "rgmii";
phy-handle = <&eth_phy>;
};

&mdio {
status = "okay";
pinctrl-0 = <&eth1_mdio_pd12 &eth1_mdc_pd1>;
pinctrl-names = "default";

eth_phy: ethernet-phy@0 {
compatible = "ethernet-phy";
reg = <0x0>;
};
};
30 changes: 24 additions & 6 deletions drivers/ethernet/eth_stm32_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ static const struct device *eth_stm32_phy_dev = DEVICE_DT_GET(DT_INST_PHANDLE(0,
#define ETH_RXBUFNB ETH_RX_DESC_CNT
#define ETH_TXBUFNB ETH_TX_DESC_CNT

#define ETH_MEDIA_INTERFACE_MII HAL_ETH_MII_MODE
#define ETH_MEDIA_INTERFACE_RMII HAL_ETH_RMII_MODE

/* Only one tx_buffer is sufficient to pass only 1 dma_buffer */
#define ETH_TXBUF_DEF_NB 1U
#else
Expand All @@ -78,11 +75,25 @@ static const struct device *eth_stm32_phy_dev = DEVICE_DT_GET(DT_INST_PHANDLE(0,

#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32h7_ethernet) */

#if defined(CONFIG_ETH_STM32_HAL_API_V1)
#define HAL_ETH_MII_MODE ETH_MEDIA_INTERFACE_MII
#define HAL_ETH_RMII_MODE ETH_MEDIA_INTERFACE_RMII
#endif

#define MAC_NODE DT_NODELABEL(mac)

#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
#define STM32_ETH_PHY_MODE(node_id) \
((DT_ENUM_HAS_VALUE(node_id, phy_connection_type, mii) ? HAL_ETH_MII_MODE : \
(DT_ENUM_HAS_VALUE(node_id, phy_connection_type, rmii) ? HAL_ETH_RMII_MODE : \
(DT_ENUM_HAS_VALUE(node_id, phy_connection_type, gmii) ? HAL_ETH_GMII_MODE : \
(DT_ENUM_HAS_VALUE(node_id, phy_connection_type, rgmii) ? HAL_ETH_RGMII_MODE : \
HAL_ETH_RMII_MODE)))))
Comment on lines +86 to +91
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we use ETH_MEDIA_INTERFACE_FOO values now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We used ETH_MEDIA_INTERFACE_FOO to support the api v1, but here we have only stm32n6.
We can add the definition of ETH_MEDIA_INTERFACE_FOO for RGMII and GMII, if it makes the code compatible

#define ETH_MEDIA_INTERFACE_RGMII		HAL_ETH_RGMII_MODE
#define ETH_MEDIA_INTERFACE_GMII	        HAL_ETH_GMII_MODE

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be cleaner indeed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or we remove the ETH_MEDIA_INTERFACE_FOO, but we should be able to use only one macro version.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the definition of ETH_MEDIA_INTERFACE_FOO and using directly HAL_ETH_XMII for API V2, but for API V1 we can only use ETH_MEDIA_INTERFACE_FOO .

In case of removing the definition "ETH_MEDIA_INTERFACE_FOO", we should add definition for HAL_ETH_XMII_MODE to support API v1.

#if !defined(CONFIG_ETH_STM32_HAL_API_V2)
#define HAL_ETH_MII_MODE   ETH_MEDIA_INTERFACE_MII
#define HAL_ETH_RMII_MODE ETH_MEDIA_INTERFACE_RMII
#endif

#define STM32_ETH_PHY_MODE(node_id) \
	(DT_ENUM_HAS_VALUE(node_id, phy_connection_type, mii) ? \
		HAL_ETH_MII_MODE : HAL_ETH_RMII_MODE)

#else
#define STM32_ETH_PHY_MODE(node_id) \
(DT_ENUM_HAS_VALUE(node_id, phy_connection_type, mii) ? \
ETH_MEDIA_INTERFACE_MII : ETH_MEDIA_INTERFACE_RMII)
HAL_ETH_MII_MODE : HAL_ETH_RMII_MODE)
#endif

#define ETH_DMA_TX_TIMEOUT_MS 20U /* transmit timeout in milliseconds */

Expand Down Expand Up @@ -1138,7 +1149,12 @@ static void set_mac_config(const struct device *dev, struct phy_link_state *stat
mac_config.DuplexMode =
PHY_LINK_IS_FULL_DUPLEX(state->speed) ? ETH_FULLDUPLEX_MODE : ETH_HALFDUPLEX_MODE;

mac_config.Speed = PHY_LINK_IS_SPEED_100M(state->speed) ? ETH_SPEED_100M : ETH_SPEED_10M;
mac_config.Speed =
#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
PHY_LINK_IS_SPEED_1000M(state->speed) ? ETH_SPEED_1000M :
#endif
PHY_LINK_IS_SPEED_100M(state->speed) ? ETH_SPEED_100M : ETH_SPEED_10M;


hal_ret = HAL_ETH_SetMACConfig(heth, &mac_config);
if (hal_ret != HAL_OK) {
Expand Down Expand Up @@ -1477,7 +1493,9 @@ static const struct eth_stm32_hal_dev_cfg eth0_config = {
};

BUILD_ASSERT(DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, mii) ||
DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, rmii),
DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, rmii) ||
DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, rgmii) ||
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use a IF_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet),(check for rgmii and gmii)), to only allow gigabit connection types on supported soc

DT_ENUM_HAS_VALUE(MAC_NODE, phy_connection_type, gmii),
"Unsupported PHY connection type selected");

static struct eth_stm32_hal_dev_data eth0_data = {
Expand Down