Commit 1a981c05 authored by Thierry Reding's avatar Thierry Reding Committed by David S. Miller
Browse files

net: stmmac: Make MDIO bus reset optional 



The Tegra EQOS driver already resets the MDIO bus at probe time via the
reset GPIO specified in the phy-reset-gpios device tree property. There
is no need to reset the bus again later on.

This avoids the need to query the device tree for the snps,reset GPIO,
which is not part of the Tegra EQOS device tree bindings. This quiesces
an error message from the generic bus reset code if it doesn't find the
snps,reset related delays.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f530eed6

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

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ static void *tegra_eqos_probe(struct platform_device *pdev, 
	usleep_range(2000, 4000);

	gpiod_set_value(eqos->reset, 0);



	/* MDIO bus was already reset just above */

	data->mdio_bus_data->needs_reset = false;



	eqos->rst = devm_reset_control_get(&pdev->dev, "eqos");

	if (IS_ERR(eqos->rst)) {

		err = PTR_ERR(eqos->rst);

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

+3 −1
Original line number Diff line number Diff line
@@ -348,7 +348,9 @@ int stmmac_mdio_register(struct net_device *ndev) 
		max_addr = PHY_MAX_ADDR;

	}



	if (mdio_bus_data->needs_reset)

		new_bus->reset = &stmmac_mdio_reset;



	snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x",

		 new_bus->name, priv->plat->bus_id);

	new_bus->priv = ndev;

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

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void common_default_data(struct plat_stmmacenet_data *plat) 
	plat->has_gmac = 1;

	plat->force_sf_dma_mode = 1;



	plat->mdio_bus_data->needs_reset = true;

	plat->mdio_bus_data->phy_mask = 0;



	/* Set default value for multicast hash bins */

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

+7 −1
Original line number Diff line number Diff line
@@ -342,10 +342,16 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, 
		mdio = true;

	}



	if (mdio)

	if (mdio) {

		plat->mdio_bus_data =

			devm_kzalloc(dev, sizeof(struct stmmac_mdio_bus_data),

				     GFP_KERNEL);

		if (!plat->mdio_bus_data)

			return -ENOMEM;



		plat->mdio_bus_data->needs_reset = true;

	}



	return 0;

}

include/linux/stmmac.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct stmmac_mdio_bus_data { 
	unsigned int phy_mask;

	int *irqs;

	int probed_phy_irq;

	bool needs_reset;

};



struct stmmac_dma_cfg {

CRA Git | Maintained and supported by SUSTech CRA and CCSE