4 files changed, 22 insertions, 32 deletions
diff --git a/usr/src/uts/sun4v/ml/hcall.s b/usr/src/uts/sun4v/ml/hcall.s
index 4ad798d4bf..b216f0448e 100644
--- a/usr/src/uts/sun4v/ml/hcall.s
+++ b/usr/src/uts/sun4v/ml/hcall.s
@@ -201,11 +201,6 @@ hv_mach_desc(uint64_t buffer_ra, uint64_t *buffer_sizep)
 	
 /*ARGSUSED*/	
 uint64_t
-hv_ncs_request(int cmd, uint64_t realaddr, size_t sz)
-{ return (0); }
-
-/*ARGSUSED*/	
-uint64_t
 hv_ra2pa(uint64_t ra)
 { return (0); }
 
@@ -669,16 +664,6 @@ hv_hpriv(void *func, uint64_t arg1, uint64_t arg2, uint64_t arg3)
 	SET_SIZE(hv_mach_desc)
 
 	/*
-	 * hv_ncs_request(int cmd, uint64_t realaddr, size_t sz)
-	 */
-	ENTRY(hv_ncs_request)
-	mov	HV_NCS_REQUEST, %o5
-	ta	FAST_TRAP
-	retl
-	nop
-	SET_SIZE(hv_ncs_request)
-
-	/*
 	 * hv_ra2pa(uint64_t ra)
 	 *
 	 * MACH_DESC
diff --git a/usr/src/uts/sun4v/os/hsvc.c b/usr/src/uts/sun4v/os/hsvc.c
index 16bd642617..689c1cc8c5 100644
--- a/usr/src/uts/sun4v/os/hsvc.c
+++ b/usr/src/uts/sun4v/os/hsvc.c
@@ -654,17 +654,15 @@ hsvc_init(void)
  * group only for itself.
  *
  * Rest of the API groups are currently negotiated on behalf
- * of the pcitool, glvc and  Niagara crypto support.  In
- * future, when these drivers are modified to do the negotiation
- * themselves, corresponding entry should be removed from the
- * table below.
+ * of the pcitool and glvc support.  In future, when these drivers
+ * are modified to do the negotiation themselves, corresponding
+ * entry should be removed from the table below.
  */
 static hsvc_info_t  hsvcinfo_unix[] = {
 	{HSVC_REV_1, NULL,	HSVC_GROUP_SUN4V,	1,	0, NULL},
 	{HSVC_REV_1, NULL,	HSVC_GROUP_CORE,	1,	0, NULL},
 	{HSVC_REV_1, NULL,	HSVC_GROUP_VSC,		1,	0, NULL},
-	{HSVC_REV_1, NULL,	HSVC_GROUP_DIAG,	1,	0, NULL},
-	{HSVC_REV_1, NULL,	HSVC_GROUP_NCS,		1,	0, NULL}
+	{HSVC_REV_1, NULL,	HSVC_GROUP_DIAG,	1,	0, NULL}
 };
 
 #define	HSVCINFO_UNIX_CNT	(sizeof (hsvcinfo_unix) / sizeof (hsvc_info_t))
diff --git a/usr/src/uts/sun4v/sys/hypervisor_api.h b/usr/src/uts/sun4v/sys/hypervisor_api.h
index c619800f14..3b4aad6910 100644
--- a/usr/src/uts/sun4v/sys/hypervisor_api.h
+++ b/usr/src/uts/sun4v/sys/hypervisor_api.h
@@ -129,8 +129,6 @@ extern "C" {
 #define	MMU_STAT_AREA		0xfc
 #endif /* SET_MMU_STATS */
 
-#define	HV_NCS_REQUEST		0x110
-
 #define	HV_RA2PA		0x200
 #define	HV_HPRIV		0x201
 
diff --git a/usr/src/uts/sun4v/sys/ncs.h b/usr/src/uts/sun4v/sys/ncs.h
index 4a84fb1b7f..bb28f7dc4c 100644
--- a/usr/src/uts/sun4v/sys/ncs.h
+++ b/usr/src/uts/sun4v/sys/ncs.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,6 +32,15 @@
 extern "C" {
 #endif
 
+/*
+ * NCS HV API versioni definitions.
+ */
+#define	NCS_MAJOR_VER		1
+#define	NCS_MINOR_VER		0
+
+#define	HV_NCS_REQUEST		0x110
+
+#ifndef _ASM
 /* Forward typedefs */
 typedef union ma_ctl		ma_ctl_t;
 typedef union ma_mpa		ma_mpa_t;
@@ -54,6 +62,7 @@ union ma_ctl {
 		uint64_t	length:6;
 	} bits;
 };
+#endif	/* !_ASM */
 
 /* Values for ma_ctl operation field */
 #define	MA_OP_LOAD		0x0
@@ -93,7 +102,7 @@ union ma_ma {
 	} bits;
 };
 
-#endif	/* _ASM */
+#endif	/* !_ASM */
 
 
 /*
@@ -102,7 +111,7 @@ union ma_ma {
 
 #ifndef _ASM
 #include <sys/mutex.h>
-#endif	/* _ASM */
+#endif	/* !_ASM */
 
 /*
  * NCS API definitions
@@ -128,6 +137,7 @@ union ma_ma {
 #define	NCS_SYNC	0
 #define	NCS_ASYNC	1
 
+#ifndef _ASM
 typedef struct ncs_qconf_arg {
 	uint64_t	nq_mid;
 	uint64_t	nq_base;
@@ -141,7 +151,6 @@ typedef struct ncs_qtail_update_arg {
 	uint64_t	nu_syncflag;
 } ncs_qtail_update_arg_t;
 
-#ifndef _ASM
 /*
  * The interface to the MAU is via the following data structures. The
  * structure consists of a copy of all relevant registers required to perform
@@ -179,10 +188,10 @@ typedef struct ncs_hvdesc {
 #define	NCS_HVDESC_SIZE_EXPECTED	(1 << NCS_HVDESC_SHIFT)
 #define	NCS_HVDESC_SIZE_ACTUAL		(sizeof (ncs_hvdesc_t))
 
-#endif	/* _ASM */
-
 extern uint64_t hv_ncs_request(int, uint64_t, size_t);
 
+#endif	/* !_ASM */
+
 #ifdef	__cplusplus
 }
 #endif