diff options
-rw-r--r-- | drivers/net/davinci_emac.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index d465eaa796c4..65a2d0ba64e2 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
@@ -200,6 +200,9 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1"; | |||
200 | /** NOTE:: For DM646x the IN_VECTOR has changed */ | 200 | /** NOTE:: For DM646x the IN_VECTOR has changed */ |
201 | #define EMAC_DM646X_MAC_IN_VECTOR_RX_INT_VEC BIT(EMAC_DEF_RX_CH) | 201 | #define EMAC_DM646X_MAC_IN_VECTOR_RX_INT_VEC BIT(EMAC_DEF_RX_CH) |
202 | #define EMAC_DM646X_MAC_IN_VECTOR_TX_INT_VEC BIT(16 + EMAC_DEF_TX_CH) | 202 | #define EMAC_DM646X_MAC_IN_VECTOR_TX_INT_VEC BIT(16 + EMAC_DEF_TX_CH) |
203 | #define EMAC_DM646X_MAC_IN_VECTOR_HOST_INT BIT(26) | ||
204 | #define EMAC_DM646X_MAC_IN_VECTOR_STATPEND_INT BIT(27) | ||
205 | |||
203 | 206 | ||
204 | /* CPPI bit positions */ | 207 | /* CPPI bit positions */ |
205 | #define EMAC_CPPI_SOP_BIT BIT(31) | 208 | #define EMAC_CPPI_SOP_BIT BIT(31) |
@@ -2167,7 +2170,11 @@ static int emac_poll(struct napi_struct *napi, int budget) | |||
2167 | emac_int_enable(priv); | 2170 | emac_int_enable(priv); |
2168 | } | 2171 | } |
2169 | 2172 | ||
2170 | if (unlikely(status & EMAC_DM644X_MAC_IN_VECTOR_HOST_INT)) { | 2173 | mask = EMAC_DM644X_MAC_IN_VECTOR_HOST_INT; |
2174 | if (priv->version == EMAC_VERSION_2) | ||
2175 | mask = EMAC_DM646X_MAC_IN_VECTOR_HOST_INT; | ||
2176 | |||
2177 | if (unlikely(status & mask)) { | ||
2171 | u32 ch, cause; | 2178 | u32 ch, cause; |
2172 | dev_err(emac_dev, "DaVinci EMAC: Fatal Hardware Error\n"); | 2179 | dev_err(emac_dev, "DaVinci EMAC: Fatal Hardware Error\n"); |
2173 | netif_stop_queue(ndev); | 2180 | netif_stop_queue(ndev); |