linux-kernel - Re: [PATCH 2/6] net: stmmac: Expand clock rate variables

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ciueb72cjvfkmo3snnb5zcrfqtbum5x54kgurkkouwe6zrdrjj@vi54y7cczow3>
Date: Tue, 6 Aug 2024 13:17:52 +0300
From: Serge Semin <fancer.lancer@...il.com>
To: "Jan Petrous (OSS)" <jan.petrous@....nxp.com>
Cc: Maxime Coquelin <mcoquelin.stm32@...il.com>, 
	Alexandre Torgue <alexandre.torgue@...s.st.com>, dl-S32 <S32@....com>, 
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, 
	"linux-stm32@...md-mailman.stormreply.com" <linux-stm32@...md-mailman.stormreply.com>, 
	"linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, Claudiu Manoil <claudiu.manoil@....com>, 
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH 2/6] net: stmmac: Expand clock rate variables

On Sun, Aug 04, 2024 at 08:49:49PM +0000, Jan Petrous (OSS) wrote:
> The clock API clk_get_rate() returns unsigned long value.
> Expand affected members of stmmac platform data.
> 
> Signed-off-by: Jan Petrous (OSS) <jan.petrous@....nxp.com>

Since you are fixing this anyway, please convert the
stmmac_clk_csr_set() and dwmac4_core_init() methods to defining the
unsigned long clk_rate local variables.

After taking the above into account feel free to add:
Reviewed-by: Serge Semin <fancer.lancer@...il.com>

-Serge(y)

> ---
>  drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +-
>  drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c   | 2 +-
>  include/linux/stmmac.h                                  | 6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> index 901a3c1959fa..2a5b38723635 100644
> --- 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/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index ad868e8d195d..b1e4df1a86a0 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -639,7 +639,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 7caaa5ae6674..47a763699916 100644
> --- a/include/linux/stmmac.h
> +++ b/include/linux/stmmac.h
> @@ -279,8 +279,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;
> @@ -292,7 +292,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;

Sigh... One another Intel clumsy stuff: this field is initialized by
the Intel glue-drivers and utilized in there only. Why on earth has it
been added to the generic plat_stmmacenet_data structure?.. The
only explanation is that the Intel developers were lazy to refactor
the glue-driver a bit so the to be able to reach the platform data at
the respective context.

-Serge(y)

>  	struct pci_dev *pdev;
>  	int int_snapshot_num;
>  	int msi_mac_vec;
> -- 
> 2.45.2
> 
>