[PATCH] cpm2_pic: Allow correct flow_types for port C interrupts

[PATCH] cpm2_pic: Allow correct flow_types for port C interrupts

[Mark Ware]

CPM2 Port C interrupts can be either falling edge, or either edge.
Other external interrupts are either falling edge or active low.

Signed-Off-By: Mark Ware <mware@elphinstone.net>
---
 arch/powerpc/sysdev/cpm2_pic.c |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 78f1f7c..179822c 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -141,13 +141,28 @@ static int cpm2_set_irq_type(unsigned int virq, unsigned int flow_type)
 	struct irq_desc *desc = get_irq_desc(virq);
 	unsigned int vold, vnew, edibit;
 
-	if (flow_type == IRQ_TYPE_NONE)
-		flow_type = IRQ_TYPE_LEVEL_LOW;
-
-	if (flow_type & IRQ_TYPE_EDGE_RISING) {
-		printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
-			flow_type);
-		return -EINVAL;
+	/* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or
+	 * IRQ_TYPE_EDGE_BOTH (default).  All others are IRQ_TYPE_EDGE_FALLING
+	 * or IRQ_TYPE_LEVEL_LOW (default)
+	 */
+	if (src >= CPM2_IRQ_PORTC15 && src <= CPM2_IRQ_PORTC0) {
+		if (flow_type == IRQ_TYPE_NONE)
+			flow_type = IRQ_TYPE_EDGE_BOTH;
+
+		if (flow_type & ~IRQ_TYPE_EDGE_BOTH) {
+			printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
+				flow_type);
+			return -EINVAL;
+		}
+	} else {
+		if (flow_type == IRQ_TYPE_NONE)
+			flow_type = IRQ_TYPE_LEVEL_LOW;
+
+		if (flow_type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)) {
+			printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
+				flow_type);
+			return -EINVAL;
+		}
 	}
 
 	desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-- 
1.5.6.5

Re: [PATCH] cpm2_pic: Allow correct flow_types for port C interrupts

[Mark Ware]

Any comments/Acks/Nacks on this patch?

- Mark

Mark Ware wrote:
> CPM2 Port C interrupts can be either falling edge, or either edge.
> Other external interrupts are either falling edge or active low.
> 
> Signed-Off-By: Mark Ware <mware@elphinstone.net>
> ---
>  arch/powerpc/sysdev/cpm2_pic.c |   29 ++++++++++++++++++++++-------
>  1 files changed, 22 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
> index 78f1f7c..179822c 100644
> --- a/arch/powerpc/sysdev/cpm2_pic.c
> +++ b/arch/powerpc/sysdev/cpm2_pic.c
> @@ -141,13 +141,28 @@ static int cpm2_set_irq_type(unsigned int virq, unsigned int flow_type)
>  	struct irq_desc *desc = get_irq_desc(virq);
>  	unsigned int vold, vnew, edibit;
>  
> -	if (flow_type == IRQ_TYPE_NONE)
> -		flow_type = IRQ_TYPE_LEVEL_LOW;
> -
> -	if (flow_type & IRQ_TYPE_EDGE_RISING) {
> -		printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
> -			flow_type);
> -		return -EINVAL;
> +	/* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or
> +	 * IRQ_TYPE_EDGE_BOTH (default).  All others are IRQ_TYPE_EDGE_FALLING
> +	 * or IRQ_TYPE_LEVEL_LOW (default)
> +	 */
> +	if (src >= CPM2_IRQ_PORTC15 && src <= CPM2_IRQ_PORTC0) {
> +		if (flow_type == IRQ_TYPE_NONE)
> +			flow_type = IRQ_TYPE_EDGE_BOTH;
> +
> +		if (flow_type & ~IRQ_TYPE_EDGE_BOTH) {
> +			printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
> +				flow_type);
> +			return -EINVAL;
> +		}
> +	} else {
> +		if (flow_type == IRQ_TYPE_NONE)
> +			flow_type = IRQ_TYPE_LEVEL_LOW;
> +
> +		if (flow_type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH)) {
> +			printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
> +				flow_type);
> +			return -EINVAL;
> +		}
>  	}
>  
>  	desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);

Re: [PATCH] cpm2_pic: Allow correct flow_types for port C interrupts

[Scott Wood]

Mark Ware wrote:
> Mark Ware wrote:
>> CPM2 Port C interrupts can be either falling edge, or either edge.
>> Other external interrupts are either falling edge or active low.
[snip]
>> +	/* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or
>> +	 * IRQ_TYPE_EDGE_BOTH (default).  All others are IRQ_TYPE_EDGE_FALLING
>> +	 * or IRQ_TYPE_LEVEL_LOW (default)
>> +	 */
>> +	if (src >= CPM2_IRQ_PORTC15 && src <= CPM2_IRQ_PORTC0) {
>> +		if (flow_type == IRQ_TYPE_NONE)
>> +			flow_type = IRQ_TYPE_EDGE_BOTH;
>> +
>> +		if (flow_type & ~IRQ_TYPE_EDGE_BOTH) {
>> +			printk(KERN_ERR "CPM2 PIC: sense type 0x%x not supported\n",
>> +				flow_type);
>> +			return -EINVAL;
>> +		}

The above code looks like it would allow rising-only, which according to 
the changelog isn't supported.

-Scott

Re: [PATCH] cpm2_pic: Allow correct flow_types for port C interrupts

[Mark Ware]

Scott Wood wrote:
> Mark Ware wrote:
>> Mark Ware wrote:
>>> CPM2 Port C interrupts can be either falling edge, or either edge.
>>> Other external interrupts are either falling edge or active low.
> [snip]
>>> +    /* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or
>>> +     * IRQ_TYPE_EDGE_BOTH (default).  All others are
>>> IRQ_TYPE_EDGE_FALLING
>>> +     * or IRQ_TYPE_LEVEL_LOW (default)
>>> +     */
>>> +    if (src >= CPM2_IRQ_PORTC15 && src <= CPM2_IRQ_PORTC0) {
>>> +        if (flow_type == IRQ_TYPE_NONE)
>>> +            flow_type = IRQ_TYPE_EDGE_BOTH;
>>> +
>>> +        if (flow_type & ~IRQ_TYPE_EDGE_BOTH) {
>>> +            printk(KERN_ERR "CPM2 PIC: sense type 0x%x not
>>> supported\n",
>>> +                flow_type);
>>> +            return -EINVAL;
>>> +        }
> 
> The above code looks like it would allow rising-only, which according to
> the changelog isn't supported.
> 
> -Scott
> 

Thanks Scott, you're right.  I'll update and send v2 shortly.

- Mark