From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751549AbdFZIVA (ORCPT <rfc822;w@1wt.eu>);
        Mon, 26 Jun 2017 04:21:00 -0400
Received: from Galois.linutronix.de ([146.0.238.70]:38710 "EHLO
        Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751470AbdFZIUs (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 26 Jun 2017 04:20:48 -0400
Date: Mon, 26 Jun 2017 10:20:44 +0200 (CEST)
From: Thomas Gleixner <tglx@linutronix.de>
To: Jeffy Chen <jeffy.chen@rock-chips.com>
cc: linux-kernel@vger.kernel.org, briannorris@chromium.org,
        dianders@chromium.org, tfiga@chromium.org
Subject: Re: [RFC PATCH] genirq: Avoid unnecessary low level irq function
 calls
In-Reply-To: <1498457522-25045-1-git-send-email-jeffy.chen@rock-chips.com>
Message-ID: <alpine.DEB.2.20.1706261011540.2425@nanos>
References: <1498457522-25045-1-git-send-email-jeffy.chen@rock-chips.com>
User-Agent: Alpine 2.20 (DEB 67 2015-01-07)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Jeffy,

On Mon, 26 Jun 2017, Jeffy Chen wrote:
>  void irq_enable(struct irq_desc *desc)
>  {
> -	irq_state_clr_disabled(desc);
> -	if (desc->irq_data.chip->irq_enable)
> -		desc->irq_data.chip->irq_enable(&desc->irq_data);
> -	else
> -		desc->irq_data.chip->irq_unmask(&desc->irq_data);
> -	irq_state_clr_masked(desc);
> +	if (irqd_is_started(&desc->irq_data) &&
> +	    !irqd_irq_disabled(&desc->irq_data)) {
> +		unmask_irq(desc);

I'm having a hard time to understand the logic here.

    if (started && !disabled)
    	unmask()

That does not make any sense. If you need that to work around a state
inconsistency then it needs to be addressed there and not worked around
here.

> +	} else {
> +		irq_state_clr_disabled(desc);
> +		if (desc->irq_data.chip->irq_enable) {
> +			desc->irq_data.chip->irq_enable(&desc->irq_data);
> +			irq_state_clr_masked(desc);
> +		} else {
> +			unmask_irq(desc);
> +		}
> +	}
>  }
>  
>  static void __irq_disable(struct irq_desc *desc, bool mask)
>  {
> -	irq_state_set_disabled(desc);
> -	if (desc->irq_data.chip->irq_disable) {
> -		desc->irq_data.chip->irq_disable(&desc->irq_data);
> -		irq_state_set_masked(desc);
> -	} else if (mask) {
> -		mask_irq(desc);
> +	if (irqd_irq_disabled(&desc->irq_data)) {
> +		if (mask)
> +			mask_irq(desc);
> +	} else {
> +		irq_state_set_disabled(desc);
> +		if (desc->irq_data.chip->irq_disable) {
> +			desc->irq_data.chip->irq_disable(&desc->irq_data);
> +			irq_state_set_masked(desc);
> +		} else if (mask) {
> +			mask_irq(desc);
> +		}
>  	}
>  }
>  
> @@ -311,18 +322,21 @@ void irq_percpu_disable(struct irq_desc *desc, unsigned int cpu)
>  
>  static inline void mask_ack_irq(struct irq_desc *desc)
>  {
> -	if (desc->irq_data.chip->irq_mask_ack)
> +	if (desc->irq_data.chip->irq_mask_ack) {
>  		desc->irq_data.chip->irq_mask_ack(&desc->irq_data);
> -	else {
> -		desc->irq_data.chip->irq_mask(&desc->irq_data);
> +		irq_state_set_masked(desc);
> +	} else {
> +		mask_irq(desc);
>  		if (desc->irq_data.chip->irq_ack)
>  			desc->irq_data.chip->irq_ack(&desc->irq_data);
>  	}
> -	irq_state_set_masked(desc);
>  }
>  
>  void mask_irq(struct irq_desc *desc)
>  {
> +	if (irqd_irq_masked(&desc->irq_data))
> +		return;
> +
>  	if (desc->irq_data.chip->irq_mask) {
>  		desc->irq_data.chip->irq_mask(&desc->irq_data);
>  		irq_state_set_masked(desc);
> @@ -331,6 +345,10 @@ void mask_irq(struct irq_desc *desc)
>  
>  void unmask_irq(struct irq_desc *desc)
>  {
> +	if (irqd_is_started(&desc->irq_data) &&
> +	    !irqd_irq_masked(&desc->irq_data))
> +		return;

Ditto.

Thanks,

	tglx