From patchwork Thu Jul 21 14:01:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 14965 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 745E65678; Thu, 21 Jul 2016 16:02:41 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0082.outbound.protection.outlook.com [104.47.36.82]) by dpdk.org (Postfix) with ESMTP id D70FB5594 for ; Thu, 21 Jul 2016 16:02:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=BibOBUCZ4c/OL5frkf2TOHsrc0/R6BscFCursV3c1so=; b=ZErz4whgrWHJot1QlwDK6Eknzzbc04mi0RyXVDo0Uotv8LR5I06Pq3YGviRzutu+jd0EuUM5ajoHSMZR5RZ6p6y16g8VnpgvuKXopyTSivFZHgP2qK+2hwgzzgVqt6Vb0JCmv0Gwp1s9xoM/O497Z3aV807aKp/rv1fmn3NDON4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerin.Jacob@cavium.com; Received: from localhost.localdomain.localdomain (122.166.90.242) by BLUPR0701MB1715.namprd07.prod.outlook.com (10.163.85.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.544.10; Thu, 21 Jul 2016 14:02:35 +0000 From: Jerin Jacob To: CC: , , Jerin Jacob Date: Thu, 21 Jul 2016 19:31:47 +0530 Message-ID: <1469109707-23213-4-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1469109707-23213-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1469109707-23213-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [122.166.90.242] X-ClientProxiedBy: MAXPR01CA0021.INDPRD01.PROD.OUTLOOK.COM (10.164.147.28) To BLUPR0701MB1715.namprd07.prod.outlook.com (10.163.85.141) X-MS-Office365-Filtering-Correlation-Id: 7c1b0aab-3814-49e1-9154-08d3b16fabe0 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 2:NbFLUg1lMnIfbvNnOJFPaMV6pRb0fPeMKhQxXUTKCvL+DKPj6Exw9f4k/kWr8BrsySaUCB9jdnXgmCKpavHmNwXqhB3+EEGLluIyMq6nDjrkiYXP52+nVZfEkbndSHYIY0pSrqJf9uvh1weja3QhCSY1FZkEca8SiDe/19Da4N8EZY1msv4v2xHTfkEDP2Vx; 3:ftNYmJNbeZ8TbBwBdqc283ulamL9ClrwRny3gZeTknOutf9eG/EdDVYCOH19aAOAErh8w4mpxWjrJd2ROX+DH360+GS7Q5zJ2b18cFWhtm4KAN6BPs86tiEK0gXEdZNR; 25:YirvIYTqfZdxqd4qNM5PmkibC48jcDzYM6mpqRLye5CHdQLGhEse1Uk5lW+3metyQh6kgcGPaQv6/HB0Oti997g9Gibaogp/kSw77sRZhIFVkjNyfqFkXwDhOxUB55P5roKT4ekVuNmkzNvIGe8WTjhENU8L47cQeIRka4z67ONYueTI/jaAv7GoDlo8oC/Vh356WX5Hu1Yqv/lplmsY7sJZB4z1nN0Rka4Cctqo1FPWnuyowY0gQApHn1jg5SqqmAn42yzkj4zLSS8cWKh02SpZOCKjXZPhkmcDRFVM5sVlKQQ/c2NTMMSlzo0QwKQV81X82WUCUZ+4/kG/Vu1/ERCCuqFEnv7ri4iaND+0uLxm3lPbIb9v4XQUpGpVIJ0Rjzb+ssof7hmrMG3xBy6LchzdVsYWTNtVtN58slEgTqg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0701MB1715; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 31:VWv0JtPhE+kF2CTKfHIBFRz5Hv+w7iYMw2UCdsFX79IlOcxVrPbkhaab1axZuXp7kuYD4P5/mx+BCyQjE4MM0CiScXGqfKUaLmEgd5FQLeh3QS8eo0bXiAfjH4jiKVMthjNzwRMNnZbTDHLx2k7xKWX5MuyA4z0US821PuAmWQIALD0sPoREO3nLAEOx+/rlIX7oBf66Sp8zRPB8yNlFsg==; 20:LuSpHAxbHzCzDb57KxjuvQyvv7SimpjTDjTbbDHxLxHQSlxNZQ+yeNR4HIQejKHab08huSX6yDaAKCK2XQgAM5Umj0wtuUyr1HSj2QJtpBWlelyB7zD5Z082IPV6V5RclKN/6yee21ooT946Yr0vS6aO7rQvnJk1efVdstCGzVGsSiJ/aGV3Wrf/S9/ncDiap5lKvk1rYv8K5mfj/Yc2bOfE9NpOtmPuj9+bgiAREKidKRG8D+DMJlg7hdaa2yv+ZIcJB1lqONlCnoNMxnEp/0Gek5NAnM3FTVurECrk03hrFTfQucD7J/UyuZdSIJHtBHhP1G2OEcTihatu4PQ+zY//GnO4D/bsIM9pbY9/TUDVIqZcDgV3zMWpgAyKrhQkgOVh2NYY+PwKBUA27aRdFCMt6koSvOTavXPkuu6z5xIyxydXT1uXCsm17EiDxnCL2gX8wS3nJ4CAyXY9zPtIqlXx7tmzG0feRTuzAq5tceqtlBxvTEPt6iTL5JQ+JJ9X+smyOUh2L2zUERkxj3QY+0RvH6x2aFfDDdN1r/EqUHGdR1TX5aa65x0339QDeAqVth2j0fEo5zQiox6+sAHguBbOz2VpP2VVE8vz6zjycKk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:BLUPR0701MB1715; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1715; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 4:efTOMQBK0xDED36Blo1E0SwoS+aIBG0h0ONrSg0VfsW60i38oLHxzOEho27whrD1wjy1U6PLYeYh9fTczyODBpUJyUr+V3OYBFz6kIj5Z1CHkxejx5ZzwMbwiNTuxpnkP1T2LFDE2xJ3YRJRdBLIoDJMz/p4Pnh9KvmCskgrj/qQVREXZ8cF739dX4t2Ro5rPQGOyijm8zQ5mlu9eWlJDHA33UAnNkggAYclzCw3j+deK+VwiOWwYhTkpDHRPkmgZLmat0+aREDY/8SdzjsbB2fXhgMmHnj0YSOfEARCnWOZJUUemZhDgslxT/hlL6+W8/hEV7YJxwWr+MlpwF7xDs/UdAhBW8HaJHTj5/IrGKZk8XDVD5WRWgRLEKG67AzW X-Forefront-PRVS: 0010D93EFE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(199003)(189002)(189998001)(110136002)(33646002)(97736004)(5003940100001)(19580405001)(19580395003)(229853001)(50986999)(76176999)(107886002)(101416001)(36756003)(4001430100002)(2351001)(586003)(3846002)(4326007)(66066001)(2950100001)(50466002)(8676002)(81166006)(81156014)(47776003)(7736002)(2906002)(7846002)(92566002)(50226002)(42186005)(68736007)(48376002)(77096005)(105586002)(106356001)(6116002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1715; H:localhost.localdomain.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1715; 23:XPUhjsQ5uHQmPJSqTTEFsP3DgqCbl4TkY06xxi3?= =?us-ascii?Q?WofXltXl0dCDMbDNU7wFPdhj5KV8W45Nvqca/38rjoe34m1Qin0Z9v/ah0vN?= =?us-ascii?Q?2SeAAJS8TK+Z+9HoUmV08aQX3VBvzcsUR2Pejyzfq0sdf1wI/2ES9IsTmlTV?= =?us-ascii?Q?kg2LFcv32BCmWWyHegA35kcA5Qpj13CaDodo77LFS6xanKuaS0mOdti2BzIV?= =?us-ascii?Q?5xYiAKOHccqjNv+VtjuZVJYz+N0eK5XZZga+C3Z6zBfwtQNufDzEJOwxaE63?= =?us-ascii?Q?a/Flx9OwI+SOk1qvMYnc2mxGO1AsjRoCXiLVIsueZzsDm/28dN3+fWQ31DOr?= =?us-ascii?Q?7iQsCR+GWFkAjduocwP8zBgXm7RTs1V1zd7kj9krlarS/pt+IxZiv1DkQjlK?= =?us-ascii?Q?c171kysfG4467e9nk6vj5iwz0sINK86QLu6np5S4euufHH6cuemIrgVECrz1?= =?us-ascii?Q?liC2B7YV/RNeNnWp+asPGNYUctkE6Z0TlqYPDfON4ERn9hQdA87knakWJMPf?= =?us-ascii?Q?Q9dExO0xaoALMFjUk6vAdM1oCHxLTfUYXzaa8rMSb1Dj0qDNs+Dw2a9KW06h?= =?us-ascii?Q?DM/pEikRd5jDLvzojOkNVjvfgKAWAR6OR3W8W8cRQLH+WOIEKdMir7GbviGe?= =?us-ascii?Q?gfjnCOmFjv8QIX5XobbfkIGQlpEp57HAxo+t5aPBwf4ZUmXyrfnv3TIzPrAS?= =?us-ascii?Q?l9c8ZMkue+ddfoWW9PkeQDDbr2aaxUGQM/7R1CSwFxEdu4bkRYki75g21J7i?= =?us-ascii?Q?HudCVZPj+bnfgDuamWkp5QCwFqgPtMaR62HlwYuQ1dw9SIM3wxS8zbgbeMOp?= =?us-ascii?Q?IErsxd9A6rg+A7jgJoc3FnHLVN5V4fxXJamYKCl85INU+u7Cewy0Sfxxb8e9?= =?us-ascii?Q?ZvfTSJ1QtbJqzsXEFfcsH0mhAvQmjwCPldixTL11Q7LV9oalrg03XS6vYQ2X?= =?us-ascii?Q?HHqB7tEOnYfvg9XQtM3oJGGRxgX3UZNIeewxzTAXqCBobhtTSPRsVfHcjS9z?= =?us-ascii?Q?Sq/QD6ED22hDylTmPW5E/ATswztViORSbTkp9oSLdET8W+prNPiYXOkFyb1i?= =?us-ascii?Q?7msmRw1sNAL/0zkyWSujghEIHokA1vNJmlN0iNMEwnUnQ+8UhWN5M+EsVpTe?= =?us-ascii?Q?y36lMp/o8fIk=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 6:nrJ/B4uATXzJfi+UbajqfILUsFv+PU2iRg2qzNfA9PAtoBPqx8nrOUC8YHYhsQ48LjqE92nZx4xwMPgjd58X0zVfxpIDwyKAVd6NsmGNXXJx656PQfKgRtd05PrLqbOYEa/iPx6ryH4O1Fh0uwc0JDfDg0+ZlDoTBQ740olq7BoTSig38ZgXTpLIhMeaKf1CeU/irghvEOyMDt0XdGXuNNBCFN5prLej0/xQ6SerQNN1/Nl2xyDT+elcyiU8v4Y8LXOUMd9mb5lfz9iDeAga+rmBKsy+zFD44K5XAUdPFO8=; 5:TiIPXDCqRtGD5WU3mwLeCaEa2xdbb9zdnEZEHFgAI3Q+j8ore+1VoH1z7EfCq7jN/AJwk75jwLlEKT6ZnpG19u4HRJh9xpBa864LDEJQjgpkf9i8x5haZXUTDagYspN700nAoQCVweM7twfHWC9ToA==; 24:h0eQO0o9cVYbymRi70tndKxY5eOEMhvLMbN4vDksFQMjZCr/XBm4aRSyOYY6grhSq0rXZYjo5wffl7WbwEJh7YOqILHNGkAYuM0u5cj1lzk=; 7:/ePsKXRToNZI9r135bj/pC+qXhgl3ZyVplJl/EAaYLXFk0AG0LLNbl+mAP5hExJlqsbJnEb9xWkDh7A47FuqXpDDjldc8hfwDezKgdoYBM92H5okyh8MeAZqgyR3BzUFlmR8lpK2Ox4MFr+KHftczGhV+IVjfB9zmLszUD8Fe8BemVPgcVeO/MUxmg2573dGI/WGwD6sryI2+d5/NHbsjGJ/PVIUay4enQRMmhYd72ijSPIX/CON8SIHDTVqkoFb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2016 14:02:35.5083 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1715 Subject: [dpdk-dev] [PATCH 3/3] net/thunderx: add 81xx SoC support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 81xx NIC subsystem differs in new PCI subsystem_device_id and NICVF_CAP_CQE_RX2 capability. Signed-off-by: Jerin Jacob --- doc/guides/nics/thunderx.rst | 1 + drivers/net/thunderx/base/nicvf_hw.c | 3 +++ drivers/net/thunderx/base/nicvf_hw.h | 1 + drivers/net/thunderx/nicvf_ethdev.c | 7 +++++++ 4 files changed, 12 insertions(+) diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index e38f260..0604d25 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -60,6 +60,7 @@ Features of the ThunderX PMD are: Supported ThunderX SoCs ----------------------- - CN88xx +- CN81xx Prerequisites ------------- diff --git a/drivers/net/thunderx/base/nicvf_hw.c b/drivers/net/thunderx/base/nicvf_hw.c index 2b12d9c..4bdd183 100644 --- a/drivers/net/thunderx/base/nicvf_hw.c +++ b/drivers/net/thunderx/base/nicvf_hw.c @@ -143,6 +143,9 @@ nicvf_base_init(struct nicvf *nic) if (nicvf_hw_version(nic) == PCI_SUB_DEVICE_ID_CN88XX_PASS2_NICVF) nic->hwcap |= NICVF_CAP_TUNNEL_PARSING; + if (nicvf_hw_version(nic) == PCI_SUB_DEVICE_ID_CN81XX_NICVF) + nic->hwcap |= NICVF_CAP_TUNNEL_PARSING | NICVF_CAP_CQE_RX2; + return NICVF_OK; } diff --git a/drivers/net/thunderx/base/nicvf_hw.h b/drivers/net/thunderx/base/nicvf_hw.h index 5629d9c..a6cda82 100644 --- a/drivers/net/thunderx/base/nicvf_hw.h +++ b/drivers/net/thunderx/base/nicvf_hw.h @@ -42,6 +42,7 @@ #define PCI_DEVICE_ID_THUNDERX_NICVF 0xA034 #define PCI_SUB_DEVICE_ID_CN88XX_PASS1_NICVF 0xA11E #define PCI_SUB_DEVICE_ID_CN88XX_PASS2_NICVF 0xA134 +#define PCI_SUB_DEVICE_ID_CN81XX_NICVF 0xA234 #define NICVF_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index f6faddf..4402f6a 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -1758,6 +1758,13 @@ static const struct rte_pci_id pci_id_nicvf_map[] = { .subsystem_device_id = PCI_SUB_DEVICE_ID_CN88XX_PASS2_NICVF, }, { + .class_id = RTE_CLASS_ANY_ID, + .vendor_id = PCI_VENDOR_ID_CAVIUM, + .device_id = PCI_DEVICE_ID_THUNDERX_NICVF, + .subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM, + .subsystem_device_id = PCI_SUB_DEVICE_ID_CN81XX_NICVF, + }, + { .vendor_id = 0, }, };