diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-12 11:06:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-12 11:06:48 +0100 |
| commit | a2a9d4adabe340617a24eb73a8b2a116d28a6b38 (patch) | |
| tree | 85ea9fd4b3fd39cbe1fe30282378289b235a59d0 | |
| parent | 9411db8f37c64b9adb3e4b393c623a5760bcb847 (diff) | |
| parent | 38298611d5a87d2739d0a21d5f9e47ba43570c22 (diff) | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190712' into staging
ppc patch queue for 2019-07-12
First 4.1 hard freeze pull request. Not much here, just a bug fix for
the XICS interrupt controller and a SLOF firmware update to fix a bug
with IP discovery when there are multiple NICs.
# gpg: Signature made Fri 12 Jul 2019 06:51:24 BST
# gpg: using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-4.1-20190712:
xics/kvm: Always set the MASKED bit if interrupt is masked
pseries: Update SLOF firmware image
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/intc/xics_kvm.c | 3 | ||||
| -rw-r--r-- | pc-bios/README | 2 | ||||
| -rw-r--r-- | pc-bios/slof.bin | bin | 926392 -> 926432 bytes | |||
| m--------- | roms/SLOF | 0 |
4 files changed, 4 insertions, 1 deletions
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; } 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 Binary files differindex 65db1a6e57..2def514717 100644 --- a/pc-bios/slof.bin +++ b/pc-bios/slof.bin diff --git a/roms/SLOF b/roms/SLOF -Subproject a5b428e1c1eae703bdd62a3f527223c291ee3fd +Subproject ba1ab360eebe6338bb8d7d83a9220ccf7e213af |