net: stmmac: Fix the logic of checking if RX Watchdog must be enabled (3b509466) · Commits · 戴 / test

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

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -4168,6 +4168,18 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
	return ret;		return ret;
	}		}

			/* Rx Watchdog is available in the COREs newer than the 3.40.
			* In some case, for example on bugged HW this feature
			* has to be disable and this can be done by passing the
			* riwt_off field from the platform.
			*/
			if (((priv->synopsys_id >= DWMAC_CORE_3_50) \|\|
			(priv->plat->has_xgmac)) && (!priv->plat->riwt_off)) {
			priv->use_riwt = 1;
			dev_info(priv->device,
			"Enable RX Mitigation via HW Watchdog Timer\n");
			}

	return 0;		return 0;
	}		}

	@@ -4300,18 +4312,6 @@ int stmmac_dvr_probe(struct device *device,
	if (flow_ctrl)		if (flow_ctrl)
	priv->flow_ctrl = FLOW_AUTO; /* RX/TX pause on */		priv->flow_ctrl = FLOW_AUTO; /* RX/TX pause on */

	/* Rx Watchdog is available in the COREs newer than the 3.40.
	* In some case, for example on bugged HW this feature
	* has to be disable and this can be done by passing the
	* riwt_off field from the platform.
	*/
	if (((priv->synopsys_id >= DWMAC_CORE_3_50) \|\|
	(priv->plat->has_xgmac)) && (!priv->plat->riwt_off)) {
	priv->use_riwt = 1;
	dev_info(priv->device,
	"Enable RX Mitigation via HW Watchdog Timer\n");
	}

	/* Setup channels NAPI */		/* Setup channels NAPI */
	maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);		maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);