[PATCH 0/3] APLIC hwirq implementation for irqchip

[PATCH 0/3] APLIC hwirq implementation for irqchip

[Raymond Mao]

From: Raymond Mao <raymond.mao@riscstar.com>

This series implements the APLIC hwirq handling (mask / unmask /
eoi / setup / process) aligned with recent irqchip framework
refactoring [1], and register them during cold init.
Moreover, it provides a minimal APLIC direct-mode configuration
and test hooks under QEMU via UART RX.

[1] [PATCH 0/8] Extend irqchip framework for M-mode interrupts
https://lists.infradead.org/pipermail/opensbi/2026-February/009407.html

Raymond Mao (3):
  lib: sbi_irqchip: Add irqchip private context pointer in
    sbi_irqchip_device
  lib: utils: irqchip: implement APLIC hwirq operation hooks
  [NOT-FOR-UPSTREAM] lib: utils: irqchip: add QEMU virt test for APLIC wired IRQs

 Makefile                  |   3 +
 include/sbi/sbi_irqchip.h |   3 +
 lib/utils/irqchip/aplic.c | 235 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 241 insertions(+)

-- 
2.25.1


-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

[PATCH 1/3] lib: sbi_irqchip: Add irqchip private context pointer in sbi_irqchip_device

[Raymond Mao]

From: Raymond Mao <raymond.mao@riscstar.com>

HW specific private data is required for irqchip device operations,
for example, for APLIC, address, num_idc and num_source are needed
for mask / unmask / claim an IRQ, thus it is reasonable to add a
private HW data pointer in sbi_irqchip_device.

Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
---
 include/sbi/sbi_irqchip.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/sbi/sbi_irqchip.h b/include/sbi/sbi_irqchip.h
index 77b54110..af820ec1 100644
--- a/include/sbi/sbi_irqchip.h
+++ b/include/sbi/sbi_irqchip.h
@@ -56,6 +56,9 @@ struct sbi_irqchip_device {
 
 	/** Unmask a hardware interrupt of this irqchip */
 	void (*hwirq_unmask)(struct sbi_irqchip_device *chip, u32 hwirq);
+
+	/** Irqchip device private context */
+	void *chip_priv;
 };
 
 /**
-- 
2.25.1


-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

Re: [PATCH 1/3] lib: sbi_irqchip: Add irqchip private context pointer in sbi_irqchip_device

[Anup Patel]

On Thu, Feb 12, 2026 at 3:50 AM Raymond Mao <raymondmaoca@gmail.com> wrote:
>
> From: Raymond Mao <raymond.mao@riscstar.com>
>
> HW specific private data is required for irqchip device operations,
> for example, for APLIC, address, num_idc and num_source are needed
> for mask / unmask / claim an IRQ, thus it is reasonable to add a
> private HW data pointer in sbi_irqchip_device.
>
> Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
> ---
>  include/sbi/sbi_irqchip.h | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/include/sbi/sbi_irqchip.h b/include/sbi/sbi_irqchip.h
> index 77b54110..af820ec1 100644
> --- a/include/sbi/sbi_irqchip.h
> +++ b/include/sbi/sbi_irqchip.h
> @@ -56,6 +56,9 @@ struct sbi_irqchip_device {
>
>         /** Unmask a hardware interrupt of this irqchip */
>         void (*hwirq_unmask)(struct sbi_irqchip_device *chip, u32 hwirq);
> +
> +       /** Irqchip device private context */
> +       void *chip_priv;

No need for this patch since we can use container_of() to
get irqchip device private context.

