From ec664376f82f7566d2ab9bca3cd5e372a02fe0d1 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 20 Sep 2018 12:23:55 -0700
Subject: [PATCH] Updates for ACPI servers

o Enable CONFIG_SCHED_SMT for hyperthreading processors.
o Enable CONFIG_ARM64_LSE_ATOMICS for v8.1 processors.
o Enable a number of ACPI options likely to be available on servers.
o CONFIG_ACPI_APEI selects PSTORE, so remove the arm64 specific setting.

Signed-off-by: Geoff Levand <geoff@infradead.org>

[bwh:
 - Drop CONFIG_ACPI_CONFIGFS for now, as I think this the feature
   might need to be disabled under Secure Boot and the lockdown
   patches don't currently do that
 - Drop automatic config symbols
 - Note the changes in debian/changelog
]
---
 debian/changelog           |  9 +++++++++
 debian/config/arm64/config | 21 ++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58ca6c85c..8515e0fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,15 @@ linux (4.18.8-2) UNRELEASED; urgency=medium
   * [x86] enable PINCTRL_AMD for touchpad support on Lenovo IdeaPad.
     (closes: #876141)
 
+  [ Geoff Levand ]
+  * [arm64] Add support for new server hardware (Closes: #900581):
+    - Enable SCHED_SMT for hardware multithreading processors
+    - Enable ARM64_LSE_ATOMICS for v8.1 processors
+    - ACPI: Enable ACPI_PCI_SLOT, ACPI_HED, ACPI_BGRT, ACPI_APEI,
+      ACPI_APEI_GHES, ACPI_APEI_PCIEAER, ACPI_APEI_SEA,
+      ACPI_APEI_MEMORY_FAILURE as built-in;
+      ACPI_APEI_EINJ, WDAT_WDT as modules
+
  -- Vagrant Cascadian <vagrant@debian.org>  Tue, 18 Sep 2018 10:13:18 -0700
 
 linux (4.18.8-1) unstable; urgency=medium
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 487f92394..159f0af01 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -9,6 +9,7 @@ CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_VA_BITS_48=y
 ## end choice
 CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=256
 CONFIG_NUMA=y
 CONFIG_SECCOMP=y
@@ -19,6 +20,7 @@ CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
+CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_PMEM=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
@@ -67,6 +69,19 @@ CONFIG_ARCH_XGENE=y
 ##
 CONFIG_ACPI=y
 CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_BGRT=y
+
+##
+## file: drivers/acpi/apei/Kconfig
+##
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_SEA=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
 
 ##
 ## file: drivers/android/Kconfig
@@ -1092,6 +1107,7 @@ CONFIG_VIRTIO_MMIO=m
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_GPIO_WATCHDOG=m
+CONFIG_WDAT_WDT=m
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
@@ -1102,11 +1118,6 @@ CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=m
 CONFIG_BCM2835_WDT=m
 
-##
-## file: fs/pstore/Kconfig
-##
-CONFIG_PSTORE=y
-
 ##
 ## file: mm/Kconfig
 ##