diff options
| author | Anže Lešnik <anze.lesnik@norik.com> | 2022-07-05 10:55:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-07-05 15:50:25 +0200 |
| commit | 64cc8cf0b816723d155fa86b38d9cffc1ecf5cc2 (patch) | |
| tree | bbeb83fc31368cbace6374e1b812d0d58a4af873 /drivers/net/fec_imx.c | |
| parent | 64881838a5e93d4ef5b5721481cfa043f086fac7 (diff) | |
| download | barebox-64cc8cf0b816723d155fa86b38d9cffc1ecf5cc2.tar.gz barebox-64cc8cf0b816723d155fa86b38d9cffc1ecf5cc2.tar.xz | |
drivers: net: fec_imx: Fix system halt after FEC reinit
Fix problem with system hang when trying to re-init ethernet interface
on i.MX devices. The problem is that RX and TX buffer descriptor address
registers are only being set in fec_probe(). When fec_halt() is called
when bringing down the interface, this resets the FEC and values are
lost. As per documentation, these registers should be reconfigured
before re-enabling the FEC. Additionally, move fec_init() call from
probe to open, since the FEC needs to re-initialized after every reset.
Signed-off-by: Anže Lešnik <anze.lesnik@norik.com>
Link: https://lore.barebox.org/barebox/c51b2c94-61b7-df44-5d4c-025d18c4b24f@norik.com
Link: https://lore.barebox.org/20220705085534.34251-1-anze.lesnik@norik.com
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/fec_imx.c')
| -rw-r--r-- | drivers/net/fec_imx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 0c2d600d12..673555a48a 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -320,6 +320,10 @@ static int fec_init(struct eth_device *dev) /* size of each buffer */ writel(FEC_MAX_PKT_SIZE, fec->regs + FEC_EMRBR); + /* set rx and tx buffer descriptor base address */ + writel(virt_to_phys(fec->tbd_base), fec->regs + FEC_ETDSR); + writel(virt_to_phys(fec->rbd_base), fec->regs + FEC_ERDSR); + return 0; } @@ -359,6 +363,8 @@ static int fec_open(struct eth_device *edev) if (fec->phy_init) fec->phy_init(edev->phydev); + fec_init(edev); + /* * Initialize RxBD/TxBD rings */ @@ -839,9 +845,6 @@ static int fec_probe(struct device_d *dev) base += FEC_RBD_NUM * sizeof(struct buffer_descriptor); fec->tbd_base = base; - writel(virt_to_phys(fec->tbd_base), fec->regs + FEC_ETDSR); - writel(virt_to_phys(fec->rbd_base), fec->regs + FEC_ERDSR); - ret = fec_alloc_receive_packets(fec, FEC_RBD_NUM, FEC_MAX_PKT_SIZE); if (ret < 0) goto free_xbd; @@ -861,8 +864,6 @@ static int fec_probe(struct device_d *dev) if (ret) goto free_receive_packets; - fec_init(edev); - fec->miibus.read = fec_miibus_read; fec->miibus.write = fec_miibus_write; |