Commit 68861a3b authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski
Browse files

net: stmmac: replace the tso_en 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-6-brgl@bgdev.pl


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

drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int dwc_eth_dwmac_config_dt(struct platform_device *pdev, 
	/* dwc-qos needs GMAC4, AAL, TSO and PMT */

	plat_dat->has_gmac4 = 1;

	plat_dat->dma_cfg->aal = 1;

	plat_dat->tso_en = 1;

	plat_dat->flags |= STMMAC_FLAG_TSO_EN;

	plat_dat->pmt = 1;



	return 0;

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+1 −2
Original line number Diff line number Diff line
@@ -458,8 +458,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, 
	plat->has_gmac = 0;

	plat->has_gmac4 = 1;

	plat->force_sf_dma_mode = 0;

	plat->tso_en = 1;

	plat->flags |= STMMAC_FLAG_SPH_DISABLE;

	plat->flags |= (STMMAC_FLAG_TSO_EN | STMMAC_FLAG_SPH_DISABLE);



	/* Multiplying factor to the clk_eee_i clock time

	 * period to make it closer to 100 ns. This value

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+2 −1
Original line number Diff line number Diff line
@@ -783,7 +783,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) 
	if (ethqos->has_emac_ge_3)

		plat_dat->dwmac4_addrs = &data->dwmac4_addrs;

	plat_dat->pmt = 1;

	plat_dat->tso_en = of_property_read_bool(np, "snps,tso");

	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;

	if (data->has_integrated_pcs)

drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int tegra_mgbe_probe(struct platform_device *pdev) 
	}



	plat->has_xgmac = 1;

	plat->tso_en = 1;

	plat->flags |= STMMAC_FLAG_TSO_EN;

	plat->pmt = 1;

	plat->bsp_priv = mgbe;

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

+2 −2
Original line number Diff line number Diff line
@@ -5677,7 +5677,7 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev, 
		features &= ~NETIF_F_CSUM_MASK;



	/* Disable tso if asked by ethtool */

	if ((priv->plat->tso_en) && (priv->dma_cap.tsoen)) {

	if ((priv->plat->flags & STMMAC_FLAG_TSO_EN) && (priv->dma_cap.tsoen)) {

		if (features & NETIF_F_TSO)

			priv->tso = true;

		else
@@ -7250,7 +7250,7 @@ int stmmac_dvr_probe(struct device *device, 
		ndev->hw_features |= NETIF_F_HW_TC;

	}



	if ((priv->plat->tso_en) && (priv->dma_cap.tsoen)) {

	if ((priv->plat->flags & STMMAC_FLAG_TSO_EN) && (priv->dma_cap.tsoen)) {

		ndev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6;

		if (priv->plat->has_gmac4)

			ndev->hw_features |= NETIF_F_GSO_UDP_L4;