[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 8/9] openpic: export e500 epr enable into a ppc.c func
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 8/9] openpic: export e500 epr enable into a ppc.c function |
Date: |
Fri, 18 Jan 2013 19:13:40 +0100 |
Enabling and disabling the EPR capability (mpic_proxy) is a system
wide operation. As such, it belongs into the ppc.c file, since that's
where PPC specific machine wide logic happens.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/openpic.c | 11 +++++------
hw/ppc.c | 11 +++++++++++
hw/ppc.h | 2 ++
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index bcafe0a..cc8ec35 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -40,6 +40,7 @@
#include "sysbus.h"
#include "pci/msi.h"
#include "qemu/bitops.h"
+#include "ppc.h"
//#define DEBUG_OPENPIC
@@ -646,8 +647,7 @@ 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;
+ bool mpic_proxy = false;
if (val & GCR_RESET) {
openpic_reset(&opp->busdev.qdev);
@@ -659,11 +659,10 @@ static void openpic_gcr_write(OpenPICState *opp, uint64_t
val)
/* 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;
+ mpic_proxy = true;
}
+
+ ppce500_set_mpic_proxy(mpic_proxy);
}
static void openpic_gbl_write(void *opaque, hwaddr addr, uint64_t val,
diff --git a/hw/ppc.c b/hw/ppc.c
index e473f9e..1fce604 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -428,6 +428,17 @@ void ppce500_irq_init(CPUPPCState *env)
env->irq_inputs = (void **)qemu_allocate_irqs(&ppce500_set_irq,
cpu, PPCE500_INPUT_NB);
}
+
+/* Enable or Disable the E500 EPR capability */
+void ppce500_set_mpic_proxy(bool enabled)
+{
+ CPUPPCState *env;
+
+ for (env = first_cpu; env != NULL; env = env->next_cpu) {
+ env->mpic_proxy = enabled;
+ }
+}
+
/*****************************************************************************/
/* PowerPC time base and decrementer emulation */
diff --git a/hw/ppc.h b/hw/ppc.h
index e73ae83..ee0cd16 100644
--- a/hw/ppc.h
+++ b/hw/ppc.h
@@ -73,6 +73,8 @@ void ppc6xx_irq_init (CPUPPCState *env);
void ppc970_irq_init (CPUPPCState *env);
void ppcPOWER7_irq_init (CPUPPCState *env);
+void ppce500_set_mpic_proxy(bool enabled);
+
/* PPC machines for OpenBIOS */
enum {
ARCH_PREP = 0,
--
1.6.0.2
- [Qemu-ppc] [PULL 0/9] ppc patch queue 2013-01-18, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 2/9] openpic: unify gcr mode mask updates, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 5/9] PPC: Provide zero SVR for -cpu e500mc and e5500, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 1/9] openpic: move gcr write into a function, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 8/9] openpic: export e500 epr enable into a ppc.c function,
Alexander Graf <=
- [Qemu-ppc] [PATCH 7/9] Update Linux kernel headers, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 6/9] PPC: e500: Change in-memory order of load blobs, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 4/9] PPC: E500: Calculate loading blob offsets properly, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 3/9] openpic: set mixed mode as supported, Alexander Graf, 2013/01/18
- [Qemu-ppc] [PATCH 9/9] PPC: KVM: Add support for EPR with KVM, Alexander Graf, 2013/01/18
- Re: [Qemu-ppc] [PULL 0/9] ppc patch queue 2013-01-18, Blue Swirl, 2013/01/19