svn commit: r304052 - in head/sys/powerpc: booke powerpc

[Justin Hibbits]

Author: jhibbits
Date: Sat Aug 13 18:57:14 2016
New Revision: 304052
URL: https://svnweb.freebsd.org/changeset/base/304052

Log:
  Add missing pmap_kenter() method for book-e.
  
  This isn't added to AIM yet, because it's not yet needed.  It's needed for
  Book-E ePAPR boot support.
  
  X-MFC With:	r304047

Modified:
  head/sys/powerpc/booke/pmap.c
  head/sys/powerpc/powerpc/mmu_if.m
  head/sys/powerpc/powerpc/pmap_dispatch.c

Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c	Sat Aug 13 18:46:49 2016	(r304051)
+++ head/sys/powerpc/booke/pmap.c	Sat Aug 13 18:57:14 2016	(r304052)
@@ -385,7 +385,7 @@ static mmu_method_t mmu_booke_methods[] 
 	MMUMETHOD(mmu_kenter,		mmu_booke_kenter),
 	MMUMETHOD(mmu_kenter_attr,	mmu_booke_kenter_attr),
 	MMUMETHOD(mmu_kextract,		mmu_booke_kextract),
-/*	MMUMETHOD(mmu_kremove,		mmu_booke_kremove),	*/
+	MMUMETHOD(mmu_kremove,		mmu_booke_kremove),
 	MMUMETHOD(mmu_unmapdev,		mmu_booke_unmapdev),
 	MMUMETHOD(mmu_change_attr,	mmu_booke_change_attr),
 

Modified: head/sys/powerpc/powerpc/mmu_if.m
==============================================================================
--- head/sys/powerpc/powerpc/mmu_if.m	Sat Aug 13 18:46:49 2016	(r304051)
+++ head/sys/powerpc/powerpc/mmu_if.m	Sat Aug 13 18:57:14 2016	(r304052)
@@ -870,6 +870,16 @@ METHOD void kenter_attr {
 } DEFAULT mmu_null_kenter_attr;
 
 /**
+ * @brief Unmap a wired page from kernel virtual address space
+ *
+ * @param _va		mapped virtual address
+ */
+METHOD void kremove {
+	mmu_t		_mmu;
+	vm_offset_t	_va;
+};
+
+/**
  * @brief Determine if the given physical address range has been direct-mapped.
  *
  * @param _pa		physical address start

Modified: head/sys/powerpc/powerpc/pmap_dispatch.c
==============================================================================
--- head/sys/powerpc/powerpc/pmap_dispatch.c	Sat Aug 13 18:46:49 2016	(r304051)
+++ head/sys/powerpc/powerpc/pmap_dispatch.c	Sat Aug 13 18:57:14 2016	(r304052)
@@ -510,6 +510,14 @@ pmap_kenter_attr(vm_offset_t va, vm_offs
 	MMU_KENTER_ATTR(mmu_obj, va, pa, ma);
 }
 
+void
+pmap_kremove(vm_offset_t va)
+{
+
+	CTR2(KTR_PMAP, "%s(%#x)", __func__, va);
+	return (MMU_KREMOVE(mmu_obj, va));
+}
+
 boolean_t
 pmap_dev_direct_mapped(vm_paddr_t pa, vm_size_t size)
 {