ARM: tegra: Check VPR before enabling GPU

Check that VPR is locked down before enabling GPU.

Change-Id: I455b3cb0fee489e19daf7217f925d7d8348458f1
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/390184
Reviewed-by: Prashant Malani <pmalani@nvidia.com>
(cherry picked from commit 9857267dba8b4081a94e90cf39d76f4d4fb2e71e)
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Signed-off-by: Prabhu Kuttiyam <pkuttiyam@nvidia.com>
Reviewed-on: http://git-master/r/408430
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Winnie Hsu <whsu@nvidia.com>

diff --git a/arch/arm/mach-tegra/powergate-t12x.c b/arch/arm/mach-tegra/powergate-t12x.c
index 05933a731a91fe112558513bfa0b6a21fe09d0ee..14bd096be15eade9aa6215e9f9b04613471acbf4 100644 (file)
--- a/arch/arm/mach-tegra/powergate-t12x.c
+++ b/arch/arm/mach-tegra/powergate-t12x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -286,6 +286,7 @@ static struct powergate_partition_info tegra12x_powergate_partition_info[] = {
 #define MC_CLIENT_HOTRESET_STAT                0x204
 #define MC_CLIENT_HOTRESET_CTRL_1      0x970
 #define MC_CLIENT_HOTRESET_STAT_1      0x974
+#define MC_VIDEO_PROTECT_REG_CTRL      0x650
 
 #define PMC_GPU_RG_CNTRL_0             0x2d4
 
@@ -444,12 +445,27 @@ err_power_off:
        return ret;
 }
 
+static int mc_check_vpr(void)
+{
+       int ret = 0;
+       u32 val = mc_read(MC_VIDEO_PROTECT_REG_CTRL);
+       if ((val & 1) == 0) {
+               pr_err("VPR configuration not locked down\n");
+               ret = -EINVAL;
+       }
+       return ret;
+}
+
 static int tegra12x_gpu_unpowergate(int id,
        struct powergate_partition_info *pg_info)
 {
        int ret = 0;
        bool first = false;
 
+       ret = mc_check_vpr();
+       if (ret)
+               return ret;
+
        if (!gpu_rail) {
                gpu_rail = tegra_dvfs_get_rail_by_name("vdd_gpu");
                if (IS_ERR_OR_NULL(gpu_rail)) {