From 81ef73fb1b1ec8ad04028645c6f079f52cb1c63d Mon Sep 17 00:00:00 2001
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Tue, 23 Aug 2016 04:26:30 +0000
Subject: [PATCH] Take into account mas7/8 when reading/writing TLB entries on
 e6500

Summary: Current booke/pmap code ignores mas7 and mas8 on e6500 CPU.

Submitted by:	Ivan Krivonos <int0dster_gmail.com>
Differential Revision: https://reviews.freebsd.org/D7606
---
 sys/powerpc/booke/pmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
index 616601bd563..564ee5ff832 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -3166,6 +3166,7 @@ tlb1_read_entry(tlb_entry_t *entry, unsigned int slot)
 	case FSL_E500v2:
 	case FSL_E500mc:
 	case FSL_E5500:
+	case FSL_E6500:
 		entry->mas7 = mfspr(SPR_MAS7);
 		break;
 	default:
@@ -3206,6 +3207,7 @@ tlb1_write_entry(tlb_entry_t *e, unsigned int idx)
 	switch ((mfpvr() >> 16) & 0xFFFF) {
 	case FSL_E500mc:
 	case FSL_E5500:
+	case FSL_E6500:
 		mtspr(SPR_MAS8, 0);
 		__asm __volatile("isync");
 		/* FALLTHROUGH */