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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 OpC7wS^Q(S%?tcM>id`81 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; }