diff options
| author | Tianrui Zhao <zhaotianrui@loongson.cn> | 2022-12-27 11:19:57 +0800 |
|---|---|---|
| committer | Song Gao <gaosong@loongson.cn> | 2023-01-06 14:12:43 +0800 |
| commit | f4d10ce8aa545266a0b6df223a7f8ea2afca18b2 (patch) | |
| tree | e2b3a100c9294d8590dd0561d21d8f780d082ab4 | |
| parent | 270950b49d36659372acbc12e65ff34969bed678 (diff) | |
| download | qemu-f4d10ce8aa545266a0b6df223a7f8ea2afca18b2.zip qemu-f4d10ce8aa545266a0b6df223a7f8ea2afca18b2.tar.gz qemu-f4d10ce8aa545266a0b6df223a7f8ea2afca18b2.tar.bz2 | |
hw/intc/loongarch_pch: Change default irq number of pch irq controller
Change the default irq number of pch pic to 32, so that the irq
number of pch msi is 224(256 - 32), and move the 'PCH_PIC_IRQ_NUM'
macro to pci-host/ls7a.h and add prefix 'VIRT' on it to keep standard
format.
Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230104020518.2564263-4-zhaotianrui@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
| -rw-r--r-- | hw/intc/loongarch_pch_pic.c | 3 | ||||
| -rw-r--r-- | hw/loongarch/virt.c | 2 | ||||
| -rw-r--r-- | include/hw/intc/loongarch_pch_msi.h | 6 | ||||
| -rw-r--r-- | include/hw/intc/loongarch_pch_pic.h | 1 | ||||
| -rw-r--r-- | include/hw/pci-host/ls7a.h | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c index 33966e7..9208fc4 100644 --- a/hw/intc/loongarch_pch_pic.c +++ b/hw/intc/loongarch_pch_pic.c @@ -9,6 +9,7 @@ #include "qemu/bitops.h" #include "hw/sysbus.h" #include "hw/loongarch/virt.h" +#include "hw/pci-host/ls7a.h" #include "hw/irq.h" #include "hw/intc/loongarch_pch_pic.h" #include "hw/qdev-properties.h" @@ -377,7 +378,7 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) { LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev); - if (!s->irq_num || s->irq_num > PCH_PIC_IRQ_NUM) { + if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { error_setg(errp, "Invalid 'pic_irq_num'"); return; } diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 35d4bce..66be925 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -616,7 +616,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams) } pch_pic = qdev_new(TYPE_LOONGARCH_PCH_PIC); - num = PCH_PIC_IRQ_NUM; + num = VIRT_PCH_PIC_IRQ_NUM; qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num); d = SYS_BUS_DEVICE(pch_pic); sysbus_realize_and_unref(d, &error_fatal); diff --git a/include/hw/intc/loongarch_pch_msi.h b/include/hw/intc/loongarch_pch_msi.h index c5a52bc..832e69f 100644 --- a/include/hw/intc/loongarch_pch_msi.h +++ b/include/hw/intc/loongarch_pch_msi.h @@ -8,10 +8,10 @@ #define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi" OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHMSI, LOONGARCH_PCH_MSI) -/* Msi irq start start from 64 to 255 */ -#define PCH_MSI_IRQ_START 64 +/* MSI irq start from 32 to 255 */ +#define PCH_MSI_IRQ_START 32 #define PCH_MSI_IRQ_END 255 -#define PCH_MSI_IRQ_NUM 192 +#define PCH_MSI_IRQ_NUM 224 struct LoongArchPCHMSI { SysBusDevice parent_obj; diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h index efae5fa..258e3b3 100644 --- a/include/hw/intc/loongarch_pch_pic.h +++ b/include/hw/intc/loongarch_pch_pic.h @@ -9,7 +9,6 @@ #define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC) -#define PCH_PIC_IRQ_NUM 64 #define PCH_PIC_INT_ID_VAL 0x7000000UL #define PCH_PIC_INT_ID_VER 0x1UL diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h index 6443327..8061c4b 100644 --- a/include/hw/pci-host/ls7a.h +++ b/include/hw/pci-host/ls7a.h @@ -32,6 +32,7 @@ * 0 ~ 16 irqs used for non-pci device while 16 ~ 64 irqs * used for pci device. */ +#define VIRT_PCH_PIC_IRQ_NUM 32 #define PCH_PIC_IRQ_OFFSET 64 #define VIRT_DEVICE_IRQS 16 #define VIRT_UART_IRQ (PCH_PIC_IRQ_OFFSET + 2) |