mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-17 11:27:55 -04:00
Merge branch 'refactor-phy-reset-handling-and'
Thangaraj Samynathan says: ==================== Refactor PHY reset handling and fix WOL This patch series refines the PHY reset and initialization logic in the lan743x driver. Enhance the robustness of the driver initialization process and prevent WOL-related issues during suspend/resume cycles. ==================== Link: https://patch.msgid.link/20250526053048.287095-1-thangaraj.s@microchip.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -1330,7 +1330,7 @@ static int lan743x_mac_set_mtu(struct lan743x_adapter *adapter, int new_mtu)
|
||||
}
|
||||
|
||||
/* PHY */
|
||||
static int lan743x_phy_reset(struct lan743x_adapter *adapter)
|
||||
static int lan743x_hw_reset_phy(struct lan743x_adapter *adapter)
|
||||
{
|
||||
u32 data;
|
||||
|
||||
@@ -1346,11 +1346,6 @@ static int lan743x_phy_reset(struct lan743x_adapter *adapter)
|
||||
50000, 1000000);
|
||||
}
|
||||
|
||||
static int lan743x_phy_init(struct lan743x_adapter *adapter)
|
||||
{
|
||||
return lan743x_phy_reset(adapter);
|
||||
}
|
||||
|
||||
static void lan743x_phy_interface_select(struct lan743x_adapter *adapter)
|
||||
{
|
||||
u32 id_rev;
|
||||
@@ -3534,10 +3529,6 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = lan743x_phy_init(adapter);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = lan743x_ptp_init(adapter);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -3674,6 +3665,10 @@ static int lan743x_pcidev_probe(struct pci_dev *pdev,
|
||||
if (ret)
|
||||
goto cleanup_pci;
|
||||
|
||||
ret = lan743x_hw_reset_phy(adapter);
|
||||
if (ret)
|
||||
goto cleanup_pci;
|
||||
|
||||
ret = lan743x_hardware_init(adapter, pdev);
|
||||
if (ret)
|
||||
goto cleanup_pci;
|
||||
|
||||
Reference in New Issue
Block a user