From patchwork Wed Jun 26 21:30:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2788571 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2DE9CC0AB1 for ; Wed, 26 Jun 2013 21:30:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA1E420336 for ; Wed, 26 Jun 2013 21:30:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03A6F202C8 for ; Wed, 26 Jun 2013 21:30:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753053Ab3FZVaP (ORCPT ); Wed, 26 Jun 2013 17:30:15 -0400 Received: from mail-ie0-f170.google.com ([209.85.223.170]:54873 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372Ab3FZVaO (ORCPT ); Wed, 26 Jun 2013 17:30:14 -0400 Received: by mail-ie0-f170.google.com with SMTP id e11so33243683iej.29 for ; Wed, 26 Jun 2013 14:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=DNjXMOd0PXE8f/m/e/JbNTQq043bp7KV6gKZe07fQCA=; b=dPAvluzGtkyqrcxRmeFEYWpWhvGCsG8UmQicmilBftArq7Ub8qttYn2bdM5lUY8bcI Bxa6NlXqNlelydwDOShVas9Qh5+ysMTJ+3DKu7lezEBjWbJvpM5cAOeoLsJ4+97n3aIR ncDB3NKzDidex7/brBh2D6ZZPf+x1aKQEiCTscNr5SJIho/L9xw0lM0u6dLFjXOhfL0n GsyQBjAyDj5o/8EAg0E9+kAIFJN3hXSDbGfBFotcHk0/VRtTACfJ6puJFyNX5L9GB4fF mz0ijlvcZSk7CiqxA8K0IQgRyglDM9rk44RiRpY4QWCTfoFT6DF2l/bUKO0HrfosJNps UMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=DNjXMOd0PXE8f/m/e/JbNTQq043bp7KV6gKZe07fQCA=; b=DkMn4fH1IuhS8azrJAhcGdCjoury7nq1I5Nqmjerx3e9Q8cwsB+tp4OdKv31jdBuyt 2kKliR1SIm9ZPIhg6wwDx3n/8Jlte+jGM+Iyl2MeTAXYhbR+SX3MD+rd7YMZiJ5w1IrX F7ZjEcbScVpcz7CdfVmMeIqkoVDuooZA7rYGqwHsKZsz6tYInUrsKNR6NpA3kQ+ijFRA 6hIYEEAf4+J4Mq/bhhdjYPOo1IaOwzVCC/Vd4dvnqojqe3f0lIfPsFxMSw89aIg4tEo5 PPEnIh3hj3TBt6oJeuDodinnusjx2r+Et/BrA2QDVoO17Gg8f7keP7wZUB9BAfuq8XKu ragQ== X-Received: by 10.50.12.5 with SMTP id u5mr12927832igb.58.1372282213514; Wed, 26 Jun 2013 14:30:13 -0700 (PDT) Received: from google.com ([172.29.124.56]) by mx.google.com with ESMTPSA id n8sm9805772igk.7.2013.06.26.14.30.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Jun 2013 14:30:13 -0700 (PDT) Date: Wed, 26 Jun 2013 15:30:10 -0600 From: Bjorn Helgaas To: Darren Hart Cc: Linux Kernel Mailing List , "H. Peter Anvin" , Peter P Waskiewicz Jr , Andy Shevchenko , danders@circuitco.com, vishal.l.verma@intel.com, "linux-pci@vger.kernel.org" Subject: Re: [PATCH 7/8] pci: Add CircuitCo VENDOR ID and MinnowBoard DEVICE ID Message-ID: <20130626213010.GA31010@google.com> References: <83879b07cd4ce95f086420d1faa926c1692d63b4.1372211451.git.dvhart@linux.intel.com> <20130626163250.GA29299@google.com> <1372266904.8177.83.camel@envy.home> <1372281416.2720.28.camel@envy.home> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1372281416.2720.28.camel@envy.home> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQme4izC10PysMfKvarVdMu76L0xaHjOfiW5u3bCssPiICKeelKk00egg4KOhQeRmQnsBK+pjFVza1R0eld2ElMjJBob3Wk+PCrDVKcME4NmkfIeTyfGzqt3+KPbU3kDDRLRM/aFg7ML1257KkafDzreCKJubuNdbhW9MaqRvRCVk1CxYXOiu87w0fRKIcsKyuKvbj9Wx0vXTsTK453hGH0xPsjeSQ== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 On Wed, Jun 26, 2013 at 02:16:56PM -0700, Darren Hart wrote: > On Wed, 2013-06-26 at 13:37 -0600, Bjorn Helgaas wrote: > > On Wed, Jun 26, 2013 at 11:15 AM, Darren Hart wrote: > > > On Wed, 2013-06-26 at 10:32 -0600, Bjorn Helgaas wrote: > > > > >> +#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 > > >> + > > >> #define PCI_VENDOR_ID_TEKRAM 0x1de1 > > >> #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 > > > > > > > > > Thanks Bjorn. When I reuse this Subsystem ID and there is more than one > > > usage, I should send a patch to pci_ids.h adding it and replace the hex > > > value in all drivers with the new define. Is that right? > > > > Yeah, that's what I was thinking. > > > > But Peter's comment makes more sense to me now. The spec refers to > > that config register as "Subsystem ID," not "Subsystem Device ID," but > > I was confused because most existing usage treats it as a device ID. > > For example, the field in struct pci_device_id is named "subdevice," > > and all the existing #defines in pci_ids.h are of the form > > PCI_SUBDEVICE_ID_*. > > > > Device IDs are pretty specific identifiers, so I was thinking that a > > "sub-device ID" would be even more specific. Then it would make no > > sense to have a "sub-device ID" that was as generic as "MINNOWBOARD." > > But the register is actually *not* a "sub-device ID," and I can see > > that using the same Subsystem ID for all the devices on a board might > > make sense. > > > > So I think the name PCI_DEVICE_ID_CIRCUITCO_MINNOWBOARD is a bit of a > > misnomer, and something like PCI_SUBSYSTEM_CIRCUITCO_MINNOWBOARD would > > make it more clear that it really isn't sharing the device ID space > > assigned to CircuitCo. It would make perfect sense to have a Device > > ID, e.g., "PCI_DEVICE_ID_CIRCUIT_CO_xxx 0x0001," that has nothing to > > do with the Subsystem ID 0x0001. > > > > If you want to do something like that (or even keep your original > > patch), I can put that in my -next branch. Just let me know. > > > > Bjorn > > > I would be happy to change DEVICE to SUBSYSTEM in the the pci_ids.h: > > +#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 > +#define PCI_SUBSYSTEM_ID_CITCUITCO_MINNOWBOARD 0x0001 > > Would you like me to send another patch? No need. I'll just apply the following patch. Obviously your follow-on pch_gbe patch will need a corresponding change. Let me know if it needs tweaking, or if you decide I was talking nonsense above. commit c2efb42ab6033388f3bbed2dbe0fb76f2402e04a Author: Darren Hart Date: Tue Jun 25 20:08:46 2013 -0600 PCI: Add CircuitCo vendor ID and subsystem ID Add CircuitCo's newly created VENDOR ID and their first board subsystem ID for the MinnowBoard. [bhelgaas: sort, change DEVICE_ID to SUBSYSTEM_ID] Signed-off-by: Darren Hart Signed-off-by: Bjorn Helgaas --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c129162..4c7b349 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2476,6 +2476,9 @@ #define PCI_VENDOR_ID_ASMEDIA 0x1b21 +#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 +#define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD 0x0001 + #define PCI_VENDOR_ID_TEKRAM 0x1de1 #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29