Skip to content

drivers: ethernet: nxp: use net_if_carrier correct #100809

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

Merged
MaureenHelm merged 1 commit into from
Mar 30, 2026
Merged

drivers: ethernet: nxp: use net_if_carrier correct #100809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 2 additions & 42 deletions drivers/ethernet/eth_nxp_s32_gmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ struct eth_nxp_s32_config {
struct eth_nxp_s32_data {
struct net_if *iface;
uint8_t mac_addr[ETH_NXP_S32_MAC_ADDR_LEN];
uint8_t if_suspended;
struct k_sem rx_sem;
struct k_sem tx_sem;
struct k_thread rx_thread;
Expand Down Expand Up @@ -118,13 +117,6 @@ static void phy_link_state_changed(const struct device *pdev,

cfg->base->MAC_CONFIGURATION |= GMAC_MAC_CONFIGURATION_DM(gmac_cfg.Duplex);

/* net iface should be down even if PHY link state is up
* till the upper network layers have suspended the iface.
*/
if (ctx->if_suspended) {
return;
}

LOG_DBG("Link up");
net_eth_carrier_on(ctx->iface);
} else {
Expand Down Expand Up @@ -228,33 +220,12 @@ static int eth_nxp_s32_init(const struct device *dev)
static int eth_nxp_s32_start(const struct device *dev)
{
const struct eth_nxp_s32_config *cfg = dev->config;
struct eth_nxp_s32_data *ctx = dev->data;
struct phy_link_state state;

Gmac_Ip_EnableController(cfg->instance);

irq_enable(cfg->rx_irq);
irq_enable(cfg->tx_irq);

/* If upper layers enable the net iface then mark it as
* not suspended so that PHY Link changes can have the impact
*/
ctx->if_suspended = false;

if (cfg->phy_dev) {
phy_get_link_state(cfg->phy_dev, &state);

/* Enable net_iface only when Ethernet PHY link is up or else
* if net_iface is enabled when link is down and tx happens
* in this state then the used tx buffers will never be recovered back.
*/
if (state.is_up == true) {
net_eth_carrier_on(ctx->iface);
}
} else {
net_eth_carrier_on(ctx->iface);
}

LOG_DBG("GMAC%d started", cfg->instance);

return 0;
Expand All @@ -263,20 +234,12 @@ static int eth_nxp_s32_start(const struct device *dev)
static int eth_nxp_s32_stop(const struct device *dev)
{
const struct eth_nxp_s32_config *cfg = dev->config;
struct eth_nxp_s32_data *ctx = dev->data;
Gmac_Ip_StatusType status;
int err = 0;

irq_disable(cfg->rx_irq);
irq_disable(cfg->tx_irq);

/* If upper layers disable the net iface then mark it as suspended
* in order to save it from the PHY link state changes
*/
ctx->if_suspended = true;

net_eth_carrier_off(ctx->iface);

status = Gmac_Ip_DisableController(cfg->instance);
if (status != GMAC_STATUS_SUCCESS) {
LOG_ERR("Failed to disable controller GMAC%d (%d)", cfg->instance, status);
Expand Down Expand Up @@ -306,17 +269,14 @@ static void eth_nxp_s32_iface_init(struct net_if *iface)
ctx->mac_addr[0], ctx->mac_addr[1], ctx->mac_addr[2],
ctx->mac_addr[3], ctx->mac_addr[4], ctx->mac_addr[5]);

/* Make sure that the net iface state is not suspended unless
* upper layers explicitly stop the iface
*/
ctx->if_suspended = false;

/* No PHY available, link is always up and MAC speed/duplex settings are fixed */
if (cfg->phy_dev == NULL) {
net_if_carrier_on(iface);
return;
}

net_if_carrier_off(iface);

/*
* GMAC controls the PHY. If PHY is configured either as fixed
* link or autoneg, the callback is executed at least once
Expand Down
Loading