net: bcmgenet: always enable status blocks

The hardware offloading of the NETIF_F_HW_CSUM and NETIF_F_RXCSUM
features requires the use of Transmit Status Blocks before transmit
frame data and Receive Status Blocks before receive frame data to
carry the checksum information.

Unfortunately, these status blocks are currently only enabled when
the NETIF_F_HW_CSUM feature is enabled. As a result NETIF_F_RXCSUM
will not actually be offloaded to the hardware unless both it and
NETIF_F_HW_CSUM are enabled. Fortunately, that is the default
configuration.

This commit addresses this issue by always enabling the use of
status blocks on both transmit and receive frames. Further, it
replaces the use of a dedicated flag within the driver private
data structure with direct use of the netdev features flags.

Fixes: 83eb203ad6ec ("net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index ce64b4e47febe0518b9c26ad20e27b260e589fd6..1d678bee2cc9c26f63ad2414a61206f8c63af5f9 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -94,12 +94,6 @@ static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv,
        bcmgenet_writel(value, d + DMA_DESC_LENGTH_STATUS);
 }
 
-static inline u32 dmadesc_get_length_status(struct bcmgenet_priv *priv,
-                                           void __iomem *d)
-{
-       return bcmgenet_readl(d + DMA_DESC_LENGTH_STATUS);
-}
-
 static inline void dmadesc_set_addr(struct bcmgenet_priv *priv,
                                    void __iomem *d,
                                    dma_addr_t addr)
@@ -508,61 +502,6 @@ static int bcmgenet_set_link_ksettings(struct net_device *dev,
        return phy_ethtool_ksettings_set(dev->phydev, cmd);
 }
 
