From patchwork Fri Jun 5 15:11:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 6556001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 62A609F1CC for ; Fri, 5 Jun 2015 15:19:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91FA6206D9 for ; Fri, 5 Jun 2015 15:19:39 +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 BD6822062C for ; Fri, 5 Jun 2015 15:19:38 +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 1Z0tKN-0002Cn-T5; Fri, 05 Jun 2015 15:14:35 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z0tIz-00019u-0N; Fri, 05 Jun 2015 15:13:12 +0000 Received: by pabqy3 with SMTP id qy3so52192454pab.3; Fri, 05 Jun 2015 08:12:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=46LVtJlnXsAtHaevxDcEl2vt6WjmO3CiymxpelNlnmI=; b=OqBqMqWigVCur+iKMvfqbJGewjcFsTArHXe0VLWmWFghrA+oUzsiha5MVGM79Ujc11 Gb9hCv+fr4zdCFg/SM4dz0xs130pC4tffLw2+breHHKJNt/zM9qfvAUmGzQIybnWeXuW T4N/Ul/DC0ZGbSuXz78oEUGlIob2XDwSJk3Ujx4fqyEJDWLXQNCYPd5vx9Ep5AskPQrr xX6ebGJ8GQ0sZMktJme7Z7EQ/A3cWRoSo9JUwm+Y3WVwVlKstV1J+lOxXHqOf4NUTKto 6oSDhJgakxFUyxHa5wqsoynBvCzSyP9Elv2MLS6ry8WkCyiu/8VL/83MGz3B1V9kq/+U qsWQ== X-Received: by 10.70.127.231 with SMTP id nj7mr6768449pdb.63.1433517167492; Fri, 05 Jun 2015 08:12:47 -0700 (PDT) Received: from localhost.localdomain ([103.47.144.43]) by mx.google.com with ESMTPSA id bt16sm7100959pdb.91.2015.06.05.08.12.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jun 2015 08:12:46 -0700 (PDT) From: Caesar Wang To: Heiko Stuebner Subject: [PATCH v3 1/3] ARM: rockchip: fix the CPU soft reset Date: Fri, 5 Jun 2015 23:11:42 +0800 Message-Id: <1433517104-7595-2-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433517104-7595-1-git-send-email-wxt@rock-chips.com> References: <1433517104-7595-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150605_081309_094166_81172B8A X-CRM114-Status: GOOD ( 11.85 ) X-Spam-Score: -0.7 (/) Cc: Russell King , Dmitry Torokhov , dianders@chromium.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Caesar Wang 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 We need different orderings when turning a core on and turning a core off. In one case we need to assert reset before turning power off. In ther other case we need to turn power on and the deassert reset. In general, the correct flow is: CPU off: reset_control_assert regmap_update_bits(pmu, PMU_PWRDN_CON, BIT(pd), BIT(pd)) CPU on: regmap_update_bits(pmu, PMU_PWRDN_CON, BIT(pd), 0) reset_control_deassert This is needed for stressing CPU up/down, as per: cd /sys/devices/system/cpu/ for i in $(seq 1000); do echo "================= $i ============" for j in $(seq 100); do while [[ "$(cat cpu1/online)$(cat cpu2/online)$(cat cpu3/online)" != "000"" ]] echo 0 > cpu1/online echo 0 > cpu2/online echo 0 > cpu3/online done while [[ "$(cat cpu1/online)$(cat cpu2/online)$(cat cpu3/online)" != "111" ]]; do echo 1 > cpu1/online echo 1 > cpu2/online echo 1 > cpu3/online done done done The following is reproducile log: [34466.186812] PM: noirq suspend of devices complete after 0.669 msecs [34466.186824] Disabling non-boot CPUs ... [34466.187509] CPU1: shutdown [34466.188672] CPU2: shutdown [34473.736627] Kernel panic - not syncing:Watchdog detected hard LOCKUP on cpu 0 ....... Signed-off-by: Caesar Wang --- arch/arm/mach-rockchip/platsmp.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 5b4ca3c..25da16f 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -88,18 +88,24 @@ static int pmu_set_power_domain(int pd, bool on) return PTR_ERR(rstc); } - if (on) - reset_control_deassert(rstc); - else + if (!on) reset_control_assert(rstc); - reset_control_put(rstc); - } + ret = regmap_update_bits(pmu, PMU_PWRDN_CON, BIT(pd), val); + if (ret < 0) { + pr_err("%s: could not update power domain\n", __func__); + reset_control_put(rstc); + return ret; + } - ret = regmap_update_bits(pmu, PMU_PWRDN_CON, BIT(pd), val); - if (ret < 0) { - pr_err("%s: could not update power domain\n", __func__); - return ret; + if (on) + reset_control_deassert(rstc); + } else { + ret = regmap_update_bits(pmu, PMU_PWRDN_CON, BIT(pd), val); + if (ret < 0) { + pr_err("%s: could not update power domain\n", __func__); + return ret; + } } ret = -1;