[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] openpic: unify gcr mode mask updates
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 2/9] openpic: unify gcr mode mask updates |
Date: |
Fri, 18 Jan 2013 19:13:34 +0100 |
The mode mask already masks out bits we don't care about, so the
actual handling code can stay intact regardless.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/openpic.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index 085c954..c986b5d 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -646,22 +646,23 @@ static inline void write_IRQreg_ivpr(OpenPICState *opp,
int n_IRQ, uint32_t val)
static void openpic_gcr_write(OpenPICState *opp, uint64_t val)
{
+ CPUArchState *env;
+ int mpic_proxy = 0;
+
if (val & GCR_RESET) {
openpic_reset(&opp->busdev.qdev);
- } else if (opp->mpic_mode_mask) {
- CPUArchState *env;
- int mpic_proxy = 0;
+ return;
+ }
- opp->gcr &= ~opp->mpic_mode_mask;
- opp->gcr |= val & opp->mpic_mode_mask;
+ opp->gcr &= ~opp->mpic_mode_mask;
+ opp->gcr |= val & opp->mpic_mode_mask;
- /* Set external proxy mode */
- if ((val & opp->mpic_mode_mask) == GCR_MODE_PROXY) {
- mpic_proxy = 1;
- }
- for (env = first_cpu; env != NULL; env = env->next_cpu) {
- env->mpic_proxy = mpic_proxy;
- }
+ /* Set external proxy mode */
+ if ((val & opp->mpic_mode_mask) == GCR_MODE_PROXY) {
+ mpic_proxy = 1;
+ }
+ for (env = first_cpu; env != NULL; env = env->next_cpu) {
+ env->mpic_proxy = mpic_proxy;
}
}
--
1.6.0.2
- [Qemu-devel] [PULL 0/9] ppc patch queue 2013-01-18, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 1/9] openpic: move gcr write into a function, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 2/9] openpic: unify gcr mode mask updates,
Alexander Graf <=
- [Qemu-devel] [PATCH 6/9] PPC: e500: Change in-memory order of load blobs, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 5/9] PPC: Provide zero SVR for -cpu e500mc and e5500, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 8/9] openpic: export e500 epr enable into a ppc.c function, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 7/9] Update Linux kernel headers, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 3/9] openpic: set mixed mode as supported, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 9/9] PPC: KVM: Add support for EPR with KVM, Alexander Graf, 2013/01/18
- [Qemu-devel] [PATCH 4/9] PPC: E500: Calculate loading blob offsets properly, Alexander Graf, 2013/01/18
- Re: [Qemu-devel] [PULL 0/9] ppc patch queue 2013-01-18, Blue Swirl, 2013/01/19