2019-09-09 22:22:25

by Marc Zyngier

Subject: Re: [PATCH 1/1] irqchip: al-fic: add support for irq retrigger

On Mon, 09 Sep 2019 09:39:18 +0100,
Talel Shenhar <[email protected]> wrote:

Hi Talel,

>
> Introduce interrupts retrigger support for Amazon's Annapurna Labs Fabric
> Interrupt Controller.
>
> Signed-off-by: Talel Shenhar <[email protected]>
> ---
> drivers/irqchip/irq-al-fic.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/irqchip/irq-al-fic.c b/drivers/irqchip/irq-al-fic.c
> index 1a57cee..0b0a737 100644
> --- a/drivers/irqchip/irq-al-fic.c
> +++ b/drivers/irqchip/irq-al-fic.c
> @@ -15,6 +15,7 @@
>
> /* FIC Registers */
> #define AL_FIC_CAUSE 0x00
> +#define AL_FIC_SET_CAUSE 0x08
> #define AL_FIC_MASK 0x10
> #define AL_FIC_CONTROL 0x28
>
> @@ -126,6 +127,16 @@ static void al_fic_irq_handler(struct irq_desc *desc)
> chained_irq_exit(irqchip, desc);
> }
>
> +static int al_fic_irq_retrigger(struct irq_data *data)
> +{
> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
> + struct al_fic *fic = gc->private;
> +
> + writel_relaxed(BIT(data->hwirq), fic->base + AL_FIC_SET_CAUSE);
> +
> + return 1;
> +}
> +
> static int al_fic_register(struct device_node *node,
> struct al_fic *fic)
> {
> @@ -159,6 +170,7 @@ static int al_fic_register(struct device_node *node,
> gc->chip_types->chip.irq_unmask = irq_gc_mask_clr_bit;
> gc->chip_types->chip.irq_ack = irq_gc_ack_clr_bit;
> gc->chip_types->chip.irq_set_type = al_fic_irq_set_type;
> + gc->chip_types->chip.irq_retrigger = al_fic_irq_retrigger;
> gc->chip_types->chip.flags = IRQCHIP_SKIP_SET_WAKE;
> gc->private = fic;

Looks good to me. Is this a fix or a new feature? If the former, I can
queue it up for -rc1.

M.

--
Jazz is not dead, it just smells funny.

2019-09-10 05:43:44

by Shenhar, Talel

Subject: Re: [UNVERIFIED SENDER] Re: [PATCH 1/1] irqchip: al-fic: add support for irq retrigger

On 9/9/2019 12:40 PM, Marc Zyngier wrote:
> On Mon, 09 Sep 2019 09:39:18 +0100,
> Talel Shenhar <[email protected]> wrote:
>
> Hi Talel,
>
>> Introduce interrupts retrigger support for Amazon's Annapurna Labs Fabric
>> Interrupt Controller.
>>
>> Signed-off-by: Talel Shenhar <[email protected]>
>> ---
>> drivers/irqchip/irq-al-fic.c | 12 ++++++++++++
>> 1 file changed, 12 insertions(+)
>>
>> diff --git a/drivers/irqchip/irq-al-fic.c b/drivers/irqchip/irq-al-fic.c
>> index 1a57cee..0b0a737 100644
>> --- a/drivers/irqchip/irq-al-fic.c
>> +++ b/drivers/irqchip/irq-al-fic.c
>> @@ -15,6 +15,7 @@
>>
>> /* FIC Registers */
>> #define AL_FIC_CAUSE 0x00
>> +#define AL_FIC_SET_CAUSE 0x08
>> #define AL_FIC_MASK 0x10
>> #define AL_FIC_CONTROL 0x28
>>
>> @@ -126,6 +127,16 @@ static void al_fic_irq_handler(struct irq_desc *desc)
>> chained_irq_exit(irqchip, desc);
>> }
>>
>> +static int al_fic_irq_retrigger(struct irq_data *data)
>> +{
>> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
>> + struct al_fic *fic = gc->private;
>> +
>> + writel_relaxed(BIT(data->hwirq), fic->base + AL_FIC_SET_CAUSE);
>> +
>> + return 1;
>> +}
>> +
>> static int al_fic_register(struct device_node *node,
>> struct al_fic *fic)
>> {
>> @@ -159,6 +170,7 @@ static int al_fic_register(struct device_node *node,
>> gc->chip_types->chip.irq_unmask = irq_gc_mask_clr_bit;
>> gc->chip_types->chip.irq_ack = irq_gc_ack_clr_bit;
>> gc->chip_types->chip.irq_set_type = al_fic_irq_set_type;
>> + gc->chip_types->chip.irq_retrigger = al_fic_irq_retrigger;
>> gc->chip_types->chip.flags = IRQCHIP_SKIP_SET_WAKE;
>> gc->private = fic;
> Looks good to me. Is this a fix or a new feature? If the former, I can
> queue it up for -rc1.
>
> M.

This is an enhancement to the merged al-fic driver. queuing it up sounds
good.

Thanks Marc!