4 files changed, 6 insertions, 142 deletions
diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig
index dd4017c52e..022c77cb2f 100644
--- a/src/soc/nvidia/tegra132/Kconfig
+++ b/src/soc/nvidia/tegra132/Kconfig
@@ -6,6 +6,7 @@ config SOC_NVIDIA_TEGRA132
 	select ARCH_ROMSTAGE_ARMV4
 	select ARCH_RAMSTAGE_ARMV8_64
 	select BOOTBLOCK_CONSOLE
+	select GIC
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_HARD_RESET
 	select HAVE_UART_SPECIAL
diff --git a/src/soc/nvidia/tegra132/gic.c b/src/soc/nvidia/tegra132/gic.c
index 6b1b657495..a8cd58e045 100644
--- a/src/soc/nvidia/tegra132/gic.c
+++ b/src/soc/nvidia/tegra132/gic.c
@@ -17,124 +17,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <arch/cpu.h>
-#include <arch/io.h>
-#include <stdint.h>
-#include <console/console.h>
+#include <gic.h>
 #include <soc/addressmap.h>
-#include <soc/ramstage.h>
 
-enum {
-	GICD_CTLR  = 0x0,
-		ENABLE_GRP0 = 0x1 << 0,
-		ENABLE_GRP1 = 0x1 << 1,
-	GICD_TYPER = 0x4,
-	GICD_ITARGETSR = 0x800,
-	GICD_IGROUPR = 0x80,
-	GICD_NSACR = 0xe00,
-
-	GICC_CTLR  = 0x0,
-	GICC_PMR   = 0x4,
-};
-
-struct gicd {
-	uint32_t *base;
-	size_t num_interrupts;
-};
-
-static inline uint32_t gic_read(uint32_t *base, size_t byte_offset)
-{
-	return read32(&base[byte_offset / sizeof(uint32_t)]);
-}
-
-static inline void gic_write(uint32_t *base, size_t byte_offset, uint32_t val)
-{
-	write32(val, &base[byte_offset / sizeof(uint32_t)]);
-}
-
-static inline uint32_t gicd_read(struct gicd *gicd, size_t byte_offset)
+void *gicd_base(void)
 {
-	return gic_read(gicd->base, byte_offset);
+	return (void *)(uintptr_t)TEGRA_GICD_BASE;
 }
 
-static inline void gicd_write(struct gicd *gicd, size_t byte_offset,
-				uint32_t val)
+void *gicc_base(void)
 {
-	gic_write(gicd->base, byte_offset, val);
-}
-
-static void gic_write_regs(uint32_t *base, size_t offset,
-				size_t tot_interrupts,
-				size_t interrupts_per_reg, uint32_t val)
-{
-	size_t i;
-	size_t bound = sizeof(uint32_t) * tot_interrupts / interrupts_per_reg;
-
-	for (i = 0; i < bound; i += sizeof(uint32_t))
-		gic_write(base, offset + i, val);
-}
-
-static void gicd_write_regs(struct gicd *gicd, size_t offset,
-				size_t interrupts_per_reg, uint32_t val)
-{
-	gic_write_regs(gicd->base, offset, gicd->num_interrupts,
-			interrupts_per_reg, val);
-}
-
-static void gicd_write_banked_regs(struct gicd *gicd, size_t offset,
-				size_t interrupts_per_reg, uint32_t val)
-{
-	/* 1st 32 interrupts are banked per CPU. */
-	gic_write_regs(gicd->base, offset, 32, interrupts_per_reg, val);
-}
-
-static void gicd_init(struct gicd *gicd, uintptr_t base)
-{
-	uint32_t typer;
-
-	gicd->base = (void *)base;
-
-	typer = gicd_read(gicd, GICD_TYPER);
-
-	gicd->num_interrupts = 32 * ((typer & 0x1f) + 1);
-
-	printk(BIOS_DEBUG, "GICD at %p. TYPER=%08x, %zu interrupts.\n",
-		gicd->base, typer, gicd->num_interrupts);
-}
-
-void gic_init(void)
-{
-	struct gicd gicd;
-	uint32_t * const gicc = (void *)(uintptr_t)TEGRA_GICC_BASE;
-	uint32_t cpu_mask;
-
-	gicd_init(&gicd, TEGRA_GICD_BASE);
-
-	/* Enable Group 0 and Group 1 */
-	gicd_write(&gicd, GICD_CTLR, ENABLE_GRP0 | ENABLE_GRP1);
-
-	/* Enable Group 0 and Group 1 in GICC and enable all priroity levels. */
-	gic_write(gicc, GICC_CTLR, ENABLE_GRP0 | ENABLE_GRP1);
-	gic_write(gicc, GICC_PMR, 1 << 7);
-
-	cpu_mask = 1 << smp_processor_id();
-	cpu_mask |= cpu_mask << 8;
-	cpu_mask |= cpu_mask << 16;
-
-	/* Only write banked registers for secondary CPUs. */
-	if (smp_processor_id()) {
-		gicd_write_banked_regs(&gicd, GICD_ITARGETSR, 4, cpu_mask);
-		/* Put interrupts into Group 1. */
-		gicd_write_banked_regs(&gicd, GICD_IGROUPR, 32, 0xffffffff);
-		/* Allow Non-secure access to everything. */
-		gicd_write_banked_regs(&gicd, GICD_NSACR, 16, 0xffffffff);
-		return;
-	}
-
-	/* All interrupts routed to processors that execute this function. */
-	gicd_write_regs(&gicd, GICD_ITARGETSR, 4, cpu_mask);
-	/* Put all interrupts into Gropup 1. */
-	gicd_write_regs(&gicd, GICD_IGROUPR, 32, 0xffffffff);
-	/* Allow Non-secure access to everything. */
-	gicd_write_regs(&gicd, GICD_NSACR, 16, 0xffffffff);
+	return (void *)(uintptr_t)TEGRA_GICC_BASE;
 }
diff --git a/src/soc/nvidia/tegra132/include/soc/ramstage.h b/src/soc/nvidia/tegra132/include/soc/ramstage.h
deleted file mode 100644
index e42f56d687..0000000000
--- a/src/soc/nvidia/tegra132/include/soc/ramstage.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __SOC_NVIDIA_TEGRA132_SOC_RAMSTAGE_H__
-#define __SOC_NVIDIA_TEGRA132_SOC_RAMSTAGE_H__
-
-void gic_init(void);
-
-#endif /* __SOC_NVIDIA_TEGRA132_SOC_RAMSTAGE_H__ */
-
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c
index ac7d97b90b..b845e14322 100644
--- a/src/soc/nvidia/tegra132/soc.c
+++ b/src/soc/nvidia/tegra132/soc.c
@@ -30,7 +30,6 @@
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/cpu.h>
-#include <soc/ramstage.h>
 #include <soc/nvidia/tegra/apbmisc.h>
 #include "chip.h"
 
@@ -188,7 +187,6 @@ struct chip_operations soc_nvidia_tegra132_ops = {
 
 static void tegra132_cpu_init(device_t cpu)
 {
-	gic_init();
 }
 
 static const struct cpu_device_id ids[] = {