[N/U][PATCH 11/11] UBUNTU: [Config] enable spectre_bhi=auto by default

[Andrea Righi]

BugLink: https://bugs.launchpad.net/bugs/2060909

Set Branch History Injection (BHI) mitigation to auto by default. This
will rely on the BHI_DIS_S hardware control, if it's available on the
system CPUs, otherwise a proper software sequence will be deployed at
VMexit to mitigate BHI.

This setting can be overridden at boot time via spectre_bhi=on|off|auto.

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 debian.master/config/annotations | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b4f2872207bf..702fca42e937 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -13228,6 +13228,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK                       policy<{'amd64': 'm', 'arm64': '
 CONFIG_SPEAKUP_SYNTH_SOFT                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SPEAKUP_SYNTH_SPKOUT                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SPEAKUP_SYNTH_TXPRT                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_SPECTRE_BHI_AUTO                         policy<{'amd64': 'y'}>
+CONFIG_SPECTRE_BHI_OFF                          policy<{'amd64': 'n'}>
+CONFIG_SPECTRE_BHI_ON                           policy<{'amd64': 'n'}>
 CONFIG_SPECULATION_MITIGATIONS                  policy<{'amd64': 'y'}>
 CONFIG_SPI                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'n'}>
 CONFIG_SPI_ALTERA                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
-- 
2.43.0