Commit 63a550fc authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller

net: stmmac: Remove uneeded checks for GMAC version

With the introducion of callbacks check in hwif.h we only call the
callback if HW supports it so there is no longer need to check for GMAC
version.
Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab0204e3
...@@ -1973,11 +1973,8 @@ static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode, ...@@ -1973,11 +1973,8 @@ static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode,
static bool stmmac_safety_feat_interrupt(struct stmmac_priv *priv) static bool stmmac_safety_feat_interrupt(struct stmmac_priv *priv)
{ {
int ret = false; int ret;
/* Safety features are only available in cores >= 5.10 */
if (priv->synopsys_id < DWMAC_CORE_5_10)
return ret;
ret = stmmac_safety_feat_irq_status(priv, priv->dev, ret = stmmac_safety_feat_irq_status(priv, priv->dev,
priv->ioaddr, priv->dma_cap.asp, &priv->sstats); priv->ioaddr, priv->dma_cap.asp, &priv->sstats);
if (ret && (ret != -EINVAL)) { if (ret && (ret != -EINVAL)) {
...@@ -2495,11 +2492,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) ...@@ -2495,11 +2492,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
stmmac_core_init(priv, priv->hw, dev); stmmac_core_init(priv, priv->hw, dev);
/* Initialize MTL*/ /* Initialize MTL*/
if (priv->synopsys_id >= DWMAC_CORE_4_00)
stmmac_mtl_configuration(priv); stmmac_mtl_configuration(priv);
/* Initialize Safety Features */ /* Initialize Safety Features */
if (priv->synopsys_id >= DWMAC_CORE_5_10)
stmmac_safety_feat_configuration(priv); stmmac_safety_feat_configuration(priv);
ret = stmmac_rx_ipc(priv, priv->hw); ret = stmmac_rx_ipc(priv, priv->hw);
...@@ -3054,10 +3049,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -3054,10 +3049,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
if (enh_desc) if (enh_desc)
is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc); is_jumbo = stmmac_is_jumbo_frm(priv, skb->len, enh_desc);
if (unlikely(is_jumbo) && likely(priv->synopsys_id < if (unlikely(is_jumbo)) {
DWMAC_CORE_4_00)) {
entry = stmmac_jumbo_frm(priv, tx_q, skb, csum_insertion); entry = stmmac_jumbo_frm(priv, tx_q, skb, csum_insertion);
if (unlikely(entry < 0)) if (unlikely(entry < 0) && (entry != -EINVAL))
goto dma_map_err; goto dma_map_err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment