From patchwork Mon Oct 3 02:10:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adit Ranadive X-Patchwork-Id: 9359911 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 92AC860459 for ; Mon, 3 Oct 2016 02:11:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75B47289AD for ; Mon, 3 Oct 2016 02:11:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5816E28977; Mon, 3 Oct 2016 02:11:04 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8402228977 for ; Mon, 3 Oct 2016 02:11:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751967AbcJCCLA (ORCPT ); Sun, 2 Oct 2016 22:11:00 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:24852 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751882AbcJCCK7 (ORCPT ); Sun, 2 Oct 2016 22:10:59 -0400 Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Sun, 2 Oct 2016 19:10:21 -0700 Received: from EX13-CAS-005.vmware.com (ex13-cas-005.vmware.com [10.113.191.55]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id EFC58404FA; Sun, 2 Oct 2016 19:10:57 -0700 (PDT) Received: from EX13-CAS-004.vmware.com (10.113.191.54) by EX13-MBX-026.vmware.com (10.113.191.46) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Sun, 2 Oct 2016 19:10:57 -0700 Received: from NAM01-BY2-obe.outbound.protection.outlook.com (10.113.170.11) by EX13-CAS-004.vmware.com (10.113.191.54) with Microsoft SMTP Server (TLS) id 15.0.1156.6 via Frontend Transport; Sun, 2 Oct 2016 19:10:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=onevmw.onmicrosoft.com; s=selector1-vmware-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tVm1NSpPiLY7gDDpzp4nt97ZfAwV7MDzBc9oXrSoZ4s=; b=O51K2TRuhOZY1IIhCMfDX1xaVnnQAVZsh1dEoqdKkuIB7gnfmRdy7S7gLOlqyX1yTaRb26BnN9NPzFKhlOo2lIYvYOxWlrW7FVPrFhhu/cJ2ZeeOi8DpCx1cve0E0XafM0POIioo4muGSb3BZi7idVXv6ykQwLD/xBxtRklMaBI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aditr@vmware.com; Received: from promb-2s-dhcp95-136.eng.vmware.com (208.91.1.34) by DM2PR0501MB841.namprd05.prod.outlook.com (10.242.115.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.6; Mon, 3 Oct 2016 02:10:53 +0000 From: Adit Ranadive To: , , CC: Adit Ranadive , , , , Subject: [PATCH v6 01/16] vmxnet3: Move PCI Id to pci_ids.h Date: Sun, 2 Oct 2016 19:10:21 -0700 Message-ID: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [208.91.1.34] X-ClientProxiedBy: CY1PR1101CA0039.namprd11.prod.outlook.com (10.169.17.49) To DM2PR0501MB841.namprd05.prod.outlook.com (10.242.115.147) X-MS-Office365-Filtering-Correlation-Id: 7091f117-9a84-4a28-2047-08d3eb3281c2 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB841; 2:oAXnMNfkhq8KSGtAPMKxmRTTHIhjSYD+jhBtWmd9DpJAk2hIDafHqvBDhZspfGhHe8JjY60SDFNOFTwVCteTTMAkMHFqyyYnd0J7Il5vUyMKr/1XH/o6QQxQEqG/ll99EwbpnalEoGIX7l/DtwUV9UcSIXiGUVmynlO5mxYXAvi/uChp2Q8WMJiMPg/MeuOU8VjoMz0zCrjrtDAkuTG+rw==; 3:J2QWxZnfLN7u5RnJjaCDB2nBcUpnKEIounc2596gdu5gw82+hXOhBMg7mKdjSmIEM16nJHyExwPpUNy+kjVaFKxxOgEE4xpT1sdYoqznPoMAo8N+gygkiOKEjwjmMkZ3lzpdRRsL0snePbxjGYmgDw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0501MB841; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB841; 25:bi/uB5MPrkC/6CLh9Md6ipLN8MlhjyPG/IE0SwhtNm4jbXNg60qoLEm69xMBMd8HmcbgaYXHD2e43qSpAL7mEFV2jKX2MRXjqUjG/OQyRPqvt32J2SBtBVl+/jb3wP2EywlU3s/FL1BBuss63vR8CSYxVZloQddCpL87tO0cAxXt8ODysiU3FubVF/H/u164qsXiGZo3IAIIydrGm3jN8p6qQJuxqqbHpjmyrzQcuECqyXDisX3DyOSE0fXynLcG0ZKOYkBh1+npzqXxt3S6xzJI0NpfW77yX+SuVHpoRGbwm/H3KDhheWiLeHVPoZvyDtkOUfL0JP0Sq6JTqWBSYqEzXKCMGV7+7VN0g/mbiJYGjXkWwpLSX6qg2f+FTt6GX/GAE8Ey/0fzbHyLHnCIpU0MyhtaJXf5vpaygNeCg7CbaS5+3R/1rLA0K6Ufp5l+28BDIjfa61yZlikVc6gnaYFvLc2SnTHhPUrPmDF4CJQLmhhLMIifjsK9KZDHuykJ0+SCUS7+wPA3TrWQaIgYCUsOpU1/z+zU5qqnso+rZ6CUlAo821r5DL7x83NQJ7juLYwFY3lBBJv6oyDVu04BNrn3YEvMEyAzO7Afx+slFXGOpF1Jk1733dAyWWZTi4sgPC+Ak5Wd+knlYhvxWE0E/MbUUGH9At568tg281cSkmeaS+nxxtWq8q2QGrThq0/FdDc4w40EUatoxPmFtx2eKst/AxLyXV6v8I657ifo+lo= X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB841; 31:XsWQLrrPv/9MdACd2CQgPz3i+qik4aqKWuchkofUIf2waKOPN11xS5FmpIjQCfIwD3LplU//gc9m5Tfb4GpbYoVFNBGsR5nqfxZ3x48KpjvrKswLQ2xLhXQd4hdfzJRNCsX4HSWX7sWmoLFe4Ce0r6eEWXMuse9PVPQfj7OZDa+VBtJ8BRuO4SPh8+MvkFy/G+TIDZiQZ+pSbZ6SvhEWyADjq190TjYGV1lsQ9zyybYz769BykDyew9k6a4wDXjQnhoyuj6oo8It9P1lPFD/3g==; 20:MgV/Hz9VqWGd1uupLvgy8QeZd+4k4AclfaqF2zvjCXIjsOfT/XVHFVWSemW0qncg5E4gKU4XjICwbPbyf5fgc1OHfi/M9Dppo3adH6eqy755mB0/SF0idvg5jdBRLrLi8iT25qxTpGcy0aZB0Sob4B+J+bXOt+e44ev0EAmVoMEm/iwJ5lRIn/DcHB/+pSLwCFXxalx4g/nWxGubtomg+XnV0n/an3ZOmY/U80+a3OOq5spivIlyBWtXHSfw3MdnOKEDrvWVdakV27/Y1MFR8nyExEFboxhvNG0bS/LbfI4Yh2+l+lZpeAnxD8OJGmGOsxOM+dj0RZgr7Zn9WgIa2FYLaLzoe9sUctIQR5x7SBEeKi9mDeuxq4Bl5UXCWEyGWor36/SMDA0I72YpqARk79sD850Z4ozKs5uJ9fi8an+MsoGUC42N6Di+vpRi2JS6ik86TkJWF3Y7NQsV2QabPOZG4RGXh/+u369+MlGj3U/rNNUPK58lCT9dePzcr85i X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150)(211936372134217)(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:DM2PR0501MB841; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0501MB841; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB841; 4:OUxz7X5K5QwNbZVff4A9EvI2nW1LW961Og7i4xOKOEwfj66BtF5Zgf/hSm0f+bcKU6FSBGvphzjiIaCVpmJZFJglb1+n4y7YZkgZ2cLVzx0xk7aIDU6w8fOcTNuDWPFuZ1oH63nL7jUuvuxGkqGCELM6HvwQm6kmD9+mcKH3qw3zxwG9StGBGdzLUjviZPHW1IoGmlamr9rDPcBhNlaomsmn3ciwoFB5T7lsalrz7S/pp3lzGZnfOVOe9m+9CfZMpCnptzRorf4/2+9Q+a2ijfgydcIE0xBo2QdqPAWJIthNqqlCZFyp4Koe9amWQ4o8iGZw+YinNaLMGJBg931V9XjB1v1AW5LFk80OuJBNbhihp/37XiQvNkNnzLeem5nhHDumDpDJyI7KL/yELFLRsRVmJTURFodiGiEeIPXpMJ0FiD74o/+Ok/SFsLA+cQICtmuYAboLbwc28pUj2x7A8Mv4yLM1iaytJxcforb2j169n+Khy1r0+j9Bb9cc7QvN1SbNxzw37PKh0pZfKaCgsg== X-Forefront-PRVS: 008421A8FF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(97736004)(189998001)(42186005)(19580405001)(47776003)(8676002)(5001770100001)(33646002)(2906002)(19580395003)(77096005)(6862003)(50986999)(76176999)(106356001)(2950100002)(101416001)(5003940100001)(4326007)(5660300001)(107886002)(105586002)(92566002)(7846002)(7736002)(586003)(118296001)(229853001)(68736007)(4001430100002)(305945005)(2201001)(48376002)(6636002)(50466002)(66066001)(86362001)(50226002)(6116002)(3846002)(81156014)(6666003)(36756003)(81166006)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0501MB841; H:promb-2s-dhcp95-136.eng.vmware.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (EX13-EDG-OU-001.vmware.com: aditr@vmware.com does not designate permitted sender hosts) Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0501MB841; 23:aZey6gHevMsRmE5zv1AoFN1CpPgslUMBiGqC3xKC?= =?us-ascii?Q?2kiBWIgqDp7Xzdg5T7LzpRoXNSl7lXMWaUMLZjlPl+gZnku490Nz7iqz5dFr?= =?us-ascii?Q?aVDsS2DMKDFGCXgvIW6gXANrr+eVvYFDu0IRZX0xmRCGvHPWEWrGQBR5FnWc?= =?us-ascii?Q?fmigO/ebheOcvnO9Gx8qnyi5B+fBOcYdyRhdJ7UUToGj+6tpgzBpvRxrCnpi?= =?us-ascii?Q?TbUuMz0h0o8wdR58RSJWZCwAtzsqBVUQtcp/yjpUm0d6DLvC5nHL09Cy4vDt?= =?us-ascii?Q?IXxZGOjAWOsHMKTyR2KElckXbhXJLGIXSZZYHVDo8BMlS4iV60LqX8ij8VQJ?= =?us-ascii?Q?kKefXr+TlnV+RE4Gj+vYHBfadI0Y5MZLJMxGbG7bwoASdHGIwfgutrJN4cO3?= =?us-ascii?Q?/1Wh5hwfizsBg9s1eCUWQ/sTzZEKzNki1p4FPXjrxBc3UCQzO6JQEfkmdkZ0?= =?us-ascii?Q?oedlpGGl7zwPsOK3mmZb7aoR62YPU1klNd7RQqnQv8Ebi5lAESKg25HLYEfw?= =?us-ascii?Q?95UXah2dTX3/vIwKMQDU+VLKC4DNTl3f71jTovzYyfA681HLU/ZO6smhAaoQ?= =?us-ascii?Q?pq6ZmzOHa15wj4LnCxP8PXGPQuN3tVwIG5HSGqUVAWb5kKpocCnMSfBdTcr4?= =?us-ascii?Q?a90oNWJbeh8alygZFbQSsDrTpFcbG51zhbvMoO6wNqjXzBRuDFwFP1ZD5wKN?= =?us-ascii?Q?PtMJ3Dkmp6julgsE02VB9MRxofwuUHwyMJ54+s6YICMuN6p0BM5He0ccu1Nz?= =?us-ascii?Q?4mvoL803vg/cavicyoBUuONoa3aTHBMXgA5kWBwYn6VAyrW2RZcLnWOZ6mxx?= =?us-ascii?Q?E+MpdulNRtItz3MzYJT6Bv0Sz3qdR5H41TSiU8wjeEDT6G43jolAk0XOQ5rs?= =?us-ascii?Q?sB5l6LWuXbGCR0uVVyCMXuBiLsrYqHujfxygcb6CbG11g1txts79Gt04f1si?= =?us-ascii?Q?cmWEhJh94Fts4pnEdeyDNbDVC6SHcafiDGEnDTmmLTpL864xNutn7y9gSeYE?= =?us-ascii?Q?jw48OG1Qd1wrmtM2cpLoTkZx6HNkjA6WSpvk7gCEzVwiPXTE8/b3la4TUmW6?= =?us-ascii?Q?fsf+PTPZ6TA7ChiQr4jS+jc3P4JZYNd9Zob2ckiEMmimwVd4UIFuYcORj0xI?= =?us-ascii?Q?HybWoqyqPivaBRjPXOl4aIyDKu/UVtlzvVQb+qur4G4xoXwI8mxYZEVARMVF?= =?us-ascii?Q?vW/8F9MBLzIZZHuqOaE8XC0DvfZvVNVwuE8oVH6rSRSK9ZsoOpg8jDnvuw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB841; 6:6/dA6ym0t6YBu/SSwz1te+ZeXFGMYiY3mUOqIU4FXf6A9Aq8JnoFqbw6+lrxFEK34jW3EtsBkaj2dXt8CDNhAmRzg0aJPTMOouiqC0tpknrfsE4p/+umJpb3Q0hisi60YuFx3ioZtGLxRefgB/aCGYLLQBYFM5/BEQPoGpuGX7QWTygT0f0ZrpvfH0R2qss20HKZYtTv6gbmWuuaH63/GcNBLHyYYRzQssDM819PSfx2qLjNJ+Ak9Uj5LGA1D6wrS4qzsYT+S8ogTaUqaZwrYT0erX22mqjggmvY8jHQlikkB0sA4e8srpPc4NWOYnZB; 5:NTpTtkpHBvq+UPn1XevzE/QDdgSBaA4XhgLsVNEGIenNBPslUcvfsRiSjEo3j+2uFC3G9JCpX053Czqi0ycAGOZapwNCdaqYpvz8S6FIdydCSVfc6SS2AA3j68i76Oa3Eomt3fkAQDyfz1/lFbpX93rGHjMrKSaLitYNeFsC2UU=; 24:GRLC58W55qH/8qr3SOsK3EHT/vQ9mFq+w3uQhHtgF9JbSXHTrrIHUGYuvoWHArUZMHmcum5/umLkgy09MZJnPHGmsbWKPPASEm4e2hloRX4=; 7:/bn+Sy4wLbbq61/awkBL0ZeUN1Le2iU/2kmqf8YRxRWa7y8GweeWM3pjafmrWs8uyB8n2qQNDQtqVdRgKXaWQiEfZhdJSz2nMLBM2E6jyibIUAQzmat94oufZU/rUnLWDSUeUbO8xfHs2gubRqLwmmXXd+wBrqvZP8DYxDfcRxaiwpAADUlPQMVVTI4hD9m2ObstbfhSN7D0qah7uhcs7GXrMe1Z05XgshxGipyWz1jOoEhQP8YaTuVRbnL2unPDFT6eXudMosBHrjdvWtSTXCca0o20BNPt4qnECCcQvFqnxoGZ4wug1vinBqP3HZ+qL2ceOHY K3GX2TVvJUgqL0w== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB841; 20:rT/g5Mc1xsKHMm7Qp2jkf8wUE8/+CHou9BpQm+/O0+qMCrVn23o+TvXHAddbxwi41/1MiAOrmHD7774UeSmp9DWvLdsi7mtTf6KHszBNd7RF6j07AaDRuGbCZ42FO0F9R02LXDtHwRpN+WNnG61b3k95piG1s1MrqI53FaxtP+I= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2016 02:10:53.8079 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0501MB841 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The VMXNet3 PCI Id will be shared with our paravirtual RDMA driver. Moved it to the shared location in pci_ids.h. Suggested-by: Leon Romanovsky Acked-by: Bjorn Helgaas Reviewed-by: Yuval Shaia Signed-off-by: Adit Ranadive --- drivers/net/vmxnet3/vmxnet3_int.h | 3 +-- include/linux/pci_ids.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 74fc030..2bd6bf8 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -119,9 +119,8 @@ enum { }; /* - * PCI vendor and device IDs. + * Maximum devices supported. */ -#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 #define MAX_ETHERNET_CARDS 10 #define MAX_PCI_PASSTHRU_DEVICE 6 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c58752f..98bb455 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2251,6 +2251,7 @@ #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 #define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0 #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0