From patchwork Sun Aug 11 08:48:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 11088837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1428B6C5 for ; Sun, 11 Aug 2019 08:48:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04EE326E3A for ; Sun, 11 Aug 2019 08:48:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA99D27CEA; Sun, 11 Aug 2019 08:48:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HK_RANDOM_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FC1526E3A for ; Sun, 11 Aug 2019 08:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=P3Ca5WVnsUKlvUyfTkMRaXxgW0VAFIGy+H/Ru5CPL7E=; b=Kn1F4ykeCncPKZ HNu6/zE9f3+JvEPUNmsuRxrFjL+kwGQLKyL8M126ZMX34D3ajqlVUqZlz64Xs3G55VpzYZfWE8LJi 2B3h//yTc8zhDuCRx7/fMxDlmT0ENa+z7RXzplgUV/d4eE3jhwgdvGmciEsctEvyFbtQTdOSqbPJ+ vEHdcjTytoA4azIZNVwF/kPhXYKsy//edzWnHQOHtVf3tgzb+kn2kSdEdF+qZd65LgirgDB8gM01I FohEtvgsaZAE3QQVP2VKlQtD9ulcN+lHVhK85aiQr7iwIBBiqiGhVf/iaBAAeJ2t+rdbywYmnwxFQ Yha3NahxRD61EBIwixdA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hwjWd-0000wv-6F; Sun, 11 Aug 2019 08:48:27 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hwjWY-0000wc-Sz for linux-arm-kernel@lists.infradead.org; Sun, 11 Aug 2019 08:48:24 +0000 Received: by mail-lj1-x242.google.com with SMTP id h13so285759ljc.13 for ; Sun, 11 Aug 2019 01:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pXHasjFTPMOY9kq0PL7JOaC1aEi+PxAZiTuH1S1KxPY=; b=k62jIKVLNEu0Be0N/7l+wYBc7wVgvBzJUQXjpCeyJS3gbRqwdPYFBfHiK2zFRkxPO/ OUsBzs1m/cwMfxr7+qlEX9MAa/8hNqiRwT/RaoxM7BDP93INRIHdW7ScRFJVXn93Zkg0 D0joxhEV1nxkjYMotGQQW029J/hWfjQHoi2WPedN6XNWb1VHf+J1bEOLMEctkUerrI0d YvgQ/iazH+JjR4zwMrCP4RAVsA/XwZirTW2p2YnUH1y4Qkj78o/whSTzW5sVSlxtIOTk iPCaGFB1tf70KItAywSwXxscFYdixzF9Xl7grRT/iJVPb2V7u4P8TIz1fyoYDgr9QFvW /vLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pXHasjFTPMOY9kq0PL7JOaC1aEi+PxAZiTuH1S1KxPY=; b=FXVeezyG7WajRhl6WursCr/Wd+5s5B10RpKbrh6CLQKJtlCZoHk6f32jXicApDJiHh siD6E6uCg68mdDMMCxFElPfs2VOqjUZwoEekaTK9jKZqhyAANQyuEp6KsRvu9mMjjlQQ iWOKKmDSJkJcjQ5ugR6ZbhPVIn7ND5PoheTP4qxQtppxSTsuG3WikQpD6x5dyLwOy6XA sVluI+TGFwFmUvC+RrYHPoj4k9yZ5xcr7yS//+jzdmNznZHwV+MVf9N8R9gCA4dP4atQ CTu1tb+8GCE2JWmgm2/QTuC7QaO7Z1oNtT6VVBvLhMsEWm3YIsGXdX0e4NFgbtdEBq7x hADw== X-Gm-Message-State: APjAAAXiyu51yMTpdnspQpaksxzAZo5gAry0UEh6yxvXe0GIh6WxTCyy LnkzIRHCtuj7UCpNxLA4U84= X-Google-Smtp-Source: APXvYqwnlKb4Nta1kIvQyP6WUPknA1M8NdVMu8eeJdxxX6zeqV5kJDCOIXhMt+XQpSwveJeh6SKI8A== X-Received: by 2002:a2e:968f:: with SMTP id q15mr16037437lji.30.1565513300534; Sun, 11 Aug 2019 01:48:20 -0700 (PDT) Received: from z50.gdansk-morena.vectranet.pl (109241207190.gdansk.vectranet.pl. [109.241.207.190]) by smtp.gmail.com with ESMTPSA id l22sm20242598ljc.4.2019.08.11.01.48.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Aug 2019 01:48:19 -0700 (PDT) From: Janusz Krzysztofik To: Aaro Koskinen , Tony Lindgren Subject: [PATCH for v5.3] ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack Date: Sun, 11 Aug 2019 10:48:02 +0200 Message-Id: <20190811084802.630-1-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190811_014822_965697_305C6591 X-CRM114-Status: GOOD ( 11.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-omap@vger.kernel.org, Janusz Krzysztofik , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Non-serio path of Amstrad Delta FIQ deferred handler depended on irq_ack() method provided by OMAP GPIO driver. That method has been removed by commit 693de831c6e5 ("gpio: omap: remove irq_ack method"). Remove useless code from the deferred handler and reimplement the missing operation inside the base FIQ handler. Should another dependency - irq_unmask() - be ever removed from the OMAP GPIO driver, WARN once if missing. Signed-off-by: Janusz Krzysztofik --- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 ++- arch/arm/mach-omap1/ams-delta-fiq.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S index 81159af44862..14a6c3eb3298 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S @@ -126,6 +126,8 @@ restart: orr r11, r11, r13 @ mask all requested interrupts str r11, [r12, #OMAP1510_GPIO_INT_MASK] + str r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack all requested interrupts + ands r10, r13, #KEYBRD_CLK_MASK @ extract keyboard status - set? beq hksw @ no - try next source @@ -133,7 +135,6 @@ restart: @@@@@@@@@@@@@@@@@@@@@@ @ Keyboard clock FIQ mode interrupt handler @ r10 now contains KEYBRD_CLK_MASK, use it - str r10, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack the interrupt bic r11, r11, r10 @ unmask it str r11, [r12, #OMAP1510_GPIO_INT_MASK] diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index 43899fa56674..0254eb9cf8c6 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c @@ -70,9 +70,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id) * interrupts default to since commit 80ac93c27441 * requires interrupt already acked and unmasked. */ - if (irq_chip->irq_ack) - irq_chip->irq_ack(d); - if (irq_chip->irq_unmask) + if (!WARN_ON_ONCE(!irq_chip->irq_unmask)) irq_chip->irq_unmask(d); } for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)