>  };
>
>  /**
> --
> 2.25.1
>
>
> --
> opensbi mailing list
> opensbi@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi

Regards,
Anup

-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

[PATCH 2/3] lib: utils: irqchip: implement APLIC hwirq operation hooks

[Raymond Mao]

From: Raymond Mao <raymond.mao@riscstar.com>

Add all APLIC reqiured operation hooks, includeing mask / unmask /
eoi / setup / process and register them during cold init.
During setup, program a minimal APLIC direct-mode configuration and
enable MEIE, confirm external interrupts are claimed via IDC.CLAIMI.
Add function to fetch the TOPI value and extract the source ID (hwirq)
from CLAIMI, which is used by APLIC process hook.

Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
---
 lib/utils/irqchip/aplic.c | 191 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)

diff --git a/lib/utils/irqchip/aplic.c b/lib/utils/irqchip/aplic.c
index ec69c82b..f0ecef42 100644
--- a/lib/utils/irqchip/aplic.c
+++ b/lib/utils/irqchip/aplic.c
@@ -245,6 +245,178 @@ static int aplic_check_msicfg(struct aplic_msicfg_data *msicfg)
 	return 0;
 }
 
+static int aplic_hwirq_handler(u32 hwirq, void *opaque)
+{
+	(void)opaque;
+
+	sbi_printf("[APLIC] Enter registered hwirq %u raw handler callback\n",
+		   hwirq);
+
+	return SBI_OK;
+}
+
+static inline void *aplic_idc_base(unsigned long aplic_addr, u32 idc_index)
+{
+	return (void *)(aplic_addr + APLIC_IDC_BASE +
+			(unsigned long)idc_index * APLIC_IDC_SIZE);
+}
+
+static void aplic_hwirq_mask(struct sbi_irqchip_device *chip, u32 hwirq)
+{
+	struct aplic_data *w = chip->chip_priv;
+
+	if (!w || !hwirq)
+		return;
+
+	if (!w->addr || hwirq > w->num_source)
+		return;
+
+	/* Disable source */
+	writel(hwirq, (void *)(w->addr + APLIC_CLRIENUM));
+}
+
+static void aplic_hwirq_unmask(struct sbi_irqchip_device *chip, u32 hwirq)
+{
+	struct aplic_data *w = chip->chip_priv;
+
+	if (!w || !hwirq)
+		return;
+
+	if (!w->addr || hwirq > w->num_source)
+		return;
+
+	/* Enable source */
+	writel(hwirq, (void *)(w->addr + APLIC_SETIENUM));
+}
+
+static int aplic_hwirq_claim(struct sbi_irqchip_device *chip, u32 *hwirq)
+{
+	struct aplic_data *w = chip->chip_priv;
+	u32 hartid = current_hartid();
+	int hidx = sbi_hartid_to_hartindex(hartid);
+	void *idc;
+	u32 v, id;
+
+	if (!w || !hwirq)
+		return SBI_EINVAL;
+
+	if (!w->addr || hidx < 0 || (u32)hidx >= w->num_idc)
+		return SBI_ENODEV;
+
+	idc = aplic_idc_base(w->addr, (u32)hidx);
+
+	/*
+	 * Read CLAIMI: returns TOPI value.
+	 * ID==0 means spurious interrupt (spec-defined).
+	 */
+	v = readl(idc + APLIC_IDC_CLAIMI); /* dequeue */
+	/*
+	 * QEMU workaround: Read CLAIMI a second time since QEMU's APLIC model
+	 * currently has a bug and may not clear pending on deassert after the
+	 * first reading.
+	 */
+	if (readl(idc + APLIC_IDC_CLAIMI) != v)
+		return SBI_ENOENT;
+
+	id = (v >> APLIC_IDC_TOPI_ID_SHIFT) & APLIC_IDC_TOPI_ID_MASK;
+
+	/* ID==0 means spurious / no pending wired interrupt */
+	if (!id)
+		return SBI_ENOENT;
+
+	/* Bound check against DT-discovered num_src */
+	if (id > w->num_source)
+		return SBI_EINVAL;
+
+	*hwirq = id;
+
+	return SBI_OK;
+}
+
+static void aplic_hwirq_eoi(struct sbi_irqchip_device *chip, u32 hwirq)
+{
+	struct aplic_data *w = chip->chip_priv;
+	u32 hartid = current_hartid();
+	int hidx = sbi_hartid_to_hartindex(hartid);
+	void *idc;
+
+	sbi_printf("[APLIC] Enter regitered EOI of hwirq %u\n", hwirq);
+
+	if (!w || !w->addr)
+		return;
+	if (hidx < 0 || (u32)hidx >= w->num_idc)
+		return;
+
+	idc = aplic_idc_base(w->addr, (u32)hidx);
+
+	/* QEMU workaround: clear pending after source deassert for level IRQ */
+	writel(hwirq, idc + APLIC_CLRIPNUM);
+}
+
+static int aplic_hwirq_setup(struct sbi_irqchip_device *chip, u32 hwirq)
+{
+	const u32 hart_idx = 0;
+	unsigned long idc;
+	struct aplic_data *w = chip->chip_priv;
+
+	idc = w->addr + APLIC_IDC_BASE + hart_idx * APLIC_IDC_SIZE;
+
+	/* APLIC: sourcecfg/target/enable */
+	writel(APLIC_SOURCECFG_SM_LEVEL_HIGH,
+	       (void *)(w->addr + APLIC_SOURCECFG_BASE + (hwirq - 1) * 4));
+
+	writel((hart_idx << APLIC_TARGET_HART_IDX_SHIFT) | APLIC_DEFAULT_PRIORITY,
+	       (void *)(w->addr + APLIC_TARGET_BASE + (hwirq - 1) * 4));
+
+	writel(hwirq, (void *)(w->addr + APLIC_SETIENUM));
+
+	/* Direct mode for aia=aplic: DM=0 => don't set DM bit */
+	writel(APLIC_DOMAINCFG_IE | APLIC_DOMAINCFG_BE,
+	       (void *)(w->addr + APLIC_DOMAINCFG));
+
+	/* IDC delivery */
+	writel(APLIC_ENABLE_IDELIVERY, (void *)(idc + APLIC_IDC_IDELIVERY));
+	writel(APLIC_ENABLE_ITHRESHOLD, (void *)(idc + APLIC_IDC_ITHRESHOLD));
+
+	/* Enable MEIE + global MIE */
+	csr_set(CSR_MIE, (1UL << 11));  /* MEIE */
+	csr_set(CSR_MSTATUS, MSTATUS_MIE);
+
+	return SBI_OK;
+}
+
+static int aplic_process_hwirqs(struct sbi_irqchip_device *chip)
+{
+	if (!chip)
+		return SBI_ENODEV;
+
+	for (;;) {
+		u32 hwirq = 0;
+		int rc = aplic_hwirq_claim(chip, &hwirq);
+
+		if (rc == SBI_ENOENT)
+			break;
+		if (rc)
+			return rc;
+
+		if (!hwirq)
+			break;
+
+		sbi_printf("[APLIC] IDC_TOPI_ID from CLAIMI (hwirq) %u\n",
+			   hwirq);
+
+		if (hwirq > chip->num_hwirq) {
+			sbi_printf("[APLIC] hwirq %u > max (num_hwirq) %u)\n",
+				   hwirq, chip->num_hwirq);
+			break;
+		}
+
+		sbi_irqchip_process_hwirq(chip, hwirq);
+	}
+
+	return SBI_OK;
+}
+
 int aplic_cold_irqchip_init(struct aplic_data *aplic)
 {
 	int rc;
@@ -308,12 +480,31 @@ int aplic_cold_irqchip_init(struct aplic_data *aplic)
 	/* Register irqchip device */
 	aplic->irqchip.id = aplic->unique_id;
 	aplic->irqchip.num_hwirq = aplic->num_source + 1;
+	aplic->irqchip.chip_priv = aplic;
+	aplic->irqchip.hwirq_mask = aplic_hwirq_mask;
+	aplic->irqchip.hwirq_unmask = aplic_hwirq_unmask;
+	aplic->irqchip.hwirq_eoi = aplic_hwirq_eoi;
+	/*
+	 * Only the domain that directly injects interrupts into M-mode external
+	 * interrupt line should provide process_hwirqs().
+	 *
+	 * The other domain (e.g. S-mode) may still be registered so that its
+	 * other ops (mask/unmask/config/etc.) can be used, but it must not
+	 * claim to be the external interrupt line provider.
+	 */
+	if (aplic->targets_mmode)
+		aplic->irqchip.process_hwirqs = aplic_process_hwirqs;
+	aplic->irqchip.hwirq_setup = aplic_hwirq_setup;
 	rc = sbi_irqchip_add_device(&aplic->irqchip);
 	if (rc)
 		return rc;
 
 	/* Attach to the aplic list */
 	sbi_list_add_tail(&aplic->node, &aplic_list);
+	rc = sbi_irqchip_register_handler(&aplic->irqchip, 1, aplic->num_source,
+					  aplic_hwirq_handler, NULL);
+	if (rc)
+		return rc;
 
 	return 0;
 }
