From patchwork Mon Nov 14 10:54:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 9427185 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 462AE60476 for ; Mon, 14 Nov 2016 10:57:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 357B228841 for ; Mon, 14 Nov 2016 10:57:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A2EE2884D; Mon, 14 Nov 2016 10:57:32 +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 E25BA28841 for ; Mon, 14 Nov 2016 10:57:31 +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 1c6Evl-0007t6-01; Mon, 14 Nov 2016 10:56:05 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6Evf-0007mo-L4 for linux-arm-kernel@lists.infradead.org; Mon, 14 Nov 2016 10:56:00 +0000 Received: by mail-pf0-x244.google.com with SMTP id 144so6043606pfv.0 for ; Mon, 14 Nov 2016 02:55:39 -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=L72fQHjjTvGXKqRkzU5sv+yUihjbYvyJkm4tiEC9Hpw=; b=QECnuiIVfC7PpOzHziaBKEnOG5IhZXbFBi3oc2W8Kgjcq48FLPHk7Cl+6ERP/Y/Z7s Yc7tQvh7GSU8Kd9iiL47wSQUwxtRsAJY6bojQ5yYJKrH1Uo+mrFfDJ6dkMvgPMjB0vv/ QCSauO5vXigo96CLl1Y+Hu+tnNHIIjYvr1ntqf+0UMgw13SH854P3jZ0KvfRpEkvNIWx SXsDHTHAESEQCcZjZY1xcJ9LZuAMpbbrsHjpK39ThIuEkZdCoEBHtV1JdfDnZTv3xWzU FO0TOs6tIpQ8esCJW8fChyXGh+cQOSKHGN5HcfNCqzo04qn2CLG5IPKKMpdAWo10WERr PY2Q== 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=L72fQHjjTvGXKqRkzU5sv+yUihjbYvyJkm4tiEC9Hpw=; b=LcNQ3xarkY/QsC//4oj5JNJLOKbx4X5hkrIjfjUuOEhBQ34IPgziRMa5DVinUC8Rr/ jq7ohOV8Gm7YHKNEHYnWLhyhWyEdPOTKK0vmKE4lqliyedLs1+tHBoRL62PWRp+rlyDC gzI0CH/XLEP/rRIfb9xsDg/N+B7GYwgB5dPJQkweYdieVHP2yC7XGXKRi3qMWYdh1qFa 9CuRv4eJCtGxwyCs2GUVAFGWXaxtPg3pJ/JRDzEZvBnGxc1TQ5Vn2zE4w1RiQWJCl6Op IoljL4NxKq79OMa9WuBnuXy84LUQUFRncMmtoc8DUH7rckanOlQfMVHWNxrveMI6aeNh wsFg== X-Gm-Message-State: ABUngvdtDhPhGe7p/0z9DGD+D4UxjThiL4XzRBoGkvAhuvn7P1HMFI2G0I/A4gByr6Tdqw== X-Received: by 10.98.93.201 with SMTP id n70mr35238507pfj.161.1479120938809; Mon, 14 Nov 2016 02:55:38 -0800 (PST) Received: from machine421.in.caveonetworks.com ([14.140.2.178]) by smtp.googlemail.com with ESMTPSA id af14sm34502578pac.13.2016.11.14.02.55.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Nov 2016 02:55:38 -0800 (PST) From: sunil.kovvuri@gmail.com To: netdev@vger.kernel.org Subject: [PATCH 1/5] net: thunderx: Introduce BGX_ID_MASK macro to extract bgx_id Date: Mon, 14 Nov 2016 16:24:42 +0530 Message-Id: <1479120886-13425-2-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479120886-13425-1-git-send-email-sunil.kovvuri@gmail.com> References: <1479120886-13425-1-git-send-email-sunil.kovvuri@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161114_025559_800263_D71B778D X-CRM114-Status: GOOD ( 11.76 ) 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 , Radha Mohan Chintakuntla , 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: Radha Mohan Chintakuntla This patch fixes the 'bgx_id' determination on 83xx where there are 4 BGX blocks instead of 2 on other platforms. Signed-off-by: Radha Mohan Chintakuntla Signed-off-by: Sunil Goutham --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 4 ++-- drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 8bbaedb..050e21f 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1242,8 +1242,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_read_config_word(pdev, PCI_DEVICE_ID, &sdevid); if (sdevid != PCI_DEVICE_ID_THUNDER_RGX) { - bgx->bgx_id = - (pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM) >> 24) & 1; + bgx->bgx_id = (pci_resource_start(pdev, + PCI_CFG_REG_BAR_NUM) >> 24) & BGX_ID_MASK; bgx->bgx_id += nic_get_node_id(pdev) * MAX_BGX_PER_NODE; bgx->max_lmac = MAX_LMAC_PER_BGX; bgx_vnic[bgx->bgx_id] = bgx; diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index d59c71e..01cc7c8 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -28,6 +28,8 @@ #define MAX_DMAC_PER_LMAC 8 #define MAX_FRAME_SIZE 9216 +#define BGX_ID_MASK 0x3 + #define MAX_DMAC_PER_LMAC_TNS_BYPASS_MODE 2 /* Registers */