From patchwork Wed Oct 8 18:54:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 397687 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 605C71400D6 for ; Thu, 9 Oct 2014 05:57:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752504AbaJHS5X (ORCPT ); Wed, 8 Oct 2014 14:57:23 -0400 Received: from mail-la0-f54.google.com ([209.85.215.54]:33454 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751555AbaJHS5X (ORCPT ); Wed, 8 Oct 2014 14:57:23 -0400 Received: by mail-la0-f54.google.com with SMTP id gm9so8900957lab.41 for ; Wed, 08 Oct 2014 11:57:21 -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; bh=d9tYperxsGjT/sNBFrz7BdzoVJNqIVPb/zX0gXc9xG8=; b=Ud11rhIZelhrzfx+Rkp/xYNFlPTIJ4Vel7N6cFk6BYgLRfpcoVhXQg6mcX2TJf7hA1 /fpxUl9Mrm/e9l0q7cTLb195tOUtREZ8s3E9+/FhXlfPLdTtRiGuOaCb2pHaPq7J//KT 7pPVEzl/E3O4RSN1LXTRDGeiI83wZhFlditPsDUY+0jCMKixnhV2ZIKnn0K/hdbxivlR 9Pc/bCBm64dtdgSd0b5/Y7Urs5c1L3Z9z9K/Fj/mXjTNsyPMH80rvIcI7a4ku1MgxPf+ WfIFhsQ12rqPGx+E13uNxuFUSdJTAsjNcq/kh9MgGVzXH7OPl4/2bqyUHdBv7mskamsW TvBg== X-Received: by 10.153.11.166 with SMTP id ej6mr13640905lad.80.1412794641546; Wed, 08 Oct 2014 11:57:21 -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 eg2sm278385lbb.29.2014.10.08.11.57.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Oct 2014 11:57:20 -0700 (PDT) From: Dmitry Osipenko To: swarren@wwwdotorg.org, josephl@nvidia.com, thierry.reding@gmail.com, digetx@gmail.com Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: tegra: Re-add removed SoC id macro to tegra_resume() Date: Wed, 8 Oct 2014 22:54:10 +0400 Message-Id: <1412794450-9060-1-git-send-email-digetx@gmail.com> X-Mailer: git-send-email 2.1.1 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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. Signed-off-by: Dmitry Osipenko 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