Reviewed-by: Clement Mathieu--Drif <clement.mathieu--drif@eviden.com>
On 09/04/2025 4:36 am, Bibo Mao wrote:
> Caution: External email. Do not open attachments or click links, unless this email comes from a known sender and you know the content is safe.
>
>
> Macro PCH_PIC_HTMSI_VEC_OFFSET and PCH_PIC_ROUTE_ENTRY_OFFSET is renamed
> as PCH_PIC_HTMSI_VEC and PCH_PIC_ROUTE_ENTRY separately, it is easier to
> understand.
>
> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> ---
> hw/intc/loongarch_pch_pic.c | 20 ++++++++++----------
> hw/loongarch/virt.c | 2 +-
> include/hw/intc/loongarch_pic_common.h | 4 ++--
> 3 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
> index 2b90ccd1ff..4c845ba5e9 100644
> --- a/hw/intc/loongarch_pch_pic.c
> +++ b/hw/intc/loongarch_pch_pic.c
> @@ -263,18 +263,18 @@ static uint64_t loongarch_pch_pic_readb(void *opaque, hwaddr addr,
> {
> LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
> uint64_t val = 0;
> - uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET;
> + uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY;
> int64_t offset_tmp;
>
> switch (offset) {
> - case PCH_PIC_HTMSI_VEC_OFFSET ... PCH_PIC_HTMSI_VEC_END:
> - offset_tmp = offset - PCH_PIC_HTMSI_VEC_OFFSET;
> + case PCH_PIC_HTMSI_VEC ... PCH_PIC_HTMSI_VEC_END:
> + offset_tmp = offset - PCH_PIC_HTMSI_VEC;
> if (offset_tmp >= 0 && offset_tmp < 64) {
> val = s->htmsi_vector[offset_tmp];
> }
> break;
> - case PCH_PIC_ROUTE_ENTRY_OFFSET ... PCH_PIC_ROUTE_ENTRY_END:
> - offset_tmp = offset - PCH_PIC_ROUTE_ENTRY_OFFSET;
> + case PCH_PIC_ROUTE_ENTRY ... PCH_PIC_ROUTE_ENTRY_END:
> + offset_tmp = offset - PCH_PIC_ROUTE_ENTRY;
> if (offset_tmp >= 0 && offset_tmp < 64) {
> val = s->route_entry[offset_tmp];
> }
> @@ -292,19 +292,19 @@ static void loongarch_pch_pic_writeb(void *opaque, hwaddr addr,
> {
> LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
> int32_t offset_tmp;
> - uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET;
> + uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY;
>
> trace_loongarch_pch_pic_writeb(size, addr, data);
>
> switch (offset) {
> - case PCH_PIC_HTMSI_VEC_OFFSET ... PCH_PIC_HTMSI_VEC_END:
> - offset_tmp = offset - PCH_PIC_HTMSI_VEC_OFFSET;
> + case PCH_PIC_HTMSI_VEC ... PCH_PIC_HTMSI_VEC_END:
> + offset_tmp = offset - PCH_PIC_HTMSI_VEC;
> if (offset_tmp >= 0 && offset_tmp < 64) {
> s->htmsi_vector[offset_tmp] = (uint8_t)(data & 0xff);
> }
> break;
> - case PCH_PIC_ROUTE_ENTRY_OFFSET ... PCH_PIC_ROUTE_ENTRY_END:
> - offset_tmp = offset - PCH_PIC_ROUTE_ENTRY_OFFSET;
> + case PCH_PIC_ROUTE_ENTRY ... PCH_PIC_ROUTE_ENTRY_END:
> + offset_tmp = offset - PCH_PIC_ROUTE_ENTRY;
> if (offset_tmp >= 0 && offset_tmp < 64) {
> s->route_entry[offset_tmp] = (uint8_t)(data & 0xff);
> }
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index 8c0cc98c72..1f1cca667e 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -429,7 +429,7 @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
> memory_region_add_subregion(get_system_memory(), VIRT_IOAPIC_REG_BASE,
> sysbus_mmio_get_region(d, 0));
> memory_region_add_subregion(get_system_memory(),
> - VIRT_IOAPIC_REG_BASE + PCH_PIC_ROUTE_ENTRY_OFFSET,
> + VIRT_IOAPIC_REG_BASE + PCH_PIC_ROUTE_ENTRY,
> sysbus_mmio_get_region(d, 1));
> memory_region_add_subregion(get_system_memory(),
> VIRT_IOAPIC_REG_BASE + PCH_PIC_INT_STATUS,
> diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h
> index c04471b08d..b33bebb129 100644
> --- a/include/hw/intc/loongarch_pic_common.h
> +++ b/include/hw/intc/loongarch_pic_common.h
> @@ -19,9 +19,9 @@
> #define PCH_PIC_INT_CLEAR 0x80
> #define PCH_PIC_AUTO_CTRL0 0xc0
> #define PCH_PIC_AUTO_CTRL1 0xe0
> -#define PCH_PIC_ROUTE_ENTRY_OFFSET 0x100
> +#define PCH_PIC_ROUTE_ENTRY 0x100
> #define PCH_PIC_ROUTE_ENTRY_END 0x13f
> -#define PCH_PIC_HTMSI_VEC_OFFSET 0x200
> +#define PCH_PIC_HTMSI_VEC 0x200
> #define PCH_PIC_HTMSI_VEC_END 0x23f
> #define PCH_PIC_INT_STATUS 0x3a0
> #define PCH_PIC_INT_POL 0x3e0
> --
> 2.39.3
>
>