[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/13] hw/intc/ppc-uic: Make default dcr-base 0xc0, not 0x30
From: |
David Gibson |
Subject: |
[PULL 03/13] hw/intc/ppc-uic: Make default dcr-base 0xc0, not 0x30 |
Date: |
Tue, 19 Jan 2021 17:23:08 +1100 |
From: Peter Maydell <peter.maydell@linaro.org>
In commit 34d0831f38fd8 the ppc-uic device was added, with a dcr-base
property. The intention was that the default value of dcr-base should be
the one that most of our boards need, so that in the common case they
don't need to specify a property value.
All QEMU boards with a UIC use a dcr-base of 0xc0, with the exception of
sam460ex which has four UICs and so puts them at 0xc0, 0xd0, 0xe0, 0xf0.
So 0xc0 is the obvious right choice for the default dcr-base.
The board code conversions in commits 0270d74ef88623505 (bamboo) and
c5ac9dc64fa552a6 (virtex_ml507) assumed that default was 0xc0. Unfortunately
the actual default in 34d0831f38fd8 was 0x30, by mistake, so the
bamboo and virtex_ml507 boards were broken as they were converted
away from ppcuic_init() (which always specifies the dcr_base property
value explicitly).
Set the default dcr-base to 0xc0 as was intended, fixing bamboo and
virtex_ml507.
Fixes: 34d0831f38fd8
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Suggested-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210111213007.7381-1-peter.maydell@linaro.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/intc/ppc-uic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
index b21951eea8..7171de7b35 100644
--- a/hw/intc/ppc-uic.c
+++ b/hw/intc/ppc-uic.c
@@ -274,7 +274,7 @@ static void ppc_uic_realize(DeviceState *dev, Error **errp)
static Property ppc_uic_properties[] = {
DEFINE_PROP_LINK("cpu", PPCUIC, cpu, TYPE_CPU, CPUState *),
- DEFINE_PROP_UINT32("dcr-base", PPCUIC, dcr_base, 0x30),
+ DEFINE_PROP_UINT32("dcr-base", PPCUIC, dcr_base, 0xc0),
DEFINE_PROP_BOOL("use-vectors", PPCUIC, use_vectors, true),
DEFINE_PROP_END_OF_LIST()
};
--
2.29.2
- [PULL 00/13] ppc-for-6.0 queue 20210119, David Gibson, 2021/01/19
- [PULL 03/13] hw/intc/ppc-uic: Make default dcr-base 0xc0, not 0x30,
David Gibson <=
- [PULL 02/13] hw/ppc: Delete unused ppc405cr_init() code, David Gibson, 2021/01/19
- [PULL 01/13] hw/ppc/sam460ex: Drop use of ppcuic_init(), David Gibson, 2021/01/19
- [PULL 04/13] hw/ppc/ppc405_uc: Drop use of ppcuic_init(), David Gibson, 2021/01/19
- [PULL 08/13] sam460ex: Use type cast macro instead of simple cast, David Gibson, 2021/01/19
- [PULL 12/13] spapr_rtas.c: fix identation of rtas_ibm_suspend_me() args, David Gibson, 2021/01/19
- [PULL 10/13] spapr.h: fix trailing whitespace in phb_placement, David Gibson, 2021/01/19
- [PULL 05/13] hw/ppc: Remove unused ppcuic_init(), David Gibson, 2021/01/19
- [PULL 06/13] Revert "sam460ex: Remove FDT_PPC dependency from KConfig", David Gibson, 2021/01/19
- [PULL 13/13] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu(), David Gibson, 2021/01/19
- [PULL 07/13] Revert "ppc4xx: Move common dependency on serial to common option", David Gibson, 2021/01/19