From 57919513a9903ed0525a8ae0708665fd5ee570e3 Mon Sep 17 00:00:00 2001
From: visa <visa@openbsd.org>
Date: Wed, 11 Jan 2023 03:20:52 +0000
Subject: [PATCH] Enable TLB read inhibit on OCTEON Plus and newer SoCs.

OK deraadt@
---
 sys/arch/octeon/octeon/machdep.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 188d66edefe..a490eff6771 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.134 2021/07/24 08:21:13 visa Exp $ */
+/*	$OpenBSD: machdep.c,v 1.135 2023/01/11 03:20:52 visa Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -793,7 +793,7 @@ octeon_tlb_init(void)
 	pgrain |= PGRAIN_ELPA;
 #endif
 	if (cp0_get_config_3() & CONFIG3_RXI)
-		pgrain |= PGRAIN_XIE;
+		pgrain |= (PGRAIN_RIE | PGRAIN_XIE);
 	cp0_set_pagegrain(pgrain);
 
 	tlb_init(bootcpu_hwinfo.tlbsize);
-- 
2.20.1