bgmac: fix *initial* chip reset to support BCM5358
PATCH 1/1 bgmac: fix *initial* chip reset to support BCM5358
From: Rafał Miłecki <[email protected]>
commit f99e6d7c4ed3be2531bd576425a5bd07fb133bd7 upstream.
While bringing hardware up we should perform a full reset including the switch bit (BGMAC_BCMA_IOCTL_SW_RESET aka SICF_SWRST). It's what specification says and what reference driver does.
This seems to be critical for the BCM5358. Without this hardware doesn't get initialized properly and doesn't seem to transmit or receive any packets.
Originally bgmac was calling bgmac_chip_reset() before setting "has_robosw" property which resulted in expected behaviour. That has changed as a side effect of adding platform device support which regressed BCM5358 support.
---
Upstream commit wasn't backported to 5.4 (and older) because it couldn't be cherry-picked cleanly. There was a small fuzz caused by a missing commit 8c7da63978f1 ("bgmac: configure MTU and add support for frames beyond 8192 byte size").
I've manually cherry-picked fix for BCM5358 to the linux-5.4.x.
--- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++++-- drivers/net/ethernet/broadcom/bgmac.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +6 -2
@@ -890,13 +890,13 @@ static void bgmac_chip_reset_idm_config(struct bgmac *bgmac)if (iost &BGMAC_BCMA_IOST_ATTACHED ) { flags =BGMAC_BCMA_IOCTL_SW_CLKEN ; -if (!bgmac->has_robosw) +if (bgmac->in_init || !bgmac->has_robosw) flags |=BGMAC_BCMA_IOCTL_SW_RESET ; }bgmac_clk_enable (bgmac, flags); } -if (iost &BGMAC_BCMA_IOST_ATTACHED && !bgmac->has_robosw) +if (iost &BGMAC_BCMA_IOST_ATTACHED && (bgmac->in_init || !bgmac->has_robosw))bgmac_idm_write (bgmac,BCMA_IOCTL ,bgmac_idm_read (bgmac,BCMA_IOCTL ) & ~BGMAC_BCMA_IOCTL_SW_RESET );
@@ -1489,6 +1489,8 @@ int bgmac_enet_probe(struct bgmac *bgmac)struct net_device *net_dev = bgmac->net_dev;int err; + bgmac->in_init = true; +bgmac_chip_intrs_off (bgmac); net_dev->irq = bgmac->irq;
@@ -1538,6 +1540,8 @@ int bgmac_enet_probe(struct bgmac *bgmac) net_dev->hw_features = net_dev->features; net_dev->vlan_features = net_dev->features; + bgmac->in_init = false; + err =register_netdev (bgmac->net_dev);if (err) {dev_err (bgmac->dev,"Cannot register net device\n" );
drivers/net/ethernet/broadcom/bgmac.h +2 -0
@@ -511,6 +511,8 @@ struct bgmac {int irq;u32 int_mask; +bool in_init; +/* Current MAC state */ int mac_speed;int mac_duplex;
Signature · 1 line
2.35.3
Greg KH
maintainerQuoted 30 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
commit
f99e6d7c4ed3be2531bd576425a5bd07fb133bd7upstream.While bringing hardware up we should perform a full reset including the switch bit (
BGMAC_BCMA_IOCTL_SW_RESETakaSICF_SWRST). It's what specification says and what reference driver does.This seems to be critical for the BCM5358. Without this hardware doesn't get initialized properly and doesn't seem to transmit or receive any packets.
Originally bgmac was calling
bgmac_chip_reset()before setting "has_robosw" property which resulted in expected behaviour. That has changed as a side effect of adding platform device support which regressed BCM5358 support.Fixes f6a95a24957a ("net: ethernet: bgmac: Add platform device support")Cc Jon Mason <[email protected]>Signed-off-by Rafał Miłecki <[email protected]>Reviewed-by Leon Romanovsky <[email protected]>Reviewed-by Florian Fainelli <[email protected]>Signed-off-by Paolo Abeni <[email protected]>---
Upstream commit wasn't backported to 5.4 (and older) because it couldn't be cherry-picked cleanly. There was a small fuzz caused by a missing commit8c7da63978f1("bgmac: configure MTU and add support for frames beyond 8192 byte size").
Quoted 6 lines
I've manually cherry-picked fix for BCM5358 to the linux-5.4.x.
--- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++++-- drivers/net/ethernet/broadcom/bgmac.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-)
Now queued up, thanks.
greg k-h