From patchwork Thu Apr 18 05:26:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 237433 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 3C8662C01D6 for ; Thu, 18 Apr 2013 15:28:20 +1000 (EST) Received: from mailhub2.si.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by ozlabs.org (Postfix) with ESMTP id 1C80E2C01B8 for ; Thu, 18 Apr 2013 15:27:51 +1000 (EST) Received: from localhost (mailhub2-out [172.26.127.67]) by localhost (Postfix) with ESMTP id DE534E27C8; Thu, 18 Apr 2013 07:14:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub2.si.c-s.fr ([172.26.127.67]) by localhost (mailhub2.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id z7LaMBtZuUh6; Thu, 18 Apr 2013 07:14:47 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 925CCE27BB; Thu, 18 Apr 2013 07:14:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3EEB8C7392; Thu, 18 Apr 2013 07:27:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id bn3PJPn-Qtas; Thu, 18 Apr 2013 07:27:44 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.4.167]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by messagerie.si.c-s.fr (Postfix) with ESMTP id 72FA9C7391; Thu, 18 Apr 2013 07:27:43 +0200 (CEST) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.13.8/8.13.8) with ESMTP id r3I5QZJ8030495; Thu, 18 Apr 2013 07:26:41 +0200 Received: (from root@localhost) by localhost.localdomain (8.13.8/8.13.8/Submit) id r3I5QB6v029520; Thu, 18 Apr 2013 07:26:11 +0200 Date: Thu, 18 Apr 2013 07:26:11 +0200 Message-Id: <201304180526.r3I5QB6v029520@localhost.localdomain> From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Vitaly Bordug , Marcelo Tosatti , Thomas Gleixner Subject: [PATCH v2] Erroneous double irq_eoi() on CPM IRQ in MPC8xx Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" irq_eoi() is already called by generic_handle_irq() so it shall not be called a again Signed-off-by: Christophe Leroy Index: linux/arch/powerpc/platforms/8xx/m8xx_setup.c =================================================================== --- linux/arch/powerpc/platforms/8xx/m8xx_setup.c (revision 4802) +++ linux/arch/powerpc/platforms/8xx/m8xx_setup.c (working copy) @@ -218,19 +218,12 @@ static void cpm_cascade(unsigned int irq, struct irq_desc *desc) { - struct irq_chip *chip; - int cascade_irq; + struct irq_chip *chip = irq_desc_get_chip(desc); + int cascade_irq = cpm_get_irq(); - if ((cascade_irq = cpm_get_irq()) >= 0) { - struct irq_desc *cdesc = irq_to_desc(cascade_irq); - + if (cascade_irq >= 0) generic_handle_irq(cascade_irq); - chip = irq_desc_get_chip(cdesc); - chip->irq_eoi(&cdesc->irq_data); - } - - chip = irq_desc_get_chip(desc); chip->irq_eoi(&desc->irq_data); }