From: Jakub Kicinski Date: Tue, 22 Apr 2025 01:47:59 +0000 (-0700) Subject: Merge branch 'net-stmmac-socfpga-fix-init-ordering-and-cleanups' X-Git-Tag: v6.16-rc1~132^2~257 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50f257069a225dc343ede72dcb4bbec7cc1ff969;p=thirdparty%2Flinux.git Merge branch 'net-stmmac-socfpga-fix-init-ordering-and-cleanups' Russell King says: ==================== net: stmmac: socfpga: fix init ordering and cleanups This series fixes the init ordering of the socfpga probe function. The standard rule is to do all setup before publishing any device, and socfpga violates that. I can see no reason for this, but these patches have not been tested on hardware. Address this by moving the initialisation of dwmac->stmmac_rst along with all the other dwmac initialisers - there's no reason for this to be late as plat_dat->stmmac_rst has already been populated. Next, replace the call to ops->set_phy_mode() with an init function socfpga_dwmac_init() which will then be linked in to plat_dat->init. Then, add this to plat_dat->init, and switch to stmmac_pltfr_pm_ops from the private ops. The runtime suspend/resume socfpga implementations are identical to the platform ones, but misses the noirq versions which this will add. Before we swap the order of socfpga_dwmac_init() and stmmac_dvr_probe(), we need to change the way the interface is obtained, as that uses driver data and the struct net_device which haven't been initialised. Save a pointer to plat_dat in the socfpga private data, and use that to get the interface mode. We can then swap the order of the init and probe functions. Finally, convert to devm_stmmac_pltfr_probe() by moving the call to ops->set_phy_mode() into an init function appropriately populating plat_dat->init. ==================== Link: https://patch.msgid.link/aAE2tKlImhwKySq_@shell.armlinux.org.uk Signed-off-by: Jakub Kicinski --- 50f257069a225dc343ede72dcb4bbec7cc1ff969