aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-01-17 11:32:21 +0100
committerAlexander Graf <agraf@suse.de>2013-01-18 19:06:57 +0100
commite49798b1bd7657722080126bfd5e787efdb3bc23 (patch)
treeceab0b09a3aee7312aa6f43c28839d7e3feb68ca
parentd3dccee187ffeacec1a38ed288c112ffa0e3b513 (diff)
downloadqemu-arm-e49798b1bd7657722080126bfd5e787efdb3bc23.tar.gz
openpic: export e500 epr enable into a ppc.c function
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 <agraf@suse.de>
-rw-r--r--hw/openpic.c11
-rw-r--r--hw/ppc.c11
-rw-r--r--hw/ppc.h2
3 files changed, 18 insertions, 6 deletions
diff --git a/hw/openpic.c b/hw/openpic.c
index bcafe0a12c..cc8ec35b5d 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 e473f9e962..1fce604c73 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 e73ae83b52..ee0cd16ee5 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,