[PATCH v4 03/13] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller
Thomas Gleixner
tglx at linutronix.de
Fri Dec 8 08:01:36 PST 2023
On Wed, Nov 22 2023 at 20:12, Yu Chien Peter Lin wrote:
> To share the riscv_intc_domain_map() with the generic RISC-V INTC and
> ACPI, we add a chip parameter to riscv_intc_init_common(), so it can be
s/we//
See: Documentation/process/
> passed to the irq_domain_set_info() as private data.
> diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c
> index 2fdd40f2a791..30f0036c8978 100644
> --- a/drivers/irqchip/irq-riscv-intc.c
> +++ b/drivers/irqchip/irq-riscv-intc.c
> @@ -17,6 +17,7 @@
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/smp.h>
> +#include <linux/soc/andes/irq.h>
>
> static struct irq_domain *intc_domain;
>
> @@ -46,6 +47,31 @@ static void riscv_intc_irq_unmask(struct irq_data *d)
> csr_set(CSR_IE, BIT(d->hwirq));
> }
>
> +static void andes_intc_irq_mask(struct irq_data *d)
> +{
> + /*
> + * Andes specific S-mode local interrupt causes (hwirq)
> + * are defined as (256 + n) and controlled by n-th bit
> + * of SLIE.
> + */
> + unsigned int mask = BIT(d->hwirq % BITS_PER_LONG);
How is this supposed to be correct with BITS_PER_LONG == 64?
> +
> + if (d->hwirq < ANDES_SLI_CAUSE_BASE)
> + csr_clear(CSR_IE, mask);
> + else
> + csr_clear(ANDES_CSR_SLIE, mask);
> +}
> +
> +static void andes_intc_irq_unmask(struct irq_data *d)
> +{
> + unsigned int mask = BIT(d->hwirq % BITS_PER_LONG);
Ditto.
> + if (d->hwirq < ANDES_SLI_CAUSE_BASE)
> + csr_set(CSR_IE, mask);
> + else
> + csr_set(ANDES_CSR_SLIE, mask);
> +}
> static int riscv_intc_domain_map(struct irq_domain *d, unsigned int irq,
> irq_hw_number_t hwirq)
> {
> + struct irq_chip *chip = d->host_data;
> +
> irq_set_percpu_devid(irq);
> - irq_domain_set_info(d, irq, hwirq, &riscv_intc_chip, d->host_data,
> + irq_domain_set_info(d, irq, hwirq, chip, d->host_data,
So this sets 'chip_data' to the chip itself. What's the point? Just set
it to NULL as the chip obviously does not need chip_data at all.
> handle_percpu_devid_irq, NULL, NULL);
>
> return 0;
> @@ -112,11 +147,12 @@ static struct fwnode_handle *riscv_intc_hwnode(void)
> return intc_domain->fwnode;
> }
>
> -static int __init riscv_intc_init_common(struct fwnode_handle *fn)
> +static int __init riscv_intc_init_common(struct fwnode_handle *fn,
> + struct irq_chip *chip)
> {
> int rc;
>
> - intc_domain = irq_domain_create_tree(fn, &riscv_intc_domain_ops, NULL);
> + intc_domain = irq_domain_create_tree(fn, &riscv_intc_domain_ops, chip);
> if (!intc_domain) {
> pr_err("unable to add IRQ domain\n");
> return -ENXIO;
> @@ -138,6 +174,7 @@ static int __init riscv_intc_init(struct device_node *node,
> {
> int rc;
> unsigned long hartid;
> + struct irq_chip *chip = &riscv_intc_chip;
https://www.kernel.org/doc/html/latest/process/maintainer-tip.html#variable-declarations
Thanks
tglx
More information about the linux-riscv
mailing list