[PATCH net-next v3 1/5] net: lan743x: rename is_sgmii_en to is_pcs_en
STALE137d
From: Thangaraj Samynathan <thangaraj.s@microchip.com>
Date: 2026-05-08 05:22:22
Also in:
lkml
Subsystem:
microchip lan743x ethernet driver, networking drivers, the rest · Maintainers:
Bryan Whitehead, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v3 of 2 in this series.
Revisions (2)
- v3 current
- v4 [diff vs current]
The flag is_sgmii_en indicates whether the PCS interface is enabled. However, the name implies that the interface is strictly SGMII, which is misleading. Rename the variable to is_pcs_en to better reflect that the flag represents the PCS enable state rather than a specific interface mode. Update all references and logs accordingly (but keep device registers unchanged to match its documentation). No functional change intended. Signed-off-by: Thangaraj Samynathan <thangaraj.s@microchip.com> --- .../net/ethernet/microchip/lan743x_ethtool.c | 4 ++-- drivers/net/ethernet/microchip/lan743x_main.c | 18 +++++++++--------- drivers/net/ethernet/microchip/lan743x_main.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
index 9195419ecee0..743acfd56554 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c@@ -1312,7 +1312,7 @@ static int lan743x_get_regs_len(struct net_device *dev) struct lan743x_adapter *adapter = netdev_priv(dev); u32 num_regs = MAX_LAN743X_ETH_COMMON_REGS; - if (adapter->is_sgmii_en) + if (adapter->is_pcs_en) num_regs += MAX_LAN743X_ETH_SGMII_REGS; return num_regs * sizeof(u32);
@@ -1333,7 +1333,7 @@ static void lan743x_get_regs(struct net_device *dev, lan743x_common_regs(dev, p); p = (u32 *)p + MAX_LAN743X_ETH_COMMON_REGS; - if (adapter->is_sgmii_en) { + if (adapter->is_pcs_en) { lan743x_sgmii_regs(dev, p); p = (u32 *)p + MAX_LAN743X_ETH_SGMII_REGS; }
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index f3332417162e..fad4a246e06e 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c@@ -59,22 +59,22 @@ static void pci11x1x_strap_get_status(struct lan743x_adapter *adapter) hw_cfg & HW_CFG_RST_PROTECT_)) || (strap & STRAP_READ_USE_SGMII_EN_)) { if (strap & STRAP_READ_SGMII_EN_) - adapter->is_sgmii_en = true; + adapter->is_pcs_en = true; else - adapter->is_sgmii_en = false; + adapter->is_pcs_en = false; } else { fpga_rev = lan743x_csr_read(adapter, FPGA_REV); if (fpga_rev) { if (fpga_rev & FPGA_SGMII_OP) - adapter->is_sgmii_en = true; + adapter->is_pcs_en = true; else - adapter->is_sgmii_en = false; + adapter->is_pcs_en = false; } else { - adapter->is_sgmii_en = false; + adapter->is_pcs_en = false; } } netif_dbg(adapter, drv, adapter->netdev, - "SGMII I/F %sable\n", adapter->is_sgmii_en ? "En" : "Dis"); + "PCS I/F %s\n", str_enable_disable(adapter->is_pcs_en)); } static bool is_pci11x1x_chip(struct lan743x_adapter *adapter)
@@ -1361,7 +1361,7 @@ static void lan743x_phy_interface_select(struct lan743x_adapter *adapter) data = lan743x_csr_read(adapter, MAC_CR); id_rev = adapter->csr.id_rev & ID_REV_ID_MASK_; - if (adapter->is_pci11x1x && adapter->is_sgmii_en) + if (adapter->is_pci11x1x && adapter->is_pcs_en) adapter->phy_interface = PHY_INTERFACE_MODE_SGMII; else if (id_rev == ID_REV_ID_LAN7430_) adapter->phy_interface = PHY_INTERFACE_MODE_GMII;
@@ -3515,7 +3515,7 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter, 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) { + if (adapter->is_pcs_en) { sgmii_ctl |= SGMII_CTL_SGMII_ENABLE_; sgmii_ctl &= ~SGMII_CTL_SGMII_POWER_DN_; } else {
@@ -3580,7 +3580,7 @@ static int lan743x_mdiobus_init(struct lan743x_adapter *adapter) adapter->mdiobus->priv = (void *)adapter; if (adapter->is_pci11x1x) { - if (adapter->is_sgmii_en) { + if (adapter->is_pcs_en) { netif_dbg(adapter, drv, adapter->netdev, "SGMII operation\n"); adapter->mdiobus->read = lan743x_mdiobus_read_c22;
diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
index 160d94a7cee6..f0fa0580b04e 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.h
+++ b/drivers/net/ethernet/microchip/lan743x_main.h@@ -1070,7 +1070,7 @@ struct lan743x_adapter { struct lan743x_tx tx[PCI11X1X_USED_TX_CHANNELS]; struct lan743x_rx rx[LAN743X_USED_RX_CHANNELS]; bool is_pci11x1x; - bool is_sgmii_en; + bool is_pcs_en; /* protect ethernet syslock */ spinlock_t eth_syslock_spinlock; bool eth_syslock_en;
--
2.34.1