diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig index 07cf43092e..a410b8ba8b 100644 --- a/openpower/configs/blackbird_defconfig +++ b/openpower/configs/blackbird_defconfig @@ -16,7 +16,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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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/mihawk_defconfig b/openpower/configs/mihawk_defconfig index 8c013006bf..7af528e26e 100644 --- a/openpower/configs/mihawk_defconfig +++ b/openpower/configs/mihawk_defconfig @@ -16,7 +16,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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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/mowgli_defconfig b/openpower/configs/mowgli_defconfig index 111ae44d5a..f8fc574d07 100644 --- a/openpower/configs/mowgli_defconfig +++ b/openpower/configs/mowgli_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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/nicole_defconfig b/openpower/configs/nicole_defconfig index a9fdc54034..d3b76f4b4c 100644 --- a/openpower/configs/nicole_defconfig +++ b/openpower/configs/nicole_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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/opal_defconfig b/openpower/configs/opal_defconfig index 7871c7d4c1..7ef2e7bf11 100644 --- a/openpower/configs/opal_defconfig +++ b/openpower/configs/opal_defconfig @@ -12,7 +12,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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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 e7911f7665..7d4dc5b93b 100644 --- a/openpower/configs/p9dsu_defconfig +++ b/openpower/configs/p9dsu_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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/romulus_defconfig b/openpower/configs/romulus_defconfig index 2a911cd3f1..53ee648af2 100644 --- a/openpower/configs/romulus_defconfig +++ b/openpower/configs/romulus_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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/swift_defconfig b/openpower/configs/swift_defconfig index 6cf1ca4ad0..b472a0c398 100644 --- a/openpower/configs/swift_defconfig +++ b/openpower/configs/swift_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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 bfa8548f40..185ba1be5f 100644 --- a/openpower/configs/witherspoon_defconfig +++ b/openpower/configs/witherspoon_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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 995654f89e..5255c887ba 100644 --- a/openpower/configs/zaius_defconfig +++ b/openpower/configs/zaius_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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 0b6e3cb838..5290afc56c 100644 --- a/openpower/configs/zz_defconfig +++ b/openpower/configs/zz_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="5.10.108" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.174" 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 9380398193..24f3862ec2 100644 --- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch +++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch @@ -14,10 +14,10 @@ Signed-off-by: Joel Stanley 1 file changed, 3 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index a8d97e23f601..308ab396bd88 100644 +index 473b0b64dd57..ca0c642ce935 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -793,6 +793,9 @@ void xhci_shutdown(struct usb_hcd *hcd) +@@ -812,6 +812,9 @@ void xhci_shutdown(struct usb_hcd *hcd) xhci_dbg_trace(xhci, trace_xhci_dbg_init, "xhci_shutdown completed - status = %x", readl(&xhci->op_regs->status)); diff --git a/openpower/linux/0002-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch index d780e5980b..a592243a8d 100644 --- a/openpower/linux/0002-Release-OpenPower-kernel.patch +++ b/openpower/linux/0002-Release-OpenPower-kernel.patch @@ -9,13 +9,13 @@ Signed-off-by: Joel Stanley 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 695f8e739a91..f2280292b96e 100644 +index 92accf2ddc08..18dcc81a67e4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 5 PATCHLEVEL = 10 - SUBLEVEL = 108 + SUBLEVEL = 174 -EXTRAVERSION = +EXTRAVERSION = -openpower1 NAME = Dare mighty things