6794168 intel_nhm needs to support device quiesce
authorAdrian Frost <Adrian.Frost@Sun.COM>
Fri, 30 Jan 2009 08:52:28 +0000
changeset 8657 f9b959e02995
parent 8656 d00942080f9a
child 8658 9772d2c4d0b9
6794168 intel_nhm needs to support device quiesce 6793571 fma label for CPU FRU location needed on Sun Blade X6450
usr/src/lib/fm/topo/maps/i86pc/chip-hc-topology.xml
usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
--- a/usr/src/lib/fm/topo/maps/i86pc/chip-hc-topology.xml	Thu Jan 29 20:08:08 2009 -0700
+++ b/usr/src/lib/fm/topo/maps/i86pc/chip-hc-topology.xml	Fri Jan 30 08:52:28 2009 +0000
@@ -300,7 +300,24 @@
             </facility>
         </set> 
         <set type='product'
-	    setlist='Sun-Fire-X4450'>
+	    setlist='Sun-Fire-X4450|SUN-FIRE-X4450'>
+	    <!--
+	       chip FRU label
+	    -->
+            <propgroup name='protocol' version='1'
+                name-stability='Private' data-stability='Private' >
+                <propmethod name='fsb2_chip_label' version='0'
+		            propname='label' proptype='string' >
+              
+                    <argval name='format' type='string' value='CPU %d' />
+                    <argval name='offset' type='uint32' value='0' />
+
+                </propmethod>
+
+            </propgroup>
+        </set> 
+        <set type='product'
+	    setlist='Sun-Blade-X6450-Server-Module|SUN-BLADE-X6450-SERVER-MODULE|Sun-Blade-X6450|SUN-BLADE-X6450'>
 	    <!--
 	       chip FRU label
 	    -->
--- a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c	Thu Jan 29 20:08:08 2009 -0700
+++ b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c	Fri Jan 30 08:52:28 2009 +0000
@@ -298,7 +298,8 @@
 	nodev,			/* devo_reset */
 	&inhm_mc_cb_ops,		/* devo_cb_ops */
 	NULL,			/* devo_bus_ops */
-	NULL			/* devo_power */
+	NULL,			/* devo_power */
+	ddi_quiesce_not_needed,	/* devo_quiesce */
 };
 
 static struct modldrv modldrv = {