summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-06-28 13:56:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-01 13:56:03 +0100
commit45aeae0075ead6f6509048857c4de213a7a302a8 (patch)
treeec31394bf1bd255afe97f1110294a067c1e9cef8
parent506f4275363b9cdb15a10a6c9d94b4dd5d912c92 (diff)
downloadpoky-45aeae0075ead6f6509048857c4de213a7a302a8.tar.gz
linux-yocto/6.6: fix AMD boot trace
Integrating the following commit(s) to linux-yocto/6.6: 1/1 [ Author: Bruce Ashfield Email: bruce.ashfield@gmail.com Subject: cpu/amd: inhibit SMP check for qemux86 Date: Fri, 28 Jun 2024 12:55:18 -0400 When booting with kvm enabled on a AMD host, the following trace is thrown: [ 0.084519] ------------[ cut here ]------------ [ 0.084519] WARNING: This combination of AMD processors is not suitable for SMP. [ 0.084519] WARNING: CPU: 1 PID: 0 at /arch/x86/kernel/cpu/amd.c:341 init_amd+0xaee/0xbcc [ 0.084519] Modules linked in: [ 0.084519] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 6.6.32-yocto-standard #1 [ 0.084519] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 This warning is not valid in our configuration and is unnecesarily causing issue with debug. This has been know for some time (10+ years), but no acceptable solutioon has been found upstream: https://lists.gnu.org/archive/html/qemu-devel/2010-03/msg01428.html https://lkml.org/lkml/2010/3/30/397 We have a configuration CONFIG_QEMUX86 that has been added for situations like this. When that value is defined, we inhibit the warning, but leave it as-is for other BSPs. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: f0c03000abb7665352cf107a600da15a112af5fa) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.6.bb24
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index 3900690c74..dc1413ca94 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,8 +14,8 @@ python () {
14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
15} 15}
16 16
17SRCREV_machine ?= "1d96726faac7f57c1bb3466edc283d929fc183b6" 17SRCREV_machine ?= "4209a548f26ad97f610f6c7acfee7fabe009dd3d"
18SRCREV_meta ?= "fe550a76832d3c144e7af34ab78d5da0dcf092ce" 18SRCREV_meta ?= "da275b53b13faafa834352e3f9dd3f91a2c03bb8"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index 0a9b96753c..f02a9c186a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 20SRCREV_machine ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
21SRCREV_meta ?= "fe550a76832d3c144e7af34ab78d5da0dcf092ce" 21SRCREV_meta ?= "da275b53b13faafa834352e3f9dd3f91a2c03bb8"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index 8f1107d1ee..62c0f0ab36 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,18 +18,18 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base"
18KBRANCH:qemuloongarch64 ?= "v6.6/standard/base" 18KBRANCH:qemuloongarch64 ?= "v6.6/standard/base"
19KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64" 19KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
20 20
21SRCREV_machine:qemuarm ?= "7e5d1df22352c96c1d63d81d59457ff30e82e2d9" 21SRCREV_machine:qemuarm ?= "7558103b801174f277373aa9d7d7eedf3a30d5f8"
22SRCREV_machine:qemuarm64 ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 22SRCREV_machine:qemuarm64 ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
23SRCREV_machine:qemuloongarch64 ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 23SRCREV_machine:qemuloongarch64 ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
24SRCREV_machine:qemumips ?= "f26493dbcd22b4d89beed4eabdc52d124d59658a" 24SRCREV_machine:qemumips ?= "cd21dc96adcb1d60ad6cc57446464abf4dd338fc"
25SRCREV_machine:qemuppc ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 25SRCREV_machine:qemuppc ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
26SRCREV_machine:qemuriscv64 ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 26SRCREV_machine:qemuriscv64 ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
27SRCREV_machine:qemuriscv32 ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 27SRCREV_machine:qemuriscv32 ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
28SRCREV_machine:qemux86 ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 28SRCREV_machine:qemux86 ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
29SRCREV_machine:qemux86-64 ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 29SRCREV_machine:qemux86-64 ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
30SRCREV_machine:qemumips64 ?= "1ef0c6554b95984a5fc9e7cd3bb27ab617204149" 30SRCREV_machine:qemumips64 ?= "6700dad2e55f71fea268db201a394b371ffdd78c"
31SRCREV_machine ?= "4c1fbbd1c2b7c31e1755cfa83199cdfcb9707832" 31SRCREV_machine ?= "f71bb11887bae80ab718b3f38f1c1e80c07676a3"
32SRCREV_meta ?= "fe550a76832d3c144e7af34ab78d5da0dcf092ce" 32SRCREV_meta ?= "da275b53b13faafa834352e3f9dd3f91a2c03bb8"
33 33
34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
35# get the <version>/base branch, which is pure upstream -stable, and the same 35# get the <version>/base branch, which is pure upstream -stable, and the same