Hi,
On 16/11/2020 17:24:25+0100, Gregory CLEMENT wrote:
> static void ocelot_irq_unmask(struct irq_data *data)
> {
> struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
> + struct irq_domain *d = data->domain;
> + struct chip_props *p = d->host_data;
> struct irq_chip_type *ct = irq_data_get_chip_type(data);
> unsigned int mask = data->mask;
> u32 val;
>
> irq_gc_lock(gc);
> - val = irq_reg_readl(gc, ICPU_CFG_INTR_INTR_TRIGGER(0)) |
> - irq_reg_readl(gc, ICPU_CFG_INTR_INTR_TRIGGER(1));
> - if (!(val & mask))
> - irq_reg_writel(gc, mask, ICPU_CFG_INTR_INTR_STICKY);
> + if (p->flags & FLAGS_HAS_TRIGGER) {
> + val = irq_reg_readl(gc, ICPU_CFG_INTR_INTR_TRIGGER(p, 0)) |
> + irq_reg_readl(gc, ICPU_CFG_INTR_INTR_TRIGGER(p, 1));
> + if (!(val & mask))
> + irq_reg_writel(gc, mask, p->reg_off_sticky);
> + }
>
> *ct->mask_cache &= ~mask;
> - irq_reg_writel(gc, mask, ICPU_CFG_INTR_INTR_ENA_SET);
> + irq_reg_writel(gc, mask, p->reg_off_ena_set);
> irq_gc_unlock(gc);
> }
Looking at that again, I think you should leave this function as is...
>
> +static void luton_irq_force(struct irq_data *data,
> + struct irq_chip_generic *gc,
> + struct chip_props *p)
> +{
> + int off = p->reg_off_force + (data->hwirq * sizeof(u32));
> + u32 val = irq_reg_readl(gc, off);
> +
> + irq_reg_writel(gc, val | BIT(3), off);
> +}
> +
> +static int ocelot_irq_force(struct irq_data *data,
> + enum irqchip_irq_state which, bool state)
> +{
> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
> + struct irq_domain *d = data->domain;
> + struct chip_props *p = d->host_data;
> + int ret = -EINVAL;
> +
> + /* Only supports triggering */
> + if ((which == IRQCHIP_STATE_PENDING ||
> + which == IRQCHIP_STATE_ACTIVE) &&
> + state && p->reg_off_force) {
> + if (p->flags & FLAGS_FORCE_LUTON_STYLE)
> + /* Config register style */
> + luton_irq_force(data, gc, p);
> + else
> + /* New, bitmask style */
> + irq_reg_writel(gc, data->mask, p->reg_off_force);
> + ret = 0;
> + }
> +
> + return ret;
> +}
> +
I think the addition of the force function may be separated in an
different patch.
> -static int __init ocelot_irq_init(struct device_node *node,
> - struct device_node *parent)
> +static int __init vcoreiii_irq_init(struct device_node *node,
> + struct device_node *parent,
> + const struct chip_props *p)
> {
> struct irq_domain *domain;
> struct irq_chip_generic *gc;
> int parent_irq, ret;
>
> + pr_info("%s: Load, %d irqs\n", node->name, p->n_irq);
> +
Is this necessary?
> parent_irq = irq_of_parse_and_map(node, 0);
> if (!parent_irq)
> return -EINVAL;
>
> - domain = irq_domain_add_linear(node, OCELOT_NR_IRQ,
> + domain = irq_domain_add_linear(node, p->n_irq,
> &irq_generic_chip_ops, NULL);
> if (!domain) {
> pr_err("%pOFn: unable to add irq domain\n", node);
> return -ENOMEM;
> }
>
> - ret = irq_alloc_domain_generic_chips(domain, OCELOT_NR_IRQ, 1,
> + ret = irq_alloc_domain_generic_chips(domain, p->n_irq, 1,
> "icpu", handle_level_irq,
> 0, 0, 0);
> if (ret) {
> @@ -92,16 +171,23 @@ static int __init ocelot_irq_init(struct device_node *node,
> goto err_gc_free;
> }
>
> - gc->chip_types[0].regs.ack = ICPU_CFG_INTR_INTR_STICKY;
> - gc->chip_types[0].regs.mask = ICPU_CFG_INTR_INTR_ENA_CLR;
> + gc->chip_types[0].regs.ack = p->reg_off_sticky;
> + gc->chip_types[0].regs.mask = p->reg_off_ena_clr;
> gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit;
> gc->chip_types[0].chip.irq_mask = irq_gc_mask_set_bit;
> gc->chip_types[0].chip.irq_unmask = ocelot_irq_unmask;
> + gc->chip_types[0].chip.irq_unmask = ocelot_irq_unmask;
This is assigned the same member twice.
As said, you can probably leave ocelot_irq_unmask so we avoid having an
if in the hot path.
You should test here for triggers and if they are not available, then
you can use regs.enable/regs.disable and irq_gc_mask_disable_reg and
irq_gc_unmask_enable_reg instead of regs.mask and
irq_gc_mask_set_bit/ocelot_irq_unmask
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
