From d13355401acdba8cf5031bdaf69c50d658f1b630 Mon Sep 17 00:00:00 2001 From: Adam Jesionowski Date: Sat, 7 May 2022 00:59:49 +0000 Subject: [PATCH] Revert "Make camkes IRQ numbers match top_matcha.h" Revert "Make smc_plic.numberOfSources match top_matcha.h" Revert submission 21323-top_matcha_irqs Reason for revert: Breaks TimerService Reverted Changes: I40a840585:Make smc_plic.numberOfSources match top_matcha.h I026a541a6:Move IRQ numbers to config lib and annotate with c... I2873a0561:Make camkes IRQ numbers match top_matcha.h Ida9efaf63:Make PLIC_MAX_NUM_INT match top_matcha.h Change-Id: I07c06e2f6c43201dc2078745a5146dccab442285 GitOrigin-RevId: 6109d5353bd3a49d827c6c9a1b0b28c8827ffb28 --- apps/system/system.camkes | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/system/system.camkes b/apps/system/system.camkes index 00a45cd..7c281a7 100644 --- a/apps/system/system.camkes +++ b/apps/system/system.camkes @@ -19,7 +19,7 @@ import "components/ProcessManager/ProcessManager.camkes"; import "components/MlCoordinator/MlCoordinator.camkes"; import "components/MemoryManager/MemoryManager.camkes"; import "components/StorageManager/StorageManager.camkes"; -import "components/SecurityCoordinator/SecurityCoordinator.camkes"; +import "components/SecurityCoordinator/SecurityCoordinator.camkes"; import "components/TimerService/TimerService.camkes"; component OpenTitanUART { @@ -171,17 +171,17 @@ assembly { vctop.itcm_size = 0x100000; vctop.dtcm_paddr = 0x34000000; vctop.dtcm_size = 0x1000000; - vctop.host_req_irq_number = 13; // kTopMatchaPlicIrqIdVcTopHostReq @ top_matcha.h - vctop.finish_irq_number = 14; // kTopMatchaPlicIrqIdVcTopFinish @ top_matcha.h - vctop.instruction_fault_irq_number = 15; // kTopMatchaPlicIrqIdVcTopInstructionFault @ top_matcha.h - vctop.data_fault_irq_number = 16; // kTopMatchaPlicIrqIdVcTopDataFault @ top_matcha.h + vctop.host_req_irq_number = 11; + vctop.finish_irq_number = 12; + vctop.instruction_fault_irq_number = 13; + vctop.data_fault_irq_number = 14; vc_payload.elf_file_paddr = 0x46000000; vc_payload.elf_file_size = 0x1000000; timer.csr_paddr = 0x50030000; timer.csr_size = 0x1000; - timer.timer_interrupt_irq_number = 9; // kTopMatchaPlicIrqIdRvTimerSmcTimerExpiredHart0Timer0 @ top_matcha.h + timer.timer_interrupt_irq_number = 15; random.ID = 1;