From 6f147b07f725e34b0819d8c49659b094f6e4d6e3 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 4 Mar 2021 22:54:21 -0500 Subject: linux-yocto/5.10: fix x86 32bit boot warnings Integrating the following commit(s) to linux-yocto/5.10: 34523d7c8476 qemux86: add configuration symbol to select values In recent 5.10 kernels, the following traces have started appearing on boot; [ 1.010513] EIP: free_msi_irqs+0x49/0x180 [ 1.012036] Code: 74 11 8b 47 08 85 c0 0f 85 f4 00 00 00 8b 3f 39 df 75 ef 8b 45 ec 8b 80 c8 01 00 00 85 c0 74 0a f6 40 14 01 0f 85 1c 01 00 00 <0f> 0b 8b 45 ec 8b b8 d0 01 00 00 8b 17 39 fb 75 08 eb 40 8d 74 26 [ 1.016723] EAX: 00000000 EBX: c12199d0 ECX: c12199d0 EDX: 00000000 [ 1.021648] ESI: ffffffed EDI: c12199d0 EBP: c112bc78 ESP: c112bc64 [ 1.023517] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010246 [ 1.025449] CR0: 80050033 CR2: 00000000 CR3: 06cea000 CR4: 000006d0 [ 1.027293] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 1.029115] DR6: fffe0ff0 DR7: 00000400 [ 1.030718] Call Trace: [ 1.031986] msix_capability_init+0x228/0x400 [ 1.033542] pci_alloc_irq_vectors_affinity+0x18c/0x210 [ 1.035216] vp_find_vqs_msix+0xca/0x460 [ 1.036693] vp_find_vqs+0x29/0x190 [ 1.038097] ? setup_vq+0x240/0x240 [ 1.039519] vp_modern_find_vqs+0x21/0x80 [ 1.041014] ? setup_vq+0x240/0x240 [ 1.042444] init_vq+0x164/0x280 [ 1.043813] ? ncpus_cmp_func+0x10/0x10 [ 1.045264] virtblk_probe+0x104/0x770 [ 1.046860] virtio_dev_probe+0x1c0/0x2a0 [ 1.048357] really_probe+0xd5/0x3b0 [ 1.053029] driver_probe_device+0x49/0xa0 [ 1.054539] device_driver_attach+0x99/0xa0 [ 1.056077] __driver_attach+0x60/0xe0 [ 1.057533] ? device_driver_attach+0xa0/0xa0 [ 1.059136] bus_for_each_dev+0x5b/0xa0 [ 1.060600] driver_attach+0x19/0x20 [ 1.062033] ? device_driver_attach+0xa0/0xa0 [ 1.063903] bus_add_driver+0xed/0x1b0 [ 1.065358] driver_register+0x79/0xd0 [ 1.066791] ? loop_init+0x135/0x135 [ 1.068209] register_virtio_driver+0x1b/0x30 [ 1.069742] init+0x49/0x6f [ 1.071040] do_one_initcall+0x49/0x1e0 [ 1.072514] kernel_init_freeable+0x16b/0x1b5 [ 1.074060] ? rest_init+0xad/0xad [ 1.075477] kernel_init+0xd/0xf3 [ 1.076844] ret_from_fork+0x1c/0x28 [ 1.078267] ---[ end trace 4deef4a5c447cb13 ]--- These are due to several changes in the way that MSI interrupts are assigned and their fallbacks if they fail. Our 32bit qemu boot for x86 does not have the right support by default, hence we get the warnings (but boot continues). If we define PCI_MSI_ARCH_FALLBACKS only for the qemux86 platform we can supress the warnings and run without issues. [YOCTO: #14219] (From OE-Core rev: d9fd035d086e8980683ced8cda4722850b2db24f) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 54996a8aee..db17ffa5c4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "142456428adbf16db56572889232220afb201974" -SRCREV_meta ?= "8f72218572b1d4a5f053ced2bbf0558d0557072d" +SRCREV_machine ?= "8dffd4d97d49439dae98e38b915729bca285f0cc" +SRCREV_meta ?= "72ecf520873bd0e1a1d52db0a36d74ad88fd9824" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 8ecd10716a..1bdacd86c4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "be720c1ce6d1cba2bb3815ad04773355339380ab" -SRCREV_machine ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_meta ?= "8f72218572b1d4a5f053ced2bbf0558d0557072d" +SRCREV_machine_qemuarm ?= "55ff861a7f7be737c26b6c61f9cd170580dd3ccd" +SRCREV_machine ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_meta ?= "72ecf520873bd0e1a1d52db0a36d74ad88fd9824" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 38b56c17bf..c8ec0ae6b0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "57a6fbd33df5c7f057f301387b03a70cdc582282" -SRCREV_machine_qemuarm64 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_machine_qemumips ?= "79bd439bff3c9f95cac6fb81c76b559a404a32dc" -SRCREV_machine_qemuppc ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_machine_qemuriscv64 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_machine_qemux86 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_machine_qemux86-64 ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_machine_qemumips64 ?= "07bda345fe202b1d2ce233ffc20b7570f78c9c7f" -SRCREV_machine ?= "98eda36c9616b598b3586c7cc532e8e0ba8b3953" -SRCREV_meta ?= "8f72218572b1d4a5f053ced2bbf0558d0557072d" +SRCREV_machine_qemuarm ?= "b6e61f33c5ac14fde7fc4fd479fb6dba7c04797b" +SRCREV_machine_qemuarm64 ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_machine_qemumips ?= "4adb195168d3830786d82f29ccbb78664fd20cf9" +SRCREV_machine_qemuppc ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_machine_qemuriscv64 ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_machine_qemux86 ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_machine_qemux86-64 ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_machine_qemumips64 ?= "36e98aa424aa3ceff3d446ee2cb3f44ddcae8c31" +SRCREV_machine ?= "34523d7c8476942eb062d4f0201f9410605afc6d" +SRCREV_meta ?= "72ecf520873bd0e1a1d52db0a36d74ad88fd9824" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit v1.2.3-54-g00ecf