From owner-svn-src-all@FreeBSD.ORG Wed Sep 19 19:28:53 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 117601065670; Wed, 19 Sep 2012 19:28:53 +0000 (UTC) (envelope-from jim.harris@gmail.com) Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 7F7318FC12; Wed, 19 Sep 2012 19:28:52 +0000 (UTC) Received: by qcsg15 with SMTP id g15so1345943qcs.13 for ; Wed, 19 Sep 2012 12:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=2UL0tZrXcMBMXVwd7crKgilemCmpIuzLinPCa7rfW6E=; b=jheLPEnoJGmBjVzOUJTLc/VWidt6U7fGqO0XgkJKnnYUi2/At3hUssd2y8yvJrWB7T DqEdZsDBt60fNs964Z5RFpLaSIgM578oT/HjXZXLVjjRmLVLzAE2mIuIxx75TRMBKqFV Vg5rWkG+92kizKcfjvBVJIin0pwI6DKlujtaHYmiJ2QTQBYZO/t5DDU6VU2rhw2uZ4O0 2484cWDYGKp+VTbf7ot6JBSf87l0BzLk+U+t7PadFnvtA5K7RKZCmc5TPCsSRqvs3L2O TgpUiLvEuvm6aQhC8F/HjEu5mTWI29t9cA5/nZI+nE2V0bk03lD/1c0g4uT3nDyBHtjB godw== MIME-Version: 1.0 Received: by 10.224.189.5 with SMTP id dc5mr9231190qab.89.1348082931748; Wed, 19 Sep 2012 12:28:51 -0700 (PDT) Received: by 10.49.104.70 with HTTP; Wed, 19 Sep 2012 12:28:51 -0700 (PDT) In-Reply-To: <201209191822.q8JIMFEi043012@svn.freebsd.org> References: <201209191822.q8JIMFEi043012@svn.freebsd.org> Date: Wed, 19 Sep 2012 12:28:51 -0700 Message-ID: From: Jim Harris To: Gavin Atkinson Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240699 - in head: sys/dev/pci usr.sbin/pciconf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2012 19:28:53 -0000 On Wed, Sep 19, 2012 at 11:22 AM, Gavin Atkinson wrote: > Author: gavin > Date: Wed Sep 19 18:22:14 2012 > New Revision: 240699 > URL: http://svn.freebsd.org/changeset/base/240699 > > Log: > Recognise NVM Express devices and pretty-print their name. > > MFC after: 1 week > > Modified: > head/sys/dev/pci/pci.c > head/usr.sbin/pciconf/pciconf.c > > Modified: head/sys/dev/pci/pci.c > ============================================================================== > --- head/sys/dev/pci/pci.c Wed Sep 19 16:28:38 2012 (r240698) > +++ head/sys/dev/pci/pci.c Wed Sep 19 18:22:14 2012 (r240699) > @@ -3661,6 +3661,7 @@ static struct > {PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, "ATA (ADMA)"}, > {PCIC_STORAGE, PCIS_STORAGE_SATA, "SATA"}, > {PCIC_STORAGE, PCIS_STORAGE_SAS, "SAS"}, > + {PCIC_STORAGE, PCIS_STORAGE_NVM, "NVM Express"}, Hi Gavin, This should really read "NVM", not "NVM Express". NVM Express should be reserved for NVM subclass devices with the NVM Express PI (Programming Interface). PCI SIG refers to this PI as "Enterprise NVMHCI", but it's the same thing. Regards, -Jim > {PCIC_NETWORK, -1, "network"}, > {PCIC_NETWORK, PCIS_NETWORK_ETHERNET, "ethernet"}, > {PCIC_NETWORK, PCIS_NETWORK_TOKENRING, "token ring"}, > > Modified: head/usr.sbin/pciconf/pciconf.c > ============================================================================== > --- head/usr.sbin/pciconf/pciconf.c Wed Sep 19 16:28:38 2012 (r240698) > +++ head/usr.sbin/pciconf/pciconf.c Wed Sep 19 18:22:14 2012 (r240699) > @@ -345,6 +345,7 @@ static struct > {PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, "ATA (ADMA)"}, > {PCIC_STORAGE, PCIS_STORAGE_SATA, "SATA"}, > {PCIC_STORAGE, PCIS_STORAGE_SAS, "SAS"}, > + {PCIC_STORAGE, PCIS_STORAGE_NVM, "NVM Express"}, > {PCIC_NETWORK, -1, "network"}, > {PCIC_NETWORK, PCIS_NETWORK_ETHERNET, "ethernet"}, > {PCIC_NETWORK, PCIS_NETWORK_TOKENRING, "token ring"},