2 files changed, 18 insertions, 19 deletions
diff --git a/src/soc/amd/cezanne/psp_verstage/chipset.c b/src/soc/amd/cezanne/psp_verstage/chipset.c
index c0593bf05a..7ad21490f8 100644
--- a/src/soc/amd/cezanne/psp_verstage/chipset.c
+++ b/src/soc/amd/cezanne/psp_verstage/chipset.c
@@ -8,8 +8,6 @@
 #include <bl_uapp/bl_syscall_public.h>
 #include <console/console.h>
 #include <psp_verstage.h>
-#include <reset.h>
-#include <timer.h>
 
 uint32_t update_psp_bios_dir(uint32_t *psp_dir_offset, uint32_t *bios_dir_offset)
 {
@@ -35,17 +33,3 @@ uint32_t svc_write_postcode(uint32_t postcode)
 {
 	return 0;
 }
-
-static uint64_t tmp_timer_value = 0;
-void timer_monotonic_get(struct mono_time *mt)
-{
-	mt->microseconds = tmp_timer_value / 1000;
-	tmp_timer_value++;
-}
-
-void do_board_reset(void)
-{
-	printk(BIOS_ERR, "Reset not implemented yet.\n");
-	while (1)
-		;
-}
diff --git a/src/soc/amd/cezanne/psp_verstage/svc.c b/src/soc/amd/cezanne/psp_verstage/svc.c
index 70cb36983c..bd4bec5798 100644
--- a/src/soc/amd/cezanne/psp_verstage/svc.c
+++ b/src/soc/amd/cezanne/psp_verstage/svc.c
@@ -35,9 +35,8 @@ uint32_t svc_get_boot_mode(uint32_t *boot_mode)
 
 void svc_delay_in_usec(uint32_t delay)
 {
-	uint32_t i;
-	for (i = 0; i < delay * 1000; i++)
-		asm volatile ("nop");
+	uint32_t unused = 0;
+	SVC_CALL1(SVC_DELAY_IN_MICRO_SECONDS, delay, unused);
 }
 
 uint32_t svc_get_spi_rom_info(struct spirom_info *spi_rom_info)
@@ -97,3 +96,19 @@ uint32_t svc_save_uapp_data(void *address, uint32_t size)
 	SVC_CALL2(SVC_COPY_DATA_FROM_UAPP, (uint32_t)address, size, retval);
 	return retval;
 }
+
+uint32_t svc_read_timer_val(enum psp_timer_type type, uint64_t *counter_value)
+{
+	unsigned int retval = 0;
+	assert(type < PSP_TIMER_TYPE_MAX);
+	SVC_CALL2(SVC_READ_TIMER_VAL, type, counter_value, retval);
+	return retval;
+}
+
+uint32_t svc_reset_system(enum reset_type reset_type)
+{
+	unsigned int retval = 0;
+	assert(reset_type < RESET_TYPE_MAX);
+	SVC_CALL1(SVC_RESET_SYSTEM, reset_type, retval);
+	return retval;
+}