-- 
2.25.1


-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

Re: [PATCH 2/3] lib: utils: irqchip: implement APLIC hwirq operation hooks

[Anup Patel]

On Thu, Feb 12, 2026 at 3:50 AM Raymond Mao <raymondmaoca@gmail.com> wrote:
>
> From: Raymond Mao <raymond.mao@riscstar.com>
>
> Add all APLIC reqiured operation hooks, includeing mask / unmask /
> eoi / setup / process and register them during cold init.
> During setup, program a minimal APLIC direct-mode configuration and
> enable MEIE, confirm external interrupts are claimed via IDC.CLAIMI.
> Add function to fetch the TOPI value and extract the source ID (hwirq)
> from CLAIMI, which is used by APLIC process hook.
>
> Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
> ---
>  lib/utils/irqchip/aplic.c | 191 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 191 insertions(+)
>
> diff --git a/lib/utils/irqchip/aplic.c b/lib/utils/irqchip/aplic.c
> index ec69c82b..f0ecef42 100644
> --- a/lib/utils/irqchip/aplic.c
> +++ b/lib/utils/irqchip/aplic.c
> @@ -245,6 +245,178 @@ static int aplic_check_msicfg(struct aplic_msicfg_data *msicfg)
>         return 0;
>  }
>
> +static int aplic_hwirq_handler(u32 hwirq, void *opaque)
> +{
> +       (void)opaque;
> +
> +       sbi_printf("[APLIC] Enter registered hwirq %u raw handler callback\n",
> +                  hwirq);
> +
> +       return SBI_OK;
> +}
> +
> +static inline void *aplic_idc_base(unsigned long aplic_addr, u32 idc_index)
> +{
> +       return (void *)(aplic_addr + APLIC_IDC_BASE +
> +                       (unsigned long)idc_index * APLIC_IDC_SIZE);
> +}
> +
> +static void aplic_hwirq_mask(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +
> +       if (!w || !hwirq)
> +               return;
> +
> +       if (!w->addr || hwirq > w->num_source)
> +               return;
> +
> +       /* Disable source */
> +       writel(hwirq, (void *)(w->addr + APLIC_CLRIENUM));
> +}
> +
> +static void aplic_hwirq_unmask(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +
> +       if (!w || !hwirq)
> +               return;
> +
> +       if (!w->addr || hwirq > w->num_source)
> +               return;
> +
> +       /* Enable source */
> +       writel(hwirq, (void *)(w->addr + APLIC_SETIENUM));
> +}
> +
> +static int aplic_hwirq_claim(struct sbi_irqchip_device *chip, u32 *hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +       u32 hartid = current_hartid();
> +       int hidx = sbi_hartid_to_hartindex(hartid);
> +       void *idc;
> +       u32 v, id;
> +
> +       if (!w || !hwirq)
> +               return SBI_EINVAL;
> +
> +       if (!w->addr || hidx < 0 || (u32)hidx >= w->num_idc)
> +               return SBI_ENODEV;
> +
> +       idc = aplic_idc_base(w->addr, (u32)hidx);

This is broken for platforms having multiple APLIC instances.
The APLIC hart index is relative to a particular APLIC instance
and has nothing to do with OpenSBI hart index.

> +
> +       /*
> +        * Read CLAIMI: returns TOPI value.
> +        * ID==0 means spurious interrupt (spec-defined).
> +        */
> +       v = readl(idc + APLIC_IDC_CLAIMI); /* dequeue */
> +       /*
> +        * QEMU workaround: Read CLAIMI a second time since QEMU's APLIC model
> +        * currently has a bug and may not clear pending on deassert after the
> +        * first reading.
> +        */
> +       if (readl(idc + APLIC_IDC_CLAIMI) != v)
> +               return SBI_ENOENT;

Please fix QEMU first. If QEMU is already fixed then drop this work-around.

> +
> +       id = (v >> APLIC_IDC_TOPI_ID_SHIFT) & APLIC_IDC_TOPI_ID_MASK;
> +
> +       /* ID==0 means spurious / no pending wired interrupt */
> +       if (!id)
> +               return SBI_ENOENT;
> +
> +       /* Bound check against DT-discovered num_src */
> +       if (id > w->num_source)
> +               return SBI_EINVAL;
> +
> +       *hwirq = id;
> +
> +       return SBI_OK;
> +}
> +
> +static void aplic_hwirq_eoi(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +       u32 hartid = current_hartid();
> +       int hidx = sbi_hartid_to_hartindex(hartid);
> +       void *idc;
> +
> +       sbi_printf("[APLIC] Enter regitered EOI of hwirq %u\n", hwirq);

Drop this unnecessary debug prints from all places.

> +
> +       if (!w || !w->addr)
> +               return;
> +       if (hidx < 0 || (u32)hidx >= w->num_idc)
> +               return;
> +
> +       idc = aplic_idc_base(w->addr, (u32)hidx);
> +
> +       /* QEMU workaround: clear pending after source deassert for level IRQ */
> +       writel(hwirq, idc + APLIC_CLRIPNUM);

This is unecessary for APLIC in direct-mode. The Linux APLIC driver
does not do this even on QEMU.

> +}
> +
> +static int aplic_hwirq_setup(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       const u32 hart_idx = 0;
> +       unsigned long idc;
> +       struct aplic_data *w = chip->chip_priv;
> +
> +       idc = w->addr + APLIC_IDC_BASE + hart_idx * APLIC_IDC_SIZE;
> +

The aplic_hwirq_setup() must fail over here for interrupts which are
delegated to child domains.

> +       /* APLIC: sourcecfg/target/enable */
> +       writel(APLIC_SOURCECFG_SM_LEVEL_HIGH,
> +              (void *)(w->addr + APLIC_SOURCECFG_BASE + (hwirq - 1) * 4));
> +
> +       writel((hart_idx << APLIC_TARGET_HART_IDX_SHIFT) | APLIC_DEFAULT_PRIORITY,
> +              (void *)(w->addr + APLIC_TARGET_BASE + (hwirq - 1) * 4));
> +
> +       writel(hwirq, (void *)(w->addr + APLIC_SETIENUM));
> +
> +       /* Direct mode for aia=aplic: DM=0 => don't set DM bit */
> +       writel(APLIC_DOMAINCFG_IE | APLIC_DOMAINCFG_BE,
> +              (void *)(w->addr + APLIC_DOMAINCFG));
> +
> +       /* IDC delivery */
> +       writel(APLIC_ENABLE_IDELIVERY, (void *)(idc + APLIC_IDC_IDELIVERY));
> +       writel(APLIC_ENABLE_ITHRESHOLD, (void *)(idc + APLIC_IDC_ITHRESHOLD));
> +
> +       /* Enable MEIE + global MIE */
> +       csr_set(CSR_MIE, (1UL << 11));  /* MEIE */

Drop this MIE csr programing since it is already done by sbi_irqchip framework.

> +       csr_set(CSR_MSTATUS, MSTATUS_MIE);

Even this is not needed because M-mode will take interrupt
even if mstatus.MIE == 0 when CPU is in lower privilege.

> +
> +       return SBI_OK;
> +}
> +
> +static int aplic_process_hwirqs(struct sbi_irqchip_device *chip)
> +{
> +       if (!chip)
> +               return SBI_ENODEV;
> +
> +       for (;;) {
> +               u32 hwirq = 0;
> +               int rc = aplic_hwirq_claim(chip, &hwirq);
> +
> +               if (rc == SBI_ENOENT)
> +                       break;
> +               if (rc)
> +                       return rc;
> +
> +               if (!hwirq)
> +                       break;
> +
> +               sbi_printf("[APLIC] IDC_TOPI_ID from CLAIMI (hwirq) %u\n",
> +                          hwirq);
> +
> +               if (hwirq > chip->num_hwirq) {
> +                       sbi_printf("[APLIC] hwirq %u > max (num_hwirq) %u)\n",
> +                                  hwirq, chip->num_hwirq);
> +                       break;
> +               }
> +
> +               sbi_irqchip_process_hwirq(chip, hwirq);
> +       }
> +
> +       return SBI_OK;
> +}
> +
>  int aplic_cold_irqchip_init(struct aplic_data *aplic)
>  {
>         int rc;
> @@ -308,12 +480,31 @@ int aplic_cold_irqchip_init(struct aplic_data *aplic)
>         /* Register irqchip device */
>         aplic->irqchip.id = aplic->unique_id;
>         aplic->irqchip.num_hwirq = aplic->num_source + 1;
> +       aplic->irqchip.chip_priv = aplic;
> +       aplic->irqchip.hwirq_mask = aplic_hwirq_mask;
> +       aplic->irqchip.hwirq_unmask = aplic_hwirq_unmask;
> +       aplic->irqchip.hwirq_eoi = aplic_hwirq_eoi;
> +       /*
> +        * Only the domain that directly injects interrupts into M-mode external
> +        * interrupt line should provide process_hwirqs().
> +        *
> +        * The other domain (e.g. S-mode) may still be registered so that its
> +        * other ops (mask/unmask/config/etc.) can be used, but it must not
> +        * claim to be the external interrupt line provider.
> +        */
> +       if (aplic->targets_mmode)
> +               aplic->irqchip.process_hwirqs = aplic_process_hwirqs;

Provide process_hwirqs() only when APLIC targets M-mode and
APLIC is in direct-mode.

> +       aplic->irqchip.hwirq_setup = aplic_hwirq_setup;
>         rc = sbi_irqchip_add_device(&aplic->irqchip);
>         if (rc)
>                 return rc;
>
>         /* Attach to the aplic list */
>         sbi_list_add_tail(&aplic->node, &aplic_list);
> +       rc = sbi_irqchip_register_handler(&aplic->irqchip, 1, aplic->num_source,
> +                                         aplic_hwirq_handler, NULL);

This is only needed when APLIC is in MSI-mode so drop this
registration and aplic_hwirq_handler.

> +       if (rc)
> +               return rc;
>
>         return 0;
>  }
> --
> 2.25.1
>
>
> --
> opensbi mailing list
> opensbi@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi

