]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: lan743x: Restore SGMII CTRL register on resume
authorThangaraj Samynathan <thangaraj.s@microchip.com>
Fri, 16 May 2025 03:57:19 +0000 (09:27 +0530)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 May 2025 02:44:17 +0000 (19:44 -0700)
SGMII_CTRL register, which specifies the active interface, was not
properly restored when resuming from suspend. This led to incorrect
interface selection after resume particularly in scenarios involving
the FPGA.

To fix this:
- Move the SGMII_CTRL setup out of the probe function.
- Initialize the register in the hardware initialization helper function,
which is called during both device initialization and resume.

This ensures the interface configuration is consistently restored after
suspend/resume cycles.

Fixes: a46d9d37c4f4f ("net: lan743x: Add support for SGMII interface")
Signed-off-by: Thangaraj Samynathan <thangaraj.s@microchip.com>
Link: https://patch.msgid.link/20250516035719.117960-1-thangaraj.s@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/microchip/lan743x_main.c

index e2d6bfb5d69334f3ec4bcbf8e6a2ba9c53147145..a70b88037a208b1bfbe52f0edf6ba53ccf546a2f 100644 (file)
@@ -3495,6 +3495,7 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter,
                                 struct pci_dev *pdev)
 {
        struct lan743x_tx *tx;
+       u32 sgmii_ctl;
        int index;
        int ret;
 
@@ -3507,6 +3508,15 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter,
                spin_lock_init(&adapter->eth_syslock_spinlock);
                mutex_init(&adapter->sgmii_rw_lock);
                pci11x1x_set_rfe_rd_fifo_threshold(adapter);
+               sgmii_ctl = lan743x_csr_read(adapter, SGMII_CTL);
+               if (adapter->is_sgmii_en) {
+                       sgmii_ctl |= SGMII_CTL_SGMII_ENABLE_;
+                       sgmii_ctl &= ~SGMII_CTL_SGMII_POWER_DN_;
+               } else {
+                       sgmii_ctl &= ~SGMII_CTL_SGMII_ENABLE_;
+                       sgmii_ctl |= SGMII_CTL_SGMII_POWER_DN_;
+               }
+               lan743x_csr_write(adapter, SGMII_CTL, sgmii_ctl);
        } else {
                adapter->max_tx_channels = LAN743X_MAX_TX_CHANNELS;
                adapter->used_tx_channels = LAN743X_USED_TX_CHANNELS;
@@ -3558,7 +3568,6 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter,
 
 static int lan743x_mdiobus_init(struct lan743x_adapter *adapter)
 {
-       u32 sgmii_ctl;
        int ret;
 
        adapter->mdiobus = devm_mdiobus_alloc(&adapter->pdev->dev);
@@ -3570,10 +3579,6 @@ static int lan743x_mdiobus_init(struct lan743x_adapter *adapter)
        adapter->mdiobus->priv = (void *)adapter;
        if (adapter->is_pci11x1x) {
                if (adapter->is_sgmii_en) {
-                       sgmii_ctl = lan743x_csr_read(adapter, SGMII_CTL);
-                       sgmii_ctl |= SGMII_CTL_SGMII_ENABLE_;
-                       sgmii_ctl &= ~SGMII_CTL_SGMII_POWER_DN_;
-                       lan743x_csr_write(adapter, SGMII_CTL, sgmii_ctl);
                        netif_dbg(adapter, drv, adapter->netdev,
                                  "SGMII operation\n");
                        adapter->mdiobus->read = lan743x_mdiobus_read_c22;
@@ -3584,10 +3589,6 @@ static int lan743x_mdiobus_init(struct lan743x_adapter *adapter)
                        netif_dbg(adapter, drv, adapter->netdev,
                                  "lan743x-mdiobus-c45\n");
                } else {
-                       sgmii_ctl = lan743x_csr_read(adapter, SGMII_CTL);
-                       sgmii_ctl &= ~SGMII_CTL_SGMII_ENABLE_;
-                       sgmii_ctl |= SGMII_CTL_SGMII_POWER_DN_;
-                       lan743x_csr_write(adapter, SGMII_CTL, sgmii_ctl);
                        netif_dbg(adapter, drv, adapter->netdev,
                                  "RGMII operation\n");
                        // Only C22 support when RGMII I/F