From 269473047d747f7815af570197e4ef7322d3632c Mon Sep 17 00:00:00 2001
From: Evan Yan <Evan.Yan@Sun.COM>
Date: Mon, 2 Nov 2009 15:58:28 +0800
Subject: PSARC/2008/181 Solaris Hotplug Framework 6837240 Solaris Hotplug
 Framework 6783012 Add support for PCIe Alternate Routing-ID Interpretation
 6638136 remove obsolete ndi_ra_xxx logic from px_msi code 6695081 Race
 condition between pciehpc_intr() and pciehpc_init()

--HG--
rename : usr/src/uts/common/io/hotplug/pciehpc/pciehpc.c => usr/src/uts/common/io/pciex/hotplug/pciehpc.c
rename : usr/src/uts/common/io/hotplug/pcishpc/pcishpc.c => usr/src/uts/common/io/pciex/hotplug/pcishpc.c
rename : usr/src/uts/intel/io/hotplug/pciehpc/pciehpc_acpi.c => usr/src/uts/intel/io/pciex/hotplug/pciehpc_acpi.c
rename : usr/src/uts/intel/io/hotplug/pciehpc/pciehpc_acpi.h => usr/src/uts/intel/sys/hotplug/pci/pciehpc_acpi.h
rename : usr/src/uts/sparc/pcicfg.e/Makefile => usr/src/uts/sparc/pcicfg/Makefile
rename : usr/src/uts/sun4/io/pcicfg.e.c => usr/src/uts/sun4/io/pcicfg.c
---
 usr/src/uts/common/sys/devops.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'usr/src/uts/common/sys/devops.h')

diff --git a/usr/src/uts/common/sys/devops.h b/usr/src/uts/common/sys/devops.h
index 705a8dba02..6efcdcc257 100644
--- a/usr/src/uts/common/sys/devops.h
+++ b/usr/src/uts/common/sys/devops.h
@@ -19,14 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_SYS_DEVOPS_H
 #define	_SYS_DEVOPS_H
 
-
 #include <sys/types.h>
 #include <sys/cred.h>
 #include <sys/uio.h>
@@ -42,6 +41,8 @@
 #include <sys/ddifm.h>
 #include <sys/nexusdefs.h>
 #include <sys/ddi_intr.h>
+#include <sys/ddi_hp.h>
+#include <sys/ddi_hp_impl.h>
 #include <sys/aio_req.h>
 #include <vm/page.h>
 
@@ -145,7 +146,8 @@ struct cb_ops  {
 #define	BUSO_REV_7	7
 #define	BUSO_REV_8	8
 #define	BUSO_REV_9	9
-#define	BUSO_REV	BUSO_REV_9
+#define	BUSO_REV_10	10
+#define	BUSO_REV	BUSO_REV_10
 
 
 struct bus_ops  {
@@ -268,6 +270,13 @@ struct bus_ops  {
 	int		(*bus_intr_op)(dev_info_t *dip, dev_info_t *rdip,
 			    ddi_intr_op_t op, ddi_intr_handle_impl_t *hdlp,
 			    void *result);
+
+	/*
+	 * NOTE: the following busop entrypoint is available with version
+	 * 10 or greater.
+	 */
+	int		(*bus_hp_op)(dev_info_t *dip, char *cn_name,
+			    ddi_hp_op_t op, void *arg, void *result);
 };
 
 /*
-- 
cgit v1.2.3