net: stmmac: Make MDIO bus reset optional
Subsystems (5)
PATCH 1/2 net: stmmac: Make MDIO bus reset optional
From: Thierry Reding <[email protected]>
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.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 3 +++ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 +++- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +++++++- include/linux/stmmac.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +3 -0
@@ -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
@@ -348,7 +348,9 @@ int stmmac_mdio_register(struct net_device *ndev) max_addr =PHY_MAX_ADDR ; } - new_bus->reset = &stmmac_mdio_reset; +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
@@ -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
@@ -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
@@ -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 {
Signature · 1 line
2.22.0
PATCH 2/2 net: stmmac: Do not request stmmaceth clock
From: Thierry Reding <[email protected]>
The stmmaceth clock is specified by the slave_bus and apb_pclk clocks in the device tree bindings for snps,dwc-qos-ethernet-4.10 compatible nodes of this IP.
The subdrivers for these bindings will be requesting the stmmac clock correctly at a later point, so there is no need to request it here and cause an error message to be printed to the kernel log.
--- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +8 -6
@@ -521,13 +521,15 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) }/* clock setup */ - plat->stmmac_clk =devm_clk_get (&pdev->dev, -STMMAC_RESOURCE_NAME ); -if (IS_ERR (plat->stmmac_clk)) { -dev_warn (&pdev->dev,"Cannot get CSR clock\n" ); - plat->stmmac_clk =NULL ; +if (!of_device_is_compatible (np,"snps,dwc-qos-ethernet-4.10" )) { + plat->stmmac_clk =devm_clk_get (&pdev->dev, +STMMAC_RESOURCE_NAME ); +if (IS_ERR (plat->stmmac_clk)) { +dev_warn (&pdev->dev,"Cannot get CSR clock\n" ); + plat->stmmac_clk =NULL ; + } +clk_prepare_enable (plat->stmmac_clk); } -clk_prepare_enable (plat->stmmac_clk); plat->pclk =devm_clk_get (&pdev->dev,"pclk" );if (IS_ERR (plat->pclk)) {
Signature · 1 line
2.22.0
From: Thierry Reding <[email protected]>
Date: Fri, 26 Jul 2019 12:27:40 +0200
Quoted 6 lines
From: Thierry Reding <[email protected]>
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.
Quoted 6 lines
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 Thierry Reding <[email protected]>
Applied.
Re: [PATCH net-next 2/2] net: stmmac: Do not request stmmaceth clock
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Date: Fri, 26 Jul 2019 12:27:41 +0200
Quoted 11 lines
From: Thierry Reding <[email protected]>
The stmmaceth clock is specified by the
slave_busandapb_pclkclocks in the device tree bindings for snps,dwc-qos-ethernet-4.10 compatible nodes of this IP.The subdrivers for these bindings will be requesting the stmmac clock correctly at a later point, so there is no need to request it here and cause an error message to be printed to the kernel log.
Signed-off-by Thierry Reding <[email protected]>
Applied.