From 1f94f0eb7e214bff29468bf9c39cb99520e290f2 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Tue, 13 Dec 2022 14:59:33 -0600
Subject: Add cp15 cyclecnt clock source

---
 rtl/core/cp15/cp15.sv | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'rtl/core/cp15/cp15.sv')

diff --git a/rtl/core/cp15/cp15.sv b/rtl/core/cp15/cp15.sv
index 0659cad..5a482d4 100644
--- a/rtl/core/cp15/cp15.sv
+++ b/rtl/core/cp15/cp15.sv
@@ -10,7 +10,8 @@ module core_cp15
 	input  coproc_decode  dec,
 	input  word           write,
 
-	input  logic          fault_register,
+	input  logic          halt,
+	                      fault_register,
 	                      fault_page,
 	input  ptr            fault_addr,
 	input  mmu_fault_type fault_type,
@@ -31,8 +32,8 @@ module core_cp15
 	assign {op1, op2} = {dec.op1, dec.op2};
 	assign load = dec.load;
 
-	word read_cpuid, read_syscfg, read_ttbr, read_domain,
-	     read_far, read_fsr, read_cache_lockdown, read_tlb_lockdown;
+	word read_cpuid, read_syscfg, read_ttbr, read_domain, read_far,
+	     read_fsr, read_cache_lockdown, read_tlb_lockdown, read_cyclecnt;
 
 	core_cp15_cpuid cpuid
 	(
@@ -101,6 +102,12 @@ module core_cp15
 		.*
 	);
 
+	core_cp15_cyclecnt cyclecnt
+	(
+		.read(read_cyclecnt),
+		.*
+	);
+
 	always_comb
 		unique case(crn)
 			`CP15_CRN_CPUID:
@@ -127,6 +134,9 @@ module core_cp15
 			`CP15_CRN_TLB_LCK:
 				read = read_tlb_lockdown;
 
+			`CP15_CRN_CYCLECNT:
+				read = read_cyclecnt;
+
 			default:
 				read = {$bits(read){1'bx}};
 		endcase
-- 
cgit v1.2.3