From patchwork Sat Sep 24 23:21:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adit Ranadive X-Patchwork-Id: 9349329 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 3E7C2601C2 for ; Sat, 24 Sep 2016 23:22:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FF95290C3 for ; Sat, 24 Sep 2016 23:22:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24EDC290CB; Sat, 24 Sep 2016 23:22:35 +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=unavailable 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 579F2290C6 for ; Sat, 24 Sep 2016 23:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965639AbcIXXWS (ORCPT ); Sat, 24 Sep 2016 19:22:18 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:24761 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965526AbcIXXWP (ORCPT ); Sat, 24 Sep 2016 19:22:15 -0400 Received: from sc9-mailhost1.vmware.com (10.113.161.71) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Sat, 24 Sep 2016 16:21:47 -0700 Received: from EX13-CAS-005.vmware.com (smtp-inbound.vmware.com [10.113.191.55]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id E046E1845C; Sat, 24 Sep 2016 16:22:13 -0700 (PDT) Received: from EX13-MBX-032.vmware.com (10.113.191.72) by EX13-MBX-019.vmware.com (10.113.191.39) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Sat, 24 Sep 2016 16:22:13 -0700 Received: from EX13-CAS-003.vmware.com (10.113.191.53) by EX13-MBX-032.vmware.com (10.113.191.72) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Sat, 24 Sep 2016 16:22:13 -0700 Received: from NAM01-BN3-obe.outbound.protection.outlook.com (10.113.170.11) by EX13-CAS-003.vmware.com (10.113.191.53) with Microsoft SMTP Server (TLS) id 15.0.1156.6 via Frontend Transport; Sat, 24 Sep 2016 16:22:13 -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=mI6P/UVQ8MONHXuuPJRifnnkyM6PrEKd68vcGhzyjbzVPun74i4AGs3KEOhQU3mjosGACj2DO6kfie2pYoCHRUlIhi/OvsgBUsJtRFf7il0D2ubNYPlVMcawh9TpLmQnkFDT1Q9D7bGhqftT//HT80lQhECj+6vhVpyH0bKz93M= 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 CO2PR0501MB837.namprd05.prod.outlook.com (10.141.244.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.2; Sat, 24 Sep 2016 23:22:08 +0000 From: Adit Ranadive To: , , CC: Adit Ranadive , , , , , , Subject: [PATCH v5 01/16] vmxnet3: Move PCI Id to pci_ids.h Date: Sat, 24 Sep 2016 16:21:25 -0700 Message-ID: <0ed494851c6a1de2152f68be6a1735af6579d3ae.1474759181.git.aditr@vmware.com> 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: CY1PR18CA0027.namprd18.prod.outlook.com (10.163.31.37) To CO2PR0501MB837.namprd05.prod.outlook.com (10.141.244.147) X-MS-Office365-Filtering-Correlation-Id: 21f05fe6-430c-47d6-d9b4-08d3e4d19b4e X-Microsoft-Exchange-Diagnostics: 1; CO2PR0501MB837; 2:cVGaHxjDN0i+VQrzXLajPO/iL8iZv9QJxAaKmdIXKcqc9DYtNM0AicpRmI0CIVhSINl9O/GOBcv9t7lJ5UcNXmvfsgYZVEMAkTZcQPS6IpKV/LOp9ob2KJW8qXNVWP53Zd3SrpQbW9MTdsIV4Pn9ey/pEOI4gTRB9jkbaddOxANPiGymSrTyr6Ok8CV8PTqs; 3:QVmLP1eO5R6uVNBuUp/U7MoyMWZE2B8ut6rSQXozo/V/ZoN3x45V+xq+kk2NTph3vHrJj27vSv6igO7+YGKDd1WrrkScF+PyvlkU9Un14c6N8A5Z+KY+fKKJTPo9WKnP; 25:K3+cclHzAjQ/ekE/Os5/GABaGtBUr6vM8aAbqCgT+vFbhbkhQs+ab7rcl9qAA44q8R5fvIDFPc0ITKlxPETwocou8dKSSUNrxySYPHmknkR4t/e9rpgbOZ0+iQoVwxrSp9fKQC5qGE1Da9qk3kTLmQTLAsnXHTnJ5ojERBD+Q3n2IbgDfmszY2QjoB7KlNDA/JKtZnpaVWucq0052VXVC74+uZp7t7/7elGX8+EKDbqyB4F4u1WnlKJ0tAEHU41sudI0bA3fbVEQD/v5rK6Mx45QO03zh1XC9swlLzQZfdwPPo2FI36HngRaKhMRvbUMlSuerjs52BTauN1zNUcpkYwxVFofZAfXk+dGgnHMgXOPY0ddBPaTpQ1yF6fvyTCl+/k1cYe8F1eZuliHdUZA3p8PLYs03vLQSdW7tuekjTA= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR0501MB837; X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; CO2PR0501MB837; 31:fxd+H8vd2rr50FOWeUcguCVpG+5JxxSEgpAb8mQUuSxbfGFf5baAtBttHwQARL7t46Z3l90Ma9EWMtwslSy5OolYYp0DWQ1wmOGJJ/lnJGzqN/EGZ/gbyD45d6ILwDQqVjzWdrQR/KpY+Cqx+XejyABG/ZyN0CGqrXCRtGkOx3NQV1S5Nt4yPW48F4m2rK8zhKKe7d4RJP+Jcc1/xLkBjwxLd5/OFmIXGyHjJeFg8hs=; 20:QnW43BQNzyaADRfiiA31iJ1ShMzZwb8hiRGsNHRMVkHgJfsr9ebJBPROvlIPaAu4ufc3BeUQBc4QKUCvEozUytwqBScqmihUwtwJiXmMYN9pD/cumC86ewxz8ubRjUMq/wqtk5BZPJhdavSAVIYVN71UTLR+x+S7qRsB05BFyuiCw8vN6/f6cj0nYbuzbIzV0hqMLW4uO4rgL9qC7aoKagdwcZ6HdWGaeTk9NTby/Dc4j02ybTiIMyakc3RucOgPPVf3id2tDAvVANt54H0wph+2Bt8V8Fz0326X2969boxlFVeARAe/mxQn3k2fUUZ2JrUXkbex3AOxtqh2MIppI+WfOiMXr0sNJ/bEIJ+J+jkAnUGglKsLf9GWmRY0iy5D3tGP+TQ6O1W6lkj+XuzOJuWJklfHKgf1qh3xgH8B7RapHt7ASMpRj6FijMBMqyS/mS+fDCxfz4PvBlFEX2+FLtaN25EUyHhijmbzETb50dZ5Dd2v8c9HiN1R1ZiwlbwG 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)(8121501046)(5005006)(3002001)(10201501046); SRVR:CO2PR0501MB837; BCL:0; PCL:0; RULEID:; SRVR:CO2PR0501MB837; X-Microsoft-Exchange-Diagnostics: 1; CO2PR0501MB837; 4:sthdPizjFitHzfTtDpCpq0F8c/c6iOXMJHbtfzJbiw/RAkaNYzdlNcm9bt64vLuEmiGgUhHwPMAbfzY+Q5CIGsQbuNrcQVZUmDsGdeZQXDulRMODYuHnDyz3kfw8SOtFo55RXM9SMYgn1dBTRy3O6qRVYK0gqQBIOHXN7kRU/34CmZrkzhqljTt0xqtICja2TFdizaxvrwh8gYuC4mmU1FqXbwHn56sAjXB8mqKPf3n7wTzfOHdhDk/U/Wn/IxltrljFNVAd6+DfB8r8ccqae6S0G8h+c8AaraVNbpty6az3iz1aCNAr9hIVPFD1moSnhTsPuseab3ECZ6/Hxi/Hvqit4HcH943+f3XuaC7wsOYrwD3/+x7SwWrVrmZWRSRNfVV7agJJ84q4oXoR6VYirR9Z80B9yZWDfudTNqtljCsWrXf+9Y4PG0Y4IjzI9jZxkc+tTc5H7PK4BaCQFr1H+OHTVqX4IqTd5iWJsMeUJA3m2ue1rEkDSzErlGe4hbc6 X-Forefront-PRVS: 0075CB064E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(107886002)(77096005)(97736004)(4326007)(106356001)(105586002)(76176999)(586003)(6862003)(118296001)(50986999)(2950100002)(33646002)(6116002)(5001770100001)(19580395003)(5660300001)(19580405001)(92566002)(2906002)(3846002)(47776003)(189998001)(50466002)(86362001)(48376002)(2201001)(81156014)(81166006)(101416001)(8676002)(50226002)(5003940100001)(36756003)(7736002)(7846002)(305945005)(229853001)(42186005)(68736007)(66066001)(4001430100002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR0501MB837; 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; CO2PR0501MB837; 23:s9yNoaZ1oV4XIv5fmmbwmfVgYBONPIysn0nVbO1R?= =?us-ascii?Q?LPf4svj+dE37l2HA3wg5ng2eTgqa5PUkVGHIX+//7NQufZTfSC3Hkz/jl31i?= =?us-ascii?Q?v9bkOQ3rhwUVV9mJBGmNWkJhRPygTIYhMYd1VYvu0jXmsnbmRwaKI0fWY+JR?= =?us-ascii?Q?nExSD8mwYl3XNkR7V9LoYAUzmSDPY0JKc1Ddpr8+AfJIGZrZdj7LVC9igaWA?= =?us-ascii?Q?Qdf9Gjf+pRZFq2u/aLXlRGxlFPDd42SzDm1G2vTzGZxIFdoea6pgG79B32MG?= =?us-ascii?Q?f7uq72DZlwqcSHgKtRHwEs3ShK89EFb/xREdrdfubLXHK2H3L4jbfzwK+yBf?= =?us-ascii?Q?dgPHvR7UagciiHM4HWpf6NxKQlKEbolMU3NCza2fg7p9bf08HOtH803nMVW/?= =?us-ascii?Q?9cDMIMwQpKtRjwLmRod2VxiFsDvs0U6NYqnrb4bz/ckm7ZNX2wVb4iAgKjp0?= =?us-ascii?Q?uWvpDi07XFtvwQXnYJ5vJ5nhiL7Zgl4gKc+aHcutQmWw3IKREmZ9UOrpBTYD?= =?us-ascii?Q?KdIYSfX+AmwrFArXnwiF7YKtMfzqmUb4jOfDOuMYD/y/y6/tYTZol+6CyPCI?= =?us-ascii?Q?AZGYbBN7ZjL6+TFu6NA6qbj5VvnJm5EpJ+Ig3Ofd2kJqiOXrUIgdOhM3cstW?= =?us-ascii?Q?+PrFfaCn+jYFsCpIiC8UBNXbBeJGHI660ZfiQxe+ZlzPeefFsL+RXxww23+p?= =?us-ascii?Q?G8YLsHV0hvJw6h0pjker1SHHH+CCkLfj7uy49bmHS39lcDwuZxFgw1xdY5OM?= =?us-ascii?Q?Cyf78/I1yOkUNDSoBB+zQzEsfCmKzDiDGSdDOBt0+cSBTszlAQk0FMI9CGnN?= =?us-ascii?Q?OdCt0zogNwcnfEW98TU+fWcNb1s+1uH8CojmSHyn2Sav09xNMhMzsxBZrX/l?= =?us-ascii?Q?Tz4hpS+pYFQcwvXfOrdE8aKMaNV+s+qmEAAIpN6k6lyG/gTatCS9aaZF0vOt?= =?us-ascii?Q?f4gOqM2MZqRjnlE/WqLHpC00WGBkbeVkWcG/dma1XDDSEQUjYjTqrUc/xbEl?= =?us-ascii?Q?XORB80nIx7Rp+bAfbsPQCh8FPQ4I7aRSFj78ZpMp+zzeWT5N3MBLt6SqxUld?= =?us-ascii?Q?Wwny9qaq+rHufyAPYnhI1MBSbvqSfm/4dyFdgUgTIPKYH6TdHGTps07JZ8Z3?= =?us-ascii?Q?JvtV13DOqjJJ1gMWd8HAtMGC9aExkt02/XGGxPvx4wx7K4qo1qY44u0UjVeH?= =?us-ascii?Q?dxbger7dhnL3Z20=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR0501MB837; 6:YAhzhC7QR0t/4JBwGcaRauNkiqeBSzIHH8p45hoiR8AxyhzgDHVI2ee2iy4uhOoQPwCi9NqfnMMgTiWzQkgt20IIb2f75W0qYEBLjKqllhffEOAXp5XiDRUwqaCGUASyBeZjwxSBvBPp+a6ukkZfZDIIVRjaHzt5lBsYQw4+hvnf6AzNdoxUfT6sO/EiCcoIYZTnWZQphwZ2VIycKynvkZThHBiOypkkgmmNnJbxBnY1R75I9PYvhPMarwivAAO3t24Ds291EJbwI3M1YZ+PPwIwwAYyZ3v7WSUhRyGVWIg=; 5:wpQoxhWrtp/d6cOjWgMAIBjwFAXlU//gdc8Vd/k78CEVNNOn5csG3LNqmlDAiyX80hu4zdS2NwHGu9LtlywQWZdDww2/Ep2se23uS0FrQkGJk+KAI1lu4PBvTuzezBRbKAf2IqB5ZnscbLkVCaP2Sw==; 24:Ep73bMQk4rAjjeKTm7/ykEE5IhwOt+O/DsYOFJPzb+INMjuablZ+2EYUhohQuoZ6AYttrb79vqY/Ak9mMy0UnI3j1nvReAWniLFJ9We5l2M=; 7:6niQkUbJJOCrLqOZsxacHxauASBBApKP+IaChsQRm3VcDP/FFN1snrhnhvWu9pmk8REP3mSvxUnkB5JMkhKDo2AZv0WKjNqJDAR8rxt2wl7ddodQewhBeTI37IyYLMS3wIFjQVPYYekgq0d2JX2wlbjwUySc0w3zPo0+NClnR9LWY28XXZ/A30WHrknahVXy1GMSiSb9DHKy7CX6/P5/h2iQVS7sKSEJyaQ7c+qnV1ygYGctxFe8mNJ/KzDDLlBKOIbB280rBqg1ktW05vKUweAuvFKdbqaV28b1a+QNNKiOhhd+32+Ioy4LqLaaHD6h SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR0501MB837; 20:ddAIa8f15BshDqLhNRqJ8uuhN31nNDbBFZoZ52+gtu85GkoxQp3IHlnrcgo1rGdIrk+ZajUC/8xA1aK9xW8h0yEfLE4pMUXEZBg33fcpmLerFVLeJVFxHIahcjRbwBy4pFrFEh+GGRxsHelAOKSH5/p4xq0YJpu5Oa1vgUwU6Lg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2016 23:22:08.1965 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR0501MB837 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