Chanho Park wrote:
>
> This patch adds set_irq_affinity function for combiner_irq. We need this
> function to enable a arm-pmu because the pmu of exynos has combined type
> irqs.
>
> Reviewed-by: Thomas Abraham <thomas.abra...@linaro.org>
> Signed-off-by: Chanho Park <chanho61.p...@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
> ---
> arch/arm/mach-exynos/common.c | 30 +++++++++++++++++++++++++-----
> 1 file changed, 25 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
> index 715b690..709245e 100644
> --- a/arch/arm/mach-exynos/common.c
> +++ b/arch/arm/mach-exynos/common.c
> @@ -405,6 +405,7 @@ struct combiner_chip_data {
> unsigned int irq_offset;
> unsigned int irq_mask;
> void __iomem *base;
> + unsigned int parent_irq;
> };
>
> static struct irq_domain *combiner_irq_domain;
> @@ -461,10 +462,28 @@ static void combiner_handle_cascade_irq(unsigned int
> irq, struct irq_desc *desc)
> chained_irq_exit(chip, desc);
> }
>
> +#ifdef CONFIG_SMP
> +static int combiner_set_affinity(struct irq_data *d,
> + const struct cpumask *mask_val, bool force)
> +{
> + struct combiner_chip_data *chip_data =
> irq_data_get_irq_chip_data(d);
> + struct irq_chip *chip = irq_get_chip(chip_data->parent_irq);
> + struct irq_data *data = irq_get_irq_data(chip_data->parent_irq);
> +
> + if (chip && chip->irq_set_affinity)
> + return chip->irq_set_affinity(data, mask_val, force);
> + else
> + return -EINVAL;
> +}
> +#endif
> +
> static struct irq_chip combiner_chip = {
> - .name = "COMBINER",
> - .irq_mask = combiner_mask_irq,
> - .irq_unmask = combiner_unmask_irq,
> + .name = "COMBINER",
> + .irq_mask = combiner_mask_irq,
> + .irq_unmask = combiner_unmask_irq,
> +#ifdef CONFIG_SMP
> + .irq_set_affinity = combiner_set_affinity,
> +#endif
> };
>
> static void __init combiner_cascade_irq(unsigned int combiner_nr,
> unsigned int irq)
> @@ -484,12 +503,13 @@ static void __init combiner_cascade_irq(unsigned int
> combiner_nr, unsigned int i
> }
>
> static void __init combiner_init_one(unsigned int combiner_nr,
> - void __iomem *base)
> + void __iomem *base, unsigned int irq)
> {
> combiner_data[combiner_nr].base = base;
> combiner_data[combiner_nr].irq_offset = irq_find_mapping(
> combiner_irq_domain, combiner_nr * MAX_IRQ_IN_COMBINER);
> combiner_data[combiner_nr].irq_mask = 0xff << ((combiner_nr % 4) <<
> 3);
> + combiner_data[combiner_nr].parent_irq = irq;
>
> /* Disable all interrupts */
> __raw_writel(combiner_data[combiner_nr].irq_mask,
> @@ -573,12 +593,12 @@ static void __init combiner_init(void __iomem
> *combiner_base,
> }
>
> for (i = 0; i < max_nr; i++) {
> - combiner_init_one(i, combiner_base + (i >> 2) * 0x10);
> irq = IRQ_SPI(i);
> #ifdef CONFIG_OF
> if (np)
> irq = irq_of_parse_and_map(np, i);
> #endif
> + combiner_init_one(i, combiner_base + (i >> 2) * 0x10, irq);
> combiner_cascade_irq(i, irq);
> }
> }
> --
> 1.7.9.5
Looks good to me, applied.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene....@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
