[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 26/40] openpic: make brr1 model specific
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 26/40] openpic: make brr1 model specific |
Date: |
Fri, 14 Dec 2012 13:13:42 +0100 |
Now that we can properly distinguish between openpic model differences,
let's move brr1 out of the raven code path.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/openpic.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index 591b291..5bf16ea 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -206,6 +206,7 @@ typedef struct OpenPICState {
uint32_t tifr_reset;
uint32_t ipvp_reset;
uint32_t ide_reset;
+ uint32_t brr1;
/* Sub-regions */
MemoryRegion sub_io_mem[7];
@@ -784,7 +785,7 @@ static uint32_t openpic_cpu_read_internal(void *opaque,
hwaddr addr,
addr &= 0xFF0;
switch (addr) {
case 0x00: /* Block Revision Register1 (BRR1) */
- retval = FSL_BRR1_IPID | FSL_BRR1_IPMJ | FSL_BRR1_IPMN;
+ retval = opp->brr1;
break;
case 0x80: /* PCTP */
retval = dst->pctp;
@@ -1082,6 +1083,7 @@ static int openpic_init(SysBusDevice *dev)
opp->max_irq = FSL_MPIC_20_MAX_IRQ;
opp->irq_ipi0 = FSL_MPIC_20_IPI_IRQ;
opp->irq_tim0 = FSL_MPIC_20_TMR_IRQ;
+ opp->brr1 = FSL_BRR1_IPID | FSL_BRR1_IPMJ | FSL_BRR1_IPMN;
list = list_be;
break;
case OPENPIC_MODEL_RAVEN:
@@ -1095,6 +1097,7 @@ static int openpic_init(SysBusDevice *dev)
opp->max_irq = RAVEN_MAX_IRQ;
opp->irq_ipi0 = RAVEN_IPI_IRQ;
opp->irq_tim0 = RAVEN_TMR_IRQ;
+ opp->brr1 = -1;
list = list_le;
/* Only UP supported today */
--
1.6.0.2
- [Qemu-ppc] [PULL 00/40] ppc patch queue 2012-12-14, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 18/40] openpic: merge mpic and openpic timer handling, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 11/40] pseries: Don't allow TCE (iommu) tables to be registered with duplicate LIOBNs, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 19/40] openpic: combine openpic and mpic reset functions, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 21/40] openpic: remove unused type variable, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 22/40] openpic: convert simple reg operations to builtin bitops, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 14/40] openpic: update to proper memory api, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 04/40] pseries: Allow RTAS tokens without a qemu handler, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 26/40] openpic: make brr1 model specific,
Alexander Graf <=
- [Qemu-ppc] [PATCH 40/40] pseries: Increase default NVRAM size, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 23/40] openpic: rename openpic_t to OpenPICState, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 35/40] PPC: E500: Generate dt pci irq map dynamically, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 08/40] pseries: Update SLOF for NVRAM support, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 27/40] openpic: add Shared MSI support, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 34/40] PPC: E500: PCI: Make IRQ calculation more generic, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 38/40] PPC: e500: pci: Export slot2irq calculation, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 28/40] PPC: e500: Add MSI support, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 20/40] openpic: unify memory api subregions, Alexander Graf, 2012/12/14
- [Qemu-ppc] [PATCH 36/40] PPC: E500: Move PCI slot information into params, Alexander Graf, 2012/12/14