svn commit: r267002 - in stable/10: sys/dev/pci usr.sbin/pciconf

[Alexander Motin]

Author: mav
Date: Tue Jun  3 06:48:35 2014
New Revision: 267002
URL: http://svnweb.freebsd.org/changeset/base/267002

Log:
  MFC r266468:
  Add IOMMU PCI subclass, found on Tyan S8236 motherboard.
  
  Submitted by:	Dmitry Luhtionov <dmitryluhtionov at gmail.com>

Modified:
  stable/10/sys/dev/pci/pci.c
  stable/10/sys/dev/pci/pcireg.h
  stable/10/usr.sbin/pciconf/pciconf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/pci/pci.c
==============================================================================
--- stable/10/sys/dev/pci/pci.c	Tue Jun  3 05:19:10 2014	(r267001)
+++ stable/10/sys/dev/pci/pci.c	Tue Jun  3 06:48:35 2014	(r267002)
@@ -3782,6 +3782,7 @@ static const struct
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_RTC,	1, "realtime clock"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_PCIHOT,	1, "PCI hot-plug controller"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_SDHC,	1, "SD host controller"},
+	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_IOMMU,	1, "IOMMU"},
 	{PCIC_INPUTDEV,		-1,			1, "input device"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_KEYBOARD,	1, "keyboard"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_DIGITIZER,1, "digitizer"},

Modified: stable/10/sys/dev/pci/pcireg.h
==============================================================================
--- stable/10/sys/dev/pci/pcireg.h	Tue Jun  3 05:19:10 2014	(r267001)
+++ stable/10/sys/dev/pci/pcireg.h	Tue Jun  3 06:48:35 2014	(r267002)
@@ -361,6 +361,7 @@
 #define	PCIS_BASEPERIPH_RTC	0x03
 #define	PCIS_BASEPERIPH_PCIHOT	0x04
 #define	PCIS_BASEPERIPH_SDHC	0x05
+#define	PCIS_BASEPERIPH_IOMMU	0x06
 #define	PCIS_BASEPERIPH_OTHER	0x80
 
 #define	PCIC_INPUTDEV	0x09

Modified: stable/10/usr.sbin/pciconf/pciconf.c
==============================================================================
--- stable/10/usr.sbin/pciconf/pciconf.c	Tue Jun  3 05:19:10 2014	(r267001)
+++ stable/10/usr.sbin/pciconf/pciconf.c	Tue Jun  3 06:48:35 2014	(r267002)
@@ -466,6 +466,7 @@ static struct
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_RTC,	"realtime clock"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_PCIHOT,	"PCI hot-plug controller"},
 	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_SDHC,	"SD host controller"},
+	{PCIC_BASEPERIPH,	PCIS_BASEPERIPH_IOMMU,	"IOMMU"},
 	{PCIC_INPUTDEV,		-1,			"input device"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_KEYBOARD,	"keyboard"},
 	{PCIC_INPUTDEV,		PCIS_INPUTDEV_DIGITIZER,"digitizer"},