mbox series

[net,0/2] net: bcmgenet: revisit MAC reset

Message ID 1584395096-41674-1-git-send-email-opendmb@gmail.com
Headers show
Series net: bcmgenet: revisit MAC reset | expand

Message

Doug Berger March 16, 2020, 9:44 p.m. UTC 
Commit 3a55402c9387 ("net: bcmgenet: use RGMII loopback for MAC 
reset") was intended to resolve issues with reseting the UniMAC
core within the GENET block by providing better control over the
clocks used by the UniMAC core. Unfortunately, it is not
compatible with all of the supported system configurations so an
alternative method must be applied.

This commit set provides such an alternative. The first commit
reverts the previous change and the second commit provides the
alternative reset sequence that addresses the concerns observed
with the previous implementation.

This replacement implementation should be applied to the stable
branches wherever commit 3a55402c9387 ("net: bcmgenet: use RGMII 
loopback for MAC reset") has been applied.

Unfortunately, reverting that commit may conflict with some
restructuring changes introduced by commit 4f8d81b77e66 ("net: 
bcmgenet: Refactor register access in bcmgenet_mii_config").
The first commit in this set has been manually edited to
resolve the conflict on net/master. I would be happy to help
stable maintainers with resolving any such conflicts if they
occur. However, I do not expect that commit to have been
backported to stable branch so hopefully the revert can be
applied cleanly.

Doug Berger (2):
  Revert "net: bcmgenet: use RGMII loopback for MAC reset"
  net: bcmgenet: keep MAC in reset until PHY is up

 drivers/net/ethernet/broadcom/genet/bcmgenet.c     | 10 +++---
 drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c |  6 +++-
 drivers/net/ethernet/broadcom/genet/bcmmii.c       | 40 ++++------------------
 3 files changed, 16 insertions(+), 40 deletions(-)