From patchwork Tue Jul 30 17:23:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1139183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="K7+Yqnzo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45yk1w24j2z9sBZ for ; Wed, 31 Jul 2019 03:24:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726810AbfG3RYP (ORCPT ); Tue, 30 Jul 2019 13:24:15 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37696 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727720AbfG3RYO (ORCPT ); Tue, 30 Jul 2019 13:24:14 -0400 Received: by mail-lj1-f194.google.com with SMTP id z28so8608255ljn.4; Tue, 30 Jul 2019 10:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BzusjStSC705ddcrZJxz4h/GqHJ0Wvp0CyBksrxFkjE=; b=K7+YqnzoAJbcU3re3wvsGQtqgYzrtZ1iEPoAqUapFLwAMFGLUNq+TVIRvNGosVXOA6 nb6/RWLlyEBowGgmB+l8Z/G5X3JZC4GQKRYSUDSWJHK/2aX3UUWwJibvS04BBFsWodis Z8k96jE4jRqOa1mwwiQzTRw0bEdX3X2tZeOenCDe/D0n+JinOJBVyEpl/qOaJ43tZwNW vZul+f5+46IBmg68+jKhactPoiL17qj8Ico+KKuiJBeua5YcpvJDEGchyAv/8vyD7Cm2 I/0a67mdWhDeWosKOQhnGgxegdPiMCC/n4pnc9jgM+Q3oFDu+EBXhXAOOFwlB9vlsc0g g0hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BzusjStSC705ddcrZJxz4h/GqHJ0Wvp0CyBksrxFkjE=; b=eDW1mjZ5BZrNHkd1phUzWSGVBd1rezAJq1Yg9Vx+IVU9RwGogYo3gfu74tv+tAFaCZ /9oklRIi+cGgiyVFyLYZz0EnbeV9EG7Ta8dCW6Zjv2GgBU+5+4M9vgcmWU1TRFKuJ0Uk pYFCQmVi8VVU4JCq7PLMdwFqbpumfnb5lS+hoW1NsBxf17I1tzMSEiO9VasNLR2dpQgp 63NRCRsgdwLQLovCTJW+VhsqI1j/e/nTGuCGbjQh7m2RCLUXcbXeVYQnO7PKlvQ+yl7a 6rtChjOO8Gc5gMcWDn/cHUKsQEEigl7eQndPykTqsldpCratUGTzv3mthWFpjE4q6WcX eBxQ== X-Gm-Message-State: APjAAAUpVCpbTrKxdFIGkEM3E0LCTShdBCpn4nia38IjBg7L9Qqjn/Xj 2yT+fnr1axmqd8g3I9VVdew= X-Google-Smtp-Source: APXvYqxwOlxxTeAD55uAjPuC/+LQv1P7kUzP7AJk5u+SGEErv+gOa4wEFviXvLQNPBY4hxLZextcyA== X-Received: by 2002:a2e:9188:: with SMTP id f8mr16185563ljg.33.1564507452137; Tue, 30 Jul 2019 10:24:12 -0700 (PDT) Received: from localhost.localdomain (ppp91-78-220-99.pppoe.mtu-net.ru. [91.78.220.99]) by smtp.gmail.com with ESMTPSA id c15sm13345252lja.79.2019.07.30.10.24.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jul 2019 10:24:11 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Peter De Schrijver Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() Date: Tue, 30 Jul 2019 20:23:39 +0300 Message-Id: <20190730172340.14037-2-digetx@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190730172340.14037-1-digetx@gmail.com> References: <20190730172340.14037-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org There is an unfortunate typo in the code that results in writing to FLOW_CTLR_HALT instead of FLOW_CTLR_CSR. Cc: Acked-by: Peter De Schrijver Signed-off-by: Dmitry Osipenko --- arch/arm/mach-tegra/reset-handler.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index df44828a34d3..53123ae4ac3b 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -44,16 +44,16 @@ ENTRY(tegra_resume) cmp r6, #TEGRA20 beq 1f @ Yes /* Clear the flow controller flags for this CPU. */ - cpu_to_csr_reg r1, r0 + cpu_to_csr_reg r3, r0 mov32 r2, TEGRA_FLOW_CTRL_BASE - ldr r1, [r2, r1] + ldr r1, [r2, r3] /* Clear event & intr flag */ orr r1, r1, \ #FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG movw r0, #0x3FFD @ enable, cluster_switch, immed, bitmaps @ & ext flags for CPU power mgnt bic r1, r1, r0 - str r1, [r2] + str r1, [r2, r3] 1: mov32 r9, 0xc09 From patchwork Tue Jul 30 17:23:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1139184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hYJdqV50"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45yk1w5j6Cz9sBt for ; Wed, 31 Jul 2019 03:24:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727720AbfG3RYT (ORCPT ); Tue, 30 Jul 2019 13:24:19 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:46615 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730703AbfG3RYP (ORCPT ); Tue, 30 Jul 2019 13:24:15 -0400 Received: by mail-lf1-f67.google.com with SMTP id z15so41036142lfh.13; Tue, 30 Jul 2019 10:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b+B6WL/Mm5Gfj7Ncn0tXPPFbZ6O1gNJ677UNpoqOzb4=; b=hYJdqV50me0Z9LIdMcr2Yt/NUeD1qzNq/EJ/XPcfa4N2919j7hN3oVhfzSs7GEl9TB uQx+G8VoPAKfDYFwGnzMqkB/72fsZ0CfIvu7fwwYr72a0TI+Uyc7lvvO4zFD2ggoBVBK u7oZRLwBFX+kbpv0ZNzshvreXj1nM1egHCZXdMPv+dlO0mzzaDC+bcATx12WkEnMQY2S 7iR9GDmKN8TtQuWWEV/5b9Eg9Jy1aOt7voz649s3a+LVMvW5vCllyKory7wijPfKSp96 5MbVrKAWTryDC2WJm4JdmddbDTr8XsIosoJip0DatpmblrPRdzlt1fJM23SAGUnJfRzL mFdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b+B6WL/Mm5Gfj7Ncn0tXPPFbZ6O1gNJ677UNpoqOzb4=; b=OMrZbcIXZ8Ux9TDo1VJ5OE2fmINmzgftR5pvaLW2IOxidb+LH6s55BeuQ36IkSOori jG0mQSbRfr4iqD4ofGqIr9VXC3jbZ3oYAcxxHcMLFdRbGdSvDZwKx1calFP8D5vCH2pA ycRtxS2P35wqll2dEXOr8DWZmRMFGLmbVCh9FLXT+3vouibaHIBWdEgInfhYkKjoiUI2 tenM2E7xHkl0XlusuCzw/gU7jn3XLCOImUa/xgjwFria0JRcJLXDlNMiXkTn0h68y0yW bcdSPCAmQ4Zfzbc3QI7DTDg+XXedwCPGrWQCUAx/v6HUb1Bu8fUw7k0ziMyLJR3NDEpy wQsA== X-Gm-Message-State: APjAAAX8ipmSsSYTyNOSHkXp5KKmA0SknLslQkIiN/ZAUUG5gKnjN5sC NJiePRzxoNwJMq0O9rCplHA= X-Google-Smtp-Source: APXvYqwYFp5syPBqan4DsGyDHstS6GiCFJI4WqfTbURhiAjMn5P8Os8pIXoFfSJ1VoMaPr+3yFcT5A== X-Received: by 2002:ac2:42ca:: with SMTP id n10mr37481007lfl.121.1564507453058; Tue, 30 Jul 2019 10:24:13 -0700 (PDT) Received: from localhost.localdomain (ppp91-78-220-99.pppoe.mtu-net.ru. [91.78.220.99]) by smtp.gmail.com with ESMTPSA id c15sm13345252lja.79.2019.07.30.10.24.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jul 2019 10:24:12 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Peter De Schrijver Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] ARM: tegra: Use WFE for power-gating on Tegra30 Date: Tue, 30 Jul 2019 20:23:40 +0300 Message-Id: <20190730172340.14037-3-digetx@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190730172340.14037-1-digetx@gmail.com> References: <20190730172340.14037-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Turned out that WFI doesn't work reliably on Tegra30 as a trigger for the power-gating, it causes CPU hang under some circumstances like having memory controller running of PLLP. The TRM doc states that WFI should be used for the Big-Little "Cluster Switch", while WFE for the power-gating. Hence let's use the WFE for CPU0 power-gating, like it is done for the power-gating of a secondary cores. This fixes CPU hang after entering LP2 with memory running off PLLP. Acked-by: Peter De Schrijver Signed-off-by: Dmitry Osipenko Tested-by: Peter Geis --- arch/arm/mach-tegra/sleep-tegra30.S | 4 +++- drivers/soc/tegra/flowctrl.c | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S index 6c28395d8c75..17f7a2a6a494 100644 --- a/arch/arm/mach-tegra/sleep-tegra30.S +++ b/arch/arm/mach-tegra/sleep-tegra30.S @@ -683,10 +683,12 @@ tegra30_enter_sleep: dsb ldr r0, [r6, r2] /* memory barrier */ + cmp r10, #TEGRA30 halted: isb dsb - wfi /* CPU should be power gated here */ + wfine /* CPU should be power gated here */ + wfeeq /* !!!FIXME!!! Implement halt failure handler */ b halted diff --git a/drivers/soc/tegra/flowctrl.c b/drivers/soc/tegra/flowctrl.c index b6bdeef33db1..eb96a3086d6d 100644 --- a/drivers/soc/tegra/flowctrl.c +++ b/drivers/soc/tegra/flowctrl.c @@ -91,8 +91,23 @@ void flowctrl_cpu_suspend_enter(unsigned int cpuid) reg &= ~TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP; /* clear wfi bitmap */ reg &= ~TEGRA30_FLOW_CTRL_CSR_WFI_BITMAP; - /* pwr gating on wfi */ - reg |= TEGRA30_FLOW_CTRL_CSR_WFI_CPU0 << cpuid; + + if (tegra_get_chip_id() == TEGRA30) { + /* + * The wfi doesn't work well on Tegra30 because + * CPU hangs under some odd circumstances after + * power-gating (like memory running off PLLP), + * hence use wfe that is working perfectly fine. + * Note that Tegra30 TRM doc clearly stands that + * wfi should be used for the "Cluster Switching", + * while wfe for the power-gating, just like it + * is done on Tegra20. + */ + reg |= TEGRA20_FLOW_CTRL_CSR_WFE_CPU0 << cpuid; + } else { + /* pwr gating on wfi */ + reg |= TEGRA30_FLOW_CTRL_CSR_WFI_CPU0 << cpuid; + } break; } reg |= FLOW_CTRL_CSR_INTR_FLAG; /* clear intr flag */