From patchwork Thu Jun 23 05:54:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 9194535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 537806075F for ; Thu, 23 Jun 2016 05:57:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44C5A283EA for ; Thu, 23 Jun 2016 05:57:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 398AA2842D; Thu, 23 Jun 2016 05:57:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id C6630283EA for ; Thu, 23 Jun 2016 05:57:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bFxcG-0006NK-3X; Thu, 23 Jun 2016 05:55:52 +0000 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bFxc5-0006D1-14 for linux-arm-kernel@lists.infradead.org; Thu, 23 Jun 2016 05:55:42 +0000 Received: by mail-pa0-x241.google.com with SMTP id ts6so5680768pac.0 for ; Wed, 22 Jun 2016 22:55:20 -0700 (PDT) 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=S153XjNpmPhqiJYyK2LqwisG1XYGFR2nHSqP+t8zR+I=; b=IU8Bt53zW+icIjvGrK8ApKvlKFpoBgw7b+NuKUN4MhDtTsd65kKtV758Um3bnXKP7H DIjzJe4C5uIF3WeGuwQu4+UhnkFGKM1suPc+8v7nULlmfnQK/5dqMMN7/04VFBCHtgWu 7FT83KmAWmJQq2cDM7mGr2jfED/M3zecG3pD9zAZdLbmBkDqIkNYL82WE8dLLJr3TkOr iuKekOwMsHpxaJGa9T4OKQJLtbqIvxxzbVA4AqUMLQ5eql0KtUnT17+R7QNS+FF6HpAJ UNQ6FN1ncZvrAVSr+YWnA5D/tj70HsXiusqpVW6k3GG4foJZFw8piDbrz1irj9HteteH mXhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S153XjNpmPhqiJYyK2LqwisG1XYGFR2nHSqP+t8zR+I=; b=SwwVwBu8wZl2RvzQ3RFYitPadtLqAx/+gIre8m8DvXGeHqwgNvaXdQ3ztUtuztdawD Ed4gFlatAZJnnsexB30w5XrfltGF9bsHCr/35W1J41Ddsayg9cZSOcpioXGfi27/Kfvg Sps6d1V3CVc8psrRWdlgpisT5geCmys3wWfjRohTjfxj4lcXvf0yaPfr6YumsU5/Iv3t UCRDSJVZSVIHxHtrkFS8hpRGohUg6yTAktd0lG5dSLWhZQX+FLlG0E/Hy5d2acpXlQTz vTAy390gmZtIJmlBXPfjxR8GAZagOY64uj9pyGVG0SHnSzinBOezUTtdc7N6iZa/nU72 UY6g== X-Gm-Message-State: ALyK8tJooXuBbE1/vkj0YWOohSM76pXjbzm476D6+pYcdzhq3LrsuBTOJof28P05txYKFA== X-Received: by 10.66.149.99 with SMTP id tz3mr40857828pab.128.1466661320015; Wed, 22 Jun 2016 22:55:20 -0700 (PDT) Received: from machine421.in.caveonetworks.com ([14.140.2.178]) by smtp.googlemail.com with ESMTPSA id 69sm3761611pfc.90.2016.06.22.22.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 22:55:19 -0700 (PDT) From: sunil.kovvuri@gmail.com To: netdev@vger.kernel.org Subject: [PATCH 2/2] net: thunderx: Fix TL4 configuration for secondary Qsets Date: Thu, 23 Jun 2016 11:24:18 +0530 Message-Id: <1466661258-349-3-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466661258-349-1-git-send-email-sunil.kovvuri@gmail.com> References: <1466661258-349-1-git-send-email-sunil.kovvuri@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160622_225541_175915_B0FC9C6E X-CRM114-Status: GOOD ( 13.28 ) 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 , Naveen.Reddy@cavium.com, robert.richter@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-Virus-Scanned: ClamAV using ClamSMTP From: Sunil Goutham TL4 calculation for a given SQ of secondary Qsets is incorrect and goes out of bounds and also for some SQ's TL4 chosen will transmit data via a different BGX interface and not same as primary Qset's interface. This patch fixes this issue. Signed-off-by: Sunil Goutham --- drivers/net/ethernet/cavium/thunder/nic_main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c index 95f17f8..16ed203 100644 --- a/drivers/net/ethernet/cavium/thunder/nic_main.c +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c @@ -499,6 +499,7 @@ static void nic_tx_channel_cfg(struct nicpf *nic, u8 vnic, u32 rr_quantum; u8 sq_idx = sq->sq_num; u8 pqs_vnic; + int svf; if (sq->sqs_mode) pqs_vnic = nic->pqs_vf[vnic]; @@ -511,10 +512,19 @@ static void nic_tx_channel_cfg(struct nicpf *nic, u8 vnic, /* 24 bytes for FCS, IPG and preamble */ rr_quantum = ((NIC_HW_MAX_FRS + 24) / 4); - tl4 = (lmac * NIC_TL4_PER_LMAC) + (bgx * NIC_TL4_PER_BGX); + if (!sq->sqs_mode) { + tl4 = (lmac * NIC_TL4_PER_LMAC) + (bgx * NIC_TL4_PER_BGX); + } else { + for (svf = 0; svf < MAX_SQS_PER_VF; svf++) { + if (nic->vf_sqs[pqs_vnic][svf] == vnic) + break; + } + tl4 = (MAX_LMAC_PER_BGX * NIC_TL4_PER_LMAC); + tl4 += (lmac * NIC_TL4_PER_LMAC * MAX_SQS_PER_VF); + tl4 += (svf * NIC_TL4_PER_LMAC); + tl4 += (bgx * NIC_TL4_PER_BGX); + } tl4 += sq_idx; - if (sq->sqs_mode) - tl4 += vnic * 8; tl3 = tl4 / (NIC_MAX_TL4 / NIC_MAX_TL3); nic_reg_write(nic, NIC_PF_QSET_0_127_SQ_0_7_CFG2 |