Regards,
Anup

-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

Re: [PATCH 2/3] lib: utils: irqchip: implement APLIC hwirq operation hooks

[Anup Patel]

On Thu, Feb 12, 2026 at 3:50 AM Raymond Mao <raymondmaoca@gmail.com> wrote:
>
> From: Raymond Mao <raymond.mao@riscstar.com>
>
> Add all APLIC reqiured operation hooks, includeing mask / unmask /
> eoi / setup / process and register them during cold init.
> During setup, program a minimal APLIC direct-mode configuration and
> enable MEIE, confirm external interrupts are claimed via IDC.CLAIMI.
> Add function to fetch the TOPI value and extract the source ID (hwirq)
> from CLAIMI, which is used by APLIC process hook.
>
> Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
> ---
>  lib/utils/irqchip/aplic.c | 191 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 191 insertions(+)
>
> diff --git a/lib/utils/irqchip/aplic.c b/lib/utils/irqchip/aplic.c
> index ec69c82b..f0ecef42 100644
> --- a/lib/utils/irqchip/aplic.c
> +++ b/lib/utils/irqchip/aplic.c
> @@ -245,6 +245,178 @@ static int aplic_check_msicfg(struct aplic_msicfg_data *msicfg)
>         return 0;
>  }
>
> +static int aplic_hwirq_handler(u32 hwirq, void *opaque)
> +{
> +       (void)opaque;
> +
> +       sbi_printf("[APLIC] Enter registered hwirq %u raw handler callback\n",
> +                  hwirq);
> +
> +       return SBI_OK;
> +}
> +
> +static inline void *aplic_idc_base(unsigned long aplic_addr, u32 idc_index)
> +{
> +       return (void *)(aplic_addr + APLIC_IDC_BASE +
> +                       (unsigned long)idc_index * APLIC_IDC_SIZE);
> +}
> +
> +static void aplic_hwirq_mask(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +
> +       if (!w || !hwirq)
> +               return;
> +
> +       if (!w->addr || hwirq > w->num_source)
> +               return;
> +
> +       /* Disable source */
> +       writel(hwirq, (void *)(w->addr + APLIC_CLRIENUM));
> +}
> +
> +static void aplic_hwirq_unmask(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +
> +       if (!w || !hwirq)
> +               return;
> +
> +       if (!w->addr || hwirq > w->num_source)
> +               return;
> +
> +       /* Enable source */
> +       writel(hwirq, (void *)(w->addr + APLIC_SETIENUM));
> +}
> +
> +static int aplic_hwirq_claim(struct sbi_irqchip_device *chip, u32 *hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;

This can simply be:

struct aplic_data *w = container_of(chip, struct aplic_data, irqchip);

No need of "chip_priv" in "struct sbi_irqchip_device"

> +       u32 hartid = current_hartid();
> +       int hidx = sbi_hartid_to_hartindex(hartid);
> +       void *idc;
> +       u32 v, id;
> +
> +       if (!w || !hwirq)
> +               return SBI_EINVAL;
> +
> +       if (!w->addr || hidx < 0 || (u32)hidx >= w->num_idc)
> +               return SBI_ENODEV;
> +
> +       idc = aplic_idc_base(w->addr, (u32)hidx);
> +
> +       /*
> +        * Read CLAIMI: returns TOPI value.
> +        * ID==0 means spurious interrupt (spec-defined).
> +        */
> +       v = readl(idc + APLIC_IDC_CLAIMI); /* dequeue */
> +       /*
> +        * QEMU workaround: Read CLAIMI a second time since QEMU's APLIC model
> +        * currently has a bug and may not clear pending on deassert after the
> +        * first reading.
> +        */
> +       if (readl(idc + APLIC_IDC_CLAIMI) != v)
> +               return SBI_ENOENT;
> +
> +       id = (v >> APLIC_IDC_TOPI_ID_SHIFT) & APLIC_IDC_TOPI_ID_MASK;
> +
> +       /* ID==0 means spurious / no pending wired interrupt */
> +       if (!id)
> +               return SBI_ENOENT;
> +
> +       /* Bound check against DT-discovered num_src */
> +       if (id > w->num_source)
> +               return SBI_EINVAL;
> +
> +       *hwirq = id;
> +
> +       return SBI_OK;
> +}
> +
> +static void aplic_hwirq_eoi(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       struct aplic_data *w = chip->chip_priv;
> +       u32 hartid = current_hartid();
> +       int hidx = sbi_hartid_to_hartindex(hartid);
> +       void *idc;
> +
> +       sbi_printf("[APLIC] Enter regitered EOI of hwirq %u\n", hwirq);
> +
> +       if (!w || !w->addr)
> +               return;
> +       if (hidx < 0 || (u32)hidx >= w->num_idc)
> +               return;
> +
> +       idc = aplic_idc_base(w->addr, (u32)hidx);
> +
> +       /* QEMU workaround: clear pending after source deassert for level IRQ */
> +       writel(hwirq, idc + APLIC_CLRIPNUM);
> +}
> +
> +static int aplic_hwirq_setup(struct sbi_irqchip_device *chip, u32 hwirq)
> +{
> +       const u32 hart_idx = 0;
> +       unsigned long idc;
> +       struct aplic_data *w = chip->chip_priv;
> +
> +       idc = w->addr + APLIC_IDC_BASE + hart_idx * APLIC_IDC_SIZE;
> +
> +       /* APLIC: sourcecfg/target/enable */
> +       writel(APLIC_SOURCECFG_SM_LEVEL_HIGH,
> +              (void *)(w->addr + APLIC_SOURCECFG_BASE + (hwirq - 1) * 4));
> +
> +       writel((hart_idx << APLIC_TARGET_HART_IDX_SHIFT) | APLIC_DEFAULT_PRIORITY,
> +              (void *)(w->addr + APLIC_TARGET_BASE + (hwirq - 1) * 4));
> +
> +       writel(hwirq, (void *)(w->addr + APLIC_SETIENUM));
> +
> +       /* Direct mode for aia=aplic: DM=0 => don't set DM bit */
> +       writel(APLIC_DOMAINCFG_IE | APLIC_DOMAINCFG_BE,
> +              (void *)(w->addr + APLIC_DOMAINCFG));
> +
> +       /* IDC delivery */
> +       writel(APLIC_ENABLE_IDELIVERY, (void *)(idc + APLIC_IDC_IDELIVERY));
> +       writel(APLIC_ENABLE_ITHRESHOLD, (void *)(idc + APLIC_IDC_ITHRESHOLD));
> +
> +       /* Enable MEIE + global MIE */
> +       csr_set(CSR_MIE, (1UL << 11));  /* MEIE */
> +       csr_set(CSR_MSTATUS, MSTATUS_MIE);
> +
> +       return SBI_OK;
> +}
> +
> +static int aplic_process_hwirqs(struct sbi_irqchip_device *chip)
> +{
> +       if (!chip)
> +               return SBI_ENODEV;
> +
> +       for (;;) {
> +               u32 hwirq = 0;
> +               int rc = aplic_hwirq_claim(chip, &hwirq);
> +
> +               if (rc == SBI_ENOENT)
> +                       break;
> +               if (rc)
> +                       return rc;
> +
> +               if (!hwirq)
> +                       break;
> +
> +               sbi_printf("[APLIC] IDC_TOPI_ID from CLAIMI (hwirq) %u\n",
> +                          hwirq);
> +
> +               if (hwirq > chip->num_hwirq) {
> +                       sbi_printf("[APLIC] hwirq %u > max (num_hwirq) %u)\n",
> +                                  hwirq, chip->num_hwirq);
> +                       break;
> +               }
> +
> +               sbi_irqchip_process_hwirq(chip, hwirq);
> +       }
> +
> +       return SBI_OK;
> +}
> +
>  int aplic_cold_irqchip_init(struct aplic_data *aplic)
>  {
>         int rc;
> @@ -308,12 +480,31 @@ int aplic_cold_irqchip_init(struct aplic_data *aplic)
>         /* Register irqchip device */
>         aplic->irqchip.id = aplic->unique_id;
>         aplic->irqchip.num_hwirq = aplic->num_source + 1;
> +       aplic->irqchip.chip_priv = aplic;
> +       aplic->irqchip.hwirq_mask = aplic_hwirq_mask;
> +       aplic->irqchip.hwirq_unmask = aplic_hwirq_unmask;
> +       aplic->irqchip.hwirq_eoi = aplic_hwirq_eoi;
> +       /*
> +        * Only the domain that directly injects interrupts into M-mode external
> +        * interrupt line should provide process_hwirqs().
> +        *
> +        * The other domain (e.g. S-mode) may still be registered so that its
> +        * other ops (mask/unmask/config/etc.) can be used, but it must not
> +        * claim to be the external interrupt line provider.
> +        */
> +       if (aplic->targets_mmode)
> +               aplic->irqchip.process_hwirqs = aplic_process_hwirqs;
> +       aplic->irqchip.hwirq_setup = aplic_hwirq_setup;
>         rc = sbi_irqchip_add_device(&aplic->irqchip);
>         if (rc)
>                 return rc;
>
>         /* Attach to the aplic list */
>         sbi_list_add_tail(&aplic->node, &aplic_list);
> +       rc = sbi_irqchip_register_handler(&aplic->irqchip, 1, aplic->num_source,
> +                                         aplic_hwirq_handler, NULL);
> +       if (rc)
> +               return rc;
>
>         return 0;
>  }
> --
> 2.25.1
>
>
> --
> opensbi mailing list
> opensbi@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi

