From patchwork Mon Nov 30 18:19:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 7728881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9BDBF9F1C0 for ; Mon, 30 Nov 2015 18:27:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5181205DD for ; Mon, 30 Nov 2015 18:27:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0459320591 for ; Mon, 30 Nov 2015 18:27:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a3T5U-00070S-NU; Mon, 30 Nov 2015 18:22:08 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a3T26-0003Hq-Bs for linux-arm-kernel@lists.infradead.org; Mon, 30 Nov 2015 18:18:40 +0000 Received: by pabfh17 with SMTP id fh17so197913863pab.0 for ; Mon, 30 Nov 2015 10:18:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=338cRO6fdUuMfFBEH6Fp1NvTzeYxnkphyg+ObBw+SU0=; b=0CXueGiusYoUjzKiD3nRDdjbgEe5Z0URRxNbMsNNlnxaUek9qY+Ew3Vi16MAVXKDJr H15JiMXmU0UMH7X2RTUgFZ5yFER0JyiR8aWwsLJAbL12frS5OT79WCag4mVfuCpzzmkb 1fOUu2qt2mrcTBI6UgQ7+zdQXtLM6gIUWqikioKirNmkswEbcYa/7iT7CZWbBENDK9F0 580aqc+P6qPDbnVydBv5qa4ouHXCEjHPt+0WhWg8YN5Bq2KHMchSp/9Nk5JH+zceTGw+ hQPFpUbL6W+PQNKWa7r5g4aBYiIdtbkmzlpxN7vQXGQAH7T5wx47MrCX/mM/hILoONuc dr9Q== X-Received: by 10.66.100.135 with SMTP id ey7mr50586203pab.108.1448907497660; Mon, 30 Nov 2015 10:18:17 -0800 (PST) Received: from localhost.localdomain ([14.140.2.178]) by smtp.googlemail.com with ESMTPSA id fc8sm32001244pab.21.2015.11.30.10.18.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Nov 2015 10:18:16 -0800 (PST) From: Sunil Goutham To: netdev@vger.kernel.org Subject: [PATCH 10/13] net: thunderx: Enable CQE count threshold irq on pass2 silicon Date: Mon, 30 Nov 2015 23:49:06 +0530 Message-Id: <1448907549-5296-11-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151130_101838_677449_7BCBC333 X-CRM114-Status: GOOD ( 12.91 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sunil Goutham , Sunil.Goutham@caviumnetworks.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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: Sunil Goutham Signed-off-by: Sunil Goutham --- drivers/net/ethernet/cavium/thunder/nic.h | 2 ++ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 5 ++++- drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h index 02571f4..e782856 100644 --- a/drivers/net/ethernet/cavium/thunder/nic.h +++ b/drivers/net/ethernet/cavium/thunder/nic.h @@ -34,6 +34,8 @@ /* NIC priv flags */ #define NIC_SRIOV_ENABLED BIT(0) +#define VNIC_NAPI_WEIGHT NAPI_POLL_WEIGHT + /* Min/Max packet size */ #define NIC_HW_MIN_FRS 64 #define NIC_HW_MAX_FRS 9200 /* 9216 max packet including FCS */ diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index df07bd7..51bbe67 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -1147,7 +1147,7 @@ int nicvf_open(struct net_device *netdev) cq_poll->cq_idx = qidx; cq_poll->nicvf = nic; netif_napi_add(netdev, &cq_poll->napi, nicvf_poll, - NAPI_POLL_WEIGHT); + VNIC_NAPI_WEIGHT); napi_enable(&cq_poll->napi); nic->napi[qidx] = cq_poll; } diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index 209e495..5855828 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -299,7 +299,10 @@ static int nicvf_init_cmp_queue(struct nicvf *nic, return err; cq->desc = cq->dmem.base; - cq->thresh = CMP_QUEUE_CQE_THRESH; + if (!pass1_silicon(nic->pdev)) + cq->thresh = CMP_QUEUE_CQE_THRESH; + else + cq->thresh = 0; nic->cq_coalesce_usecs = (CMP_QUEUE_TIMER_THRESH * 0.05) - 1; return 0; diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h index bce8099..2cfc85b 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h @@ -10,6 +10,7 @@ #define NICVF_QUEUES_H #include +#include "nic.h" #include "q_struct.h" #define MAX_QUEUE_SET 128 @@ -75,7 +76,7 @@ */ #define CMP_QSIZE CMP_QUEUE_SIZE3 #define CMP_QUEUE_LEN (1ULL << (CMP_QSIZE + 10)) -#define CMP_QUEUE_CQE_THRESH 0 +#define CMP_QUEUE_CQE_THRESH (VNIC_NAPI_WEIGHT / 2) #define CMP_QUEUE_TIMER_THRESH 80 /* ~2usec */ #define RBDR_SIZE RBDR_SIZE0