diff options
19 files changed, 21 insertions, 75 deletions
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig index 3c9b3569..c0cfa1c2 100644 --- a/openpower/configs/barreleye_defconfig +++ b/openpower/configs/barreleye_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig index db6d1e3a..29ef022e 100644 --- a/openpower/configs/firenze_defconfig +++ b/openpower/configs/firenze_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig index 637b5533..ec125739 100644 --- a/openpower/configs/firestone_defconfig +++ b/openpower/configs/firestone_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig index f423358c..6f1be681 100644 --- a/openpower/configs/garrison_defconfig +++ b/openpower/configs/garrison_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig index fc4eb904..765efa51 100644 --- a/openpower/configs/habanero_defconfig +++ b/openpower/configs/habanero_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig index 0aeaeefd..1a9f53e8 100644 --- a/openpower/configs/openpower_mambo_defconfig +++ b/openpower/configs/openpower_mambo_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig index d82c8483..929be7f0 100644 --- a/openpower/configs/openpower_p9_mambo_defconfig +++ b/openpower/configs/openpower_p9_mambo_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig index 009a8f52..b97ce49b 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig index a5a0e85e..5837e395 100644 --- a/openpower/configs/palmetto_defconfig +++ b/openpower/configs/palmetto_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig index 4b7c9137..f652fb2e 100644 --- a/openpower/configs/pseries_defconfig +++ b/openpower/configs/pseries_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig" diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig index ab600ecf..40af4acf 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig index d4ff8c7e..62adbd0e 100644 --- a/openpower/configs/vesnin_defconfig +++ b/openpower/configs/vesnin_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig index db9e7788..e392b254 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/witherspoon_dev_defconfig b/openpower/configs/witherspoon_dev_defconfig index f62b8ff3..1ee32aae 100644 --- a/openpower/configs/witherspoon_dev_defconfig +++ b/openpower/configs/witherspoon_dev_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig index 05e501f9..ba484128 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_defconfig @@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig index 2d373288..21cd63c1 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.4" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig" diff --git a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch index a195d748..838a2393 100644 --- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch +++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Brian King <brking@linux.vnet.ibm.com> Date: Wed, 25 Oct 2017 10:42:59 +1100 -Subject: [PATCH 1/3] xhci: Reset controller on xhci shutdown +Subject: [PATCH 1/2] xhci: Reset controller on xhci shutdown Fixes kexec boot. Without a hard reset, some USB chips will fail to initialize in a kexec booted kernel. diff --git a/openpower/linux/0003-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch index 77391821..46d2a505 100644 --- a/openpower/linux/0003-Release-OpenPower-kernel.patch +++ b/openpower/linux/0002-Release-OpenPower-kernel.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joel Stanley <joel@jms.id.au> -Date: Mon, 4 Jun 2018 17:14:35 +0930 -Subject: [PATCH 3/3] Release OpenPower kernel +Date: Wed, 4 Jul 2018 14:07:48 +1000 +Subject: [PATCH 2/2] Release OpenPower kernel Signed-off-by: Joel Stanley <joel@jms.id.au> --- @@ -9,13 +9,13 @@ Signed-off-by: Joel Stanley <joel@jms.id.au> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 31dc3a08295a..0b03fdaf7349 100644 +index 1d740dbe676d..15430bc142eb 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 4 PATCHLEVEL = 17 - SUBLEVEL = 3 + SUBLEVEL = 4 -EXTRAVERSION = +EXTRAVERSION = -openpower1 NAME = Merciless Moray diff --git a/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch b/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch deleted file mode 100644 index 76436dae..00000000 --- a/openpower/linux/0002-powerpc-perf-Fix-memory-allocation-for-core-imc-base.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Anju T Sudhakar <anju@linux.vnet.ibm.com> -Date: Fri, 11 May 2018 19:13:42 +0530 -Subject: [PATCH 2/3] powerpc/perf: Fix memory allocation for core-imc based on - num_possible_cpus() - -Currently memory is allocated for core-imc based on cpu_present_mask, which has -bit 'cpu' set iff cpu is populated. We use (cpu number / threads per core) -as as array index to access the memory. -So in a system with guarded cores, since allocation happens based on -cpu_present_mask, (cpu number / threads per core) bounds the index and leads -to memory overflow. - -The issue is exposed in a guard test. -The guard test will make some CPU's as un-available to the system during boot -time as well as at runtime. So when the cpu is unavailable to the system during -boot time, the memory allocation happens depending on the number of available -cpus. And when we access the memory using (cpu number / threads per core) as the -index the system crashes due to memory overflow. - -Allocating memory for core-imc based on cpu_possible_mask, which has -bit 'cpu' set iff cpu is populatable, will fix this issue. - -Reported-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com> -Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com> -Reviewed-by: Balbir Singh <bsingharora@gmail.com> -Message-Id: <1526046222-17842-1-git-send-email-anju@linux.vnet.ibm.com> -Signed-off-by: Joel Stanley <joel@jms.id.au> ---- - arch/powerpc/perf/imc-pmu.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c -index d7532e7b9ab5..75fb23c24ee8 100644 ---- a/arch/powerpc/perf/imc-pmu.c -+++ b/arch/powerpc/perf/imc-pmu.c -@@ -1146,7 +1146,7 @@ static int init_nest_pmu_ref(void) - - static void cleanup_all_core_imc_memory(void) - { -- int i, nr_cores = DIV_ROUND_UP(num_present_cpus(), threads_per_core); -+ int i, nr_cores = DIV_ROUND_UP(num_possible_cpus(), threads_per_core); - struct imc_mem_info *ptr = core_imc_pmu->mem_info; - int size = core_imc_pmu->counter_mem_size; - -@@ -1264,7 +1264,7 @@ static int imc_mem_init(struct imc_pmu *pmu_ptr, struct device_node *parent, - if (!pmu_ptr->pmu.name) - return -ENOMEM; - -- nr_cores = DIV_ROUND_UP(num_present_cpus(), threads_per_core); -+ nr_cores = DIV_ROUND_UP(num_possible_cpus(), threads_per_core); - pmu_ptr->mem_info = kcalloc(nr_cores, sizeof(struct imc_mem_info), - GFP_KERNEL); - |
