linux-yocto/6.1: fix intermittent x86 boot hangs

The commit in question appeared as -stable backport in 6.1.28, which is
where we started to see intermittent boot hangs on x86.

Richard noted that others are seeing this is well, as can be seen in
this thread:

    https://lkml.org/lkml/2023/6/13/1460

We bump our SRCREVs to pick up the revert:

    947f660bde07 Revert "tick/common: Align tick period with the HZ tick."

(From OE-Core rev: 10e7c5c2aadbc14b9ec56322595826707bb92316)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 73b7f36e51de39ed19dfd3cd253be1876db60ca4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Bruce Ashfield
2023-06-14 23:16:08 -04:00
committed by Steve Sakoman
parent a3edcf3d7e
commit 9a64c95df7
3 changed files with 16 additions and 16 deletions

View File

@@ -14,8 +14,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
SRCREV_machine ?= "6871194107bd40397162bfca0a9ef06661057c50"
SRCREV_meta ?= "1dd270d3231f82d94d2123b95e4eb576019440a3"
SRCREV_machine ?= "2993cbe41f0f859331c81d6ec8001b094f53cb9e"
SRCREV_meta ?= "db25e51e2006721528f5e7bcd8f4501592bd74fe"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"

View File

@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_meta ?= "1dd270d3231f82d94d2123b95e4eb576019440a3"
SRCREV_machine ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_meta ?= "db25e51e2006721528f5e7bcd8f4501592bd74fe"
PV = "${LINUX_VERSION}+git${SRCPV}"

View File

@@ -17,18 +17,18 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
SRCREV_machine:qemuarm ?= "cff918ff5ee0001dec6493620535d8804f02cd8b"
SRCREV_machine:qemuarm64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemuloongarch64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemumips ?= "7a59adc4cd39bea852101be2873855cfc835ef45"
SRCREV_machine:qemuppc ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemuriscv64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemuriscv32 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemux86 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemux86-64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_machine:qemumips64 ?= "273e099163a72247262a495cb73889d2e0ed6d2c"
SRCREV_machine ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16"
SRCREV_meta ?= "1dd270d3231f82d94d2123b95e4eb576019440a3"
SRCREV_machine:qemuarm ?= "93797f49c15b6ce9656a607626437e76a3b6c6da"
SRCREV_machine:qemuarm64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemuloongarch64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemumips ?= "1279631d08d52a5b20044404da4b01205ba4b725"
SRCREV_machine:qemuppc ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemuriscv64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemuriscv32 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemux86 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemux86-64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_machine:qemumips64 ?= "3b25f845f704021fbe223ef48ab22ff5fa3886b9"
SRCREV_machine ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
SRCREV_meta ?= "db25e51e2006721528f5e7bcd8f4501592bd74fe"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same