* [PATCH net-next 0/2] net: stmmac: qcom-ethqos: cleanups @ 2026-01-12 18:08 Russell King (Oracle) 2026-01-12 18:11 ` [PATCH net-next 1/2] net: stmmac: qcom-ethqos: remove mac_base Russell King (Oracle) 2026-01-12 18:11 ` [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method Russell King (Oracle) 0 siblings, 2 replies; 7+ messages in thread From: Russell King (Oracle) @ 2026-01-12 18:08 UTC (permalink / raw) To: Andrew Lunn, Heiner Kallweit Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul Hi, Two changes: 1. In a previous commit, I missed that mac_base became write only. Remove it. 2. Switch qcom-ethqos to use the set_clk_tx_rate() method rather than setting the RGMII clock in the fix_mac_speed() method. .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last! ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next 1/2] net: stmmac: qcom-ethqos: remove mac_base 2026-01-12 18:08 [PATCH net-next 0/2] net: stmmac: qcom-ethqos: cleanups Russell King (Oracle) @ 2026-01-12 18:11 ` Russell King (Oracle) 2026-01-12 19:41 ` Andrew Lunn 2026-01-12 18:11 ` [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method Russell King (Oracle) 1 sibling, 1 reply; 7+ messages in thread From: Russell King (Oracle) @ 2026-01-12 18:11 UTC (permalink / raw) To: Andrew Lunn, Heiner Kallweit Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul Since the blamed commit, ethqos->mac_base is only written, never read. Let's remove it. Fixes: 9b443e58a896 ("net: stmmac: qcom-ethqos: remove MAC_CTRL_REG modification") Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 0826a7bd32ff..869f924f3cde 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -100,7 +100,6 @@ struct ethqos_emac_driver_data { struct qcom_ethqos { struct platform_device *pdev; void __iomem *rgmii_base; - void __iomem *mac_base; int (*configure_func)(struct qcom_ethqos *ethqos, int speed); unsigned int link_clk_rate; @@ -772,8 +771,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(ethqos->rgmii_base), "Failed to map rgmii resource\n"); - ethqos->mac_base = stmmac_res.addr; - data = of_device_get_match_data(dev); ethqos->por = data->por; ethqos->num_por = data->num_por; -- 2.47.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 1/2] net: stmmac: qcom-ethqos: remove mac_base 2026-01-12 18:11 ` [PATCH net-next 1/2] net: stmmac: qcom-ethqos: remove mac_base Russell King (Oracle) @ 2026-01-12 19:41 ` Andrew Lunn 0 siblings, 0 replies; 7+ messages in thread From: Andrew Lunn @ 2026-01-12 19:41 UTC (permalink / raw) To: Russell King (Oracle) Cc: Heiner Kallweit, Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul On Mon, Jan 12, 2026 at 06:11:24PM +0000, Russell King (Oracle) wrote: > Since the blamed commit, ethqos->mac_base is only written, never > read. Let's remove it. > > Fixes: 9b443e58a896 ("net: stmmac: qcom-ethqos: remove MAC_CTRL_REG modification") > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method 2026-01-12 18:08 [PATCH net-next 0/2] net: stmmac: qcom-ethqos: cleanups Russell King (Oracle) 2026-01-12 18:11 ` [PATCH net-next 1/2] net: stmmac: qcom-ethqos: remove mac_base Russell King (Oracle) @ 2026-01-12 18:11 ` Russell King (Oracle) 2026-01-12 20:01 ` Simon Horman ` (2 more replies) 1 sibling, 3 replies; 7+ messages in thread From: Russell King (Oracle) @ 2026-01-12 18:11 UTC (permalink / raw) To: Andrew Lunn, Heiner Kallweit Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul Set the RGMII link clock using the set_clk_tx_rate() method rather than coding it into the .fix_mac_speed() method. This simplifies ethqos's ethqos_fix_mac_speed(). Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 869f924f3cde..d6df3ca757be 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -102,7 +102,6 @@ struct qcom_ethqos { void __iomem *rgmii_base; int (*configure_func)(struct qcom_ethqos *ethqos, int speed); - unsigned int link_clk_rate; struct clk *link_clk; struct phy *serdes_phy; int serdes_speed; @@ -174,19 +173,18 @@ static void rgmii_dump(void *priv) rgmii_readl(ethqos, EMAC_SYSTEM_LOW_POWER_DEBUG)); } -static void -ethqos_update_link_clk(struct qcom_ethqos *ethqos, int speed) +static int ethqos_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, + phy_interface_t interface, int speed) { + struct qcom_ethqos *ethqos = bsp_priv; long rate; - if (!phy_interface_mode_is_rgmii(ethqos->phy_mode)) - return; + if (!phy_interface_mode_is_rgmii(interface)) + return 0; rate = rgmii_clock(speed); if (rate > 0) - ethqos->link_clk_rate = rate * 2; - - clk_set_rate(ethqos->link_clk, ethqos->link_clk_rate); + clk_set_rate(ethqos->link_clk, rate * 2); } static void @@ -645,7 +643,6 @@ static void ethqos_fix_mac_speed(void *priv, int speed, unsigned int mode) struct qcom_ethqos *ethqos = priv; qcom_ethqos_set_sgmii_loopback(ethqos, false); - ethqos_update_link_clk(ethqos, speed); ethqos_configure(ethqos, speed); } @@ -797,10 +794,12 @@ static int qcom_ethqos_probe(struct platform_device *pdev) "Failed to get serdes phy\n"); ethqos->serdes_speed = SPEED_1000; - ethqos_update_link_clk(ethqos, SPEED_1000); + ethqos_set_clk_tx_rate(ethqos, NULL, plat_dat->phy_interface, + SPEED_1000); ethqos_set_func_clk_en(ethqos); plat_dat->bsp_priv = ethqos; + plat_dat->set_clk_tx_rate = ethqos_set_clk_tx_rate; plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; plat_dat->ptp_clk_freq_config = ethqos_ptp_clk_freq_config; -- 2.47.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method 2026-01-12 18:11 ` [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method Russell King (Oracle) @ 2026-01-12 20:01 ` Simon Horman 2026-01-13 3:52 ` kernel test robot 2026-01-13 5:17 ` kernel test robot 2 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2026-01-12 20:01 UTC (permalink / raw) To: Russell King (Oracle) Cc: Andrew Lunn, Heiner Kallweit, Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul On Mon, Jan 12, 2026 at 06:11:29PM +0000, Russell King (Oracle) wrote: > Set the RGMII link clock using the set_clk_tx_rate() method rather than > coding it into the .fix_mac_speed() method. This simplifies ethqos's > ethqos_fix_mac_speed(). > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > .../stmicro/stmmac/dwmac-qcom-ethqos.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > index 869f924f3cde..d6df3ca757be 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > @@ -102,7 +102,6 @@ struct qcom_ethqos { > void __iomem *rgmii_base; > int (*configure_func)(struct qcom_ethqos *ethqos, int speed); > > - unsigned int link_clk_rate; > struct clk *link_clk; > struct phy *serdes_phy; > int serdes_speed; > @@ -174,19 +173,18 @@ static void rgmii_dump(void *priv) > rgmii_readl(ethqos, EMAC_SYSTEM_LOW_POWER_DEBUG)); > } > > -static void > -ethqos_update_link_clk(struct qcom_ethqos *ethqos, int speed) > +static int ethqos_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, > + phy_interface_t interface, int speed) > { > + struct qcom_ethqos *ethqos = bsp_priv; > long rate; > > - if (!phy_interface_mode_is_rgmii(ethqos->phy_mode)) > - return; > + if (!phy_interface_mode_is_rgmii(interface)) > + return 0; > > rate = rgmii_clock(speed); > if (rate > 0) > - ethqos->link_clk_rate = rate * 2; > - > - clk_set_rate(ethqos->link_clk, ethqos->link_clk_rate); > + clk_set_rate(ethqos->link_clk, rate * 2); Hi Russell, An int needs to be returned here. > } > > static void -- pw-bot: cr ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method 2026-01-12 18:11 ` [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method Russell King (Oracle) 2026-01-12 20:01 ` Simon Horman @ 2026-01-13 3:52 ` kernel test robot 2026-01-13 5:17 ` kernel test robot 2 siblings, 0 replies; 7+ messages in thread From: kernel test robot @ 2026-01-13 3:52 UTC (permalink / raw) To: Russell King (Oracle), Andrew Lunn, Heiner Kallweit Cc: oe-kbuild-all, Alexandre Torgue, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul Hi Russell, kernel test robot noticed the following build warnings: [auto build test WARNING on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Russell-King-Oracle/net-stmmac-qcom-ethqos-remove-mac_base/20260113-061245 base: net-next/main patch link: https://lore.kernel.org/r/E1vfMO1-00000002kJF-33UK%40rmk-PC.armlinux.org.uk patch subject: [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20260113/202601131106.zgy17BPH-lkp@intel.com/config) compiler: arc-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260113/202601131106.zgy17BPH-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202601131106.zgy17BPH-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c: In function 'ethqos_set_clk_tx_rate': >> drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c:188:1: warning: control reaches end of non-void function [-Wreturn-type] 188 | } | ^ vim +188 drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c a7c30e62d4b895 Vinod Koul 2019-01-21 175 a69650e88a5551 Russell King (Oracle 2026-01-12 176) static int ethqos_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, a69650e88a5551 Russell King (Oracle 2026-01-12 177) phy_interface_t interface, int speed) a7c30e62d4b895 Vinod Koul 2019-01-21 178 { a69650e88a5551 Russell King (Oracle 2026-01-12 179) struct qcom_ethqos *ethqos = bsp_priv; 98f9928843331f Russell King (Oracle 2025-02-21 180) long rate; 98f9928843331f Russell King (Oracle 2025-02-21 181) a69650e88a5551 Russell King (Oracle 2026-01-12 182) if (!phy_interface_mode_is_rgmii(interface)) a69650e88a5551 Russell King (Oracle 2026-01-12 183) return 0; 26311cd112d05a Sarosh Hasan 2024-02-26 184 98f9928843331f Russell King (Oracle 2025-02-21 185) rate = rgmii_clock(speed); 98f9928843331f Russell King (Oracle 2025-02-21 186) if (rate > 0) a69650e88a5551 Russell King (Oracle 2026-01-12 187) clk_set_rate(ethqos->link_clk, rate * 2); a7c30e62d4b895 Vinod Koul 2019-01-21 @188 } a7c30e62d4b895 Vinod Koul 2019-01-21 189 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method 2026-01-12 18:11 ` [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method Russell King (Oracle) 2026-01-12 20:01 ` Simon Horman 2026-01-13 3:52 ` kernel test robot @ 2026-01-13 5:17 ` kernel test robot 2 siblings, 0 replies; 7+ messages in thread From: kernel test robot @ 2026-01-13 5:17 UTC (permalink / raw) To: Russell King (Oracle), Andrew Lunn, Heiner Kallweit Cc: llvm, oe-kbuild-all, Alexandre Torgue, Eric Dumazet, Jakub Kicinski, Konrad Dybcio, linux-arm-kernel, linux-arm-msm, linux-stm32, Maxime Coquelin, Mohd Ayaan Anwar, netdev, Paolo Abeni, Vinod Koul Hi Russell, kernel test robot noticed the following build warnings: [auto build test WARNING on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Russell-King-Oracle/net-stmmac-qcom-ethqos-remove-mac_base/20260113-061245 base: net-next/main patch link: https://lore.kernel.org/r/E1vfMO1-00000002kJF-33UK%40rmk-PC.armlinux.org.uk patch subject: [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method config: loongarch-allmodconfig (https://download.01.org/0day-ci/archive/20260113/202601131202.sz9WCQgh-lkp@intel.com/config) compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260113/202601131202.sz9WCQgh-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202601131202.sz9WCQgh-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c:188:1: warning: non-void function does not return a value in all control paths [-Wreturn-type] 188 | } | ^ 1 warning generated. vim +188 drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c a7c30e62d4b895 Vinod Koul 2019-01-21 175 a69650e88a5551 Russell King (Oracle 2026-01-12 176) static int ethqos_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i, a69650e88a5551 Russell King (Oracle 2026-01-12 177) phy_interface_t interface, int speed) a7c30e62d4b895 Vinod Koul 2019-01-21 178 { a69650e88a5551 Russell King (Oracle 2026-01-12 179) struct qcom_ethqos *ethqos = bsp_priv; 98f9928843331f Russell King (Oracle 2025-02-21 180) long rate; 98f9928843331f Russell King (Oracle 2025-02-21 181) a69650e88a5551 Russell King (Oracle 2026-01-12 182) if (!phy_interface_mode_is_rgmii(interface)) a69650e88a5551 Russell King (Oracle 2026-01-12 183) return 0; 26311cd112d05a Sarosh Hasan 2024-02-26 184 98f9928843331f Russell King (Oracle 2025-02-21 185) rate = rgmii_clock(speed); 98f9928843331f Russell King (Oracle 2025-02-21 186) if (rate > 0) a69650e88a5551 Russell King (Oracle 2026-01-12 187) clk_set_rate(ethqos->link_clk, rate * 2); a7c30e62d4b895 Vinod Koul 2019-01-21 @188 } a7c30e62d4b895 Vinod Koul 2019-01-21 189 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-01-13 5:18 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-01-12 18:08 [PATCH net-next 0/2] net: stmmac: qcom-ethqos: cleanups Russell King (Oracle) 2026-01-12 18:11 ` [PATCH net-next 1/2] net: stmmac: qcom-ethqos: remove mac_base Russell King (Oracle) 2026-01-12 19:41 ` Andrew Lunn 2026-01-12 18:11 ` [PATCH net-next 2/2] net: stmmac: qcom-ethqos: convert to set_clk_tx_rate() method Russell King (Oracle) 2026-01-12 20:01 ` Simon Horman 2026-01-13 3:52 ` kernel test robot 2026-01-13 5:17 ` kernel test robot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox