Enable NUMA on aarch64, Enable Cavium ThunderX

4 files changed, 24 insertions, 13 deletions

diff --git a/config-arm64 b/config-arm64
index 2779fd369..5ec79ca83 100644
--- a/config-arm64
+++ b/config-arm64
@@ -8,6 +8,7 @@ CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_THUNDER=y
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM2835 is not set
@@ -19,7 +20,6 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_RENESAS is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_THUNDER is not set
 # CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCH_UNIPHIER is not set
@@ -34,6 +34,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 
@@ -108,6 +109,16 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_CONFIGFS=m
 
+CONFIG_NUMA=y
+CONFIG_ACPI_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NODES_SHIFT=9
+
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
@@ -264,13 +275,14 @@ CONFIG_QCOM_COINCELL=m
 
 # ThunderX
 # CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_THUNDER is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-
-CONFIG_DMI=y
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
+CONFIG_MDIO_THUNDER=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+# CONFIG_LIQUIDIO is not set
 
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_AHCI_SEATTLE=m
@@ -303,7 +315,4 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 # CONFIG_IMX_THERMAL is not set
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 
-# Will probably need to be changed later
-# CONFIG_NUMA is not set
-
 # CONFIG_BCM_PDC_MBOX is not set
diff --git a/config-x86-generic b/config-x86-generic
index b925fbd05..7df9a0751 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -86,7 +86,6 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_FAN=y
-CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 8cdc4ca78..592093575 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -9,14 +9,15 @@ CONFIG_GENERIC_CPU=y
 CONFIG_X86_UV=y
 CONFIG_UV_MMTIMER=m
 CONFIG_NUMA=y
+CONFIG_ACPI_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NFIT=m
 # CONFIG_ACPI_NFIT_DEBUG is not set
 # CONFIG_NUMA_EMU is not set
 CONFIG_X86_NUMACHIP=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 
 # https://lists.fedoraproject.org/pipermail/kernel/2013-November/004601.html
 CONFIG_NR_CPUS=1024
diff --git a/kernel.spec b/kernel.spec
index f25ad0ec7..de2cd994c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2142,6 +2142,8 @@ fi
 * Thu Aug 11 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Minor ARM config updates
 - Disable long running watchdog in VM patch (in theory fixed)
+- Enable NUMA on aarch64
+- Enable Cavium ThunderX
 
 * Wed Aug 10 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc1.git3.1
 - Linux v4.8-rc1-70-g9512c47