diff --git a/src/soc/amd/genoa/Kconfig b/src/soc/amd/genoa/Kconfig
index f780e062de..28774cc9cd 100644
--- a/src/soc/amd/genoa/Kconfig
+++ b/src/soc/amd/genoa/Kconfig
@@ -15,6 +15,7 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_ACPI
 	select SOC_AMD_COMMON_BLOCK_ACPIMMIO
 	select SOC_AMD_COMMON_BLOCK_ACPI_CPU_POWER_STATE
+	select SOC_AMD_COMMON_BLOCK_ACPI_IVRS
 	select SOC_AMD_COMMON_BLOCK_AOAC
 	select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
 	select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM17H_19H
diff --git a/src/soc/amd/genoa/acpi.c b/src/soc/amd/genoa/acpi.c
index 1f7b7bf02f..2f7af7a427 100644
--- a/src/soc/amd/genoa/acpi.c
+++ b/src/soc/amd/genoa/acpi.c
@@ -9,6 +9,8 @@
 #include <amdblocks/data_fabric.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
+#include <device/device.h>
+#include <soc/acpi.h>
 #include <vendorcode/amd/opensil/genoa_poc/opensil.h>
 
 /* TODO: this can go in a common place */
@@ -53,6 +55,20 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
 	fadt->x_firmware_ctl_h = 0;
 }
 
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    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);
+
+	return current;
+}
+
 /* There are only the following 2 C-states reported by the reference firmware */
 const acpi_cstate_t cstate_cfg_table[] = {
 	[0] = {
diff --git a/src/soc/amd/genoa/chip.c b/src/soc/amd/genoa/chip.c
index 46f43d1f48..d32d3aef7a 100644
--- a/src/soc/amd/genoa/chip.c
+++ b/src/soc/amd/genoa/chip.c
@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
+#include <soc/southbridge.h>
+#include <soc/acpi.h>
 
 static void soc_init(void *chip_info)
 {
+	default_dev_ops_root.write_acpi_tables = soc_acpi_write_tables;
 }
 
 static void soc_final(void *chip_info)
diff --git a/src/soc/amd/genoa/include/soc/acpi.h b/src/soc/amd/genoa/include/soc/acpi.h
index 51fa91ef93..5c0efa5868 100644
--- a/src/soc/amd/genoa/include/soc/acpi.h
+++ b/src/soc/amd/genoa/include/soc/acpi.h
@@ -3,6 +3,12 @@
 #ifndef AMD_GENOA_ACPI_H
 #define AMD_GENOA_ACPI_H
 
+#include <acpi/acpi.h>
+#include <device/device.h>
+
 #define ACPI_SCI_IRQ 9
 
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    struct acpi_rsdp *rsdp);
+
 #endif /* AMD_GENOA_ACPI_H */