Commit 9d0c0d5e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski
Browse files

net: stmmac: replace the en_tx_lpi_clockgating field with a flag 



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

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-13-brgl@bgdev.pl


Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 743dd1db

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static int stmmac_enable_eee_mode(struct stmmac_priv *priv) 
	/* Check and enter in LPI mode */

	if (!priv->tx_path_in_lpi_mode)

		stmmac_set_eee_mode(priv, priv->hw,

				priv->plat->en_tx_lpi_clockgating);

			priv->plat->flags & STMMAC_FLAG_EN_TX_LPI_CLOCKGATING);

	return 0;

}

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -466,8 +466,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) 
	plat->force_sf_dma_mode =

		of_property_read_bool(np, "snps,force_sf_dma_mode");



	plat->en_tx_lpi_clockgating =

		of_property_read_bool(np, "snps,en-tx-lpi-clockgating");

	if (of_property_read_bool(np, "snps,en-tx-lpi-clockgating"))

		plat->flags |= STMMAC_FLAG_EN_TX_LPI_CLOCKGATING;



	/* Set the maxmtu to a default of JUMBO_LEN in case the

	 * parameter is not present in the device tree.

include/linux/stmmac.h

+1 −1
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ struct dwmac4_addrs { 
#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)

#define STMMAC_FLAG_EN_TX_LPI_CLOCKGATING	BIT(11)



struct plat_stmmacenet_data {

	int bus_id;
@@ -280,7 +281,6 @@ struct plat_stmmacenet_data { 
	int has_gmac4;

	int rss_en;

	int mac_port_sel_speed;

	bool en_tx_lpi_clockgating;

	int has_xgmac;

	u8 vlan_fail_q;

	unsigned int eee_usecs_rate;