From: Diana Craciun <diana.craciun@nxp.com>
Date: Wed, 12 Dec 2018 14:03:09 +0000 (+0200)
Subject: powerpc/fsl: Update Spectre v2 reporting
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dfa88658fb0583abb92e062c7a9cd5a5b94f2a46;p=openwrt%2Fstaging%2Fblogic.git

powerpc/fsl: Update Spectre v2 reporting

Report branch predictor state flush as a mitigation for
Spectre variant 2.

Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index 9ab771b1aebb..9b8631533e02 100644
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -213,8 +213,11 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, c
 
 		if (count_cache_flush_type == COUNT_CACHE_FLUSH_HW)
 			seq_buf_printf(&s, "(hardware accelerated)");
-	} else
+	} else if (btb_flush_enabled) {
+		seq_buf_printf(&s, "Mitigation: Branch predictor state flush");
+	} else {
 		seq_buf_printf(&s, "Vulnerable");
+	}
 
 	seq_buf_printf(&s, "\n");