]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "net: axienet: Wait for PhyRstCmplt after core reset"
authorSasha Levin <sashal@kernel.org>
Fri, 11 Feb 2022 23:25:23 +0000 (18:25 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Feb 2022 11:44:50 +0000 (12:44 +0100)
This reverts commit ff594e1b6f39f07f050759de2d27c36b7739c0c9.

Breaks the build on 4.14 and 4.9.

Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/xilinx/xilinx_axienet_main.c

index d2ba466613c0aa6434b9abd0d1ff1cfeb4f3b51e..7876e56a5b5db62770d4bb349df4b698090171ea 100644 (file)
@@ -279,16 +279,6 @@ static int axienet_dma_bd_init(struct net_device *ndev)
        axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET,
                          cr | XAXIDMA_CR_RUNSTOP_MASK);
 
-       /* Wait for PhyRstCmplt bit to be set, indicating the PHY reset has finished */
-       ret = read_poll_timeout(axienet_ior, value,
-                               value & XAE_INT_PHYRSTCMPLT_MASK,
-                               DELAY_OF_ONE_MILLISEC, 50000, false, lp,
-                               XAE_IS_OFFSET);
-       if (ret) {
-               dev_err(lp->dev, "%s: timeout waiting for PhyRstCmplt\n", __func__);
-               return ret;
-       }
-
        return 0;
 out:
        axienet_dma_bd_release(ndev);