net: stmmac: dwmac-meson8b: fix the RX delay validation

When has_prg_eth1_rgmii_rx_delay is true then we support RX delays
between 0ps and 3000ps in 200ps steps. Swap the validation of the RX
delay based on the has_prg_eth1_rgmii_rx_delay flag so the 200ps check
is now applied correctly on G12A SoCs (instead of only allow 0ps or
2000ps on G12A, but 0..3000ps in 200ps steps on older SoCs which don't
support that).

Fixes: a72f17e94d1242 ("net: stmmac: dwmac-meson8b: add support for the RGMII RX delay on G12A")
Reported-by: Martijn van Deventer <martijn@martijnvandeventer.nl>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20210119202424.591349-1-martin.blumenstingl@googlemail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
index 55152d7ba99add5e83ff516133434826d7d749aa..848e5c37746bb528d60c918b98af898e7c00e829 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
@@ -443,16 +443,16 @@ static int meson8b_dwmac_probe(struct platform_device *pdev)
        }
 
        if (dwmac->data->has_prg_eth1_rgmii_rx_delay) {
-               if (dwmac->rx_delay_ps != 0 && dwmac->rx_delay_ps != 2000) {
+               if (dwmac->rx_delay_ps > 3000 || dwmac->rx_delay_ps % 200) {
                        dev_err(dwmac->dev,
-                               "The only allowed RGMII RX delays values are: 0ps, 2000ps");
+                               "The RGMII RX delay range is 0..3000ps in 200ps steps");
                        ret = -EINVAL;
                        goto err_remove_config_dt;
                }
        } else {
-               if (dwmac->rx_delay_ps > 3000 || dwmac->rx_delay_ps % 200) {
+               if (dwmac->rx_delay_ps != 0 && dwmac->rx_delay_ps != 2000) {
                        dev_err(dwmac->dev,
-                               "The RGMII RX delay range is 0..3000ps in 200ps steps");
+                               "The only allowed RGMII RX delays values are: 0ps, 2000ps");
                        ret = -EINVAL;
                        goto err_remove_config_dt;
                }