From patchwork Wed Aug 10 06:42:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 657791 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s8fhs0S2Qz9sDf for ; Thu, 11 Aug 2016 04:25:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gbu5ek3d; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934497AbcHJSY3 (ORCPT ); Wed, 10 Aug 2016 14:24:29 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34771 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933797AbcHJSY1 (ORCPT ); Wed, 10 Aug 2016 14:24:27 -0400 Received: by mail-pa0-f65.google.com with SMTP id hh10so3218525pac.1; Wed, 10 Aug 2016 11:24:26 -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=pmFxuMHO+FDyvWa8TOCiIUPa47yw90TIw5SDJ+AuBL0=; b=gbu5ek3d0jffEu6WJ6YmyDyeYSyT8c2MCJuHFZfsjoFOE1uNAHHASR4LQRWRpACn/N jqs5wWwqF5qDQ+ndyIiO5uWdVxzHvB7i+tg+z69RblC6qB6bA0JAa5qOtz93kdb228eI LSYipDTyFNCzPI1F+HM7eMdKwHsz7YU4tS1YGwlGiYCL9yvjkYUxDrrJrcEYsLH67/vK 7gQ03gEQ3YoES25vwbyJe2yjv5eBglbTUgYLhkjNoanPes8+U4Jay+U54OmvL3yG0mD2 JVtmoSReTBJHZv44zSCmYgOdvWFoKkHadoXDUNCh0YFz2sKOVWv3ejE2LwntfwQEH0em IGKQ== 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=pmFxuMHO+FDyvWa8TOCiIUPa47yw90TIw5SDJ+AuBL0=; b=lG3G78fFWB2m4j7/s8VNzNgpWtwSYn8MOilZ+1aiH0cyB34fH/fY4jjxGhGhPt8Yrm Qci9Q+tcKvbT3VedFZCrvWb9/DGKw3eGJ4aTSuGeRPqtKtfr3gNhwE+OgchXodaMBMgH BwKsG1YKokXbYmbHJsVopWPRlWKUMd3AdxMTUDDeZy4M+n6gtlNbIGh+RqiYsQpmzLjZ ZPafQTSm9iKknRpfhRujxVFVG5/bZziv5vF4iFXhYHyR+LTbx4/vvFHYSR69ik4poWNa 3TZ4yo1KEh9L8OR/eaPyv1a5aa5XqvGmb+0yA8fYu6aGBBrvmKxVzaq6teHKZLmnrZEG DQXw== X-Gm-Message-State: AEkoouuOpiEznVwjyNjW8Y+gdut+kuKbj/YgjJEFLLuAWc8Hi5MpvaIHfg3uh0va9OJ2rQ== X-Received: by 10.66.88.131 with SMTP id bg3mr4313400pab.43.1470811436626; Tue, 09 Aug 2016 23:43:56 -0700 (PDT) Received: from machine421.in.caveonetworks.com ([14.140.2.178]) by smtp.googlemail.com with ESMTPSA id lf11sm60825780pab.17.2016.08.09.23.43.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 23:43:55 -0700 (PDT) From: sunil.kovvuri@gmail.com To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sunil Goutham Subject: [PATCH 02/21] net: thunderx: Add VNIC's PCI devid on future chips Date: Wed, 10 Aug 2016 12:12:34 +0530 Message-Id: <1470811373-28277-3-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470811373-28277-1-git-send-email-sunil.kovvuri@gmail.com> References: <1470811373-28277-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: Sunil Goutham This patch adds PCI device IDs of VNIC on newer chips and also registers VF driver with them. Device id remains same for all versions of chips but subsystem device id changes. Signed-off-by: Sunil Goutham --- drivers/net/ethernet/cavium/thunder/nic.h | 10 +++++++++- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h index 66b499b..6b0b240 100644 --- a/drivers/net/ethernet/cavium/thunder/nic.h +++ b/drivers/net/ethernet/cavium/thunder/nic.h @@ -21,7 +21,15 @@ #define PCI_DEVICE_ID_THUNDER_BGX 0xA026 /* Subsystem device IDs */ -#define PCI_SUBSYS_DEVID_88XX_NIC_PF 0xA11E +#define PCI_SUBSYS_DEVID_88XX_NIC_PF 0xA11E +#define PCI_SUBSYS_DEVID_81XX_NIC_PF 0xA21E +#define PCI_SUBSYS_DEVID_83XX_NIC_PF 0xA31E + +#define PCI_SUBSYS_DEVID_88XX_PASS1_NIC_VF 0xA11E +#define PCI_SUBSYS_DEVID_88XX_NIC_VF 0xA134 +#define PCI_SUBSYS_DEVID_81XX_NIC_VF 0xA234 +#define PCI_SUBSYS_DEVID_83XX_NIC_VF 0xA334 + /* PCI BAR nos */ #define PCI_CFG_REG_BAR_NUM 0 diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index a19e73f..0c10635 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -29,10 +29,20 @@ static const struct pci_device_id nicvf_id_table[] = { { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVICE_ID_THUNDER_NIC_VF, - PCI_VENDOR_ID_CAVIUM, 0xA134) }, + PCI_VENDOR_ID_CAVIUM, + PCI_SUBSYS_DEVID_88XX_NIC_VF) }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVICE_ID_THUNDER_PASS1_NIC_VF, - PCI_VENDOR_ID_CAVIUM, 0xA11E) }, + PCI_VENDOR_ID_CAVIUM, + PCI_SUBSYS_DEVID_88XX_PASS1_NIC_VF) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, + PCI_DEVICE_ID_THUNDER_NIC_VF, + PCI_VENDOR_ID_CAVIUM, + PCI_SUBSYS_DEVID_81XX_NIC_VF) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, + PCI_DEVICE_ID_THUNDER_NIC_VF, + PCI_VENDOR_ID_CAVIUM, + PCI_SUBSYS_DEVID_83XX_NIC_VF) }, { 0, } /* end of table */ };