diff --git a/src/soc/amd/genoa_poc/acpi.c b/src/soc/amd/genoa_poc/acpi.c
index 7762e9d..cadf8db 100644
--- a/src/soc/amd/genoa_poc/acpi.c
+++ b/src/soc/amd/genoa_poc/acpi.c
@@ -42,12 +42,7 @@
 				    struct acpi_rsdp *rsdp)
 {
 	/* IVRS */
-	acpi_ivrs_t *ivrs;
-	current = acpi_align_current(current);
-	ivrs = (acpi_ivrs_t *)current;
-	acpi_create_ivrs(ivrs, acpi_fill_ivrs);
-	current += ivrs->header.length;
-	acpi_add_table(rsdp, ivrs);
+	current = acpi_add_ivrs_table(current, rsdp);
 
 	return current;
 }