From 4493d430d0334155d0d8192c4561783ae8fdfdc7 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Wed, 3 Jul 2019 12:30:10 +1000 Subject: [PATCH 1/2] pseries: Update SLOF firmware image This only has a fix for ipv4-after-ipv6 booting problem. Signed-off-by: Alexey Kardashevskiy Signed-off-by: David Gibson --- pc-bios/README | 2 +- pc-bios/slof.bin | Bin 926392 -> 926432 bytes roms/SLOF | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pc-bios/README b/pc-bios/README index 180795a55b..0a17f3ec6d 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -17,7 +17,7 @@ - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware implementation for certain IBM POWER hardware. The sources are at https://github.com/aik/SLOF, and the image currently in qemu is - built from git tag qemu-slof-20190114. + built from git tag qemu-slof-20190703. - sgabios (the Serial Graphics Adapter option ROM) provides a means for legacy x86 software to communicate with an attached serial console as diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin index 65db1a6e579839cfd05da7f71c246fa0251c2fc0..2def51471772b6091bc5dc19b3bb136dddd201b2 100644 GIT binary patch delta 9795 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 diff --git a/roms/SLOF b/roms/SLOF index a5b428e1c1..ba1ab360ee 160000 --- a/roms/SLOF +++ b/roms/SLOF @@ -1 +1 @@ -Subproject commit a5b428e1c1eae703bdd62a3f527223c291ee3fdc +Subproject commit ba1ab360eebe6338bb8d7d83a9220ccf7e213af3 From 38298611d5a87d2739d0a21d5f9e47ba43570c22 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Wed, 3 Jul 2019 19:22:20 +0200 Subject: [PATCH 2/2] xics/kvm: Always set the MASKED bit if interrupt is masked The ics_set_kvm_state_one() function is called either to restore the state of an interrupt source during migration or to set the interrupt source to a default state during reset. Since always, ie. 2013, the code only sets the MASKED bit if the 'current priority' and the 'saved priority' are different. This is likely true when restoring an interrupt that had been previously masked with the ibm,int-off RTAS call. However this is always false in the case of reset since both 'current priority' and 'saved priority' are equal to 0xff, and the MASKED bit is never set. The legacy KVM XICS device gets away with that because it ends updating its internal structure the same way, whether the MASKED bit is set or the priority is 0xff. The XICS-on-XIVE device for POWER9 is different. It sticks to the KVM documentation [1] and _really_ relies on the MASKED bit to correctly set. If not, it will configure the interrupt source in the XIVE HW, even though the guest hasn't configured the interrupt yet. This disturbs the complex logic implemented in XICS-on-XIVE and may result in the loss of subsequent queued events. Always set the MASKED bit if interrupt is masked as expected by the KVM XICS-on-XIVE device. This has no impact on the legacy KVM XICS. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/virtual/kvm/devices/xics.txt Signed-off-by: Greg Kurz Message-Id: <156217454083.559957.7359208229523652842.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/intc/xics_kvm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 51433b19b0..2df1f3e92c 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -257,6 +257,9 @@ int ics_set_kvm_state_one(ICSState *ics, int srcno, Error **errp) << KVM_XICS_PRIORITY_SHIFT; if (irq->priority != irq->saved_priority) { assert(irq->priority == 0xff); + } + + if (irq->priority == 0xff) { state |= KVM_XICS_MASKED; }