From patchwork Tue Mar 19 16:51:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2302891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 61D83DFB79 for ; Tue, 19 Mar 2013 16:56:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHzne-00086b-04; Tue, 19 Mar 2013 16:54:10 +0000 Received: from mail-qe0-f74.google.com ([209.85.128.74]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHzlr-00072j-Uk for linux-arm-kernel@lists.infradead.org; Tue, 19 Mar 2013 16:52:24 +0000 Received: by mail-qe0-f74.google.com with SMTP id 9so63340qea.5 for ; Tue, 19 Mar 2013 09:52:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=UOICGPYERO1IbVQsZ+K1DbWbEorQs/B0aTihAPO3y1Q=; b=Z+0p9dao02riKPKvFPIOskR1HJxWmo4Cfsi+BdNFVsQb5MEISeoewQ3fUPxdcHJ3Gd Lo7OCCnhd4fB9P3XJ7UaeX3qdprp12Ku774wAOqW4Co3/pKgibn4VfzM2jDOlE0ekoly 69fpmM1Nj2QeXxZJOVwTQ0fqzXm46ZSfLS9aFLNe6hm75tkZsvA6vvj0q6x/7bN7xCEg FApEjGPG99odIBIpWKVKGavUW6Szpoqkz5tQm1fp34CYJR2r62nj/tpaVdmFvTOitroO PEBZIbZQoqKdjWs8OMoFEchC74hKt/4oVKQZKuSwtFoCih/Hch7E3Mff9OUFttyZzNW1 BEOg== X-Received: by 10.224.185.79 with SMTP id cn15mr1579188qab.4.1363711936641; Tue, 19 Mar 2013 09:52:16 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id t12si1218113qcz.3.2013.03.19.09.52.16 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 19 Mar 2013 09:52:16 -0700 (PDT) Received: from tictac.mtv.corp.google.com (dhcp-172-22-162-106.mtv.corp.google.com [172.22.162.106]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 58B215A4225; Tue, 19 Mar 2013 09:52:16 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 0978380E5C; Tue, 19 Mar 2013 09:52:15 -0700 (PDT) From: Doug Anderson To: Kukjin Kim Subject: [PATCH 2/2] arm: exynos: Clear ENABLE_WAKEUP_SW bit when entering suspend Date: Tue, 19 Mar 2013 09:51:40 -0700 Message-Id: <1363711900-25560-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1363711900-25560-1-git-send-email-dianders@chromium.org> References: <1363711900-25560-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQmEe9pkuWsGHUku9bIbhVsv2dcWEU5rfwBovd8K1q8zbLo2QiIMPv926xgRXwxEvnY+vtxR4a1edP0F+Fuy3ZTzZ0WU+t+LA3XWMn6Y9CRZ3UO6cRwZHTmY6JS9AZNVA0kwggvCc9XjpZ5ssahjHfG+7u/AEyr9AlZQJ0Y3dmhEa6sTXTfMqxc/02jzPBGk1dAHr3ljmOP4v5AxFzPuoa2aNPIiWA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130319_125220_120152_15B2BD74 X-CRM114-Status: GOOD ( 10.33 ) X-Spam-Score: -5.1 (-----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-5.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.128.74 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -2.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, Russell King , Doug Anderson , linux-kernel@vger.kernel.org, Jonathan Kliegman , Thomas Abraham , Olof Johansson , Jaecheol Lee , Jongpill Lee , linux-arm-kernel@lists.infradead.org, Michael Spang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 From: Jonathan Kliegman Setting this bit to 0 causes the system to wait until suspended to use the wakeup masks. With it being set high previously, masked interrupts were being received and processed before the EINT_WAKEUP_MASK was configured. Signed-off-by: Jonathan Kliegman Signed-off-by: Doug Anderson Reviewed-by: Doug Anderson --- arch/arm/mach-exynos/include/mach/pm-core.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/pm-core.h b/arch/arm/mach-exynos/include/mach/pm-core.h index 9d8da51e3..7dbbfec 100644 --- a/arch/arm/mach-exynos/include/mach/pm-core.h +++ b/arch/arm/mach-exynos/include/mach/pm-core.h @@ -27,13 +27,8 @@ static inline void s3c_pm_debug_init_uart(void) static inline void s3c_pm_arch_prepare_irqs(void) { - unsigned int tmp; - tmp = __raw_readl(S5P_WAKEUP_MASK); - tmp &= ~(1 << 31); - __raw_writel(tmp, S5P_WAKEUP_MASK); - - __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK); __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); + __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); } static inline void s3c_pm_arch_stop_clocks(void)