stmmac: fix automatic PAD/FCS stripping

For Simple Ethernet frames (802.2 and 802.3) the GMAC Core
never strips pad and fcs. This means the ACS has no effect
on IPv4/6 frames.
The FL bits, in the RDES0, include the FCS so the driver
has to remove it in SW.
For 802.3 frame format with LLC or LLC-SNAP, when set the ACS
bit, the HW strips both PAD and FCS.
The FL bits, in the RDES0, actually represents the frame length
already stripped.
This patch fixes this logic within the device driver that
erroneously removed 4byte from 802.3 frames already stripped
corrupting the payload.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/stmmac/common.h b/drivers/net/stmmac/common.h
index 144f76fd3e39c71cd7870acb01a5db211f99a860..66b9da0260fe70b6177c6980604f24184dcdb431 100644 (file)
--- a/drivers/net/stmmac/common.h
+++ b/drivers/net/stmmac/common.h
@@ -108,6 +108,7 @@ enum rx_frame_status { /* IPC status */
        good_frame = 0,
        discard_frame = 1,
        csum_none = 2,
+       llc_snap = 4,
 };
 
 enum tx_dma_irq_status {

diff --git a/drivers/net/stmmac/dwmac1000.h b/drivers/net/stmmac/dwmac1000.h
index d8d0f3553770333145ca016a0277cc8b526f99fa..8b20b19971cbe6e0156ce5bee9edc96f73f06785 100644 (file)
--- a/drivers/net/stmmac/dwmac1000.h
+++ b/drivers/net/stmmac/dwmac1000.h
@@ -93,7 +93,7 @@ enum inter_frame_gap {
 #define GMAC_CONTROL_IPC       0x00000400 /* Checksum Offload */
 #define GMAC_CONTROL_DR                0x00000200 /* Disable Retry */
 #define GMAC_CONTROL_LUD       0x00000100 /* Link up/down */
-#define GMAC_CONTROL_ACS       0x00000080 /* Automatic Pad Stripping */
+#define GMAC_CONTROL_ACS       0x00000080 /* Automatic Pad/FCS Stripping */
 #define GMAC_CONTROL_DC                0x00000010 /* Deferral Check */
 #define GMAC_CONTROL_TE                0x00000008 /* Transmitter Enable */
 #define GMAC_CONTROL_RE                0x00000004 /* Receiver Enable */

diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/stmmac/enh_desc.c
index 3c18ebece043a303ee2eb3e3e7ec684aae1bac9b..f612f986a7e16b186ba5c5c1aafcc4ae98fa2313 100644 (file)
--- a/drivers/net/stmmac/enh_desc.c
+++ b/drivers/net/stmmac/enh_desc.c
@@ -123,7 +123,7 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)
         */
        if (status == 0x0) {
                CHIP_DBG(KERN_INFO "RX Des0 status: IEEE 802.3 Type frame.\n");
-               ret = good_frame;
+               ret = llc_snap;
        } else if (status == 0x4) {
                CHIP_DBG(KERN_INFO "RX Des0 status: IPv4/6 No CSUM errorS.\n");
                ret = good_frame;

diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 1083334ccd217f768116617302502e5e8c3793cd..bbb7951b9c4c34bb3992deed9c7a8e84ff52f68e 100644 (file)
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1216,9 +1216,13 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                        priv->dev->stats.rx_errors++;
                else {
                        struct sk_buff *skb;
-                       /* Length should omit the CRC */
-                       int frame_len = priv->hw->desc->get_rx_frame_len(p) - 4;
+                       int frame_len;
 
+                       frame_len = priv->hw->desc->get_rx_frame_len(p);
+                       /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
+                        * Type frames (LLC/LLC-SNAP) */
+                       if (unlikely(status != llc_snap))
+                               frame_len -= ETH_FCS_LEN;
 #ifdef STMMAC_RX_DEBUG
                        if (frame_len > ETH_FRAME_LEN)
                                pr_debug("\tRX frame size %d, COE status: %d\n",