UBUNTU: [Config] update configs and annotations after rebase to 5.19-rc7

Also make sure that all the relevant config options for retbleed
mitigations are enabled by default.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 71aa58318ab8ff82cf7c6071c22048306d1f48b2..6786ae449ecd2fac21580aec90f8806a40c87c87 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2228,7 +2228,7 @@ CONFIG_DRM_AMD_DC                               policy<{'amd64': 'y', 'arm64': '
 CONFIG_DRM_AMD_DC_HDCP                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_DRM_AMD_DC_SI                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_DEBUG_KERNEL_DC                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
-CONFIG_DRM_AMD_SECURE_DISPLAY                   policy<{'amd64': 'y', 'ppc64el': 'y'}>
+CONFIG_DRM_AMD_SECURE_DISPLAY                   policy<{'amd64': 'y'}>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> DRM Support for Allwinner A10 Display Engine
 CONFIG_DRM_SUN4I                                policy<{'arm64': 'm', 'armhf': '-'}>
@@ -11765,6 +11765,11 @@ CONFIG_DEBUG_CREDENTIALS                        policy<{'amd64': 'n', 'arm64': '
 CONFIG_DEBUG_WQ_FORCE_RR_CPU                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_CPU_HOTPLUG_STATE_CONTROL                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_LATENCYTOP                               policy<{'amd64-generic': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
+CONFIG_CPU_IBPB_ENTRY                           policy<{'amd64': 'y'}>
+CONFIG_CPU_IBRS_ENTRY                           policy<{'amd64': 'y'}>
+CONFIG_CPU_UNRET_ENTRY                          policy<{'amd64': 'y'}>
+CONFIG_SPECULATION_MITIGATIONS                  policy<{'amd64': 'y'}>
+CONFIG_RETHUNK                                  policy<{'amd64': 'y'}>
 #
 CONFIG_LATENCYTOP                               mark<ENFORCED> note<https://lists.ubuntu.com/archives/kernel-team/2014-July/045006.html, LP#1655986>
 

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 5ce396ec340e9ebff7624caf853676668e68b5c6..70c685b5128656b02ca4d19c0eda39462d95a150 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1582,6 +1582,7 @@ CONFIG_CC_HAS_INT128=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
@@ -2234,6 +2235,8 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_THERMAL=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
 CONFIG_CPU_IDLE=y
@@ -2260,6 +2263,7 @@ CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_UNRET_ENTRY=y
 CONFIG_CPU_V7=y
 CONFIG_CRAMFS_BLOCKDEV=y
 CONFIG_CRAMFS_MTD=y
@@ -2352,7 +2356,7 @@ CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
-# CONFIG_CRYPTO_CHACHA_S390 is not set
+CONFIG_CRYPTO_CHACHA_S390=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32C=y
@@ -5181,7 +5185,6 @@ CONFIG_INTEL_IDXD_BUS=m
 # CONFIG_INTEL_IDXD_COMPAT is not set
 CONFIG_INTEL_IDXD_PERFMON=y
 CONFIG_INTEL_IDXD_SVM=y
-CONFIG_INTEL_IFS=m
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IOMMU=y
@@ -9117,6 +9120,7 @@ CONFIG_RESET_TI_SYSCON=m
 # CONFIG_RESET_UNIPHIER is not set
 # CONFIG_RESET_UNIPHIER_GLUE is not set
 CONFIG_RETHOOK=y
+CONFIG_RETHUNK=y
 CONFIG_RETPOLINE=y
 CONFIG_RETU_WATCHDOG=m
 CONFIG_RFD77402=m
@@ -11067,6 +11071,7 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m
 CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPECULATION_MITIGATIONS=y
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m