Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: stmmac: qcom-ethqos: add ethqos_pcs_set_inband()

Add ethqos_pcs_set_inband() to improve readability, and to allow future
changes when phylink PCS support is properly merged.

Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> # sa8775p-ride-r3
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/E1uPkbO-004EyA-EU@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Russell King (Oracle) and committed by
Jakub Kicinski
8909f5f4 0c17270f

+9 -4
+9 -4
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
··· 622 622 } 623 623 } 624 624 625 + static void ethqos_pcs_set_inband(struct stmmac_priv *priv, bool enable) 626 + { 627 + stmmac_pcs_ctrl_ane(priv, priv->ioaddr, enable, 0, 0); 628 + } 629 + 625 630 /* On interface toggle MAC registers gets reset. 626 631 * Configure MAC block for SGMII on ethernet phy link up 627 632 */ ··· 645 640 RGMII_CONFIG2_RGMII_CLK_SEL_CFG, 646 641 RGMII_IO_MACRO_CONFIG2); 647 642 ethqos_set_serdes_speed(ethqos, SPEED_2500); 648 - stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 0, 0, 0); 643 + ethqos_pcs_set_inband(priv, false); 649 644 break; 650 645 case SPEED_1000: 651 646 val &= ~ETHQOS_MAC_CTRL_PORT_SEL; ··· 653 648 RGMII_CONFIG2_RGMII_CLK_SEL_CFG, 654 649 RGMII_IO_MACRO_CONFIG2); 655 650 ethqos_set_serdes_speed(ethqos, SPEED_1000); 656 - stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, 0, 0); 651 + ethqos_pcs_set_inband(priv, true); 657 652 break; 658 653 case SPEED_100: 659 654 val |= ETHQOS_MAC_CTRL_PORT_SEL | ETHQOS_MAC_CTRL_SPEED_MODE; 660 655 ethqos_set_serdes_speed(ethqos, SPEED_1000); 661 - stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, 0, 0); 656 + ethqos_pcs_set_inband(priv, true); 662 657 break; 663 658 case SPEED_10: 664 659 val |= ETHQOS_MAC_CTRL_PORT_SEL; ··· 668 663 SGMII_10M_RX_CLK_DVDR), 669 664 RGMII_IO_MACRO_CONFIG); 670 665 ethqos_set_serdes_speed(ethqos, SPEED_1000); 671 - stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, 0, 0); 666 + ethqos_pcs_set_inband(priv, true); 672 667 break; 673 668 } 674 669