From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Wed, 21 May 2014 18:54:10 +0000 (-0500)
Subject: sparc: add sun4v_mmu_unmap_perm_addr
X-Git-Tag: v4.1.12-92~147^2~3^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=63cb8dd7acb6d1741f6143b11f005bef3903ac22;p=users%2Fjedix%2Flinux-maple.git

sparc: add sun4v_mmu_unmap_perm_addr

original patch by Bob Picco

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Bob Picco <bob.picco@oracle.com>
---

diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index 9e7e203c5e83a..e06b58a8d86be 100644
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
@@ -811,6 +811,10 @@ unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
  * to be kept consistent.
  */
 #define HV_FAST_MMU_UNMAP_PERM_ADDR	0x28
+#ifndef __ASSEMBLY__
+extern unsigned long sun4v_mmu_unmap_perm_addr(unsigned long vaddr,
+			unsigned long nucleus, unsigned long flags);
+#endif
 
 /* mmu_tsb_ctx0_info()
  * TRAP:	HV_FAST_TRAP
diff --git a/arch/sparc/kernel/hvcalls.S b/arch/sparc/kernel/hvcalls.S
index cae3af12908b4..775aaa4365ffc 100644
--- a/arch/sparc/kernel/hvcalls.S
+++ b/arch/sparc/kernel/hvcalls.S
@@ -160,6 +160,18 @@ ENTRY(sun4v_mmu_map_perm_addr)
 	retl
 	 nop
 ENDPROC(sun4v_mmu_map_perm_addr)
+	/* %o0: virtual address
+	 * %o1: must be zero
+	 * %o2: HV_MMU_* flags
+	 *
+	 * returns %o0: status
+	 */
+ENTRY(sun4v_mmu_unmap_perm_addr)
+	mov	HV_FAST_MMU_UNMAP_PERM_ADDR, %o5
+	ta	HV_FAST_TRAP
+	retl
+	 nop
+ENDPROC(sun4v_mmu_unmap_perm_addr)
 
 	/* %o0: number of TSB descriptions
 	 * %o1: TSB descriptions real address