Commit 309efe6e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski
Browse files

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


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

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

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int tegra_eqos_probe(struct platform_device *pdev, 
	data->fix_mac_speed = tegra_eqos_fix_speed;

	data->init = tegra_eqos_init;

	data->bsp_priv = eqos;

	data->sph_disable = 1;

	data->flags |= STMMAC_FLAG_SPH_DISABLE;



	err = tegra_eqos_init(pdev, eqos);

	if (err < 0)

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

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, 
	plat->has_gmac4 = 1;

	plat->force_sf_dma_mode = 0;

	plat->tso_en = 1;

	plat->sph_disable = 1;

	plat->flags |= 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/stmmac_main.c

+2 −1
Original line number Diff line number Diff line
@@ -7258,7 +7258,8 @@ int stmmac_dvr_probe(struct device *device, 
		dev_info(priv->device, "TSO feature enabled\n");

	}



	if (priv->dma_cap.sphen && !priv->plat->sph_disable) {

	if (priv->dma_cap.sphen &&

	    !(priv->plat->flags & STMMAC_FLAG_SPH_DISABLE)) {

		ndev->hw_features |= NETIF_F_GRO;

		priv->sph_cap = true;

		priv->sph = priv->sph_cap;

include/linux/stmmac.h

+1 −1
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ struct dwmac4_addrs { 
};



#define STMMAC_FLAG_HAS_INTEGRATED_PCS		BIT(0)

#define STMMAC_FLAG_SPH_DISABLE			BIT(1)



struct plat_stmmacenet_data {

	int bus_id;
@@ -292,7 +293,6 @@ struct plat_stmmacenet_data { 
	int msi_rx_base_vec;

	int msi_tx_base_vec;

	bool use_phy_wol;

	bool sph_disable;

	bool serdes_up_after_phy_linkup;

	const struct dwmac4_addrs *dwmac4_addrs;

	unsigned int flags;