From: David S. Miller Date: Wed, 18 Mar 2020 04:00:15 +0000 (-0700) Subject: Merge branch 'net-bcmgenet-revisit-MAC-reset' X-Git-Tag: v5.15~4282^2~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af4e6671b21ff20ad189360d3a5a1d584c183091;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'net-bcmgenet-revisit-MAC-reset' Doug Berger says: ==================== net: bcmgenet: revisit MAC reset 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. ==================== Signed-off-by: David S. Miller --- af4e6671b21ff20ad189360d3a5a1d584c183091