-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

[PATCH 3/3][NOT-FOR-UPSTREAM] lib: utils: irqchip: add QEMU virt test for APLIC wired IRQs

[Raymond Mao]

From: Raymond Mao <raymond.mao@riscstar.com>

Add a QEMU virt specific test for APLIC wired external interrupt
handling.
When APLIC_QEMU_WIRED_TEST is enabled, this adds a small test hook as
a bring-up aid for validating the wired interrupt path.

Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
---
 Makefile                  |  3 +++
 lib/utils/irqchip/aplic.c | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/Makefile b/Makefile
index 46541063..418ee1aa 100644
--- a/Makefile
+++ b/Makefile
@@ -399,6 +399,9 @@ CFLAGS		+=	$(GENFLAGS)
 CFLAGS		+=	$(platform-cflags-y)
 CFLAGS		+=	-fPIE -pie
 CFLAGS		+=	$(firmware-cflags-y)
+ifeq ($(APLIC_QEMU_WIRED_TEST),y)
+CFLAGS		+=	-DAPLIC_QEMU_WIRED_TEST
+endif
 
 CPPFLAGS	+=	$(GENFLAGS)
 CPPFLAGS	+=	$(platform-cppflags-y)
diff --git a/lib/utils/irqchip/aplic.c b/lib/utils/irqchip/aplic.c
index f0ecef42..63697e14 100644
--- a/lib/utils/irqchip/aplic.c
+++ b/lib/utils/irqchip/aplic.c
@@ -119,6 +119,41 @@ static SBI_LIST_HEAD(aplic_list);
 static void aplic_writel_msicfg(struct aplic_msicfg_data *msicfg,
 				void *msicfgaddr, void *msicfgaddrH);
 
