diff --git a/src/soc/amd/common/block/data_fabric/domain.c b/src/soc/amd/common/block/data_fabric/domain.c
index aec1596fc1..c032fdb4bb 100644
--- a/src/soc/amd/common/block/data_fabric/domain.c
+++ b/src/soc/amd/common/block/data_fabric/domain.c
@@ -243,6 +243,9 @@ void amd_pci_domain_fill_ssdt(const struct device *domain)
 	}
 
 	acpigen_write_resourcetemplate_footer();
+
+	acpigen_write_BBN(domain->link_list->secondary);
+
 	/* Scope */
 	acpigen_pop_len();
 }
diff --git a/src/soc/amd/picasso/acpi/northbridge.asl b/src/soc/amd/picasso/acpi/northbridge.asl
index 688f138123..2f73ae4384 100644
--- a/src/soc/amd/picasso/acpi/northbridge.asl
+++ b/src/soc/amd/picasso/acpi/northbridge.asl
@@ -6,11 +6,6 @@ Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
 
 /* Describe the Northbridge devices */
 
-Method(_BBN, 0, NotSerialized)	/* Bus number = 0 */
-{
-	Return(0)
-}
-
 Method(_STA, 0, NotSerialized)
 {
 	Return(0x0f)	/* Status is visible */