From patchwork Fri Jun 19 00:11:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 6641971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0584DC0020 for ; Fri, 19 Jun 2015 00:18:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B5382022A for ; Fri, 19 Jun 2015 00:18:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 632A9201BC for ; Fri, 19 Jun 2015 00:18:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z5jxC-0002hG-BK; Fri, 19 Jun 2015 00:14:42 +0000 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z5jvA-0001d4-FX for linux-arm-kernel@lists.infradead.org; Fri, 19 Jun 2015 00:12:39 +0000 Received: by padev16 with SMTP id ev16so71956989pad.0 for ; Thu, 18 Jun 2015 17:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fFfF3CCt70XsN4Tp5dAEIXDdZozkT+z8lP2mNPtkWa8=; b=fFrp/rVxVKWT2GcBOrkM1hUlCJvgTc/h1mGbNI6QY5MzekMRqU2kjxzQYOiRAbwaSB XGOIFFcPpYsr5qtpEMzJeXkOzHwu6Qzvgm2xcYPamDol1yNB/wxf8eyTNJ+bgOEeLDdo +HFHS4e5aZ8YxspXNVCjss9J2HHlG7sAvesRvZuF8Y3PSiiHDnvuV8UoiEXSkgRI4XCx Ba8xURzqH7risi173QkizfqXqnRR2buxTKSlHfhc0kektX397SgJ0L7TXYAivlGAZ7B3 ynh2tUwAAuJuBBRdxEOYYckxFU7o0q4BHe/Btj9NkSZIvbLMpxDud/zRlwwr2yCh0+xU dNxw== X-Received: by 10.70.93.69 with SMTP id cs5mr25697622pdb.165.1434672735294; Thu, 18 Jun 2015 17:12:15 -0700 (PDT) Received: from ld-irv-0074.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id ox6sm9225083pdb.25.2015.06.18.17.12.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jun 2015 17:12:14 -0700 (PDT) From: Brian Norris To: Brian Norris , Gregory Fong , Florian Fainelli Subject: [PATCH 6/7] ARM: brcmstb: mask GIC IRQs on suspend Date: Thu, 18 Jun 2015 17:11:35 -0700 Message-Id: <1434672696-13632-7-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434672696-13632-1-git-send-email-computersforpeace@gmail.com> References: <1434672696-13632-1-git-send-email-computersforpeace@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150618_171236_562910_B02172CF X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, Kumar Gala , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lazily-masked IRQs can cause system suspend problems (e.g., spurious wakeups from WFI), so we need to be sure non-wakeup GIC interrupts get masked, not just disabled, during system suspend. Signed-off-by: Brian Norris Acked-by: Gregory Fong --- arch/arm/mach-bcm/brcmstb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-bcm/brcmstb.c b/arch/arm/mach-bcm/brcmstb.c index 3a60f7ee3f0c..8d9ec9d01306 100644 --- a/arch/arm/mach-bcm/brcmstb.c +++ b/arch/arm/mach-bcm/brcmstb.c @@ -12,11 +12,20 @@ */ #include +#include +#include +#include #include #include #include +static void __init brcmstb_init_irq(void) +{ + gic_set_irqchip_flags(IRQCHIP_MASK_ON_SUSPEND); + irqchip_init(); +} + static const char *const brcmstb_match[] __initconst = { "brcm,bcm7445", "brcm,brcmstb", @@ -25,4 +34,5 @@ static const char *const brcmstb_match[] __initconst = { DT_MACHINE_START(BRCMSTB, "Broadcom STB (Flattened Device Tree)") .dt_compat = brcmstb_match, + .init_irq = brcmstb_init_irq, MACHINE_END