svn commit: r320978 - stable/11/sys/powerpc/booke

[Justin Hibbits]

Author: jhibbits
Date: Fri Jul 14 01:22:27 2017
New Revision: 320978
URL: https://svnweb.freebsd.org/changeset/base/320978

Log:
  MFC r320392:
  
    Disable interrupts when updating the TLB

Modified:
  stable/11/sys/powerpc/booke/pmap.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/powerpc/booke/pmap.c
==============================================================================
--- stable/11/sys/powerpc/booke/pmap.c	Fri Jul 14 00:10:51 2017	(r320977)
+++ stable/11/sys/powerpc/booke/pmap.c	Fri Jul 14 01:22:27 2017	(r320978)
@@ -3150,10 +3150,14 @@ tlb0_print_tlbentries(void)
 void
 tlb1_read_entry(tlb_entry_t *entry, unsigned int slot)
 {
+	register_t msr;
 	uint32_t mas0;
 
 	KASSERT((entry != NULL), ("%s(): Entry is NULL!", __func__));
 
+	msr = mfmsr();
+	mtmsr(msr & ~PSL_EE);
+
 	mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(slot);
 	mtspr(SPR_MAS0, mas0);
 	__asm __volatile("isync; tlbre");
@@ -3172,6 +3176,7 @@ tlb1_read_entry(tlb_entry_t *entry, unsigned int slot)
 		entry->mas7 = 0;
 		break;
 	}
+	mtmsr(msr);
 
 	entry->virt = entry->mas2 & MAS2_EPN_MASK;
 	entry->phys = ((vm_paddr_t)(entry->mas7 & MAS7_RPN) << 32) |
@@ -3187,6 +3192,7 @@ tlb1_read_entry(tlb_entry_t *entry, unsigned int slot)
 static void
 tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
 {
+	register_t msr;
 	uint32_t mas0;
 
 	//debugf("tlb1_write_entry: s\n");
@@ -3195,6 +3201,9 @@ tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
 	mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(idx);
 	//debugf("tlb1_write_entry: mas0 = 0x%08x\n", mas0);
 
+	msr = mfmsr();
+	mtmsr(msr & ~PSL_EE);
+
 	mtspr(SPR_MAS0, mas0);
 	__asm __volatile("isync");
 	mtspr(SPR_MAS1, e->mas1);
@@ -3218,6 +3227,7 @@ tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
 	}
 
 	__asm __volatile("tlbwe; isync; msync");
+	mtmsr(msr);
 
 	//debugf("tlb1_write_entry: e\n");
 }