motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/intc/loongarch_pch: Set version information at initial stage

Browse source 
Register PCH_PIC_INT_ID constains version and supported irq number
information, and it is read only register. The detailed value can
be set at initial stage, rather than read callback.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20250507023148.1877287-5-maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
This commit is contained in:
Bibo Mao 2025-05-07 10:31:36 +08:00 • committed by Song Gao
parent e95e4e818b
commit c2658b0de5
3 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/intc/loongarch_pch_pic.c
View file

@ -80,15 +80,10 @@ static uint64_t loongarch_pch_pic_low_readw(void *opaque, hwaddr addr,
switch (offset) { switch (offset) {
case PCH_PIC_INT_ID: case PCH_PIC_INT_ID:
val = PCH_PIC_INT_ID_VAL; val = s->id.data & UINT_MAX;
break; break;
case PCH_PIC_INT_ID + 4: case PCH_PIC_INT_ID + 4:
/* val = s->id.data >> 32;
* With 7A1000 manual
* bit 0-15 pch irqchip version
* bit 16-31 irq number supported with pch irqchip
*/
val = deposit32(PCH_PIC_INT_ID_VER, 16, 16, s->irq_num - 1);
break; break;
case PCH_PIC_INT_MASK: case PCH_PIC_INT_MASK:
val = (uint32_t)s->int_mask; val = (uint32_t)s->int_mask;

13
hw/intc/loongarch_pic_common.c
View file

@ -49,6 +49,19 @@ static void loongarch_pic_common_reset_hold(Object *obj, ResetType type)
LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(obj); LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(obj);
int i; int i;
/*
* With Loongson 7A1000 user manual
* Chapter 5.2 "Description of Interrupt-related Registers"
*
* Interrupt controller identification register 1
* Bit 24-31 Interrupt Controller ID
* Interrupt controller identification register 2
* Bit 0-7 Interrupt Controller version number
* Bit 16-23 The number of interrupt sources supported
*/
s->id.desc.id = PCH_PIC_INT_ID_VAL;
s->id.desc.version = PCH_PIC_INT_ID_VER;
s->id.desc.irq_num = s->irq_num - 1;
s->int_mask = UINT64_MAX; s->int_mask = UINT64_MAX;
s->htmsi_en = 0x0; s->htmsi_en = 0x0;
s->intedge = 0x0; s->intedge = 0x0;

17
include/hw/intc/loongarch_pic_common.h
View file

@ -10,9 +10,9 @@
#include "hw/pci-host/ls7a.h" #include "hw/pci-host/ls7a.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#define PCH_PIC_INT_ID_VAL 0x7000000UL
#define PCH_PIC_INT_ID_VER 0x1UL
#define PCH_PIC_INT_ID 0x00 #define PCH_PIC_INT_ID 0x00
#define PCH_PIC_INT_ID_VAL 0x7
#define PCH_PIC_INT_ID_VER 0x1
#define PCH_PIC_INT_MASK 0x20 #define PCH_PIC_INT_MASK 0x20
#define PCH_PIC_HTMSI_EN 0x40 #define PCH_PIC_HTMSI_EN 0x40
#define PCH_PIC_INT_EDGE 0x60 #define PCH_PIC_INT_EDGE 0x60
@ -30,10 +30,23 @@
OBJECT_DECLARE_TYPE(LoongArchPICCommonState, OBJECT_DECLARE_TYPE(LoongArchPICCommonState,
LoongArchPICCommonClass, LOONGARCH_PIC_COMMON) LoongArchPICCommonClass, LOONGARCH_PIC_COMMON)
union LoongArchPIC_ID {
struct {
uint8_t _reserved_0[3];
uint8_t id;
uint8_t version;
uint8_t _reserved_1;
uint8_t irq_num;
uint8_t _reserved_2;
} QEMU_PACKED desc;
uint64_t data;
};
struct LoongArchPICCommonState { struct LoongArchPICCommonState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
qemu_irq parent_irq[64]; qemu_irq parent_irq[64];
union LoongArchPIC_ID id; /* 0x00 interrupt ID register */
uint64_t int_mask; /* 0x020 interrupt mask register */ uint64_t int_mask; /* 0x020 interrupt mask register */
uint64_t htmsi_en; /* 0x040 1=msi */ uint64_t htmsi_en; /* 0x040 1=msi */
uint64_t intedge; /* 0x060 edge=1 level=0 */ uint64_t intedge; /* 0x060 edge=1 level=0 */