From patchwork Wed May 7 08:13:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 29749 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 D308720534 for ; Wed, 7 May 2014 08:14:16 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id m1sf3355745oag.2 for ; Wed, 07 May 2014 01:14:16 -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=P+9Yx83k2e37Yo/KT5IAuwNqKd7Iol7uvBy8CfvPSjs=; b=lfLYZOvIEJISnw1g4Z7K9JHuT1WE+wFKMZPbOGVSQmoKfRydTNC4XndaEkMs7sJ1yc HBU+UegCoo5weUiuna0RKAAChM9krfq+4M8J2UtKBtxZmqI1SWOCIqjqU5CfMjqBX7/s e75VKzDs8dDiPtsP50NfiLOJsCnbCO0qCn7/gCWEsO8XARNDPxJabdRfSPZOHkyUgV3o j2QmYMGayB/Yydz2fcWF1op3N32Xop7hJT0jL68NYe2jg8xOHN/SDySuYRtSDn4Xz/1N F83crWnI6IOLpVMd/TC1soq3i9OmWrm8c8uy3rnmdyEUu38LP1eeAKoxEPrieKgJ9+Ru 9S4Q== X-Gm-Message-State: ALoCoQl/men2drF0nD6jZMbnPJVzGpl2Fb2C4YBa4C8B9h+f2gKipQLuDkCXYHaDe5LAjS2RSTP8 X-Received: by 10.50.73.74 with SMTP id j10mr3790743igv.1.1399450455982; Wed, 07 May 2014 01:14:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.201 with SMTP id z67ls3193631qgd.59.gmail; Wed, 07 May 2014 01:14:15 -0700 (PDT) X-Received: by 10.221.20.199 with SMTP id qp7mr12278526vcb.24.1399450455850; Wed, 07 May 2014 01:14:15 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id ru8si2778034vcb.29.2014.05.07.01.14.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 May 2014 01:14:15 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db11so789892veb.22 for ; Wed, 07 May 2014 01:14:15 -0700 (PDT) X-Received: by 10.220.195.196 with SMTP id ed4mr52239vcb.42.1399450455683; Wed, 07 May 2014 01:14:15 -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.221.72 with SMTP id ib8csp288580vcb; Wed, 7 May 2014 01:14:15 -0700 (PDT) X-Received: by 10.66.161.231 with SMTP id xv7mr16119087pab.7.1399450454806; Wed, 07 May 2014 01:14:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ko6si1454869pbc.270.2014.05.07.01.14.14; Wed, 07 May 2014 01:14:14 -0700 (PDT) Received-SPF: none (google.com: netdev-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755202AbaEGIOJ (ORCPT + 3 others); Wed, 7 May 2014 04:14:09 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:9489 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753889AbaEGIOD (ORCPT ); Wed, 7 May 2014 04:14:03 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N5700I7Q2VD8I00@mailout4.samsung.com>; Wed, 07 May 2014 17:14:01 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 20.1E.11120.84BE9635; Wed, 07 May 2014 17:14:00 +0900 (KST) X-AuditID: cbfee68f-b7eff6d000002b70-c1-5369eb48c26f Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 48.2B.25708.84BE9635; Wed, 07 May 2014 17:14:00 +0900 (KST) Received: from DObh74an01 ([12.36.166.149]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N57000ZW2VCYT50@mmp1.samsung.com>; Wed, 07 May 2014 17:14:00 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: davem@davemloft.net, ks.giri@samsung.com, vipul.pandya@samsung.com Subject: [PATCH] net: sxgbe: fixed mtl and dma channel feature Date: Wed, 07 May 2014 17:13:59 +0900 Message-id: <008a01cf69cc$4cd758e0$e6860aa0$%an@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac9pzEy3+4/n3ESfQKu2QV3OOo+vpw== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRmVeSWpSXmKPExsVy+t8zI12P15nBBh+XqVjMOd/CYjH/6A4m ixnn9zFZHFsgZrFtwQVmB1aPLStvMnn0bVnF6PF5k1wAcxSXTUpqTmZZapG+XQJXxvTrnxkL mnkrvk+7yN7AOIe7i5GTQ0LARGLa7XWMELaYxIV769m6GLk4hASWMUpse/yZpYuRA6yodW0p RHwRo8TblR3MEM5vRonOU99YQbrZBNQkmmdeZgOxRQRsJZYc+cwOYjMLuEnsv3wbrEZYwE5i x/2PYDUsAqoSk3q7mEFsXgEbiW2LlzFB2IISPybfY4Ho1ZJYv/M4E4QtL7F5zVtmiIPUJR79 1YVYpSex4dwTVogSEYl9L94xgtwmIbCNXeJO73ZWiF0CEt8mH4J6RlZi0wFmiIclJQ6uuMEy gVFsFpLNs5BsnoVk8ywkKxYwsqxiFE0tSC4oTkovMtYrTswtLs1L10vOz93ECImx/h2Mdw9Y H2JMBlo/kVlKNDkfGKN5JfGGxmZGFqYmpsZG5pZmpAkrifPef5gUJCSQnliSmp2aWpBaFF9U mpNafIiRiYNTqoGxINdb7lew/Hdhs3Drrf9cPn8Xmvrt3Qehy4UN3xdPfyXPXHO1w331h4id M6/6Hzm8Ttgsd4e+AttXo9jiXTz3Z6X897m6ZyHrcvW3m7NC2Y4ktM841LRx5297lczcPN/N n18eiTD6Yuz5KY/x42mJWnN/+dS0dXGTsz68XNF0Q+lCt5bYoX1KSizFGYmGWsxFxYkAc6Q/ j8cCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRmVeSWpSXmKPExsVy+t9jAV2P15nBBt96FSzmnG9hsZh/dAeT xYzz+5gsji0Qs9i24AKzA6vHlpU3mTz6tqxi9Pi8SS6AOaqB0SYjNTEltUghNS85PyUzL91W yTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMHaKWSQlliTilQKCCxuFhJ3w7ThNAQN10L mMYIXd+QILgeIwM0kLCOMWP69c+MBc28Fd+nXWRvYJzD3cXIwSEhYCLRura0i5ETyBSTuHBv PVsXIxeHkMAiRom3KzuYIZzfjBKdp76xglSxCahJNM+8zAZiiwjYSiw58pkdxGYWcJPYf/k2 WI2wgJ3EjvsfwWpYBFQlJvV2MYPYvAI2EtsWL2OCsAUlfky+xwLRqyWxfudxJghbXmLzmrfM EMepSzz6qwuxSk9iw7knrBAlIhL7XrxjnMAoMAvJpFlIJs1CMmkWkpYFjCyrGEVTC5ILipPS c430ihNzi0vz0vWS83M3MYIj+Jn0DsZVDRaHGAU4GJV4eC3eZgQLsSaWFVfmHmKU4GBWEuHd dTEzWIg3JbGyKrUoP76oNCe1+BBjMtCjE5mlRJPzgcklryTe0NjEzMjSyMzCyMTcnDRhJXHe g63WgUIC6YklqdmpqQWpRTBbmDg4pRoYIx/HFNf/m3py06l5TQt2vW1VDNs0+2yGDL+L5ILS KxPWHn5vG1EhedR/45SVZVuO/WxMlN/V6bY8M/D5T923LD995FYo1js+3ctVdTVF+eos/oNh Hk8uP5V5vUEv9uvm0NpPin0n5+3bJljPm/ss+8Nc5atvvTw092xcKn+a7c9swxvhc5KZHyix FGckGmoxFxUnAgAMI38OJAMAAA== 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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: ko This patch fixes mtl queue and dma channel value and adds mtl qsize for FIFO setting. Signed-off-by: Byungho An --- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 7dc3449..bf4447a 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -889,14 +889,19 @@ static int sxgbe_get_hw_features(struct sxgbe_priv_data * const priv) /* Read First Capability Register CAP[2] */ rval = priv->hw->mac->get_hw_feature(priv->ioaddr, 2); if (rval) { - features->rx_mtl_queues = SXGBE_HW_FEAT_RX_MTL_QUEUES(rval); - features->tx_mtl_queues = SXGBE_HW_FEAT_TX_MTL_QUEUES(rval); - features->rx_dma_channels = SXGBE_HW_FEAT_RX_DMA_CHANNELS(rval); - features->tx_dma_channels = SXGBE_HW_FEAT_TX_DMA_CHANNELS(rval); + features->rx_mtl_queues = SXGBE_HW_FEAT_RX_MTL_QUEUES(rval) + 1; + features->tx_mtl_queues = SXGBE_HW_FEAT_TX_MTL_QUEUES(rval) + 1; + features->rx_dma_channels = SXGBE_HW_FEAT_RX_DMA_CHANNELS(rval) + 1; + features->tx_dma_channels = SXGBE_HW_FEAT_TX_DMA_CHANNELS(rval) + 1; features->pps_output_count = SXGBE_HW_FEAT_PPS_OUTPUTS(rval); features->aux_input_count = SXGBE_HW_FEAT_AUX_SNAPSHOTS(rval); } + features->rx_mtl_qsize = (1 << (features->rxfifo_size + 7)) / + features->rx_mtl_queues; + features->tx_mtl_qsize = (1 << (features->txfifo_size + 7)) / + features->tx_mtl_queues; + return rval; }