From patchwork Wed Oct 8 19:24:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 5055171 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 220989F30B for ; Wed, 8 Oct 2014 19:36:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89CA12013D for ; Wed, 8 Oct 2014 19:36:43 +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 BB33F2012B for ; Wed, 8 Oct 2014 19:36:42 +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 1Xbx0G-0003Vc-EG; Wed, 08 Oct 2014 19:34:28 +0000 Received: from mail-la0-x22c.google.com ([2a00:1450:4010:c03::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xbx0C-0003PJ-8U for linux-arm-kernel@lists.infradead.org; Wed, 08 Oct 2014 19:34:25 +0000 Received: by mail-la0-f44.google.com with SMTP id gb8so9339583lab.3 for ; Wed, 08 Oct 2014 12:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7KKW5ptROxSmnu3a8EkCO4HpETycfov9jKDb8mVb9uc=; b=M7UVRoYfENi5L+tRb1QmOnY5FCbfqYLRPe6O510AYuEEMtNXdbh5BY23NI9uHihcJq CBRCxsOH9c0LVanajyushPkm2xWUUNFD0W/8epYg9deS/cFCkRwue4sxlk5FglQNQTsi 3W/J93lUWsHJQuOy0feXqVRviJyvb7m9BtYrMNbzUSla27w0jgA0kR8bUx5nrbZTy6N8 8YQRPG2jZyAH6+E9EDJQ3qBGHhMYkbX6585cq9moUzpy+TI61y3A4xF1Pync7QxDLVSI qqRSRaclb8WOFsCiCDoOFzc8siwopo6x8x2Pa3CRrUbzFNX5GY6hygocOfnHdvuuxjY2 9mkA== X-Received: by 10.152.28.74 with SMTP id z10mr13977329lag.10.1412796840978; Wed, 08 Oct 2014 12:34:00 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-190-157.pppoe.mtu-net.ru. [91.76.190.157]) by mx.google.com with ESMTPSA id h9sm298660lae.44.2014.10.08.12.33.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Oct 2014 12:34:00 -0700 (PDT) From: Dmitry Osipenko To: swarren@wwwdotorg.org, josephl@nvidia.com, thierry.reding@gmail.com, balbi@ti.com, digetx@gmail.com Subject: [PATCH V2] ARM: tegra: Re-add removed SoC id macro to tegra_resume() Date: Wed, 8 Oct 2014 23:24:15 +0400 Message-Id: <1412796255-10589-1-git-send-email-digetx@gmail.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <20141008190432.GN22688@saruman> References: <20141008190432.GN22688@saruman> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141008_123424_504179_AC8B013A X-CRM114-Status: UNSURE ( 9.02 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Commit d127e9c5c5bc1ee22a7b1fe804397cddd132f756 ("ARM: tegra: make tegra_resume can work with current and later chips") removed tegra_get_soc_id macro leaving used cpu register unassigned and as result causing execution of unintended code on tegra20. Fix it by re-adding macro. Fixes: d127e9c (ARM: tegra: make tegra_resume can work with current and later chips) Cc: # v3.13+ Reviewed-by: Felipe Balbi Signed-off-by: Dmitry Osipenko --- V2: added Cc's for lakml and stable, added "Reviewed-by:" Felipe Balbi arch/arm/mach-tegra/reset-handler.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index 7b2baab..71be4af 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -51,6 +51,7 @@ ENTRY(tegra_resume) THUMB( it ne ) bne cpu_resume @ no + tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 /* Are we on Tegra20? */ cmp r6, #TEGRA20 beq 1f @ Yes