From patchwork Mon Mar 30 08:32:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 6118861 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1F0869F349 for ; Mon, 30 Mar 2015 08:32:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ECE220386 for ; Mon, 30 Mar 2015 08:32:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13F882035C for ; Mon, 30 Mar 2015 08:32:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753302AbbC3Icj (ORCPT ); Mon, 30 Mar 2015 04:32:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56905 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752647AbbC3Ici (ORCPT ); Mon, 30 Mar 2015 04:32:38 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 822CF8EB2A; Mon, 30 Mar 2015 08:32:38 +0000 (UTC) Received: from redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t2U8WZfP016977; Mon, 30 Mar 2015 04:32:36 -0400 Date: Mon, 30 Mar 2015 10:32:34 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Bjorn Helgaas , Jonathan Corbet , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH] pci.txt: clarify vendor ID policy Message-ID: <1427704341-14125-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Top of include/linux/pci_ids.h says: Do not add new entries to this file unless the definitions are shared between multiple drivers. on the other hand, Documentation/PCI/pci.txt seems to imply that all vendor IDs should be added in include/linux/pci_ids.h. Clarify text pci.txt to avoid the apparent contradiction. Signed-off-by: Michael S. Tsirkin --- Documentation/PCI/pci.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt index 53da450..47b0e28 100644 --- a/Documentation/PCI/pci.txt +++ b/Documentation/PCI/pci.txt @@ -564,12 +564,15 @@ to be handled by platform and generic code, not individual drivers. 8. Vendor and device identifications ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -One is not required to add new device ids to include/linux/pci_ids.h. -Please add PCI_VENDOR_ID_xxx for vendors and a hex constant for device ids. +One is not required to add new device or vendor ids to include/linux/pci_ids.h. +Please define PCI_VENDOR_ID_xxx for vendor ids and use a hex constant for +device ids in your driver. -PCI_VENDOR_ID_xxx constants are re-used. The device ids are arbitrary -hex numbers (vendor controlled) and normally used only in a single -location, the pci_device_id table. +Only PCI_VENDOR_ID_xxx constant definitions that are re-used between multiple +drivers should be added to include/linux/pci_ids.h. + +The device ids are arbitrary hex numbers (vendor controlled) and normally used +only in a single location, the pci_device_id table. Please DO submit new vendor/device ids to pciids.sourceforge.net project.