summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/faraday
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2017-04-06 11:02:47 +1000
committerDavid S. Miller <davem@davemloft.net>2017-04-06 15:39:45 -0700
commiteb50af20442bdaaa2dadd658dc8d556550e862ae (patch)
tree210b3717d576ecd887fd2cfbcc856a3d9de31916 /drivers/net/ethernet/faraday
parent672021943c453c4ae04bf131ccf155a7d4f967ab (diff)
downloadlinux-eb50af20442bdaaa2dadd658dc8d556550e862ae.tar.bz2
ftgmac100: Simplify rx packets error handling
The fast path has a single unlikely() test for any error bit, calling into a helper that sets the appropriate statistics. The various netdev_info aren't particularly interesting. If we want to differentiate the various length errors later we can introduce driver specific stats using ethtool. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday')
-rw-r--r--drivers/net/ethernet/faraday/ftgmac100.c61
1 files changed, 25 insertions, 36 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 6277f6e70f6b..82ab3676974c 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -300,6 +300,18 @@ static void ftgmac100_rxdes_set_dma_own(const struct ftgmac100 *priv,
rxdes->rxdes0 &= cpu_to_le32(priv->rxdes0_edorr_mask);
}
+#define RXDES0_ANY_ERROR ( \
+ FTGMAC100_RXDES0_RX_ERR | \
+ FTGMAC100_RXDES0_CRC_ERR | \
+ FTGMAC100_RXDES0_FTL | \
+ FTGMAC100_RXDES0_RUNT | \
+ FTGMAC100_RXDES0_RX_ODD_NB)
+
+static inline bool ftgmac100_rxdes_any_error(struct ftgmac100_rxdes *rxdes)
+{
+ return rxdes->rxdes0 & cpu_to_le32(RXDES0_ANY_ERROR);
+}
+
static bool ftgmac100_rxdes_rx_error(struct ftgmac100_rxdes *rxdes)
{
return rxdes->rxdes0 & cpu_to_le32(FTGMAC100_RXDES0_RX_ERR);
@@ -446,49 +458,22 @@ ftgmac100_rx_locate_first_segment(struct ftgmac100 *priv)
return NULL;
}
-static bool ftgmac100_rx_packet_error(struct ftgmac100 *priv,
+
+static void ftgmac100_rx_packet_error(struct ftgmac100 *priv,
struct ftgmac100_rxdes *rxdes)
{
struct net_device *netdev = priv->netdev;
- bool error = false;
-
- if (unlikely(ftgmac100_rxdes_rx_error(rxdes))) {
- if (net_ratelimit())
- netdev_info(netdev, "rx err\n");
+ if (ftgmac100_rxdes_rx_error(rxdes))
netdev->stats.rx_errors++;
- error = true;
- }
-
- if (unlikely(ftgmac100_rxdes_crc_error(rxdes))) {
- if (net_ratelimit())
- netdev_info(netdev, "rx crc err\n");
+ if (ftgmac100_rxdes_crc_error(rxdes))
netdev->stats.rx_crc_errors++;
- error = true;
- }
-
- if (unlikely(ftgmac100_rxdes_frame_too_long(rxdes))) {
- if (net_ratelimit())
- netdev_info(netdev, "rx frame too long\n");
-
- netdev->stats.rx_length_errors++;
- error = true;
- } else if (unlikely(ftgmac100_rxdes_runt(rxdes))) {
- if (net_ratelimit())
- netdev_info(netdev, "rx runt\n");
-
- netdev->stats.rx_length_errors++;
- error = true;
- } else if (unlikely(ftgmac100_rxdes_odd_nibble(rxdes))) {
- if (net_ratelimit())
- netdev_info(netdev, "rx odd nibble\n");
+ if (ftgmac100_rxdes_frame_too_long(rxdes) ||
+ ftgmac100_rxdes_runt(rxdes) ||
+ ftgmac100_rxdes_odd_nibble(rxdes))
netdev->stats.rx_length_errors++;
- error = true;
- }
-
- return error;
}
static void ftgmac100_rx_drop_packet(struct ftgmac100 *priv)
@@ -528,8 +513,12 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed)
/* We don't support segmented rx frames, so drop these
* along with packets with errors.
*/
- if (unlikely(!ftgmac100_rxdes_last_segment(rxdes) ||
- ftgmac100_rx_packet_error(priv, rxdes))) {
+ if (unlikely(!ftgmac100_rxdes_last_segment(rxdes))) {
+ ftgmac100_rx_drop_packet(priv);
+ return true;
+ }
+ if (unlikely(ftgmac100_rxdes_any_error(rxdes))) {
+ ftgmac100_rx_packet_error(priv, rxdes);
ftgmac100_rx_drop_packet(priv);
return true;
}