X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2Farmv7%2FGIC%2Fgic.c;fp=Modules%2Farmv7%2FGIC%2Fgic.c;h=190b9953890dc3b43d646537c25988b87b5eb6ee;hb=be74abde2c01112d53e0fd86b47a4874ec940663;hp=90682f6454ac593877cd7accca24aa932a8d566f;hpb=ef5fc8c5f0b61b514340b8cc6e3da43032dd80cb;p=tpg%2Facess2.git

diff --git a/Modules/armv7/GIC/gic.c b/Modules/armv7/GIC/gic.c
index 90682f64..190b9953 100644
--- a/Modules/armv7/GIC/gic.c
+++ b/Modules/armv7/GIC/gic.c
@@ -5,23 +5,63 @@
  * gic.c
  * - GIC Core
  */
+#define DEBUG	1
+
 #include <acess.h>
 #include <modules.h>
+#include "gic.h"
+
+// === IMPORTS ===
+extern void	*gpIRQHandler;
 
 // === PROTOTYPES ===
  int	GIC_Install(char **Arguments);
+void	GIC_IRQHandler(void);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x100, armv7_GIC, GIC_Install, NULL, NULL);
+Uint32	*gpGIC_DistributorBase;
+Uint32	*gpGIC_InterfaceBase;
+tPAddr	gGIC_DistributorAddr;
+tPAddr	gGIC_InterfaceAddr;
 
 // === CODE ===
 int GIC_Install(char **Arguments)
 {
+	// Realview PB
+	gGIC_InterfaceAddr   = 0x1e000000;
+	gGIC_DistributorAddr = 0x1e001000;
+
+	// Initialise
+	gpGIC_InterfaceBase = (void*)MM_MapHWPages(gGIC_InterfaceAddr, 1);
+	gpGIC_DistributorBase = (void*)MM_MapHWPages(gGIC_DistributorAddr, 1);
+
+	gpGIC_InterfaceBase[GICC_PMR] = 0xFF;	
+	gpGIC_InterfaceBase[GICC_CTLR] = 1;	// Enable CPU
+	gpGIC_DistributorBase[GICD_CTLR] = 1;	// Enable Distributor
+
+	gpIRQHandler = GIC_IRQHandler;
+
+	__asm__ __volatile__ ("cpsie if");	// Enable IRQs and FIQs
+
 	return MODULE_ERR_OK;
 }
 
+void GIC_IRQHandler(void)
+{
+	Uint32	num = gpGIC_InterfaceBase[GICC_IAR];
+	Log_Debug("GIC", "IRQ 0x%x", num);
+	gpGIC_InterfaceBase[GICC_EOIR] = 1;
+}
+
 int IRQ_AddHandler(int IRQ, void (*Handler)(int, void*), void *Ptr)
 {
+	LOG("IRQ = %i", IRQ);
+	IRQ += 32;	// 32 internal IRQs
+	LOG("IRQ = %i (after adjust)", IRQ);
+	LOG("mask = 0x%x", 1 << (IRQ & (31-1)));
+	gpGIC_DistributorBase[GICD_ISENABLER0+IRQ/32] = 1 << (IRQ & (32-1));
+	((Uint8*)&gpGIC_DistributorBase[GICD_ITARGETSR0])[IRQ] = 1;
 	Log_Warning("GIC", "TODO: Implement IRQ_AddHandler");
 	return 0;
 }