From ad884cb65d2b3b99742f558288d78cdbe8cd68d3 Mon Sep 17 00:00:00 2001
From: Jean-Roch Coulon <jean-roch.coulon@thalesgroup.com>
Date: Fri, 14 Jul 2023 11:46:25 +0200
Subject: [PATCH] add cva6 parameters for FPGA

Signed-off-by: Jean-Roch Coulon <jean-roch.coulon@thalesgroup.com>
---
 corev_apu/fpga/src/ariane_xilinx.sv | 14 ++++++++++++++
 corev_apu/src/ariane.sv             |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/corev_apu/fpga/src/ariane_xilinx.sv b/corev_apu/fpga/src/ariane_xilinx.sv
index 9ccaab0ae6..2e2d8a175d 100644
--- a/corev_apu/fpga/src/ariane_xilinx.sv
+++ b/corev_apu/fpga/src/ariane_xilinx.sv
@@ -152,6 +152,16 @@ module ariane_xilinx (
   input  logic        rx          ,
   output logic        tx
 );
+
+// cva6 configuration
+// Pipeline
+localparam int unsigned NrCommitPorts = cva6_config_pkg::CVA6ConfigNrCommitPorts;
+// RVFI
+localparam int unsigned IsRVFI = 0;
+localparam type rvfi_instr_t = logic;
+localparam type rvfi_port_t = logic;
+
+
 // 24 MByte in 8 byte words
 localparam NumWords = (24 * 1024 * 1024) / 8;
 localparam NBSlave = 2; // debug, ariane
@@ -697,6 +707,10 @@ ariane_axi::req_t    axi_ariane_req;
 ariane_axi::resp_t   axi_ariane_resp;
 
 ariane #(
+    .NrCommitPorts ( NrCommitPorts ),
+    .IsRVFI ( IsRVFI ),
+    .rvfi_instr_t ( rvfi_instr_t ),
+    .rvfi_port_t ( rvfi_port_t ),
     .ArianeCfg ( ariane_soc::ArianeSocCfg )
 ) i_ariane (
     .clk_i        ( clk                 ),
diff --git a/corev_apu/src/ariane.sv b/corev_apu/src/ariane.sv
index 3b437cde24..a5789657ee 100644
--- a/corev_apu/src/ariane.sv
+++ b/corev_apu/src/ariane.sv
@@ -66,7 +66,7 @@ module ariane import ariane_pkg::*; #(
     .NrCommitPorts ( NrCommitPorts ),
     .IsRVFI ( IsRVFI ),
     .rvfi_instr_t ( rvfi_instr_t ),
-    .rvfi_port_t ( rvfi_instr_t [NrCommitPorts-1:0] ),
+    .rvfi_port_t ( rvfi_port_t ),
     //
     .ArianeCfg  ( ArianeCfg ),
     .AxiAddrWidth ( AxiAddrWidth ),