From patchwork Wed Mar 12 13:28:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 3817671 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 642019F1CD for ; Wed, 12 Mar 2014 13:28:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B3D6201B6 for ; Wed, 12 Mar 2014 13:28:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE41F2025B for ; Wed, 12 Mar 2014 13:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754205AbaCLN2m (ORCPT ); Wed, 12 Mar 2014 09:28:42 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:36061 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753203AbaCLN2j (ORCPT ); Wed, 12 Mar 2014 09:28:39 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2B00CDGS2U8Y70@mailout2.samsung.com>; Wed, 12 Mar 2014 22:28:06 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 6B.46.14803.6E060235; Wed, 12 Mar 2014 22:28:06 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-a0-532060e6e5b3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 81.BB.29263.6E060235; Wed, 12 Mar 2014 22:28:06 +0900 (KST) Received: from DObh74an01 ([12.36.166.149]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2B00IKGS2UAD30@mmp2.samsung.com>; Wed, 12 Mar 2014 22:28:06 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: davem@davemloft.net, vipul.pandya@samsung.com, ilho215.lee@samsung.com Subject: [PATCH V2 4/7] net: sxgbe: add Checksum offload support for Samsung sxgbe Date: Wed, 12 Mar 2014 22:28:06 +0900 Message-id: <005401cf3df6$e6f6d920$b4e48b60$%an@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac899ubbCMzsvaMnS6eXtJcFAiAiVw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRmVeSWpSXmKPExsVy+t8zI91nCQrBBndOK1nMOd/CYnH030JG ixnn9zFZHFsgZrFtwQVmB1aPLStvMnn0bVnF6PF5k1wAcxSXTUpqTmZZapG+XQJXxptHx9kK FvpUrD+3hK2BcaldFyMnh4SAiUTPt7OMELaYxIV769m6GLk4hASWMUo0PVjAAlM09+UURojE dEaJnk2zmCGc34wSk/euZQepYhNQk2ieeZkNxBYRsJVYcuQzWJxZwEui7cweVhBbWCBEYsmF f2BxFgFViYWPdoDZvAI2EgsOPWKBsAUlfky+xwLRqyWxfudxJghbXmLzmrdAizmALlKXePRX F2KVnsT7uX9YIUpEJPa9eAd2qITAJnaJY22fWCB2CUh8m3yIBaJXVmLTAWaIxyQlDq64wTKB UWwWks2zkGyehWTzLCQrFjCyrGIUTS1ILihOSi8y1StOzC0uzUvXS87P3cQIibKJOxjvH7A+ xJgMtH4is5Rocj4wSvNK4g2NzYwsTE1MjY3MLc1IE1YS501/lBQkJJCeWJKanZpakFoUX1Sa k1p8iJGJg1OqgVFL1jLQ/ehcf+ZdH012Z5eHzJrzskM3bX/N+hO8h53uv61yvrBI2rsg+tqy aAe5jQtyQxdUNOX2Xly1wuzEnGnz69tCNV90ndB80hVQVCymxv+ET2l7F0cgh6m6WFHRxwfb FFUP8D7+JrlZZe2HZ2GvDH9Zdr0Svf54ZuGPfZ6ixZqnbrw8l6rEUpyRaKjFXFScCAA9BX7E yAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEKsWRmVeSWpSXmKPExsVy+t9jQd1nCQrBBh1dshZzzrewWBz9t5DR Ysb5fUwWxxaIWWxbcIHZgdVjy8qbTB59W1YxenzeJBfAHNXAaJORmpiSWqSQmpecn5KZl26r 5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtFJJoSwxpxQoFJBYXKykb4dpQmiIm64F TGOErm9IEFyPkQEaSFjHmPHm0XG2goU+FevPLWFrYFxq18XIySEhYCIx9+UURghbTOLCvfVs XYxcHEIC0xklejbNYoZwfjNKTN67lh2kik1ATaJ55mU2EFtEwFZiyZHPYHFmAS+JtjN7WEFs YYEQiSUX/oHFWQRUJRY+2gFm8wrYSCw49IgFwhaU+DH5HgtEr5bE+p3HmSBseYnNa94CLeYA ukhd4tFfXYhVehLv5/5hhSgRkdj34h3jBEaBWUgmzUIyaRaSSbOQtCxgZFnFKJpakFxQnJSe a6hXnJhbXJqXrpecn7uJERzDz6R2MK5ssDjEKMDBqMTDu0BTPliINbGsuDL3EKMEB7OSCO+y KIVgId6UxMqq1KL8+KLSnNTiQ4zJQI9OZJYSTc4Hppe8knhDYxMzI0sjMwsjE3Nz0oSVxHkP tFoHCgmkJ5akZqemFqQWwWxh4uCUamBs2H+koHRdoo3YLtOZU658klda0FHU5tu659RedqnO kB8esVaTORzDVb8wBNfcDFtWc8XMYJLdq775Jgl/Jv8+kvU/m/3JbNvfcrtOl8+1t2jKvqXQ wvcwc6/ut/1SGXqHxd1717ec6ZWsXS01fV/6TfEVGVXvPsmeXXjcwHjj9T2MPg977zsqsRRn JBpqMRcVJwIASxJgWyUDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Vipul Pandya This patch adds TX and RX checksum offload support. Signed-off-by: Vipul Pandya Neatening-by: Joe Perches Signed-off-by: Byungho An --- drivers/net/ethernet/samsung/sxgbe_common.h | 6 +++- drivers/net/ethernet/samsung/sxgbe_core.c | 20 ++++++++++++ drivers/net/ethernet/samsung/sxgbe_desc.c | 27 ++++++++++++---- drivers/net/ethernet/samsung/sxgbe_desc.h | 6 ++-- drivers/net/ethernet/samsung/sxgbe_main.c | 46 ++++++++++++++++++++------- 5 files changed, 84 insertions(+), 21 deletions(-) } } @@ -1402,7 +1403,7 @@ static netdev_tx_t sxgbe_xmit(struct sk_buff *skb, struct net_device *dev) /* prepare the descriptor */ priv->hw->desc->prepare_tx_desc(tx_desc, 0, len, - len); + len, cksum_flag); /* memory barrier to flush descriptor */ wmb(); @@ -1528,6 +1529,8 @@ static int sxgbe_rx(struct sxgbe_priv_data *priv, int limit) unsigned int entry = priv->rxq[qnum]->cur_rx; unsigned int next_entry = 0; unsigned int count = 0; + int checksum; + int status; while (count < limit) { struct sxgbe_rx_norm_desc *p; @@ -1544,7 +1547,18 @@ static int sxgbe_rx(struct sxgbe_priv_data *priv, int limit) next_entry = (++priv->rxq[qnum]->cur_rx) % rxsize; prefetch(priv->rxq[qnum]->dma_rx + next_entry); - /*TO DO read the status of the incoming frame */ + /* Read the status of the incoming frame and also get checksum + * value based on whether it is enabled in SXGBE hardware or + * not. + */ + status = priv->hw->desc->rx_wbstatus(p, &priv->xstats, + &checksum); + if (unlikely(status < 0)) { + entry = next_entry; + continue; + } + if (unlikely(!priv->rxcsum_insertion)) + checksum = CHECKSUM_NONE; skb = priv->rxq[qnum]->rx_skbuff[entry]; @@ -1558,7 +1572,11 @@ static int sxgbe_rx(struct sxgbe_priv_data *priv, int limit) skb_put(skb, frame_len); - netif_receive_skb(skb); + skb->ip_summed = checksum; + if (checksum == CHECKSUM_NONE) + netif_receive_skb(skb); + else + napi_gro_receive(&priv->napi, skb); entry = next_entry; } @@ -1789,15 +1807,15 @@ static int sxgbe_set_features(struct net_device *dev, { struct sxgbe_priv_data *priv = netdev_priv(dev); netdev_features_t changed = dev->features ^ features; - u32 ctrl; if (changed & NETIF_F_RXCSUM) { - ctrl = readl(priv->ioaddr + SXGBE_CORE_RX_CONFIG_REG); - if (features & NETIF_F_RXCSUM) - ctrl |= SXGBE_RX_CSUMOFFLOAD_ENABLE; - else - ctrl &= ~SXGBE_RX_CSUMOFFLOAD_ENABLE; - writel(ctrl, priv->ioaddr + SXGBE_CORE_RX_CONFIG_REG); + if (features & NETIF_F_RXCSUM) { + priv->hw->mac->enable_rx_csum(priv->ioaddr); + priv->rxcsum_insertion = true; + } else { + priv->hw->mac->disable_rx_csum(priv->ioaddr); + priv->rxcsum_insertion = false; + } } return 0; @@ -2163,6 +2181,12 @@ struct sxgbe_priv_data *sxgbe_dvr_probe(struct device *device, } } + /* Enable Rx checksum offload */ + if (priv->hw_cap.rx_csum_offload) { + priv->hw->mac->enable_rx_csum(priv->ioaddr); + priv->rxcsum_insertion = true; + } + /* Rx Watchdog is available, enable depend on platform data */ if (!priv->plat->riwt_off) { priv->use_riwt = 1; diff --git a/drivers/net/ethernet/samsung/sxgbe_common.h b/drivers/net/ethernet/samsung/sxgbe_common.h index 1d848ce..39e21b6 100644 --- a/drivers/net/ethernet/samsung/sxgbe_common.h +++ b/drivers/net/ethernet/samsung/sxgbe_common.h @@ -351,6 +351,10 @@ struct sxgbe_core_ops { void (*set_eee_timer)(void __iomem *ioaddr, const int ls, const int tw); void (*set_eee_pls)(void __iomem *ioaddr, const int link); + + /* Enable disable checksum offload operations */ + void (*enable_rx_csum)(void __iomem *ioaddr); + void (*disable_rx_csum)(void __iomem *ioaddr); }; const struct sxgbe_core_ops *sxgbe_get_core_ops(void); @@ -466,7 +470,7 @@ struct sxgbe_priv_data { struct net_device *dev; struct device *device; struct sxgbe_ops *hw;/* sxgbe specific ops */ - int no_csum_insertion; + int rxcsum_insertion; spinlock_t lock; spinlock_t stats_lock; diff --git a/drivers/net/ethernet/samsung/sxgbe_core.c b/drivers/net/ethernet/samsung/sxgbe_core.c index 3c4058d..b5a53c7 100644 --- a/drivers/net/ethernet/samsung/sxgbe_core.c +++ b/drivers/net/ethernet/samsung/sxgbe_core.c @@ -217,6 +217,24 @@ static void sxgbe_set_eee_timer(void __iomem *ioaddr, writel(value, ioaddr + SXGBE_CORE_LPI_TIMER_CTRL); } +static void sxgbe_enable_rx_csum(void __iomem *ioaddr) +{ + u32 ctrl; + + ctrl = readl(ioaddr + SXGBE_CORE_RX_CONFIG_REG); + ctrl |= SXGBE_RX_CSUMOFFLOAD_ENABLE; + writel(ctrl, ioaddr + SXGBE_CORE_RX_CONFIG_REG); +} + +static void sxgbe_disable_rx_csum(void __iomem *ioaddr) +{ + u32 ctrl; + + ctrl = readl(ioaddr + SXGBE_CORE_RX_CONFIG_REG); + ctrl &= ~SXGBE_RX_CSUMOFFLOAD_ENABLE; + writel(ctrl, ioaddr + SXGBE_CORE_RX_CONFIG_REG); +} + const struct sxgbe_core_ops core_ops = { .core_init = sxgbe_core_init, .dump_regs = sxgbe_core_dump_regs, @@ -233,6 +251,8 @@ const struct sxgbe_core_ops core_ops = { .reset_eee_mode = sxgbe_reset_eee_mode, .set_eee_timer = sxgbe_set_eee_timer, .set_eee_pls = sxgbe_set_eee_pls, + .enable_rx_csum = sxgbe_enable_rx_csum, + .disable_rx_csum = sxgbe_disable_rx_csum, }; const struct sxgbe_core_ops *sxgbe_get_core_ops(void) diff --git a/drivers/net/ethernet/samsung/sxgbe_desc.c b/drivers/net/ethernet/samsung/sxgbe_desc.c index f223eb5..45e6676 100644 --- a/drivers/net/ethernet/samsung/sxgbe_desc.c +++ b/drivers/net/ethernet/samsung/sxgbe_desc.c @@ -47,6 +47,9 @@ static void sxgbe_prepare_tx_desc(struct sxgbe_tx_norm_desc *p, u8 is_fd, p->tdes23.tx_rd_des23.tx_pkt_len.cksum_pktlen.total_pkt_len = pkt_len; + if (cksum) + p->tdes23.tx_rd_des23.tx_pkt_len.cksum_pktlen.cksum_ctl = + cic_full; } /* Set VLAN control information */ @@ -250,31 +253,40 @@ static int sxgbe_get_rx_ld_status(struct sxgbe_rx_norm_desc *p) /* Return the RX status looking at the WB fields */ -static void sxgbe_rx_wbstatus(struct sxgbe_rx_norm_desc *p, - struct sxgbe_extra_stats *x) +static int sxgbe_rx_wbstatus(struct sxgbe_rx_norm_desc *p, + struct sxgbe_extra_stats *x, int *checksum) { + int status = 0; + *checksum = CHECKSUM_UNNECESSARY; if (p->rdes23.rx_wb_des23.err_summary) { switch (p->rdes23.rx_wb_des23.err_l2_type) { case RX_GMII_ERR: + status = -EINVAL; x->rx_code_gmii_err++; break; case RX_WATCHDOG_ERR: + status = -EINVAL; x->rx_watchdog_err++; break; case RX_CRC_ERR: + status = -EINVAL; x->rx_crc_err++; break; case RX_GAINT_ERR: + status = -EINVAL; x->rx_gaint_pkt_err++; break; case RX_IP_HDR_ERR: + *checksum = CHECKSUM_NONE; x->ip_hdr_err++; break; case RX_PAYLOAD_ERR: + *checksum = CHECKSUM_NONE; x->ip_payload_err++; break; case RX_OVERFLOW_ERR: + status = -EINVAL; x->overflow_error++; break; default: @@ -366,12 +378,14 @@ static void sxgbe_rx_wbstatus(struct sxgbe_rx_norm_desc *p, if (p->rdes23.rx_wb_des23.vlan_filter_match) x->vlan_filter_match++; - if (p->rdes23.rx_wb_des23.sa_filter_fail) + if (p->rdes23.rx_wb_des23.sa_filter_fail) { + status = -EINVAL; x->sa_filter_fail++; - - if (p->rdes23.rx_wb_des23.da_filter_fail) + } + if (p->rdes23.rx_wb_des23.da_filter_fail) { + status = -EINVAL; x->da_filter_fail++; - + } if (p->rdes23.rx_wb_des23.hash_filter_pass) x->hash_filter_pass++; @@ -381,6 +395,7 @@ static void sxgbe_rx_wbstatus(struct sxgbe_rx_norm_desc *p, if (p->rdes23.rx_wb_des23.l4_filter_match) x->l4_filter_match++; + return status; } /* Get own bit of context descriptor */ diff --git a/drivers/net/ethernet/samsung/sxgbe_desc.h b/drivers/net/ethernet/samsung/sxgbe_desc.h index 26ed30f..adf5a0f 100644 --- a/drivers/net/ethernet/samsung/sxgbe_desc.h +++ b/drivers/net/ethernet/samsung/sxgbe_desc.h @@ -113,7 +113,7 @@ struct sxgbe_rx_norm_desc { /* WB RDES3 */ u32 pkt_len:14; u32 rdes3_reserved:1; - u32 err_summary:15; + u32 err_summary:1; u32 err_l2_type:4; u32 layer34_pkt_type:4; u32 no_coagulation_pkt:1; @@ -273,8 +273,8 @@ struct sxgbe_desc_ops { int (*get_rx_ld_status)(struct sxgbe_rx_norm_desc *p); /* Return the reception status looking at the RDES1 */ - void (*rx_wbstatus)(struct sxgbe_rx_norm_desc *p, - struct sxgbe_extra_stats *x); + int (*rx_wbstatus)(struct sxgbe_rx_norm_desc *p, + struct sxgbe_extra_stats *x, int *checksum); /* Get own bit */ int (*get_rx_ctxt_owner)(struct sxgbe_rx_ctxt_desc *p); diff --git a/drivers/net/ethernet/samsung/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe_main.c index 3753329..2867db9 100644 --- a/drivers/net/ethernet/samsung/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe_main.c @@ -1314,6 +1314,7 @@ void sxgbe_tso_prepare(struct sxgbe_priv_data *priv, static netdev_tx_t sxgbe_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned int entry, frag_num; + int cksum_flag = 0; struct netdev_queue *dev_txq; unsigned txq_index = skb_get_queue_mapping(skb); struct sxgbe_priv_data *priv = netdev_priv(dev); @@ -1385,7 +1386,7 @@ static netdev_tx_t sxgbe_xmit(struct sk_buff *skb, struct net_device *dev) __func__); priv->hw->desc->prepare_tx_desc(tx_desc, 1, no_pagedlen, - no_pagedlen); + no_pagedlen, cksum_flag);