+#ifdef APLIC_QEMU_WIRED_TEST
+
+#define UART_QEMU_MMIO 0x10000000UL
+
+static void aplic_test_uart_handler(void)
+{
+	volatile u8 *uart = (volatile u8 *)UART_QEMU_MMIO;
+
+	/* Drain RX FIFO to clear the interrupt source */
+	while (uart[0x05] & 0x01) {        /* LSR.DR */
+		u8 ch = uart[0x00];            /* RBR */
+
+		sbi_printf("[APLIC TEST] UART got '%c'(0x%02x)\n",
+			   (ch >= 32 && ch < 127) ? ch : '.', ch);
+	}
+
+	/* (Optional) read IIR to acknowledge on some models */
+	(void)uart[0x02]; /* IIR is at offset 2 when DLAB=0; */
+}
+
+static void aplic_hwirq_test_run(unsigned long aplic_addr)
+{
+	volatile u8 *uart = (volatile u8 *)UART_QEMU_MMIO;
+
+	/* UART: enable RX interrupt */
+	uart[0x02] = 0x07;          /* FCR enable+clear */
+	uart[0x04] |= (1 << 3);     /* MCR.OUT2 */
+	uart[0x01] |= 0x01;         /* IER.ERBFI */
+	while (uart[0x05] & 0x01)   /* drain */
+		(void)uart[0x00];
+
+	sbi_printf("[APLIC TEST] Setup done. Type keys now.\n");
+}
+#endif
+
 static void aplic_init(struct aplic_data *aplic)
 {
 	struct aplic_delegate_data *deleg;
@@ -245,6 +280,7 @@ static int aplic_check_msicfg(struct aplic_msicfg_data *msicfg)
 	return 0;
 }
 
