From patchwork Tue Mar 18 18:19:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 26510 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 747B1202FA for ; Tue, 18 Mar 2014 18:19:53 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id j17sf29464189oag.6 for ; Tue, 18 Mar 2014 11:19:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:thread-index:dlp-filter:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding:content-language; bh=1y4I3bW49Dsf38UDnMJZrKFJedfINqRHhciU3aJ63S8=; b=ORINjIS6uwMlienFOZJ7+T0zQTmQ1AQ8cwqXIH/OXoYezDheObP/9cvUlh6DVW34Wj E16G4sUB9myuADPzBDtxHj9lrl6mo0BGNeqdkbsBwbCA9YjVFcimFtAu5y+zvv8oqA7e NQDtf/86/FCiVmqdox4A0WEw5X8tjf8erjjR1zqCxKSSa2v3VKD6qn2xhNPjPHMGxXwC ebGZrB9TeeWa2dj/PyHitrXmaMy/uBxfHuyPeOrzXWpCg9I5edE+2q8X1KmR17c7vBOg h2b+vH/hldfygPFTHDna8Gp2rQwX+sgdeUwYQy/DZssLji9oE/RafQKP0REDAH75sLGU cdfA== X-Gm-Message-State: ALoCoQmdDoGVNOt+2KJELpu9++UxTYQH7YszCxz2DTER712U/to69fzhc9rdY/VYo67hzlNuPr4u X-Received: by 10.182.104.200 with SMTP id gg8mr702601obb.45.1395166792968; Tue, 18 Mar 2014 11:19:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.113 with SMTP id p104ls2301746qga.41.gmail; Tue, 18 Mar 2014 11:19:52 -0700 (PDT) X-Received: by 10.221.29.196 with SMTP id rz4mr26095280vcb.8.1395166792850; Tue, 18 Mar 2014 11:19:52 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id d20si3783625veu.151.2014.03.18.11.19.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 11:19:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so7571780veb.15 for ; Tue, 18 Mar 2014 11:19:52 -0700 (PDT) X-Received: by 10.58.207.74 with SMTP id lu10mr25556462vec.15.1395166792721; Tue, 18 Mar 2014 11:19:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp234600vck; Tue, 18 Mar 2014 11:19:52 -0700 (PDT) X-Received: by 10.66.161.38 with SMTP id xp6mr12309586pab.145.1395166791699; Tue, 18 Mar 2014 11:19:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vu10si18853271pbc.309.2014.03.18.11.19.51; Tue, 18 Mar 2014 11:19:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757437AbaCRSTq (ORCPT + 4 others); Tue, 18 Mar 2014 14:19:46 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:35059 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757407AbaCRSTj (ORCPT ); Tue, 18 Mar 2014 14:19:39 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2N0045U9KQXA50@mailout2.samsung.com>; Wed, 19 Mar 2014 03:19:39 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 04.CF.12635.A3E88235; Wed, 19 Mar 2014 03:19:38 +0900 (KST) X-AuditID: cbfee68d-b7fcd6d00000315b-e6-53288e3ae9be Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 8C.5F.29263.A3E88235; Wed, 19 Mar 2014 03:19:38 +0900 (KST) Received: from VISITOR1LAB ([105.128.19.10]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2N003AS9K91FA0@mmp1.samsung.com>; Wed, 19 Mar 2014 03:19:38 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org Cc: davem@davemloft.net, vipul.pandya@samsung.com, ks.giri@samsung.com, siva.kallam@samsung.com, ilho215.lee@samsung.com Subject: [PATCH V5 5/8] net: sxgbe: add Checksum offload support for Samsung sxgbe Date: Tue, 18 Mar 2014 11:19:25 -0700 Message-id: <002501cf42d6$9e3c4be0$dab4e3a0$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac9C1dcIrU7lz75aTKujtfZwLxf5Jg== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRmVeSWpSXmKPExsVy+t8zQ12rPo1ggyNXLC3mnG9hsZh/5Byr xdF/Cxkt5h/dwWQx4/w+JotjC8QsVjRtZbTYtuACswOHx5aVN5k8+rasYvT4vEkugDmKyyYl NSezLLVI3y6BK2P73ImsBdstK/a862JvYFyj38XIySEhYCIx4/9HNghbTOLCvfVANheHkMAy Rom+K7uYYIo2vngFlVjEKHF58xQmCOcPo8Ta68eZQarYBNQkmmdeBhslIhAtsePIRCCbg4NZ oEri/TsDkLCwQIjE0skfWUFsFgFViWd3JzGBlPAKWEq8fxgDEuYVEJT4MfkeC4jNLKAlsX7n cSYIW15i85q3zBD3KEjsOPuaEWKTnsS3n2fZIWrEJSY9eMgOcpqEwCl2icXtfWwQuwQkvk0+ xAKyS0JAVmLTAag5khIHV9xgmcAoNgvJ6llIVs9CsnoWkhULGFlWMYqmFiQXFCelFxnqFSfm Fpfmpesl5+duYoREYO8OxtsHrA8xJgOtn8gsJZqcD4zgvJJ4Q2MzIwtTE1NjI3NLM9KElcR5 kx4mBQkJpCeWpGanphakFsUXleakFh9iZOLglGpgPBm+zsS16MpaYbWib0+nrW77U334ex7v 67PccuKK5672Fe3v1ZUL5y6qvTvRPiC+23jpHmvTBysvGG2Umvmq7qx/I3e+ZfcGO+e+7QyM HhxFfvHuL6e8exCYbzx5/Yo71ebr2W6sd1xw+COLwrYnu2eK2n/sq5HcxDbnO9MbsV0fStcu M1looMRSnJFoqMVcVJwIAPxaTUHWAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAKsWRmVeSWpSXmKPExsVy+t9jAV2rPo1gg7nrTCzmnG9hsZh/5Byr xdF/Cxkt5h/dwWQx4/w+JotjC8QsVjRtZbTYtuACswOHx5aVN5k8+rasYvT4vEkugDmqgdEm IzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB+gCJYWyxJxS oFBAYnGxkr4dpgmhIW66FjCNEbq+IUFwPUYGaCBhHWPG9rkTWQu2W1bsedfF3sC4Rr+LkZND QsBEYuOLV2wQtpjEhXvrgWwuDiGBRYwSlzdPYYJw/jBKrL1+nBmkik1ATaJ55mWwDhGBaIkd RyYC2RwczAJVEu/fGYCEhQVCJJZO/sgKYrMIqEo8uzuJCaSEV8BS4v3DGJAwr4CgxI/J91hA bGYBLYn1O48zQdjyEpvXvGWGuEdBYsfZ14wQm/Qkvv08yw5RIy4x6cFD9gmMArOQjJqFZNQs JKNmIWlZwMiyilE0tSC5oDgpPddQrzgxt7g0L10vOT93EyM4vp9J7WBc2WBxiFGAg1GJh/dA lEawEGtiWXFl7iFGCQ5mJRHeb01AId6UxMqq1KL8+KLSnNTiQ4zJQI9OZJYSTc4Hpp68knhD YxMzI0sjMwsjE3Nz0oSVxHkPtFoHCgmkJ5akZqemFqQWwWxh4uCUamBkLOXZwbGJ8bHAjuJH J22XlvydKZk87+TlDOmZ64zsFvl/OND9J8rmd2d8yUL2j25zwnpmeewq3F1s2Sh9pMjK5E6C jsJBzudt07ycNqRzfLypvmGm3Ilc15jEz3vvyMgEPvSW/ey0gLVp/4SsFSvvZKcFLTzmsvCZ /saGBTc3W/e2X1rL0RSsxFKckWioxVxUnAgA+OArEDMDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: netdev@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: bh74.an@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: en-us 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/sxgbe_common.h | 5 +++ drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 20 +++++++++ drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h | 6 +-- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 46 ++++++++++++++++----- 4 files changed, 63 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h index 937969c..7937493 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h @@ -337,6 +337,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); @@ -448,6 +452,7 @@ struct sxgbe_priv_data { struct sxgbe_ops *hw; /* sxgbe specific ops */ int no_csum_insertion; int irq; + int rxcsum_insertion; spinlock_t stats_lock; /* lock for tx/rx statatics */ struct phy_device *phydev; diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c index bf93b16..5885fd6 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c +++ b/drivers/net/ethernet/samsung/sxgbe/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/sxgbe_desc.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h index 547edf3..3c0b5a8 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h +++ b/drivers/net/ethernet/samsung/sxgbe/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/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 5490cf4..13bdb54 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -1257,6 +1257,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); @@ -1328,7 +1329,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); } } @@ -1346,7 +1347,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(); @@ -1467,6 +1468,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; @@ -1483,7 +1486,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]; @@ -1497,7 +1511,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; } @@ -1743,15 +1761,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; @@ -2114,6 +2132,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;