From patchwork Tue Sep 11 07:19:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 1435881 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 10C5FDFAF3 for ; Tue, 11 Sep 2012 07:22:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBKkq-0005ec-9A; Tue, 11 Sep 2012 07:19:28 +0000 Received: from na3sys009aog104.obsmtp.com ([74.125.149.73]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TBKkl-0005dH-K5 for linux-arm-kernel@lists.infradead.org; Tue, 11 Sep 2012 07:19:24 +0000 Received: from mail-gh0-f199.google.com ([209.85.160.199]) (using TLSv1) by na3sys009aob104.postini.com ([74.125.148.12]) with SMTP ID DSNKUE7l+YQQJNyC/drNtdnRKb0iezmLyGKs@postini.com; Tue, 11 Sep 2012 00:19:23 PDT Received: by ghrr18 with SMTP id r18so271969ghr.6 for ; Tue, 11 Sep 2012 00:19:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:x-gm-message-state; bh=DWuiWmaYEq7q/BzM8eYP6X48K+uHaeJTEkbBdxmqqAA=; b=ZZiy7/D5BTFVS49k1B1AKTV8gpAHvxWuPKYDfZ6Y1BUcHj2IvkTWGAX4YjLNeolItq 7SIgAzxTYKGI7niBGViIpmKxnasZD3/uh8WD1FKQjCyBuD7oTz9eLA9coDHJg+im19w8 cINbIX2xS2D6Cfgd1HW25wgnTUNa4QQYqQ6ssqgZuVgvz06NB5ykoO8IMwQ0dXDZpCXt WXTG38IFUXW7vsy+R2mPy5FpwIkNgplHxrstoXhlENBSptcjuvBqEBjXy8PS2PBpw9nT FsowWHoCJv5GBCJQn2qMfGxIpOCIrLrGLH6O1t+3DZeSU4Rztw6t61ygBtC5R1u+ASez Isog== Received: by 10.220.204.197 with SMTP id fn5mr23536539vcb.71.1347347960967; Tue, 11 Sep 2012 00:19:20 -0700 (PDT) Received: by 10.220.204.197 with SMTP id fn5mr23536536vcb.71.1347347960879; Tue, 11 Sep 2012 00:19:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.58.77.74 with HTTP; Tue, 11 Sep 2012 00:19:00 -0700 (PDT) In-Reply-To: References: <20120910185535.GC1303@atomide.com> From: "Shilimkar, Santosh" Date: Tue, 11 Sep 2012 12:49:00 +0530 Message-ID: Subject: Re: [PATCH] ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write To: linux-omap , Tony Lindgren X-Gm-Message-State: ALoCoQmBQPma7FNu7LiBET2DcajmIwGdYoXLA6580UpZaRjFbMW+YUqHtTJEIpPaSIbSgVPl6x/WLN25R+kijjY0nUL0LVCUqmmialUqcNg1+5Oth6t/Wq113P+Beegb9LXQ6dDIuvi/YM8kTrVYIxo4QM1TqWqIj8VvgcUwP4LO54m7UOX3bhc9rbJc33GyO343pNOdLXwI X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.73 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tue, Sep 11, 2012 at 12:13 PM, Paul Walmsley wrote: > On Tue, 11 Sep 2012, Shilimkar, Santosh wrote: > >> On Tue, Sep 11, 2012 at 12:07 PM, Paul Walmsley wrote: >> > On Tue, 11 Sep 2012, Shilimkar, Santosh wrote: >> > >> >> On Tue, Sep 11, 2012 at 12:25 AM, Tony Lindgren wrote: >> >> > * Shilimkar, Santosh [120908 01:20]: >> >> >> >> >> >> Will you able to pick up these couple of wakeupgen fixes from here or >> >> >> do you want me to send you a pull request for 3.6-rc5/6 >> >> > >> >> > I can pick them into fixes-noncritical. But if the second one is >> >> > a major bug for the -rc series, the patch should be describe what >> >> > breaks (regression? oops?). >> >> > >> >> Fixes non critical is fine. No major issue without these patches. >> > >> > There's an ordering constraint though: Santosh's patch needs to go in >> > first, then mine. >> > >> Its other way round ;-) >> Mine I created after applying your change. > > The problem is that if my patch is applied first, then there will be a > point after my patch where the AUXCOREBOOT1 register won't be saved, which > might break PM. So the patches may need to be updated. > Good point. It's trivial to re-order them. Tony, Updated patches in the end of the email. Also attached. Regards Santosh From 4e1da2a44d92b956c3a740f5af6a45ff1c2dc294 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Tue, 11 Sep 2012 12:43:18 +0530 Subject: [PATCH 2/2] ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write The wakeupgen context-save code reads and stores the AUXCOREBOOT0 and AUXCOREBOOT1 register contents twice. This seems like a waste of time, so, remove the duplicates. Acked-by: Santosh Shilimkar Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/omap-wakeupgen.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index c3795c2..567f672 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -233,12 +233,6 @@ static inline void omap4_irq_save_context(void) __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET); /* Save SyncReq generation logic */ - val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); - __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET); - val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); - __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET); - - /* Save SyncReq generation logic */ val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_MASK); __raw_writel(val, sar_base + PTMSYNCREQ_MASK_OFFSET); val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_EN); -- 1.7.9.5 From 6e3b8a3f6ec231f588b860d87b7a80f6ba38ce98 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Thu, 6 Sep 2012 11:51:34 +0530 Subject: [PATCH 1/2] ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save The wakeupgen context-save code reads AUXCOREBOOT0 register instead of AUXCOREBOOT1 register contents while saving AUXCOREBOOT1. Fix the same. Signed-off-by: Santosh Shilimkar --- arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 05fdebf..c3795c2 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -229,7 +229,7 @@ static inline void omap4_irq_save_context(void) /* Save AuxBoot* registers */ val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET); - val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0); + val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_1); __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET); /* Save SyncReq generation logic */