-static void bcmgenet_set_rx_csum(struct net_device *dev,
-                                netdev_features_t wanted)
-{
-       struct bcmgenet_priv *priv = netdev_priv(dev);
-       u32 rbuf_chk_ctrl;
-       bool rx_csum_en;
-
-       rx_csum_en = !!(wanted & NETIF_F_RXCSUM);
-
-       rbuf_chk_ctrl = bcmgenet_rbuf_readl(priv, RBUF_CHK_CTRL);
-
-       /* enable rx checksumming */
-       if (rx_csum_en)
-               rbuf_chk_ctrl |= RBUF_RXCHK_EN | RBUF_L3_PARSE_DIS;
-       else
-               rbuf_chk_ctrl &= ~RBUF_RXCHK_EN;
-       priv->desc_rxchk_en = rx_csum_en;
-
-       /* If UniMAC forwards CRC, we need to skip over it to get
-        * a valid CHK bit to be set in the per-packet status word
-       */
-       if (rx_csum_en && priv->crc_fwd_en)
-               rbuf_chk_ctrl |= RBUF_SKIP_FCS;
-       else
-               rbuf_chk_ctrl &= ~RBUF_SKIP_FCS;
-
-       bcmgenet_rbuf_writel(priv, rbuf_chk_ctrl, RBUF_CHK_CTRL);
-}
-
-static void bcmgenet_set_tx_csum(struct net_device *dev,
-                                netdev_features_t wanted)
-{
-       struct bcmgenet_priv *priv = netdev_priv(dev);
-       bool desc_64b_en;
-       u32 tbuf_ctrl, rbuf_ctrl;
-
-       tbuf_ctrl = bcmgenet_tbuf_ctrl_get(priv);
-       rbuf_ctrl = bcmgenet_rbuf_readl(priv, RBUF_CTRL);
-
-       desc_64b_en = !!(wanted & NETIF_F_HW_CSUM);
-
-       /* enable 64 bytes descriptor in both directions (RBUF and TBUF) */
-       if (desc_64b_en) {
-               tbuf_ctrl |= RBUF_64B_EN;
-               rbuf_ctrl |= RBUF_64B_EN;
-       } else {
-               tbuf_ctrl &= ~RBUF_64B_EN;
-               rbuf_ctrl &= ~RBUF_64B_EN;
-       }
-       priv->desc_64b_en = desc_64b_en;
-
-       bcmgenet_tbuf_ctrl_set(priv, tbuf_ctrl);
-       bcmgenet_rbuf_writel(priv, rbuf_ctrl, RBUF_CTRL);
-}
-
 static int bcmgenet_set_features(struct net_device *dev,
                                 netdev_features_t features)
 {
@@ -578,9 +517,6 @@ static int bcmgenet_set_features(struct net_device *dev,
        reg = bcmgenet_umac_readl(priv, UMAC_CMD);
        priv->crc_fwd_en = !!(reg & CMD_CRC_FWD);
 
-       bcmgenet_set_tx_csum(dev, features);
-       bcmgenet_set_rx_csum(dev, features);
-
        clk_disable_unprepare(priv->clk);
 
        return ret;
@@ -1475,8 +1411,8 @@ static void bcmgenet_tx_reclaim_all(struct net_device *dev)
 /* Reallocate the SKB to put enough headroom in front of it and insert
  * the transmit checksum offsets in the descriptors
  */
-static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
-                                           struct sk_buff *skb)
+static struct sk_buff *bcmgenet_add_tsb(struct net_device *dev,
+                                       struct sk_buff *skb)
 {
        struct bcmgenet_priv *priv = netdev_priv(dev);
        struct status_64 *status = NULL;
@@ -1590,13 +1526,11 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
         */
        GENET_CB(skb)->bytes_sent = skb->len;
 
-       /* set the SKB transmit checksum */
-       if (priv->desc_64b_en) {
-               skb = bcmgenet_put_tx_csum(dev, skb);
-               if (!skb) {
-                       ret = NETDEV_TX_OK;
-                       goto out;
-               }
+       /* add the Transmit Status Block */
+       skb = bcmgenet_add_tsb(dev, skb);
+       if (!skb) {
+               ret = NETDEV_TX_OK;
+               goto out;
        }
 
        for (i = 0; i <= nr_frags; i++) {
@@ -1775,6 +1709,9 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,
 
        while ((rxpktprocessed < rxpkttoprocess) &&
               (rxpktprocessed < budget)) {
+               struct status_64 *status;
+               __be16 rx_csum;
+
                cb = &priv->rx_cbs[ring->read_ptr];
                skb = bcmgenet_rx_refill(priv, cb);
 
@@ -1783,20 +1720,12 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,
                        goto next;
                }
 
-               if (!priv->desc_64b_en) {
-                       dma_length_status =
-                               dmadesc_get_length_status(priv, cb->bd_addr);
-               } else {
-                       struct status_64 *status;
-                       __be16 rx_csum;
-
-                       status = (struct status_64 *)skb->data;
-                       dma_length_status = status->length_status;
+               status = (struct status_64 *)skb->data;
+               dma_length_status = status->length_status;
+               if (dev->features & NETIF_F_RXCSUM) {
                        rx_csum = (__force __be16)(status->rx_csum & 0xffff);
-                       if (priv->desc_rxchk_en) {
-                               skb->csum = (__force __wsum)ntohs(rx_csum);
-                               skb->ip_summed = CHECKSUM_COMPLETE;
-                       }
+                       skb->csum = (__force __wsum)ntohs(rx_csum);
+                       skb->ip_summed = CHECKSUM_COMPLETE;
                }
 
                /* DMA flags and length are still valid no matter how
@@ -1840,14 +1769,10 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,
                } /* error packet */
 
                skb_put(skb, len);
-               if (priv->desc_64b_en) {
-                       skb_pull(skb, 64);
-                       len -= 64;
-               }
 
-               /* remove hardware 2bytes added for IP alignment */
-               skb_pull(skb, 2);
-               len -= 2;
+               /* remove RSB and hardware 2bytes added for IP alignment */
+               skb_pull(skb, 66);
+               len -= 66;
 
                if (priv->crc_fwd_en) {
                        skb_trim(skb, len - ETH_FCS_LEN);
@@ -2038,11 +1963,28 @@ static void init_umac(struct bcmgenet_priv *priv)
 
        bcmgenet_umac_writel(priv, ENET_MAX_MTU_SIZE, UMAC_MAX_FRAME_LEN);
 
-       /* init rx registers, enable ip header optimization */
+       /* init tx registers, enable TSB */
+       reg = bcmgenet_tbuf_ctrl_get(priv);
+       reg |= TBUF_64B_EN;
+       bcmgenet_tbuf_ctrl_set(priv, reg);
+
+       /* init rx registers, enable ip header optimization and RSB */
        reg = bcmgenet_rbuf_readl(priv, RBUF_CTRL);
-       reg |= RBUF_ALIGN_2B;
+       reg |= RBUF_ALIGN_2B | RBUF_64B_EN;
        bcmgenet_rbuf_writel(priv, reg, RBUF_CTRL);
 
+       /* enable rx checksumming */
+       reg = bcmgenet_rbuf_readl(priv, RBUF_CHK_CTRL);
+       reg |= RBUF_RXCHK_EN | RBUF_L3_PARSE_DIS;
+       /* If UniMAC forwards CRC, we need to skip over it to get
+        * a valid CHK bit to be set in the per-packet status word
+        */
+       if (priv->crc_fwd_en)
+               reg |= RBUF_SKIP_FCS;
+       else
+               reg &= ~RBUF_SKIP_FCS;
+       bcmgenet_rbuf_writel(priv, reg, RBUF_CHK_CTRL);
+
        if (!GENET_IS_V1(priv) && !GENET_IS_V2(priv))
                bcmgenet_rbuf_writel(priv, 1, RBUF_TBUF_SIZE_CTRL);
 

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 61a6fe9f4ceccd97c1b3b2c400f12abc79b5d280..daf8fb2c39b636ef688cd845dd6a770f7386ea7b 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -273,6 +273,7 @@ struct bcmgenet_mib_counters {
 #define  RBUF_FLTR_LEN_SHIFT           8
 
 #define TBUF_CTRL                      0x00
+#define  TBUF_64B_EN                   (1 << 0)
 #define TBUF_BP_MC                     0x0C
 #define TBUF_ENERGY_CTRL               0x14
 #define  TBUF_EEE_EN                   (1 << 0)
@@ -662,8 +663,6 @@ struct bcmgenet_priv {
        unsigned int irq0_stat;
 
        /* HW descriptors/checksum variables */
-       bool desc_64b_en;
-       bool desc_rxchk_en;
        bool crc_fwd_en;
 
        u32 dma_max_burst_length;