emac_adjust_link() called before prueth_emac_start() caused R30 FORWARD commands to time out (PRU not running), leaving stale R30 values that made prueth_emac_restart() fail; fixed by deferring adjust_link until after PRU starts. icssg_enable_fw_offload() dereferences a NULL second emac slot when the first port opens before the second is initialized; fixed by checking emac existence before accessing. Signed-off-by: Meghana Malladi --- drivers/net/ethernet/ti/icssg/icssg_prueth.c | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c index 746afd5d00c9..9afda5da3ca3 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c @@ -213,6 +213,8 @@ static void icssg_enable_fw_offload(struct prueth *prueth) for (mac = PRUETH_MAC0; mac < PRUETH_NUM_MACS; mac++) { emac = prueth->emac[mac]; + if (!emac) + continue; if (prueth->is_hsr_offload_mode) { if (emac->ndev->features & NETIF_F_HW_HSR_TAG_RM) icssg_set_port_state(emac, ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE); @@ -288,13 +290,22 @@ static int prueth_emac_common_start(struct prueth *prueth) ret = icssg_config(prueth, emac, slice); if (ret) goto disable_class; + } + + ret = prueth_emac_start(prueth); + if (ret) + goto disable_class; + + /* Reset link state and reconfigure after firmware is running. + * Must be done after prueth_emac_start() so that R30 commands + * (e.g. ICSSG_EMAC_PORT_FORWARD from emac_adjust_link) reach + * the PRU firmware instead of timing out with stale R30 values. + */ + for (slice = 0; slice < PRUETH_NUM_MACS; slice++) { + emac = prueth->emac[slice]; + if (!emac) + continue; - /* Reset link state to force reconfiguration in - * emac_adjust_link(). Without this, if the link was already up - * before restart, emac_adjust_link() won't detect any state - * change and will skip critical configuration like writing - * speed to firmware. - */ emac->link = 0; mutex_lock(&emac->ndev->phydev->lock); @@ -302,10 +313,6 @@ static int prueth_emac_common_start(struct prueth *prueth) mutex_unlock(&emac->ndev->phydev->lock); } - ret = prueth_emac_start(prueth); - if (ret) - goto disable_class; - emac = prueth->emac[ICSS_SLICE0] ? prueth->emac[ICSS_SLICE0] : prueth->emac[ICSS_SLICE1]; ret = icss_iep_init(emac->iep, &prueth_iep_clockops, -- 2.43.0