OSDN Git Service

Revert "net: bcmgenet: soft reset 40nm EPHYs before MAC init"
authorDoug Berger <opendmb@gmail.com>
Tue, 5 Nov 2019 19:07:25 +0000 (11:07 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Nov 2019 18:46:22 +0000 (10:46 -0800)
commit6b6d017fccb4693767d2fcae9ef2fd05243748bb
tree3e2387aeae79932233fd4dfd6f8466ae5b4dfb5b
parent3a55402c93877d291b0a612d25edb03d1b4b93ac
Revert "net: bcmgenet: soft reset 40nm EPHYs before MAC init"

This reverts commit 1f515486275a08a17a2c806b844cca18f7de5b34.

This commit improved the chances of the umac resetting cleanly by
ensuring that the PHY was restored to its normal operation prior
to resetting the umac. However, there were still cases when the
PHY might not be driving a Tx clock to the umac during this window
(e.g. when the PHY detects no link).

The previous commit now ensures that the unimac receives clocks
from the MAC during its reset window so this commit is no longer
needed. This commit also has an unintended negative impact on the
MDIO performance of the UniMAC MDIO interface because it is used
before the MDIO interrupts are reenabled, so it should be removed.

Signed-off-by: Doug Berger <opendmb@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/broadcom/genet/bcmgenet.h
drivers/net/ethernet/broadcom/genet/bcmmii.c