mirror of https://github.com/xemu-project/xemu.git
a9mpcore: Embed ARMMPTimerState
Prepares for QOM realize. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
This commit is contained in:
parent
0aadb4909c
commit
eb110bd843
|
@ -11,6 +11,7 @@
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "hw/intc/arm_gic.h"
|
#include "hw/intc/arm_gic.h"
|
||||||
#include "hw/misc/a9scu.h"
|
#include "hw/misc/a9scu.h"
|
||||||
|
#include "hw/timer/arm_mptimer.h"
|
||||||
|
|
||||||
#define TYPE_A9MPCORE_PRIV "a9mpcore_priv"
|
#define TYPE_A9MPCORE_PRIV "a9mpcore_priv"
|
||||||
#define A9MPCORE_PRIV(obj) \
|
#define A9MPCORE_PRIV(obj) \
|
||||||
|
@ -23,12 +24,12 @@ typedef struct A9MPPrivState {
|
||||||
|
|
||||||
uint32_t num_cpu;
|
uint32_t num_cpu;
|
||||||
MemoryRegion container;
|
MemoryRegion container;
|
||||||
DeviceState *mptimer;
|
|
||||||
DeviceState *wdt;
|
|
||||||
uint32_t num_irq;
|
uint32_t num_irq;
|
||||||
|
|
||||||
GICState gic;
|
GICState gic;
|
||||||
A9SCUState scu;
|
A9SCUState scu;
|
||||||
|
ARMMPTimerState mptimer;
|
||||||
|
ARMMPTimerState wdt;
|
||||||
} A9MPPrivState;
|
} A9MPPrivState;
|
||||||
|
|
||||||
static void a9mp_priv_set_irq(void *opaque, int irq, int level)
|
static void a9mp_priv_set_irq(void *opaque, int irq, int level)
|
||||||
|
@ -50,12 +51,18 @@ static void a9mp_priv_initfn(Object *obj)
|
||||||
|
|
||||||
object_initialize(&s->scu, sizeof(s->scu), TYPE_A9_SCU);
|
object_initialize(&s->scu, sizeof(s->scu), TYPE_A9_SCU);
|
||||||
qdev_set_parent_bus(DEVICE(&s->scu), sysbus_get_default());
|
qdev_set_parent_bus(DEVICE(&s->scu), sysbus_get_default());
|
||||||
|
|
||||||
|
object_initialize(&s->mptimer, sizeof(s->mptimer), TYPE_ARM_MPTIMER);
|
||||||
|
qdev_set_parent_bus(DEVICE(&s->mptimer), sysbus_get_default());
|
||||||
|
|
||||||
|
object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ARM_MPTIMER);
|
||||||
|
qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
|
||||||
}
|
}
|
||||||
|
|
||||||
static int a9mp_priv_init(SysBusDevice *dev)
|
static int a9mp_priv_init(SysBusDevice *dev)
|
||||||
{
|
{
|
||||||
A9MPPrivState *s = A9MPCORE_PRIV(dev);
|
A9MPPrivState *s = A9MPCORE_PRIV(dev);
|
||||||
DeviceState *gicdev, *scudev;
|
DeviceState *gicdev, *scudev, *mptimerdev, *wdtdev;
|
||||||
SysBusDevice *timerbusdev, *wdtbusdev, *gicbusdev, *scubusdev;
|
SysBusDevice *timerbusdev, *wdtbusdev, *gicbusdev, *scubusdev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -76,15 +83,15 @@ static int a9mp_priv_init(SysBusDevice *dev)
|
||||||
qdev_init_nofail(scudev);
|
qdev_init_nofail(scudev);
|
||||||
scubusdev = SYS_BUS_DEVICE(&s->scu);
|
scubusdev = SYS_BUS_DEVICE(&s->scu);
|
||||||
|
|
||||||
s->mptimer = qdev_create(NULL, "arm_mptimer");
|
mptimerdev = DEVICE(&s->mptimer);
|
||||||
qdev_prop_set_uint32(s->mptimer, "num-cpu", s->num_cpu);
|
qdev_prop_set_uint32(mptimerdev, "num-cpu", s->num_cpu);
|
||||||
qdev_init_nofail(s->mptimer);
|
qdev_init_nofail(mptimerdev);
|
||||||
timerbusdev = SYS_BUS_DEVICE(s->mptimer);
|
timerbusdev = SYS_BUS_DEVICE(&s->mptimer);
|
||||||
|
|
||||||
s->wdt = qdev_create(NULL, "arm_mptimer");
|
wdtdev = DEVICE(&s->wdt);
|
||||||
qdev_prop_set_uint32(s->wdt, "num-cpu", s->num_cpu);
|
qdev_prop_set_uint32(wdtdev, "num-cpu", s->num_cpu);
|
||||||
qdev_init_nofail(s->wdt);
|
qdev_init_nofail(wdtdev);
|
||||||
wdtbusdev = SYS_BUS_DEVICE(s->wdt);
|
wdtbusdev = SYS_BUS_DEVICE(&s->wdt);
|
||||||
|
|
||||||
/* Memory map (addresses are offsets from PERIPHBASE):
|
/* Memory map (addresses are offsets from PERIPHBASE):
|
||||||
* 0x0000-0x00ff -- Snoop Control Unit
|
* 0x0000-0x00ff -- Snoop Control Unit
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "hw/sysbus.h"
|
#include "hw/timer/arm_mptimer.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "qom/cpu.h"
|
#include "qom/cpu.h"
|
||||||
|
|
||||||
|
@ -27,34 +27,6 @@
|
||||||
* which is used in both the ARM11MPCore and Cortex-A9MP.
|
* which is used in both the ARM11MPCore and Cortex-A9MP.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define MAX_CPUS 4
|
|
||||||
|
|
||||||
/* State of a single timer or watchdog block */
|
|
||||||
typedef struct {
|
|
||||||
uint32_t count;
|
|
||||||
uint32_t load;
|
|
||||||
uint32_t control;
|
|
||||||
uint32_t status;
|
|
||||||
int64_t tick;
|
|
||||||
QEMUTimer *timer;
|
|
||||||
qemu_irq irq;
|
|
||||||
MemoryRegion iomem;
|
|
||||||
} TimerBlock;
|
|
||||||
|
|
||||||
#define TYPE_ARM_MPTIMER "arm_mptimer"
|
|
||||||
#define ARM_MPTIMER(obj) \
|
|
||||||
OBJECT_CHECK(ARMMPTimerState, (obj), TYPE_ARM_MPTIMER)
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
/*< private >*/
|
|
||||||
SysBusDevice parent_obj;
|
|
||||||
/*< public >*/
|
|
||||||
|
|
||||||
uint32_t num_cpu;
|
|
||||||
TimerBlock timerblock[MAX_CPUS];
|
|
||||||
MemoryRegion iomem;
|
|
||||||
} ARMMPTimerState;
|
|
||||||
|
|
||||||
static inline int get_current_cpu(ARMMPTimerState *s)
|
static inline int get_current_cpu(ARMMPTimerState *s)
|
||||||
{
|
{
|
||||||
if (current_cpu->cpu_index >= s->num_cpu) {
|
if (current_cpu->cpu_index >= s->num_cpu) {
|
||||||
|
@ -240,8 +212,9 @@ static void arm_mptimer_realize(DeviceState *dev, Error **errp)
|
||||||
ARMMPTimerState *s = ARM_MPTIMER(dev);
|
ARMMPTimerState *s = ARM_MPTIMER(dev);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (s->num_cpu < 1 || s->num_cpu > MAX_CPUS) {
|
if (s->num_cpu < 1 || s->num_cpu > ARM_MPTIMER_MAX_CPUS) {
|
||||||
hw_error("%s: num-cpu must be between 1 and %d\n", __func__, MAX_CPUS);
|
hw_error("%s: num-cpu must be between 1 and %d\n",
|
||||||
|
__func__, ARM_MPTIMER_MAX_CPUS);
|
||||||
}
|
}
|
||||||
/* We implement one timer block per CPU, and expose multiple MMIO regions:
|
/* We implement one timer block per CPU, and expose multiple MMIO regions:
|
||||||
* * region 0 is "timer for this core"
|
* * region 0 is "timer for this core"
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* Private peripheral timer/watchdog blocks for ARM 11MPCore and A9MP
|
||||||
|
*
|
||||||
|
* Copyright (c) 2006-2007 CodeSourcery.
|
||||||
|
* Copyright (c) 2011 Linaro Limited
|
||||||
|
* Written by Paul Brook, Peter Maydell
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version
|
||||||
|
* 2 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#ifndef HW_TIMER_ARM_MPTIMER_H
|
||||||
|
#define HW_TIMER_ARM_MPTIMER_H
|
||||||
|
|
||||||
|
#include "hw/sysbus.h"
|
||||||
|
|
||||||
|
#define ARM_MPTIMER_MAX_CPUS 4
|
||||||
|
|
||||||
|
/* State of a single timer or watchdog block */
|
||||||
|
typedef struct {
|
||||||
|
uint32_t count;
|
||||||
|
uint32_t load;
|
||||||
|
uint32_t control;
|
||||||
|
uint32_t status;
|
||||||
|
int64_t tick;
|
||||||
|
QEMUTimer *timer;
|
||||||
|
qemu_irq irq;
|
||||||
|
MemoryRegion iomem;
|
||||||
|
} TimerBlock;
|
||||||
|
|
||||||
|
#define TYPE_ARM_MPTIMER "arm_mptimer"
|
||||||
|
#define ARM_MPTIMER(obj) \
|
||||||
|
OBJECT_CHECK(ARMMPTimerState, (obj), TYPE_ARM_MPTIMER)
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
/*< private >*/
|
||||||
|
SysBusDevice parent_obj;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
uint32_t num_cpu;
|
||||||
|
TimerBlock timerblock[ARM_MPTIMER_MAX_CPUS];
|
||||||
|
MemoryRegion iomem;
|
||||||
|
} ARMMPTimerState;
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue