qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Mao Bibo <maobibo@loongson.cn>
Subject: [PULL 14/23] hw/intc/loongarch_pch_msi: Fix msi vector convertion
Date: Mon,  4 Jul 2022 15:03:48 +0530	[thread overview]
Message-ID: <20220704093357.983255-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220704093357.983255-1-richard.henderson@linaro.org>

From: Mao Bibo <maobibo@loongson.cn>

Loongarch pch msi intc connects to extioi controller, the range of irq
number is 64-255.  Add a property for irqbase, so that we can compute
the irq offset from the view of pch_msi controller with the method:

  msi vector (from view of upper extioi intc) - irqbase

Signed-off-by: Mao Bibo <maobibo@loongson.cn>
Message-Id: <20220701030740.2469162-1-maobibo@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/hw/intc/loongarch_pch_msi.h |  2 ++
 hw/intc/loongarch_pch_msi.c         | 22 ++++++++++++++++++++--
 hw/loongarch/loongson3.c            |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/include/hw/intc/loongarch_pch_msi.h b/include/hw/intc/loongarch_pch_msi.h
index f668bfca7a..6d67560dea 100644
--- a/include/hw/intc/loongarch_pch_msi.h
+++ b/include/hw/intc/loongarch_pch_msi.h
@@ -17,4 +17,6 @@ struct LoongArchPCHMSI {
     SysBusDevice parent_obj;
     qemu_irq pch_msi_irq[PCH_MSI_IRQ_NUM];
     MemoryRegion msi_mmio;
+    /* irq base passed to upper extioi intc */
+    unsigned int irq_base;
 };
diff --git a/hw/intc/loongarch_pch_msi.c b/hw/intc/loongarch_pch_msi.c
index 74bcdbdb48..b36d6d76e4 100644
--- a/hw/intc/loongarch_pch_msi.c
+++ b/hw/intc/loongarch_pch_msi.c
@@ -23,9 +23,14 @@ static uint64_t loongarch_msi_mem_read(void *opaque, hwaddr addr, unsigned size)
 static void loongarch_msi_mem_write(void *opaque, hwaddr addr,
                                     uint64_t val, unsigned size)
 {
-    LoongArchPCHMSI *s = LOONGARCH_PCH_MSI(opaque);
-    int irq_num = val & 0xff;
+    LoongArchPCHMSI *s = (LoongArchPCHMSI *)opaque;
+    int irq_num;
 
+    /*
+     * vector number is irq number from upper extioi intc
+     * need subtract irq base to get msi vector offset
+     */
+    irq_num = (val & 0xff) - s->irq_base;
     trace_loongarch_msi_set_irq(irq_num);
     assert(irq_num < PCH_MSI_IRQ_NUM);
     qemu_set_irq(s->pch_msi_irq[irq_num], 1);
@@ -58,11 +63,24 @@ static void loongarch_pch_msi_init(Object *obj)
     qdev_init_gpio_in(DEVICE(obj), pch_msi_irq_handler, PCH_MSI_IRQ_NUM);
 }
 
+static Property loongarch_msi_properties[] = {
+    DEFINE_PROP_UINT32("msi_irq_base", LoongArchPCHMSI, irq_base, 0),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void loongarch_pch_msi_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    device_class_set_props(dc, loongarch_msi_properties);
+}
+
 static const TypeInfo loongarch_pch_msi_info = {
     .name          = TYPE_LOONGARCH_PCH_MSI,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(LoongArchPCHMSI),
     .instance_init = loongarch_pch_msi_init,
+    .class_init    = loongarch_pch_msi_class_init,
 };
 
 static void loongarch_pch_msi_register_types(void)
diff --git a/hw/loongarch/loongson3.c b/hw/loongarch/loongson3.c
index bd20ebbb78..403dd91e11 100644
--- a/hw/loongarch/loongson3.c
+++ b/hw/loongarch/loongson3.c
@@ -267,6 +267,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
     }
 
     pch_msi = qdev_new(TYPE_LOONGARCH_PCH_MSI);
+    qdev_prop_set_uint32(pch_msi, "msi_irq_base", PCH_MSI_IRQ_START);
     d = SYS_BUS_DEVICE(pch_msi);
     sysbus_realize_and_unref(d, &error_fatal);
     sysbus_mmio_map(d, 0, LS7A_PCH_MSI_ADDR_LOW);
-- 
2.34.1



  parent reply	other threads:[~2022-07-04  9:48 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-04  9:33 [PULL 00/23] loongarch64 patch queue Richard Henderson
2022-07-04  9:33 ` [PULL 01/23] linux-user: Add LoongArch generic header files Richard Henderson
2022-07-04  9:33 ` [PULL 02/23] linux-user: Add LoongArch signal support Richard Henderson
2022-07-04  9:33 ` [PULL 03/23] linux-user: Add LoongArch elf support Richard Henderson
2022-07-04  9:33 ` [PULL 04/23] linux-user: Add LoongArch syscall support Richard Henderson
2022-07-04  9:33 ` [PULL 05/23] linux-user: Add LoongArch cpu_loop support Richard Henderson
2022-07-04  9:33 ` [PULL 06/23] scripts: add loongarch64 binfmt config Richard Henderson
2022-07-04  9:33 ` [PULL 07/23] target/loongarch: remove badaddr from CPULoongArch Richard Henderson
2022-07-04  9:33 ` [PULL 08/23] target/loongarch: Fix missing update CSR_BADV Richard Henderson
2022-07-04  9:33 ` [PULL 09/23] target/loongarch: Fix helper_asrtle_d/asrtgt_d raise wrong exception Richard Henderson
2022-07-04  9:33 ` [PULL 10/23] target/loongarch: remove unused include hw/loader.h Richard Henderson
2022-07-04  9:33 ` [PULL 11/23] target/loongarch: Adjust functions and structure to support user-mode Richard Henderson
2022-07-04  9:33 ` [PULL 12/23] default-configs: Add loongarch linux-user support Richard Henderson
2022-07-04  9:33 ` [PULL 13/23] target/loongarch: Update README Richard Henderson
2023-03-06 14:29   ` Philippe Mathieu-Daudé
2023-03-07  1:53     ` gaosong
2023-03-07 10:03       ` Philippe Mathieu-Daudé
2022-07-04  9:33 ` Richard Henderson [this message]
2022-07-04  9:33 ` [PULL 15/23] hw/rtc/ls7a_rtc: Fix uninitialied bugs and toymatch writing function Richard Henderson
2022-07-04  9:33 ` [PULL 16/23] hw/rtc/ls7a_rtc: Fix timer call back function Richard Henderson
2022-07-04  9:33 ` [PULL 17/23] hw/rtc/ls7a_rtc: Remove unimplemented device in realized function Richard Henderson
2022-07-04  9:33 ` [PULL 18/23] hw/rtc/ls7a_rtc: Add reset function Richard Henderson
2022-07-04  9:33 ` [PULL 19/23] hw/rtc/ls7a_rtc: Fix rtc enable and disable function Richard Henderson
2022-07-04  9:33 ` [PULL 20/23] hw/rtc/ls7a_rtc: Use tm struct pointer as arguments in toy_time_to_val() Richard Henderson
2022-07-04  9:33 ` [PULL 21/23] hw/rtc/ls7a_rtc: Fix 'calculate' spelling errors Richard Henderson
2022-07-04  9:33 ` [PULL 22/23] target/loongarch: Fix the meaning of ECFG reg's VS field Richard Henderson
2022-07-04  9:33 ` [PULL 23/23] target/loongarch: Add lock when writing timer clear reg Richard Henderson
2022-07-04 15:16 ` [PULL 00/23] loongarch64 patch queue Richard Henderson
2022-07-05  7:31   ` Thomas Huth
2022-07-05  8:00     ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220704093357.983255-15-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=maobibo@loongson.cn \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).