net: stmmac: Fix clock rate variables size

The clock API clk_get_rate() returns unsigned long value.
Expand affected members of stmmac platform data and
convert the stmmac_clk_csr_set() and dwmac4_core_init() methods
to defining the unsigned long clk_rate local variables.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jan Petrous (OSS) <jan.petrous@oss.nxp.com>
Link: https://patch.msgid.link/20241205-upstream_s32cc_gmac-v8-3-ec1d180df815@oss.nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 901a3c1959fa57efb078da795ad4f92a8b6f71e1..2a5b38723635b5ef9233ca4709e99dd5ddf06b77 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -777,7 +777,7 @@ static void ethqos_ptp_clk_freq_config(struct stmmac_priv *priv)
                netdev_err(priv->dev, "Failed to max out clk_ptp_ref: %d\n", err);
        plat_dat->clk_ptp_rate = clk_get_rate(plat_dat->clk_ptp_ref);
 
-       netdev_dbg(priv->dev, "PTP rate %d\n", plat_dat->clk_ptp_rate);
+       netdev_dbg(priv->dev, "PTP rate %lu\n", plat_dat->clk_ptp_rate);
 }
 
 static int qcom_ethqos_probe(struct platform_device *pdev)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index c25781874aa78aa80ec800f5b29c8be6d20b04c9..c36f90a782c505d5f258ab3b4574b4c328281b00 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -27,7 +27,7 @@ static void dwmac4_core_init(struct mac_device_info *hw,
        struct stmmac_priv *priv = netdev_priv(dev);
        void __iomem *ioaddr = hw->pcsr;
        u32 value = readl(ioaddr + GMAC_CONFIG);
-       u32 clk_rate;
+       unsigned long clk_rate;
 
        value |= GMAC_CORE_INIT;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 3cb7ad6ccc4e5ec82b2a3e81a961a22b5d302cd4..d45fd7a3acd5cbc5ff47cc9923f82967c5bce393 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -301,7 +301,7 @@ static void stmmac_global_err(struct stmmac_priv *priv)
  */
 static void stmmac_clk_csr_set(struct stmmac_priv *priv)
 {
-       u32 clk_rate;
+       unsigned long clk_rate;
 
        clk_rate = clk_get_rate(priv->plat->stmmac_clk);
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 3ac32444e492209ee3b7e27b5e18a997be5e4590..06e07e6e180b7e8f6a825d16839187b96696126e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -640,7 +640,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
                dev_info(&pdev->dev, "PTP uses main clock\n");
        } else {
                plat->clk_ptp_rate = clk_get_rate(plat->clk_ptp_ref);
-               dev_dbg(&pdev->dev, "PTP rate %d\n", plat->clk_ptp_rate);
+               dev_dbg(&pdev->dev, "PTP rate %lu\n", plat->clk_ptp_rate);
        }
 
        plat->stmmac_rst = devm_reset_control_get_optional(&pdev->dev,

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 865d0fe26f98c30557de7bb0680ec4a92e7f38d1..c9878a612e53243b9c43e6687309317b500fb9f9 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -252,8 +252,8 @@ struct plat_stmmacenet_data {
        struct clk *stmmac_clk;
        struct clk *pclk;
        struct clk *clk_ptp_ref;
-       unsigned int clk_ptp_rate;
-       unsigned int clk_ref_rate;
+       unsigned long clk_ptp_rate;
+       unsigned long clk_ref_rate;
        unsigned int mult_fact_100ns;
        s32 ptp_max_adj;
        u32 cdc_error_adj;
@@ -265,7 +265,7 @@ struct plat_stmmacenet_data {
        int mac_port_sel_speed;
        int has_xgmac;
        u8 vlan_fail_q;
-       unsigned int eee_usecs_rate;
+       unsigned long eee_usecs_rate;
        struct pci_dev *pdev;
        int int_snapshot_num;
        int msi_mac_vec;