mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/armsse: Indirect irq_is_common[] through ARMSSEInfo

Browse Source 
The SSE-300 has a slightly different set of shared-per-CPU interrupts,
allow the irq_is_common[] array to be different per SSE variant.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210219144617.4782-32-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-02-19 14:46:04 +00:00
parent 6fe8acb41e
commit 1aa9e174b4
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/arm/armsse.c
View File

@ -68,6 +68,7 @@ struct ARMSSEInfo {
bool has_cpuid; bool has_cpuid;
Property *props; Property *props;
const ARMSSEDeviceInfo *devinfo; const ARMSSEDeviceInfo *devinfo;
const bool *irq_is_common;
}; };
static Property iotkit_properties[] = { static Property iotkit_properties[] = {
@ -334,6 +335,21 @@ static const ARMSSEDeviceInfo sse200_devices[] = {
} }
}; };
/* Is internal IRQ n shared between CPUs in a multi-core SSE ? */
static const bool sse200_irq_is_common[32] = {
[0 ... 5] = true,
/* 6, 7: per-CPU MHU interrupts */
[8 ... 12] = true,
/* 13: per-CPU icache interrupt */
/* 14: reserved */
[15 ... 20] = true,
/* 21: reserved */
[22 ... 26] = true,
/* 27: reserved */
/* 28, 29: per-CPU CTI interrupts */
/* 30, 31: reserved */
};
static const ARMSSEInfo armsse_variants[] = { static const ARMSSEInfo armsse_variants[] = {
{ {
.name = TYPE_IOTKIT, .name = TYPE_IOTKIT,
@ -349,6 +365,7 @@ static const ARMSSEInfo armsse_variants[] = {
.has_cpuid = false, .has_cpuid = false,
.props = iotkit_properties, .props = iotkit_properties,
.devinfo = iotkit_devices, .devinfo = iotkit_devices,
.irq_is_common = sse200_irq_is_common,
}, },
{ {
.name = TYPE_SSE200, .name = TYPE_SSE200,
@ -364,6 +381,7 @@ static const ARMSSEInfo armsse_variants[] = {
.has_cpuid = true, .has_cpuid = true,
.props = armsse_properties, .props = armsse_properties,
.devinfo = sse200_devices, .devinfo = sse200_devices,
.irq_is_common = sse200_irq_is_common,
}, },
}; };
@ -404,21 +422,6 @@ static uint32_t armsse_sys_config_value(ARMSSE *s, const ARMSSEInfo *info)
/* Clock frequency in HZ of the 32KHz "slow clock" */ /* Clock frequency in HZ of the 32KHz "slow clock" */
#define S32KCLK (32 * 1000) #define S32KCLK (32 * 1000)
/* Is internal IRQ n shared between CPUs in a multi-core SSE ? */
static bool irq_is_common[32] = {
[0 ... 5] = true,
/* 6, 7: per-CPU MHU interrupts */
[8 ... 12] = true,
/* 13: per-CPU icache interrupt */
/* 14: reserved */
[15 ... 20] = true,
/* 21: reserved */
[22 ... 26] = true,
/* 27: reserved */
/* 28, 29: per-CPU CTI interrupts */
/* 30, 31: reserved */
};
/* /*
* Create an alias region in @container of @size bytes starting at @base * Create an alias region in @container of @size bytes starting at @base
* which mirrors the memory starting at @orig. * which mirrors the memory starting at @orig.
@ -663,7 +666,7 @@ static void armsse_init(Object *obj)
} }
if (info->num_cpus > 1) { if (info->num_cpus > 1) {
for (i = 0; i < ARRAY_SIZE(s->cpu_irq_splitter); i++) { for (i = 0; i < ARRAY_SIZE(s->cpu_irq_splitter); i++) {
if (irq_is_common[i]) { if (info->irq_is_common[i]) {
char *name = g_strdup_printf("cpu-irq-splitter%d", i); char *name = g_strdup_printf("cpu-irq-splitter%d", i);
SplitIRQ *splitter = &s->cpu_irq_splitter[i]; SplitIRQ *splitter = &s->cpu_irq_splitter[i];
@ -696,7 +699,7 @@ static qemu_irq armsse_get_common_irq_in(ARMSSE *s, int irqno)
ARMSSEClass *asc = ARM_SSE_GET_CLASS(s); ARMSSEClass *asc = ARM_SSE_GET_CLASS(s);
const ARMSSEInfo *info = asc->info; const ARMSSEInfo *info = asc->info;
assert(irq_is_common[irqno]); assert(info->irq_is_common[irqno]);
if (info->num_cpus == 1) { if (info->num_cpus == 1) {
/* Only one CPU -- just connect directly to it */ /* Only one CPU -- just connect directly to it */
@ -878,7 +881,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
/* Wire up the splitters that connect common IRQs to all CPUs */ /* Wire up the splitters that connect common IRQs to all CPUs */
if (info->num_cpus > 1) { if (info->num_cpus > 1) {
for (i = 0; i < ARRAY_SIZE(s->cpu_irq_splitter); i++) { for (i = 0; i < ARRAY_SIZE(s->cpu_irq_splitter); i++) {
if (irq_is_common[i]) { if (info->irq_is_common[i]) {
Object *splitter = OBJECT(&s->cpu_irq_splitter[i]); Object *splitter = OBJECT(&s->cpu_irq_splitter[i]);
DeviceState *devs = DEVICE(splitter); DeviceState *devs = DEVICE(splitter);
int cpunum; int cpunum;