On Thu, 3 Sep 2020 16:25:50 +0100
Marc Zyngier <maz@xxxxxxxxxx> wrote:
> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Hi Marc,
Again, only trivial stuff in here from me.
Jonathan
> ---
> drivers/irqchip/Kconfig | 6 +
> drivers/irqchip/Makefile | 1 +
> drivers/irqchip/irq-rvid.c | 259 +++++++++++++++++++++++++++++++
> include/linux/irqchip/irq-rvic.h | 19 +++
> 4 files changed, 285 insertions(+)
> create mode 100644 drivers/irqchip/irq-rvid.c
>
...
> +static int rvid_irq_set_affinity(struct irq_data *data,
> + const struct cpumask *mask_val,
> + bool force)
> +{
> + unsigned int old_cpu, cpu;
> + bool masked, pending;
> + int err = 0, ret;
Looks like err is set in all paths (might change in later patches of
course!)
> + u64 mpidr;
> +
> + if (force)
> + cpu = cpumask_first(mask_val);
> + else
> + cpu = cpumask_any_and(mask_val, cpu_online_mask);
> +
> + if (cpu >= nr_cpu_ids)
> + return -EINVAL;
> +
> + mpidr = cpu_logical_map(cpu) & MPIDR_HWID_BITMASK;
> + old_cpu = cpumask_first(data->common->effective_affinity);
> + if (cpu == old_cpu)
> + return 0;
> +
> + /* Mask on source */
> + masked = irqd_irq_masked(data);
> + if (!masked)
> + irq_chip_mask_parent(data);
> +
> + /* Switch to target */
> + irq_data_update_effective_affinity(data, cpumask_of(cpu));
> +
> + /* Mask on target */
> + irq_chip_mask_parent(data);
> +
> + /* Map the input signal to the new target */
> + ret = rvid_map(data->hwirq, mpidr, data->parent_data->hwirq);
> + if (ret != RVID_STATUS_SUCCESS) {
> + err = -ENXIO;
> + goto unmask;
> + }
> +
> + /* Back to the source */
> + irq_data_update_effective_affinity(data, cpumask_of(old_cpu));
> +
> + /* Sample pending state and clear it if necessary */
> + err = irq_chip_get_parent_state(data, IRQCHIP_STATE_PENDING, &pending);
> + if (err)
> + goto unmask;
> + if (pending)
> + irq_chip_set_parent_state(data, IRQCHIP_STATE_PENDING, false);
> +
> + /*
> + * To the target again (for good this time), propagating the
> + * pending bit if required.
> + */
> + irq_data_update_effective_affinity(data, cpumask_of(cpu));
> + if (pending)
> + irq_chip_set_parent_state(data, IRQCHIP_STATE_PENDING, true);
> +unmask:
> + /* Propagate the masking state */
> + if (!masked)
> + irq_chip_unmask_parent(data);
> +
> + return err;
> +}
> +
...
> +static int rvid_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
> + unsigned int nr_irqs, void *arg)
> +{
> + struct irq_fwspec *fwspec = arg;
> + unsigned int type = IRQ_TYPE_NONE;
> + irq_hw_number_t hwirq;
> + int i, ret;
> +
> + ret = irq_domain_translate_onecell(domain, fwspec, &hwirq, &type);
> + if (ret)
> + return ret;
> +
> + for (i = 0; i < nr_irqs; i++) {
> + unsigned int intid = hwirq + i;
> + unsigned int irq = virq + i;
> +
> + /* Get the rVIC to allocate any untrusted intid */
> + ret = irq_domain_alloc_irqs_parent(domain, irq, 1, NULL);
> + if (WARN_ON(ret))
> + return ret;
> +
> + irq_domain_set_hwirq_and_chip(domain, irq, intid,
> + &rvid_chip, &rvid);
> + irqd_set_affinity_on_activate(irq_get_irq_data(irq));
> + }
> +
> + return 0;
> +}
> +
> +static void rvid_irq_domain_free(struct irq_domain *domain, unsigned int virq,
> + unsigned int nr_irqs)
> +{
> + int i;
> +
> + irq_domain_free_irqs_parent(domain, virq, nr_irqs);
> +
> + for (i = 0; i < nr_irqs; i++) {
> + struct irq_data *d;
Trivial but for ease of comparison with _alloc, perhaps add
unsigned int int = virq + i;
> +
> + d = irq_domain_get_irq_data(domain, virq + i);
> + irq_set_handler(virq + i, NULL);
> + irq_domain_reset_irq_data(d);
> + }
> +}
> +
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
