net: stmmac: replace the rx_clk_runs_in_lpi field with a flag

Drop the boolean field of the plat_stmmacenet_data structure in favor of a
simple bitfield flag.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-12-brgl@bgdev.pl
Reviewed-by: Simon Horman <simon.horman@corigine.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 4b58904ee132b4855c1d14c7f81b9760f597b3ee..735525ba8b93171c1c477ea07bcb9aa8430b0df2 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -786,7 +786,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
        if (of_property_read_bool(np, "snps,tso"))
                plat_dat->flags |= STMMAC_FLAG_TSO_EN;
        if (of_device_is_compatible(np, "qcom,qcs404-ethqos"))
-               plat_dat->rx_clk_runs_in_lpi = 1;
+               plat_dat->flags |= STMMAC_FLAG_RX_CLK_RUNS_IN_LPI;
        if (data->has_integrated_pcs)
                plat_dat->flags |= STMMAC_FLAG_HAS_INTEGRATED_PCS;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index ebe82e7b50fc69491dd340a9f518cd1ebf22b515..2d68a6e84b0e478633cac28a3a53aa8c06d78176 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1085,7 +1085,8 @@ static void stmmac_mac_link_up(struct phylink_config *config,
        stmmac_mac_set(priv, priv->ioaddr, true);
        if (phy && priv->dma_cap.eee) {
                priv->eee_active =
-                       phy_init_eee(phy, !priv->plat->rx_clk_runs_in_lpi) >= 0;
+                       phy_init_eee(phy, !(priv->plat->flags &
+                               STMMAC_FLAG_RX_CLK_RUNS_IN_LPI)) >= 0;
                priv->eee_enabled = stmmac_eee_init(priv);
                priv->tx_lpi_enabled = priv->eee_enabled;
                stmmac_set_eee_pls(priv, priv->hw, true);

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 47708ddd57fd34adbf5c979727fbb157f708bcf1..c3769dad82381825aec0fa5c44b4cb7b9f034d19 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -214,6 +214,7 @@ struct dwmac4_addrs {
 #define STMMAC_FLAG_MULTI_MSI_EN               BIT(7)
 #define STMMAC_FLAG_EXT_SNAPSHOT_EN            BIT(8)
 #define STMMAC_FLAG_INT_SNAPSHOT_EN            BIT(9)
+#define STMMAC_FLAG_RX_CLK_RUNS_IN_LPI         BIT(10)
 
 struct plat_stmmacenet_data {
        int bus_id;
@@ -280,7 +281,6 @@ struct plat_stmmacenet_data {
        int rss_en;
        int mac_port_sel_speed;
        bool en_tx_lpi_clockgating;
-       bool rx_clk_runs_in_lpi;
        int has_xgmac;
        u8 vlan_fail_q;
        unsigned int eee_usecs_rate;