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: 82052 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp946526qge; Mon, 14 Nov 2016 02:55:46 -0800 (PST) X-Received: by 10.98.147.135 with SMTP id r7mr27535440pfk.117.1479120945994; Mon, 14 Nov 2016 02:55:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q63si21743658pfg.266.2016.11.14.02.55.45; Mon, 14 Nov 2016 02:55:45 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933115AbcKNKzm (ORCPT + 4 others); Mon, 14 Nov 2016 05:55:42 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33523 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932388AbcKNKzk (ORCPT ); Mon, 14 Nov 2016 05:55:40 -0500 Received: by mail-pf0-f195.google.com with SMTP id 144so6043607pfv.0; 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=f4VNXyIU9wJG6vPVh1kkKVOO+MO3vUL158co8GlUoAeEXSFmVTuL58TG/diHLyd8eZ rwJagM/iPke5axxD/rJBaZ30ZgGP6sidYpwCRrSByuGcjynUJ9wciZmsoWWqj7kVVbCi H5/69glrc+WLiZ48qGKtvNBUpbmfrFIUs8LFDnW89QJMQ1VHlil94GTbVJgWeXHuMtpJ UIJ64IvuRItCPoey20Odxt08GOz8AZ6ctQ4tUXOpILYwYpV2tBIvp/WG9Mz6AYuj46cR KmsyZ4UBCMB51RS9wa56fwrIBl7v/VtQBNmTB9U8bwMPCHORCkPagLISGuoc+XRFc9xl 1I3g== X-Gm-Message-State: ABUngvcSwgcQ3ZzmYFM2dvs8roTJWDpeB47BFgtyPCRV3XOIxd+htRUAlh+sB7FUX+2dAQ== 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 Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Radha Mohan Chintakuntla , Sunil Goutham 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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(-) -- 2.7.4 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 */