From patchwork Sat Jan 19 06:33:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ??? X-Patchwork-Id: 2006291 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 0C200DF2A2 for ; Sat, 19 Jan 2013 06:37:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TwS0h-0000Mn-T6; Sat, 19 Jan 2013 06:34:35 +0000 Received: from m15-111.126.com ([220.181.15.111]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TwS0c-0000MJ-Fe for linux-arm-kernel@lists.infradead.org; Sat, 19 Jan 2013 06:34:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=Received:Date:From:To:Cc:Subject:Message-ID: MIME-Version:Content-Type:Content-Disposition: Content-Transfer-Encoding:User-Agent:Sender; bh=1r7SoiTUwykkFJXP k9TEgfhLmoORANVJsxZEJBxpKoY=; b=XQ6nflPWV9pmjjBV7GWXGPUNB8heuuem 1imTUbikvuMq+UfPHOS31Jz09wf/O0jnTYhAZZ0BNy/7W6abewGii2s113YYd80A hTBPwq7EuHGY+R1UsTmdtrOeZDJAScXVCBMbst/ZZiEN6eErtSMKQtQETP+ahuZi wN5cIvY8BTo= Received: from localhost (unknown [210.13.81.28]) by smtp1 (Coremail) with SMTP id C8mowEA57EVgPvpQ85HGAA--.1595S2; Sat, 19 Jan 2013 14:34:09 +0800 (CST) Date: Sat, 19 Jan 2013 14:33:58 +0800 From: Steve zhan To: daniel.lezcano@linaro.org, srinidhi.kasagar@stericsson.com, linus.walleij@linaro.org Subject: ARM: ux500:mach-ux500/cpuidle.c spinlock dis-matching Message-ID: <20130119063358.GA27760@android11.spreadtrum.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CM-TRANSID: C8mowEA57EVgPvpQ85HGAA--.1595S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw4rZw13Zw4fGF4rJr4ruFg_yoWrZr43pr y5GasxKFn7WryDX392gw1j9r4jq34vqwn8ur1rta18uFnFyF1aqFs5KrWrurWxAFyfuayI qF1UtFy3Za4qyaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jzXd8UUUUU= X-CM-SenderInfo: h2kd06xkhqu0a6rslhhfrp/1tbiTA2pqU503uU0ywAAs- X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130119_013431_692203_6259F3A8 X-CRM114-Status: GOOD ( 18.74 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 2.7 RCVD_IN_PSBL RBL: Received via a relay in PSBL [220.181.15.111 listed in psbl.surriel.com] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zhanzhenbo[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED -0.0 SPF_PASS SPF: sender matches SPF record -0.7 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] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.9 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list 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 Hi Daniel,Linus Walleij. Using MUTT resubmit this for http://lists.infradead.org/pipermail/linux-arm-kernel/2013-January/139893.html --- Steve commit 99d0a05d163bd070eba7caab7e772206edbcbbc9 Author: steve zhan Date: Mon Jan 7 18:19:14 2013 +0800 ARM: ux500: add spin_unlock(&master_lock). Add the missing spin_unlock statement to unlock master_lock when prcmu_gic_decouple() return TRUE Signed-off-by: steve zhan 2013/1/7 Daniel Lezcano : > On 01/07/2013 06:50 AM, steve.zhan wrote: >> Hi Daniel, >> >> Happy new year, Thank you for reply. >> Sorry for that i have refer the old patch email. >> I have updated the patch, Pls check the URL: >> http://lists.infradead.org/pipermail/linux-arm-kernel/2012-December/138939.html >> Now i am using gmail GUI tools to send mail, i will switch email tool >> to MUTT to commit the other patchs in the future. > > Ok. > > Please do not introduce a new variable which is at the end pointless and > add more complexity. > > You can simply remove the if statement for prcmu_gic_decouple(), or > unlock if it fails. > > Thanks > -- Daniel > >> -------------- >> steve.zhan >> >> 2013/1/7, Daniel Lezcano : >>> On 12/28/2012 08:06 AM, steve.zhan wrote: >>>> Hi Daniel, >>> >>> Hi Steve, >>> >>> sorry I missed your email. >>> >>>> >>>> I think we must unlock the master spinlock even >>>> prcmu_gic_decouple function now always return 0. >>>> Could you give some infos about this? >>> >>> I agree, that would be cleaner. >>> >>> AFAICS, your patch does not solve the problem because 'recouple' will be >>> false if prcmu_gic_decouple fails, so the lock will never be release. >>> >>> That will be simpler to do: >>> >>> if (prcmu_gic_decouple()) { >>> spin_unlock(&master); >>> goto out; >>> } >>> >>> no ? >>> >>>> Thanks. >>>> >>>> diff --git a/arch/arm/mach-ux500/cpuidle.c >>>> b/arch/arm/mach-ux500/cpuidle.c >>>> index b54884bd..b0759ce 100644 >>>> --- a/arch/arm/mach-ux500/cpuidle.c >>>> +++ b/arch/arm/mach-ux500/cpuidle.c >>>> @@ -29,6 +29,7 @@ static inline int ux500_enter_idle(struct cpuidle_device >>>> *dev, >>>> { >>>> int this_cpu = smp_processor_id(); >>>> bool recouple = false; >>>> + bool locked = false; >>>> >>>> clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &this_cpu); >>>> >>>> @@ -39,6 +40,8 @@ static inline int ux500_enter_idle(struct cpuidle_device >>>> *dev, >>>> if (!spin_trylock(&master_lock)) >>>> goto wfi; >>>> >>>> + locked = true; >>>> + >>>> /* decouple the gic from the A9 cores */ >>>> if (prcmu_gic_decouple()) >>>> goto out; >>>> @@ -76,7 +79,7 @@ static inline int ux500_enter_idle(struct cpuidle_device >>>> *dev, >>>> /* When we switch to retention, the prcmu is in charge >>>> * of recoupling the gic automatically */ >>>> recouple = false; >>>> - >>>> + locked = false; >>>> spin_unlock(&master_lock); >>>> } >>>> wfi: >>>> @@ -86,7 +89,8 @@ out: >>>> >>>> if (recouple) { >>>> prcmu_gic_recouple(); >>>> - spin_unlock(&master_lock); >>>> + if (locked) >>>> + spin_unlock(&master_lock); >>>> } >>>> >>>> clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &this_cpu); >>>> >>>> >>>> >>>> Steve Zhan >>>> >>> >>> >>> -- >>> Linaro.org ©¦ Open source software for ARM SoCs >>> >>> Follow Linaro: Facebook | >>> Twitter | >>> Blog >>> >>> >> >> > > > -- > Linaro.org ©¦ Open source software for ARM SoCs > > Follow Linaro: Facebook | > Twitter | > Blog > diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c index b54884bd..ce91493 100644 --- a/arch/arm/mach-ux500/cpuidle.c +++ b/arch/arm/mach-ux500/cpuidle.c @@ -40,8 +40,10 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev, goto wfi; /* decouple the gic from the A9 cores */ - if (prcmu_gic_decouple()) + if (prcmu_gic_decouple()) { + spin_unlock(&master_lock); goto out; + } /* If an error occur, we will have to recouple the gic * manually */