ARM: tegra: Disable VPR

PATCH New Alexandre Courbot 3 participants 3 messages Jun 24, 2014 – Jul 2, 2014

Subsystems (2)

Arm (32-bit) Tegra architecture support

lore

Share & tools

lore

Alexandre Courbot

author

2014-06-24 02:45 UTC #0 lore raw

PATCH v3 1/1 ARM: tegra: Disable VPR

From: Bryan Wu <[email protected]>

On Tegra114 and Tegra124 platforms, certain display-related registers cannot be accessed unless the VPR registers are programmed. For bootloader, we probably don't care about VPR, so we disable it (which counts as programming it, and allows those display-related registers to be accessed.

This patch is based on the commit 5f499646c83ba08079f3fdff6591f638a0ce4c0c in Chromium OS U-Boot project.

Signed-off-by Andrew Chew <[email protected]>

Signed-off-by Jimmy Zhang <[email protected]>

Signed-off-by Bryan Wu <[email protected]>

[acourbot: ensure write went through, vpr.c style changes]

Signed-off-by Alexandre Courbot <[email protected]>

Reviewed-by Stephen Warren <[email protected]>

Cc Tom Warren <[email protected]>

Cc Stephen Warren <[email protected]>

Cc Terje Bergstrom <[email protected]>

---
Changes since v2:
- Remove useless switch case

Changes since v1:
- Use proper defines for fields values
- Move MC layout to T124 arch as it is exclusive to it
- Only compile VPR support if T124 is enabled

 arch/arm/cpu/tegra-common/Makefile      |  1 +
 arch/arm/cpu/tegra-common/ap.c          |  3 ++
 arch/arm/cpu/tegra-common/vpr.c         | 35 +++++++++++++++++++++++
 arch/arm/include/asm/arch-tegra/ap.h    |  9 ++++++
 arch/arm/include/asm/arch-tegra124/mc.h | 49 +++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+)
 create mode 100644 arch/arm/cpu/tegra-common/vpr.c
 create mode 100644 arch/arm/include/asm/arch-tegra124/mc.h

arch/arm/cpu/tegra-common/Makefile +1 -0

index 892556e64451..a18c318739fa 100644
@@ -14,3 +14,4 @@ obj-y += clock.o
 obj-y += lowlevel_init.o
 obj-y += pinmux-common.o
 obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
+obj-$(CONFIG_TEGRA124) += vpr.o

arch/arm/cpu/tegra-common/ap.c +3 -0

index 91d70da65661..a17dfd1e225e 100644
@@ -163,4 +163,7 @@ void s_init(void)
 
 	/* init the cache */
 	config_cache();
+
+	/* init vpr */
+	config_vpr();
 }

arch/arm/cpu/tegra-common/vpr.c new file +35 -0

new file mode 100644
index 000000000000..f695811c9b6d
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Tegra vpr routines */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/tegra.h>
+#include <asm/arch/mc.h>
+
+/* Configures VPR.  Right now, all we do is turn it off. */
+void config_vpr(void)
+{
+	struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
+
+	/* Turn VPR off */
+	writel(0, &mc->mc_video_protect_size_mb);
+	writel(TEGRA_MC_VIDEO_PROTECT_REG_WRITE_ACCESS_DISABLED,
+	       &mc->mc_video_protect_reg_ctrl);
+	/* read back to ensure the write went through */
+	readl(&mc->mc_video_protect_reg_ctrl);
+}

arch/arm/include/asm/arch-tegra/ap.h +9 -0

index bc5851c1d045..5c8be94d9772 100644
@@ -65,3 +65,12 @@ int tegra_get_sku_info(void);
 
 /* Do any chip-specific cache config */
 void config_cache(void);
+
+#if defined(CONFIG_TEGRA124)
+/* Do chip-specific vpr config */
+void config_vpr(void);
+#else
+static inline void config_vpr(void)
+{
+}
+#endif

arch/arm/include/asm/arch-tegra124/mc.h new file +49 -0

49 lines not on this page · raw message

Signature · 1 line

2.0.0

Thierry Reding

2014-06-27 16:21 UTC #1 lore raw

PATCH v3 1/1 ARM: tegra: Disable VPR

Quoted 28 lines · Alexandre Courbot

From: Bryan Wu <[email protected]>
On Tegra114 and Tegra124 platforms, certain display-related registers cannot be accessed unless the VPR registers are programmed. For bootloader, we probably don't care about VPR, so we disable it (which counts as programming it, and allows those display-related registers to be accessed.
This patch is based on the commit 5f499646c83ba08079f3fdff6591f638a0ce4c0c in Chromium OS U-Boot project.
Signed-off-by Andrew Chew <[email protected]>
Signed-off-by Jimmy Zhang <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
[acourbot: ensure write went through, vpr.c style changes]
Signed-off-by Alexandre Courbot <[email protected]>
Reviewed-by Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Terje Bergstrom <[email protected]>
---
Changes since v2:
- Remove useless switch case
Changes since v1:
- Use proper defines for fields values
- Move MC layout to T124 arch as it is exclusive to it
- Only compile VPR support if T124 is enabled

Quoted 8 lines

 arch/arm/cpu/tegra-common/Makefile      |  1 +
 arch/arm/cpu/tegra-common/ap.c          |  3 ++
 arch/arm/cpu/tegra-common/vpr.c         | 35 +++++++++++++++++++++++
 arch/arm/include/asm/arch-tegra/ap.h    |  9 ++++++
 arch/arm/include/asm/arch-tegra124/mc.h | 49 +++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+)
 create mode 100644 arch/arm/cpu/tegra-common/vpr.c
 create mode 100644 arch/arm/include/asm/arch-tegra124/mc.h

Tested-by Thierry Reding <[email protected]>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140627/13b13c9d/attachment.pgp>

Alexandre Courbot

2014-07-02 02:17 UTC #2 lore raw

PATCH v3 1/1 ARM: tegra: Disable VPR

Tom, is this patch ok for you? If yes, do you plan to merge it?

Quoted 39 lines · Thierry Reding

Quoted 28 lines · Alexandre Courbot
From: Bryan Wu <[email protected]>
On Tegra114 and Tegra124 platforms, certain display-related registers cannot be accessed unless the VPR registers are programmed. For bootloader, we probably don't care about VPR, so we disable it (which counts as programming it, and allows those display-related registers to be accessed.
This patch is based on the commit 5f499646c83ba08079f3fdff6591f638a0ce4c0c in Chromium OS U-Boot project.
Signed-off-by Andrew Chew <[email protected]>
Signed-off-by Jimmy Zhang <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
[acourbot: ensure write went through, vpr.c style changes]
Signed-off-by Alexandre Courbot <[email protected]>
Reviewed-by Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Terje Bergstrom <[email protected]>
---
Changes since v2:
- Remove useless switch case
Changes since v1:
- Use proper defines for fields values
- Move MC layout to T124 arch as it is exclusive to it
- Only compile VPR support if T124 is enabled
Quoted 8 lines
 arch/arm/cpu/tegra-common/Makefile      |  1 +
 arch/arm/cpu/tegra-common/ap.c          |  3 ++
 arch/arm/cpu/tegra-common/vpr.c         | 35 +++++++++++++++++++++++
 arch/arm/include/asm/arch-tegra/ap.h    |  9 ++++++
 arch/arm/include/asm/arch-tegra124/mc.h | 49 +++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+)
 create mode 100644 arch/arm/cpu/tegra-common/vpr.c
 create mode 100644 arch/arm/include/asm/arch-tegra124/mc.h
Tested-by Thierry Reding <[email protected]>