From patchwork Tue Nov 8 06:31:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 16975 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 81F425599; Tue, 8 Nov 2016 07:32:51 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0045.outbound.protection.outlook.com [104.47.38.45]) by dpdk.org (Postfix) with ESMTP id 372D22B9C for ; Tue, 8 Nov 2016 07:32:19 +0100 (CET) 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=3JOu973/paGVBr/FFUPkjsn0FSkHrajogo7PPP1bU7s=; b=Cz6mHDgxXntXsQSxlQ0VPqSqHVmFTSZCR4HpLpTES7+7u+AbG+hG9sPKL8Kh+HfQEy4m1EcPGcexOgQDUO6OPu4kqczNxfrEn7KMjqrdl/3d6f432Dtd0IZAvncSEfE/WgCorSU1f/+pYtWnfp5KDlDHcqjse4mPvWrA2BMcQM4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerin.Jacob@cavium.com; Received: from localhost.localdomain.localdomain (14.140.2.178) by CY1PR0701MB1727.namprd07.prod.outlook.com (10.163.21.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Tue, 8 Nov 2016 06:32:15 +0000 From: Jerin Jacob To: CC: , , Jerin Jacob Date: Tue, 8 Nov 2016 12:01:26 +0530 Message-ID: <1478586686-14109-3-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1478586686-14109-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1478586686-14109-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: MAXPR01CA0068.INDPRD01.PROD.OUTLOOK.COM (10.164.146.168) To CY1PR0701MB1727.namprd07.prod.outlook.com (10.163.21.141) X-MS-Office365-Filtering-Correlation-Id: 196dad36-298a-4680-527a-08d407a0fc61 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 2:O2XvSwCNoXlP8MddeZkafPYfHCIPG6zW+K0dFf10NLj43YjyIuft834m0/Aw5wofd/X7+ZB4YWdqHE2UPn8EO0bHCWKm+MAzHjx/blZvHeraB6C2sBpdQMklxdf7cYWgaV7UGh2V8iO6LRrdNgxbAyF9Ev1qFczlu7KrFWawMPD8+acjGSlm1HU6r5AdARc5dVJWncsDI7DxeKuef2kYPg==; 3:rAmcCH/OQhRVPw3FfDPstOunLRyhK6kh8c8XgVrP0nRo8BCLKWYvD7r3LLtAU+5ntt3Xzb2prMbwiXq0NVbTyjHOBklja31wcdYZj4uYWCfKWtMJU4F4isj3PJ2nTsbUpVJQB565E7pN2/dyc3Ki7w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1727; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 25:BIAzS52mk+fHwdyM9jQpTw02RqiUh1cCsskXrglM4bHWYuQrMtohKNjGSTaEjeOUjZqjJXs9gErCfLftdu3428C1Uhmx2yJmZwHGyyDfUIbFzWvbbYPBrSJ2/s9BvI/05FoMHtW2RavClbPfUS2dJ0TdtMsDDy2SGo6TE/bFaZZHrorKbXdBo0Cf1c6vUC2i41g6/Hf/iU608e01Bu51LtlKEHkTj4UHU3rprzCYxilMCwMR72stRoH5l+07piGLP01UW87l2YvzeR+2Siak3JpdInCGI3JrsjBJwAfsP7LAn9/91kbUiLAQ5WshDwqBD2TIQ7PhL8wnkvQk6akeVqHQV4hIT3qAScINMDXKwAjMLwzP3CS6AIzwB+8B7bDmYBjHBHKIwAN6PnPRQ02obYUTJmima5mkOd3eNJw/bFW7wBLrLHEkj2GWV91YwWZZiIL+I7sDrhrxHS1w8WfZQwaBjQbiZdUI5mexO9kT6W9EpGwV8NX5OqdC1Tv8eJP5xsctEt8kb8XbEn8RDJToC8rAieJWA/OI4jVbOnUGkLPb1u3IMxmQX4jRpPCHEGrKN3RqKM6leIiq0I19n4z/+d7GYI1v52qyWK94jCi4y3ury1mUiMNUqoSda8pyM7FeWyvvAUGloqCveF3Zn3ZGe6Imc98YmtWbCvMMsH4rPIvUfeUiHtHrpQqvGav/bsEArVOne5kmDIwBg2UyEkLZIq1VAV32RzYCrPsWasqcrKnNzrU301YJc5ZZSaTX/0t4 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 31:3DAzVb+jZL+/2IDUBmTo+rPfKaHcDo4PrRNwvfEb5W/Z2fbtxcKPRNXyxXVlNDZqrFOyiP+YvlY9jHz8ZPGAUy34stlDm9XP7To/awYvtns+SMnE9aKZW3hKEMnjL2uwr7Cj5BE/GiFgQW3qdQp2KKqxEtPA2yOab9qOSZUIIG2AP0dRRbcRdOk34185bcV64+AKmGFYxB8fsAz6VF0zTrOyu25jAuuSNxJlbVrDFsTpxdE0w8b54yHE/vJRa5Ct+vb6yBOL7UrcfG0iCSmOpw==; 20:iiOJJud5Jp+Ea/Iohe3/L936EcFI5DfOTTyiI38/rget9fxsr1DFxfEDzYIwpZ3q5cTzas0CA5ts2ktmX8Aql71Ch4SIcZ2LiGu+Mepmr66R5Do17U0FeWuivwWUoxguQwjz0jQ5W/o7iMxsHMKFO1pKgGOzshQXQZbnJJWTFvJW88qFzM6vytqLqMK7gS1gqEKxM4WMvi3r4fDRkV5Gg1frQiP4m3xSV6zmrIEZe71cakBJ9Kx7cTtxbQCaWeixaGhvZ+WT8ldkJEE5q/v+VMUR5QcpKv/6fh9ku9Lxqhf++pcu6xAStx3E2WUWmrExcVCp8fU1yuaypVyfBaUzfBE5WGRM1hVIStbkcQSxymW2qZWLecXVQFgjw0ACXtyq25QgMhlWPRHAqUsyNsin9H7vpSr2H5tfqmSh0BR8PsDgc89hut/Zp3U2sGG6E2B2nxOkAeEqGb4ZMZXMhVygt14xnrCZUKv04g14bTi7B4tF7z8yzZMqT6On4oFHN3wcKpQ0ZH0/IINfZInt6PyT/6AYjut6GR8rtVpN0nk4K2GI9pJmkFAnrBtZnds5YgwCOPsgA3Bqx0/fGPqrI9ivMuc++j8M7a9F1/YOj3Zn8jM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:CY1PR0701MB1727; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB1727; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 4:mZWX5Xk6nKMmpCOecm7lhhOU77fMfGidCX8szL+vC7N96zvCu26sCyohgBIGVJQpziBQZmLUAeQ5mwAjvumWDKZ7J6f6LYfGXo+MA4OJLvZ1f4uHYQa5whCp35pZDburGlWGXrZHNJgEqIiOC89f7C6WboHmxqUkfbCULsRXoMJagvOZjSnW9hZI4ry00xZZsf2jE7mehuKQ+yP4KPdoStjcw7bxUS830xfkQITzFvhX5SgSlIz0X+uaL0KDAFcajAF9LI+yz3otvHzzqCzoW/oKlkUkqs1G/cqnahRHDBM0SJwX6PgSGWL6RVjmprOTlKUohfU7cM7NyqbnPORBrpOib8ZR4Z6sHlYHdNSMIQH0O75AItcZNTG/dpU3HJJd9zDiQ394gSEJaCfqaTvzTw== X-Forefront-PRVS: 01208B1E18 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(47776003)(4001430100002)(68736007)(4326007)(97736004)(50466002)(5660300001)(101416001)(229853001)(2351001)(6116002)(77096005)(107886002)(48376002)(2906002)(3846002)(33646002)(189998001)(36756003)(50226002)(5003940100001)(42882006)(81156014)(6916009)(8676002)(2950100002)(81166006)(76176999)(50986999)(586003)(92566002)(42186005)(6666003)(110136003)(305945005)(66066001)(7736002)(5009440100003)(7846002)(105586002)(106356001)(7099028)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1727; H:localhost.localdomain.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; CY1PR0701MB1727; 23:mPlSDOk+Hjb8T5cvlbveqgWYTU5gXUmSiMCTXOC?= =?us-ascii?Q?kBDIdD+/nO6ZmVQQcm3VqymDv86JkJsN1JrR0+7cwAqd7Jl6014ObO2lse+r?= =?us-ascii?Q?b1SznK/N4TDxBTU3YJtgl8HtZqR5E5PymqIM++AHC0XEPR3dV5csQbmNUL4O?= =?us-ascii?Q?QcGjkb+SuJxeIBXKXdkMPDowgXd8leXBcSnOXOlG3K6Q96rWJKsDxXfOO0I1?= =?us-ascii?Q?FioSY2XxTEYkw9vV32bD3WOJ7db632hzYDfRIXBaCmE6Lpx6/1cXtQV2eN/f?= =?us-ascii?Q?YR90jehA/YgFobwgfujsccZGQyIb8HMvOEIT9d6tKTvFQzJBUFKFxF1vaSYQ?= =?us-ascii?Q?n+Z67dD5ftIM8ZRl8NC3FclSrgQqBn1kFCSykfOHYfMu02DAuiIEvP5w4ZZJ?= =?us-ascii?Q?wkdkac4MeWnFD1q9uNfDshk7Qo3Px6hwEVuBTtVqaWMb4PVtGvxJTJYIsdgo?= =?us-ascii?Q?3hOWlVM3EFljkI0ee5KboHSclQL/UrAIbXi6nDp1nNnuaHDDCaXk5iSW15Hy?= =?us-ascii?Q?rxSTWcBG2wS3qdZP+i9le3ozTG1t+rdcgUI96M8pfDTKGiJ/E5PZcCivsLOQ?= =?us-ascii?Q?9pu11iZLqbLidsdYBmVyuRXtSLI3+0XdFGj4kiFROoiKY9UQ3BuZny3xcEQU?= =?us-ascii?Q?aJW/59Oz7NCTuJZQ5GODTEQe84JrFyn7GU0yefT2SXnUGSW7jjDvXWcJhjYP?= =?us-ascii?Q?9qDMkeDpFk0Ecu1oZVdVJWnln6juKCEkni700mfS9JIHzt8J9R0z+Tz5/Gew?= =?us-ascii?Q?KIELJcEovRRIlBpVctZBH50B6l0l9rPqxcm787QQLoGyL5VFadKtUW6Jjtew?= =?us-ascii?Q?x4xxJFcGLvV+yQCprSNoCs+0CcaSnGZeGB5uGqsxtb7Csn2POORS4t2ggE7r?= =?us-ascii?Q?Kw/VYlcsZiwY3+ZwxUc3VkFALdfgDvUCPRo5OEc4ivio/IHC6RZW8Eyk7tRh?= =?us-ascii?Q?/Z3MFXdiBrJJjOWMN5XzW5lsoHOMWCSCqf1bmfecWo9vmGj4pDCKg1rgmYJx?= =?us-ascii?Q?YGME3a3qanHgMkNXOvP4KOguK2Gh6gP1yrNAYONBjQVSCovFcHgGpsUx+31y?= =?us-ascii?Q?J8JPFG6YEYUgyiAj6VsiBobRzlTmeVCQBVCUpGG65r1L8tcZY3hO5f+8sjX9?= =?us-ascii?Q?Q3pZTfufgVKZjJ5ztzjP6dca+9fSklfHOho5orgyNlUYjRc5WTM2GymA79kL?= =?us-ascii?Q?33bOQcZOT9FrT+KK3zDD+ZrYqH1t4el78GvXnYtKrwN6q162i5fTCp0ZNHw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 6:nQSPp+jR2tq5rxYLLyF8eyAFeA2Cw9x2wO6rOj2C1Py2g3k5zZQirEx3PI8mDJ4/NSWTOwOukR+BA/I5Tq8CVCY0crz+thbGJMCrzcn0Bi3pKBiy1prgUP2yUQQ4C3yItit+xwTEQLNOvFHQKKZ8M4xk7zgVFPFepxr5zmxaXSvnF2/WbL+uRc8pgjeg/kdIp2iaBl0kC6pQByGAhWXGFxK+QnSSr1P77IONQqk4pWqoO1QDDq9q3OuChumapNt2IkNHftOiLWfHvFyqkXaK//G5XURYoMt7m3Yt5ghbHZzbC2FfiW9LPWlTqFx5UKYM; 5:V/WJzjRwm7fkgwK7GJG0J2ed8fx/pSpGZBstxZYLVAj6jTfUYdkcXzjJon61gEuQyTABawVWeBzcVPNjW/z80igGkDK2g6NpRA/ry84hDttY60UwG3cEv1ErLCoCPAzen+By14oz1CrHJUgrWSDbOHalSQWTC9VviTY1Dlqy1bY=; 24:b4LcyQekM1h0Txzs2ZEXzy7AjemJr4qteBJkyfCiN9aBqfS7X7dQwBXT8rwUo9jTWSmDtaz8psyep0KZGEL+y7DY6+Tx+JXDvz7aPavNP2o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 7:RpKsw7mToTFn9tFuBCduR3rPWK+il5oJA2sOkOgwJ7ynZBz1egr6PJ+b28R0evtZKMwPqxUQ4mavBQZYYiARdQwbAN0AMzVjQApN1wZhh7rsXDluncT2qc/czkCOzPhyHoeDUhogmnkL6tnrdRVBFW3Wjbo+tMQjo/9nyDLVRF1emiFCk6pAPEsAs5yBaPHEH81kwdIYEIeiKQj2Z2QhIcWYZkzZ5viRo+qep4JkvWldLvxhn55mSW53CR41Ce/fDOBiZriAo2Des4hZp3EVo02vgSrLIklkWSrfbJKvh5uui1/uhWnOm+JCLgozelb/+xt195uCXJlaCSuSzv1snyKrsEV1RnM2CuICEhW1TfA= X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2016 06:32:15.7313 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1727 Subject: [dpdk-dev] [PATCH 2/2] net/thunderx: add cn83xx 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" 83xx NIC subsystem differs in new PCI subsystem_device_id and NICVF_CAP_DISABLE_APAD capability. Signed-off-by: Jerin Jacob --- doc/guides/nics/thunderx.rst | 1 + drivers/net/thunderx/base/nicvf_hw.c | 4 ++++ drivers/net/thunderx/base/nicvf_hw.h | 1 + drivers/net/thunderx/nicvf_ethdev.c | 7 +++++++ 4 files changed, 13 insertions(+) diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index 9763bb6..187c9a4 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -62,6 +62,7 @@ Supported ThunderX SoCs ----------------------- - CN88xx - CN81xx +- CN83xx Prerequisites ------------- diff --git a/drivers/net/thunderx/base/nicvf_hw.c b/drivers/net/thunderx/base/nicvf_hw.c index a69cd02..04b3b69 100644 --- a/drivers/net/thunderx/base/nicvf_hw.c +++ b/drivers/net/thunderx/base/nicvf_hw.c @@ -146,6 +146,10 @@ nicvf_base_init(struct nicvf *nic) if (nicvf_hw_version(nic) == PCI_SUB_DEVICE_ID_CN81XX_NICVF) nic->hwcap |= NICVF_CAP_TUNNEL_PARSING | NICVF_CAP_CQE_RX2; + if (nicvf_hw_version(nic) == PCI_SUB_DEVICE_ID_CN83XX_NICVF) + nic->hwcap |= NICVF_CAP_TUNNEL_PARSING | NICVF_CAP_CQE_RX2 | + NICVF_CAP_DISABLE_APAD; + return NICVF_OK; } diff --git a/drivers/net/thunderx/base/nicvf_hw.h b/drivers/net/thunderx/base/nicvf_hw.h index cf68be9..14fb2fe 100644 --- a/drivers/net/thunderx/base/nicvf_hw.h +++ b/drivers/net/thunderx/base/nicvf_hw.h @@ -43,6 +43,7 @@ #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 PCI_SUB_DEVICE_ID_CN83XX_NICVF 0xA334 #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 501c8c2..466e49c 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -2097,6 +2097,13 @@ static const struct rte_pci_id pci_id_nicvf_map[] = { .subsystem_device_id = PCI_SUB_DEVICE_ID_CN81XX_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_CN83XX_NICVF, + }, + { .vendor_id = 0, }, };