From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7362FC63797 for ; Thu, 12 Jan 2023 19:57:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35F2A8E0009; Thu, 12 Jan 2023 14:57:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C2AB80007; Thu, 12 Jan 2023 14:57:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C59A8E000D; Thu, 12 Jan 2023 14:57:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EC9FE8E0009 for ; Thu, 12 Jan 2023 14:57:27 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CBC6E40E0A for ; Thu, 12 Jan 2023 19:57:27 +0000 (UTC) X-FDA: 80347206534.23.0287DF9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 1CFB52000B for ; Thu, 12 Jan 2023 19:57:25 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=J5s1H3wJ; spf=none (imf13.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673553446; a=rsa-sha256; cv=none; b=ITZScUnrA+02jU4VEMUCEsz3IZ8HOTgbX6BfwCxqvfr+DlkBCHKtXR8HjmvSVpmFe+h3T7 HWsqiN3hDeam4YEPl3o2TiHlCJOuGiJaWZrhkypmvcfUZvsphOwr0Oh88JS8sl2P+m/AQH 7EMGW2qABuRM1kLVIdOwrrEDHM/Q1xM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=J5s1H3wJ; spf=none (imf13.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=peterz@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673553446; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=ChWtbTrciVV3G1vvtlVpdXBjaP89UEdojcC0eA3JIzQ=; b=ySaVmogDklDWUnJglGNQkFd1y7+yXhGcthGEZ2EEdVVs97oz3TnALwBjfft8IP5H3bTklV m2N5a2R/TlbQJRzMkZEp1F5D+ggp5YTLZJTDQIChuAwD91SX5vfdI0slHpYocOBoHxsjsG px4cdJW+bly81aepho1JJJTlFUqWXCs= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=ChWtbTrciVV3G1vvtlVpdXBjaP89UEdojcC0eA3JIzQ=; b=J5s1H3wJuyV1ZrYX35oWuMFT6u T7rkONaA7mOhYkZTPvPq7xCUfh89Ra86y5u0xgauRwd+PDKaMYpqa7ySs0cD65BuP9TlSYfchNae9 rHo3fB2jWIjes9nzkMjRdOry4NCkFwJa4nFQ3iESRw0ldiDaahTuRrbz/u4fOwdkQ7dPd1ZOukRfa ietaYuJhWetE6Rm/+Hjq8TYl+1zO/sGKsYAlND/4FsyKOfe/afpWWY3jSLNYcDyycmwWD5UQgOUAw 72qyauSQ5/8uDhzNtIN7j0cH7dMgtkVOtlqBUgLK/A0s3w8n28e1SaeQPCCMocxdiXwUDMbXXdabs xHfJPjOA==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pG3hf-005Ohi-Am; Thu, 12 Jan 2023 19:57:35 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id E821530345E; Thu, 12 Jan 2023 20:57:13 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 45C182CD01216; Thu, 12 Jan 2023 20:57:08 +0100 (CET) Message-ID: <20230112195541.660272394@infradead.org> User-Agent: quilt/0.66 Date: Thu, 12 Jan 2023 20:43:52 +0100 From: Peter Zijlstra To: peterz@infradead.org Cc: richard.henderson@linaro.org, ink@jurassic.park.msu.ru, mattst88@gmail.com, vgupta@kernel.org, linux@armlinux.org.uk, nsekhar@ti.com, brgl@bgdev.pl, ulli.kroll@googlemail.com, linus.walleij@linaro.org, shawnguo@kernel.org, Sascha Hauer , kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, tony@atomide.com, khilman@kernel.org, krzysztof.kozlowski@linaro.org, alim.akhtar@samsung.com, catalin.marinas@arm.com, will@kernel.org, guoren@kernel.org, bcain@quicinc.com, chenhuacai@kernel.org, kernel@xen0n.name, geert@linux-m68k.org, sammy@sammy.net, monstr@monstr.eu, tsbogend@alpha.franken.de, dinguyen@kernel.org, jonas@southpole.se, stefan.kristiansson@saunalahti.fi, shorne@gmail.com, James.Bottomley@HansenPartnership.com, deller@gmx.de, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, ysato@users.sourceforge.jp, dalias@libc.org, davem@davemloft.net, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, acme@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, jgross@suse.com, srivatsa@csail.mit.edu, amakhalov@vmware.com, pv-drivers@vmware.com, boris.ostrovsky@oracle.com, chris@zankel.net, jcmvbkbc@gmail.com, rafael@kernel.org, lenb@kernel.org, pavel@ucw.cz, gregkh@linuxfoundation.org, mturquette@baylibre.com, sboyd@kernel.org, daniel.lezcano@linaro.org, lpieralisi@kernel.org, sudeep.holla@arm.com, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, anup@brainfault.org, thierry.reding@gmail.com, jonathanh@nvidia.com, jacob.jun.pan@linux.intel.com, atishp@atishpatra.org, Arnd Bergmann , yury.norov@gmail.com, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, dennis@kernel.org, tj@kernel.org, cl@linux.com, rostedt@goodmis.org, mhiramat@kernel.org, frederic@kernel.org, paulmck@kernel.org, pmladek@suse.com, senozhatsky@chromium.org, john.ogness@linutronix.de, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, Andrew Morton , jpoimboe@kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-perf-users@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-xtensa@linux-xtensa.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, kasan-dev@googlegroups.com, "Rafael J. Wysocki" , Ulf Hansson Subject: [PATCH v3 38/51] cpuidle,omap4: Push RCU-idle into omap4_enter_lowpower() References: <20230112194314.845371875@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspam-User: X-Rspamd-Queue-Id: 1CFB52000B X-Rspamd-Server: rspam01 X-Stat-Signature: gdh6378b1audcdphcdrsf6agnyh9u86p X-HE-Tag: 1673553445-648215 X-HE-Meta: U2FsdGVkX1+QZ5JdZ5wbXmCwLp0bcsW0+axDt4og4U7APv3GoEL1wAg9e4TcKCVo9P8um8FBWIo5ogVq4j5Z4DOaaJynZEnuHgt//2Wu+fNUQN1FGEpu7gO0fpXkdHqUACjbp2syUY4dOMF0o5nQ/tgzqmJH6xvcLcB34/sH6qxL42br+fi4bI6xjtZuksrDwpbUx+hPiWxeYV2QXftNb9cN4YOpHZV1nT47rTJRyxSYNzC/FIo9H4G6mWpxYxWozELzDFUSxBrs3yPomBUvCrAXhGXL7RdoH+oPyBDJUxpd9T+n/qqFqG7mkJ0uaHR0o1xZWASZX+TIWlNnTXWGFKmlJk1mVFfr6aCBW6138Bm60Qnym+bhZaSWeuvJYzabqo697oWIjU5RDxynWE/0Uk7oZ8Uv/yUHJxvoVjaP3SOBZWsBbbrGbxsfN3viRxLGX26DSLqcMDyP8ZQD9GavxjoQk6dP4aCCaW2SRETFbMvJ/wcS7gmXENd3nPYS4BmflKomWVdUFMEl6vFp5In6Z6WbzPfYdofaOTBpB3W1HFp3Facvc5CksS6p1TN+OiCnIcGTZnkmmgxayDw4cceHtURJRmwpcIHG+To4CFysiBz9/g9jVSa1C2qsIYYaX+KeaJr6vIoY9S7T2CmIgUIvakBiWPwLOqY8IME9armAglEspb8NyIrauTKXrmTdmpydCyyOqihRp4V8Kru+ag020lDxDbvm8s6/BvrS0YZn2PwJhAQC2NIMc78mMDQkU8yoPk6OuI0ydO/06TfgKmJ5uXSfy8ujxnz83AwUOU3tvrbOhbq5ng6EswgQAynG7f5PmxAudkf2kXq0ZxkHZ4CCIINooCiJzWh99lekbEwnR7o3x8sVFXx8jNZN3AMevuFIc2Zy/C9feXdD9LoAgPWx7IDcyJwnqYWEwFbgeC5EtB0uvQLsxF+vHcBG+EmteG11TISUZ27ZDnZT7pCQ+xz tcOknaxR qRlOY2woBz7gWsZ5ZG9FOCaICS5XRyhXblghkKuPkIYmfCzG6FotQpQqYGMdxV/iMFVTkogZi7kfInPSSiU+Vf/rFzGDJlh4HJrK9w8SexhUEfDWqPg8CQ8LkJZrbCrr6ZbAYw/FkvtpIysYer5WlpEgUxeclXXW6sz7GWoXjS8bOJN9VbE5Msivi/zJZdCqNq1w7e/FmqUJaOaR/B8OFhzGt3FZxBDKvc/ClZ1htOTfIUMvH56I9VtBfz7UwBLpakdQvFNy+uW/tJjeDWI1wh05SxvYHwgRvJA9pGmUNYEmmE8lulerH4tN09uXtsTLesawX6/V/cUBwrITKp2PboHO8phtD9M+vvGNdN/5klBJ1964CugFjY2AG0ubE+iDbgOn9Bz/bTO24LkzqAb3akIrbNiySf3UgWGaCRkL/HI1fhPJGpacsBax4IjPe4IyzediE0/FUis2kH3DVRAfwUo0s8yzYcH9MUGA03qcuTVxnbkiqY6c5EmAUtNLiRfa0PyP5IrSlafvonQDPS9W4DKBqpABCa90IGYgdUSD/Bi50Y2BmEBPoIFrQ31i2ndosBIRyDbs5s9JFqaAld2t+MV/WLJ367nnSLBcxuCmgiYIpPPFd2Y/UeqSUXs2jcQo6aOyzJBzSDFOtl3uHet2drPDpjcLrjbu+YPTYi95I+of8pGAQQ3ht2O68WYo93kcBXjLjxXQ0RerYkcg6gkQpW4tVZ+H0HGmSKOQeM0qEWaZv2hM9MVtecpeA4SfK/TI6wAm+F8gxHJ3q8s5kmWzjB4T81UQ9YEvuKV43bRQkiOQ7CyNgFQjwZUZNa0VaufNQJoB0Z/aZolaMjFmDpR+O6VbbnvS73WjUaH8jX2smMjBgDAUsckLuEgdANLcLTxUjso2kDFTO8UM2hrl4EtnYdROszkKSJeNdbOcIm4VQVL4TK1+7aoccyN8Rhm3yujWrvu6VdOlqzicGKPzPQYKIpqRfUKu0 2YgDN05A I3RtI09DFPTXbSokncdCCqMblSlYSCeZ7XoFf8bSpkQ99uRAnyLY7cVgWC/YUpMxaih57U7SetlHEqnvCFmYzXaomPAFh38rlnt6tcAj6b4OiuJjy+t5xzfDI61J++VuMTEfGRmO09m+fFXK6MAk2i/zcuAeXa3/72bQohjKnqC/pIrJYlMuGP6LFCKFzkBtOZ0ifA+93BG/q/5pvtTUUYbnR8yDVnxRS32OY9g9f+FhIbQ7vn74KBLblC1cjwolLj76xiMMuCReaKzvy6NquKbcVNWd3fJljYklR4o90oLxBB60LZccgLohaCG2ERwE6A2UgHPO6w6mLzYTdoet5jwk9SWzshm2PtDSR/5oj19DK+g4mPpe94O8kBKzz12fHKdAKETDnnC8tsbHvKlmCRB7XyStV9uxOWzpb3uZLkPYjf8dg7X1wTLBybmNmNH1amdKEPBTjXp8lXiraIJuo8nA29HY/q6p5lpOrUTnRbIgl/o8s4aKiEKUTECvtlPlcKljgDiQVhOElXMGVYJRVHs+B7hvgBkzby94QqeJXcGTPwx218KYo2nUpVZKYqkt8CtQtOiDFgO0rTVrsKTH56Pvmb5GA8x8jMJLZfYFpYaumnFtPeE+KtpZbePUNmMQiApYYp6jmZcMHjdmOviX812hKBy7T63v0YV7sFKuyFCkgxJZ1a6P8sw08bqY/FppdUpX1YbDECJ5bQtAOYQwAXfzAvdyBFKecZDBg0BQBzK/oZdQHm5FwbBI8dymrtDDVbUyvdwzq1xJpWTah+ESg9msIWD99iufEEjBkMgTZ7vnkYDVrdbFPZDMxyuFE4qEfitWRVC8+D9hFHr4y2571mLyXqVoFmqeem0jghhaZUFKkhRGo/xwXevqR27qHUV5fXRCsiSORhwEnPNifG4guOhQAqfleyQWFI66vN8Uc6G1jcC6he/jkpidMHJj4bL9wpOUinz8CFsIKFFzDtMLckIYttw8F uCukcknm oDpP0R5/0VjeyMlLUcbJqiyK+PlhpE17izbZtW+bOHZXIwMPawbTNYh3/Bm+Tig3V4MEd5h0j62cOaq6daOdhki5bQ5ujw5+oqvOwxRfCoMIT3YyDNGdbzJ/LaKTCMXOi5aSTt2ffiH5zmxmi452YN/zQEedvUbz8w9zfbUuS/0bLvibFKvzLBtdNbPyN6QC6BDSpxwlGao4xiLIccl2KSLxfvosZlpZcor63BWGeRDd5D+gfIPREAzg8fQ391XlZC99QWVrS1bUQGm+obtCB4qH6XbO76ZvWXh4vuoP2En+jDKvNfNH4q+rhspBYBQoyT9VdDqv6J3cuy6pGD0xJvHmX4MhsTbVeLEz0pTQcAP6FZe8s4B3bOHdDrMJbqnCdv3HtPZtQsKZGU2SCrZv8wu6DX8BX5F6AmFi6WmWRjENmYDbydWwL7sUSNV7h537fgG0l8Z+r5oDeLEnopdQTB0bBtAMTdjHfoHRvV95yTov/hC23WGmpoLdPxxke/RQBuYG47+2/00Hv3XIPbeOPj5rR0tp4VZgfuqodkc8FtQ5LxDdu82XHt1jGt/DHcuuCYjVKVNe/bduVx87/pyyWjCqNJzXTJIbTI2ALWt4VmFZ1KbUAHgpQr44Bv3Lvu0o7k/JlYJ3kI6oC1Hf35MO9Ff59cEpGriac88EfxK0f3ylObOGNjL5DLVbwE6N37xmy1rVgIbJYjm/Im3P43YZn26nrgU9fIZH49nXbmGuyKBTW2XJTd/g8IDZsMnUqIC/YaFDPMsuJ99ul6rQ+U+05/8YORYA8e38LEjFzJ/WdHVsMaI1wGNxHvAZpO/lV/sQuCstt3LJzssmeuzbk3erbogiCCxfQ4c+3cOjsPUO+HsNZFxi+WNGZO9CH+qfrLZ/5P8nHTFWzMyIj+rytbkDP1MLPFtnkPvclTzfE8LIAZ50yuHmI0ekcfLYf6bz809eTVlkepn2aqzDkJstFtX7qejTPRJO9 DdVo2p2z f1mwaZ/xZ8A/83OrOOMTX6VOKVSZoq1wpMxljPJwwOuQBCKGOc1ZTP8jq2qF6h0sMBWeBbHYmF4a1oDxlgx4rFiWYK7OE+Mnd8tSNc90POchJl272dPikr3hTBDTdViTa+M0A98reWg1PnVGb9wCLc X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Tony Lindgren OMAP4 uses full SoC suspend modes as idle states, as such it needs the whole power-domain and clock-domain code from the idle path. All that code is not suitable to run with RCU disabled, as such push RCU-idle deeper still. Signed-off-by: Tony Lindgren Signed-off-by: Peter Zijlstra (Intel) Acked-by: Rafael J. Wysocki Acked-by: Frederic Weisbecker Tested-by: Tony Lindgren Tested-by: Ulf Hansson Link: https://lkml.kernel.org/r/Yqcv6crSNKuSWoTu@atomide.com --- arch/arm/mach-omap2/common.h | 6 ++++-- arch/arm/mach-omap2/cpuidle44xx.c | 8 ++------ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 12 +++++++++++- arch/arm/mach-omap2/pm44xx.c | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -284,11 +284,13 @@ extern u32 omap4_get_cpu1_ns_pa_addr(voi #if defined(CONFIG_SMP) && defined(CONFIG_PM) extern int omap4_mpuss_init(void); -extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state); +extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state, + bool rcuidle); extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state); #else static inline int omap4_enter_lowpower(unsigned int cpu, - unsigned int power_state) + unsigned int power_state, + bool rcuidle) { cpu_do_idle(); return 0; --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -105,9 +105,7 @@ static int omap_enter_idle_smp(struct cp } raw_spin_unlock_irqrestore(&mpu_lock, flag); - ct_cpuidle_enter(); - omap4_enter_lowpower(dev->cpu, cx->cpu_state); - ct_cpuidle_exit(); + omap4_enter_lowpower(dev->cpu, cx->cpu_state, true); raw_spin_lock_irqsave(&mpu_lock, flag); if (cx->mpu_state_vote == num_online_cpus()) @@ -186,10 +184,8 @@ static int omap_enter_idle_coupled(struc } } - ct_cpuidle_enter(); - omap4_enter_lowpower(dev->cpu, cx->cpu_state); + omap4_enter_lowpower(dev->cpu, cx->cpu_state, true); cpu_done[dev->cpu] = true; - ct_cpuidle_exit(); /* Wakeup CPU1 only if it is not offlined */ if (dev->cpu == 0 && cpumask_test_cpu(1, cpu_online_mask)) { --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -33,6 +33,7 @@ * and first to wake-up when MPUSS low power states are excercised */ +#include #include #include #include @@ -214,6 +215,7 @@ static void __init save_l2x0_context(voi * of OMAP4 MPUSS subsystem * @cpu : CPU ID * @power_state: Low power state. + * @rcuidle: RCU needs to be idled * * MPUSS states for the context save: * save_state = @@ -222,7 +224,8 @@ static void __init save_l2x0_context(voi * 2 - CPUx L1 and logic lost + GIC lost: MPUSS OSWR * 3 - CPUx L1 and logic lost + GIC + L2 lost: DEVICE OFF */ -int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) +int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state, + bool rcuidle) { struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu); unsigned int save_state = 0, cpu_logic_state = PWRDM_POWER_RET; @@ -268,6 +271,10 @@ int omap4_enter_lowpower(unsigned int cp cpu_clear_prev_logic_pwrst(cpu); pwrdm_set_next_pwrst(pm_info->pwrdm, power_state); pwrdm_set_logic_retst(pm_info->pwrdm, cpu_logic_state); + + if (rcuidle) + ct_cpuidle_enter(); + set_cpu_wakeup_addr(cpu, __pa_symbol(omap_pm_ops.resume)); omap_pm_ops.scu_prepare(cpu, power_state); l2x0_pwrst_prepare(cpu, save_state); @@ -283,6 +290,9 @@ int omap4_enter_lowpower(unsigned int cp if (IS_PM44XX_ERRATUM(PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD) && cpu) gic_dist_enable(); + if (rcuidle) + ct_cpuidle_exit(); + /* * Restore the CPUx power state to ON otherwise CPUx * power domain can transitions to programmed low power --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -76,7 +76,7 @@ static int omap4_pm_suspend(void) * domain CSWR is not supported by hardware. * More details can be found in OMAP4430 TRM section 4.3.4.2. */ - omap4_enter_lowpower(cpu_id, cpu_suspend_state); + omap4_enter_lowpower(cpu_id, cpu_suspend_state, false); /* Restore next powerdomain state */ list_for_each_entry(pwrst, &pwrst_list, node) {