| Message ID | 20201115185210.573739-3-martin.blumenstingl@googlemail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dwmac-meson8b: picosecond precision RX delay support | expand |
On Sun, Nov 15, 2020 at 07:52:07PM +0100, Martin Blumenstingl wrote: > The timing-adjustment clock only has to be enabled when a) there is a > 2ns RX delay configured using device-tree and b) the phy-mode indicates > that the RX delay should be enabled. > > Only enable the RX delay if both are true, instead of (by accident) also > enabling it when there's the 2ns RX delay configured but the phy-mode > incicates that the RX delay is not used. > > Fixes: 9308c47640d515 ("net: stmmac: dwmac-meson8b: add support for the RX delay configuration") > Reported-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On 11/15/20 10:52 AM, Martin Blumenstingl wrote: > The timing-adjustment clock only has to be enabled when a) there is a > 2ns RX delay configured using device-tree and b) the phy-mode indicates > that the RX delay should be enabled. > > Only enable the RX delay if both are true, instead of (by accident) also > enabling it when there's the 2ns RX delay configured but the phy-mode > incicates that the RX delay is not used. > > Fixes: 9308c47640d515 ("net: stmmac: dwmac-meson8b: add support for the RX delay configuration") > Reported-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c index dc0b8b6d180d..e27e2e7a53fd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c @@ -301,7 +301,7 @@ static int meson8b_init_prg_eth(struct meson8b_dwmac *dwmac) return -EINVAL; } - if (rx_dly_config & PRG_ETH0_ADJ_ENABLE) { + if (delay_config & PRG_ETH0_ADJ_ENABLE) { if (!dwmac->timing_adj_clk) { dev_err(dwmac->dev, "The timing-adjustment clock is mandatory for the RX delay re-timing\n");
The timing-adjustment clock only has to be enabled when a) there is a 2ns RX delay configured using device-tree and b) the phy-mode indicates that the RX delay should be enabled. Only enable the RX delay if both are true, instead of (by accident) also enabling it when there's the 2ns RX delay configured but the phy-mode incicates that the RX delay is not used. Fixes: 9308c47640d515 ("net: stmmac: dwmac-meson8b: add support for the RX delay configuration") Reported-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)