+#ifdef APLIC_QEMU_WIRED_TEST
 static int aplic_hwirq_handler(u32 hwirq, void *opaque)
 {
 	(void)opaque;
@@ -252,8 +288,12 @@ static int aplic_hwirq_handler(u32 hwirq, void *opaque)
 	sbi_printf("[APLIC] Enter registered hwirq %u raw handler callback\n",
 		   hwirq);
 
+	if (hwirq == 10)
+		aplic_test_uart_handler();
+
 	return SBI_OK;
 }
+#endif
 
 static inline void *aplic_idc_base(unsigned long aplic_addr, u32 idc_index)
 {
@@ -501,10 +541,14 @@ int aplic_cold_irqchip_init(struct aplic_data *aplic)
 
 	/* Attach to the aplic list */
 	sbi_list_add_tail(&aplic->node, &aplic_list);
+#ifdef APLIC_QEMU_WIRED_TEST
 	rc = sbi_irqchip_register_handler(&aplic->irqchip, 1, aplic->num_source,
 					  aplic_hwirq_handler, NULL);
 	if (rc)
 		return rc;
 
+	/* Enable test in M-mode before jumping to any payload */
+	aplic_hwirq_test_run(aplic->addr);
+#endif
 	return 0;
 }
-- 
2.25.1


-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi