From 36260f162defe41fe144d69756990519c4188c83 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Fri, 29 Jun 2018 13:55:02 +0200 Subject: net: designware: make sure DMA is disabled on kernel start. Halt is not automatically executed if we start the kernel. So, we may have potentially memory corruptions. Signed-off-by: Oleksij Rempel Signed-off-by: Sascha Hauer --- drivers/net/designware.c | 8 ++++++++ drivers/net/designware.h | 1 + drivers/net/designware_generic.c | 1 + drivers/net/designware_socfpga.c | 1 + 4 files changed, 11 insertions(+) diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 862ee2f046..49ddaa20d8 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -471,6 +471,7 @@ struct dw_eth_dev *dwc_drv_probe(struct device_d *dev) miibus = &priv->miibus; edev->priv = priv; + dev->priv = edev; edev->parent = dev; edev->open = dwc_ether_open; edev->send = dwc_ether_send; @@ -489,3 +490,10 @@ struct dw_eth_dev *dwc_drv_probe(struct device_d *dev) return priv; } + +void dwc_drv_remove(struct device_d *dev) +{ + struct eth_device *edev = dev->priv; + + dwc_ether_halt(edev); +} diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 4a99fa2aa6..6236d6c2e5 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -51,6 +51,7 @@ struct dw_eth_drvdata { }; struct dw_eth_dev *dwc_drv_probe(struct device_d *dev); +void dwc_drv_remove(struct device_d *dev); #define CONFIG_TX_DESCR_NUM 16 #define CONFIG_RX_DESCR_NUM 16 diff --git a/drivers/net/designware_generic.c b/drivers/net/designware_generic.c index 29269deac9..9d125b47a6 100644 --- a/drivers/net/designware_generic.c +++ b/drivers/net/designware_generic.c @@ -55,6 +55,7 @@ static __maybe_unused struct of_device_id dwc_ether_compatible[] = { static struct driver_d dwc_ether_driver = { .name = "designware_eth", .probe = dwc_ether_probe, + .remove = dwc_drv_remove, .of_compatible = DRV_OF_COMPAT(dwc_ether_compatible), }; device_platform_driver(dwc_ether_driver); diff --git a/drivers/net/designware_socfpga.c b/drivers/net/designware_socfpga.c index 154c38f9a1..cb88882d66 100644 --- a/drivers/net/designware_socfpga.c +++ b/drivers/net/designware_socfpga.c @@ -179,6 +179,7 @@ static __maybe_unused struct of_device_id socfpga_dwc_ether_compatible[] = { static struct driver_d socfpga_dwc_ether_driver = { .name = "socfpga_designware_eth", .probe = socfpga_dwc_ether_probe, + .remove = dwc_drv_remove, .of_compatible = DRV_OF_COMPAT(socfpga_dwc_ether_compatible), }; device_platform_driver(socfpga_dwc_ether_driver); -- cgit v1.2.3