From patchwork Wed Feb 12 23:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11379403 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 025B9109A for ; Wed, 12 Feb 2020 23:47:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6C0F24649 for ; Wed, 12 Feb 2020 23:47:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HMEGN5A6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729484AbgBLXrG (ORCPT ); Wed, 12 Feb 2020 18:47:06 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:40442 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729360AbgBLXqj (ORCPT ); Wed, 12 Feb 2020 18:46:39 -0500 Received: by mail-lj1-f196.google.com with SMTP id n18so4416367ljo.7; Wed, 12 Feb 2020 15:46:37 -0800 (PST) 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=yt7iB+8N46yIzqprXkevBuhRmPkO5WOPeg5Oq7Gq+OM=; b=HMEGN5A6ibF/Y9VvdzkVvGQD+ATNO1Lu6sIpUbl2kcoZnNQ1KV45gT8jtLtwkEIUz5 94CiiGM0Wh4bLIU8A0Vho0F/EgrBfP/+rby6+EycMAZqvRjblDIjNIdWI0c7xtZOwzLB 0W5flISWtH5EgrtFXtWYurRKGNtDDW2fgXmYgtUF0g6B2IUO8XWL2GSQ4Jb923YtY8H2 Dpswkvk7+tXUU0tC5+ovgh7TKVuXiYZB/BoiU0q07TCn6hDwPhTS1IaIbYAswH30v3tw +cqpeP540xdTjA/vLeINy8/TxaJko0TrIuPaoAI1J2Y82LLrRrDHqy93r3/4rJ8oxTRE sCkg== 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=yt7iB+8N46yIzqprXkevBuhRmPkO5WOPeg5Oq7Gq+OM=; b=JFMb+Te3/TTX0zNuYQBn96rou5iyjgJ90b/oFb9gF0OMFo0Lv1Q1jbd6YjOAY4pYo9 VIyK12VovYzoxSgz3oMJFnB9KK5P9+ueL7wuLTKlMi5eNMBaorOhbmLOj242eveBiDK0 b2CToZGQwo497iYig3/2K5wIfnpnaPT0PjByqNGdDSbMiOj+MBzymYlJVjW730rbql5R XilgUAIzqLQLqqBI+W5PUPuxcMgElz2m4jWF+24NSNSmztd1oq2Ld2XKQQFrx9NovSV4 2PTe7k23uvNsSffQZds0qAQeRk3DaaEbAsRNF+4/4gNgDarnnZITxlRGHBIOExg5qwyQ NCxA== X-Gm-Message-State: APjAAAVcp7jp3wyeXXtjSrojfbNhChwRGpTaBYviNiGzscHKMFGSZ7AH BqrUodhcx7PXd49Qr6rQYxA= X-Google-Smtp-Source: APXvYqwUmr00KiHe7WEgw6vme2JIMo+4Umi9uwQlS1cHQXb9a+2UzVKMYPCdxXb+KiXHxE35+4H5rg== X-Received: by 2002:a2e:814e:: with SMTP id t14mr9246918ljg.149.1581551196359; Wed, 12 Feb 2020 15:46:36 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id u15sm234453lfl.87.2020.02.12.15.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 15:46:35 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Peter De Schrijver , Prashant Gaikwad , "Rafael J. Wysocki" , Viresh Kumar , Michael Turquette , Stephen Boyd , Peter Geis , Nicolas Chauvet , Marcel Ziswiler , =?utf-8?b?TWljaGHFgiBNaXJv?= =?utf-8?b?c8WCYXc=?= , Jasper Korten , David Heidelberg Cc: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 06/12] ARM: tegra: Switch CPU to PLLP on resume from LP1 on Tegra30/114/124 Date: Thu, 13 Feb 2020 02:46:01 +0300 Message-Id: <20200212234607.11521-7-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200212234607.11521-1-digetx@gmail.com> References: <20200212234607.11521-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The early-resume code shall not switch CPU to PLLX because PLLX configuration could be unstable or PLLX should be simply disabled if CPU enters into suspend running off some other PLL (the case if CPUFREQ driver is active). The actual burst policy is restored by the clock drivers. Acked-by: Peter De Schrijver Tested-by: Peter Geis Tested-by: Marcel Ziswiler Tested-by: Jasper Korten Tested-by: David Heidelberg Signed-off-by: Dmitry Osipenko --- arch/arm/mach-tegra/sleep-tegra30.S | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S index 02cc6ff96f30..b897d4a433b3 100644 --- a/arch/arm/mach-tegra/sleep-tegra30.S +++ b/arch/arm/mach-tegra/sleep-tegra30.S @@ -398,11 +398,8 @@ _pll_m_c_x_done: ldr r4, [r5, #0x1C] @ restore SCLK_BURST str r4, [r0, #CLK_RESET_SCLK_BURST] - cmp r10, #TEGRA30 - movweq r4, #:lower16:((1 << 28) | (0x8)) @ burst policy is PLLX - movteq r4, #:upper16:((1 << 28) | (0x8)) - movwne r4, #:lower16:((1 << 28) | (0xe)) - movtne r4, #:upper16:((1 << 28) | (0xe)) + movw r4, #:lower16:((1 << 28) | (0x4)) @ burst policy is PLLP + movt r4, #:upper16:((1 << 28) | (0x4)) str r4, [r0, #CLK_RESET_CCLK_BURST] /* Restore pad power state to normal */