From e8fc8f31b4decd0ac70f82f5c3f90a244ee51964 Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Thu, 22 Jul 2021 06:44:01 +0200 Subject: mb/siemens/mc_apl{1,2,3,5,6}: Use PCI_ALLOW_BUS_MASTER_ANY_DEVICE Use the Kconfig switch PCI_ALLOW_BUS_MASTER_ANY_DEVICE instead of PCI_ALLOW_BUS_MASTER to enable PCIe bus master bit as requested in CB:56441 during review. Change-Id: I433dbae0d9b15e41d1d0750298868341ce3d6b46 Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/c/coreboot/+/56502 Tested-by: build bot (Jenkins) Reviewed-by: Mario Scheithauer --- src/mainboard/siemens/mc_apl1/mainboard.c | 2 +- src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c | 2 +- src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c | 2 +- src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c | 2 +- src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c index 114d6e32b8fd..7ac8764b6011 100644 --- a/src/mainboard/siemens/mc_apl1/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/mainboard.c @@ -216,7 +216,7 @@ static void mainboard_final(void *chip_info) variant_mainboard_final(); /* Set Master Enable for on-board PCI device if allowed. */ - if (CONFIG(PCI_ALLOW_BUS_MASTER)) { + if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) { dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403f, 0); if (dev) { pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c index 7d8b9f518121..3951e336ee7f 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c @@ -10,7 +10,7 @@ void variant_mainboard_final(void) { struct device *dev; - if (CONFIG(PCI_ALLOW_BUS_MASTER)) { + if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) { /* Set Master Enable for on-board PCI device if allowed. */ dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); if (dev) { diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c index 4f43782cf45f..0b05bf912f29 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c @@ -39,7 +39,7 @@ void variant_mainboard_final(void) /* Set Master Enable for on-board PCI device if allowed. */ dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); if (dev) { - if (CONFIG(PCI_ALLOW_BUS_MASTER)) + if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); /* Disable clock outputs 0 and 2-4 (CLKOUT) for upstream diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c index 82528d5952bf..f9cca156af38 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c @@ -46,7 +46,7 @@ void variant_mainboard_final(void) /* Set Master Enable for on-board PCI device if allowed. */ dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); if (dev) { - if (CONFIG(PCI_ALLOW_BUS_MASTER)) + if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); /* Disable clock outputs 0-3 (CLKOUT) for upstream XIO2001 PCIe diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c index 2a8dd9b20f87..a9c1d1ba2e4b 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c @@ -39,7 +39,7 @@ void variant_mainboard_final(void) /* Set Master Enable for on-board PCI device if allowed. */ dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); if (dev) { - if (CONFIG(PCI_ALLOW_BUS_MASTER)) + if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); /* Disable clock outputs 0-3 (CLKOUT) for upstream -- cgit v1.2.3