commit 205b53ee77baa257f20265dfbc6d6d72a2e504a5
author Felix Singer <felix.singer@secunet.com> Mon Sep 07 15:21:21 2020 +0200
committer Patrick Georgi <pgeorgi@google.com> Mon Nov 16 12:14:01 2020 +0000
tree 2df84a72949b92fa010a2b5b79c53c08b725061e
parent 81f5bf301710911a5381084aba9ff99b8e575a46

device: Allow configuring bus mastering for PCI bridges conditionally

Change-Id: Ic7cacce28f473dda76ca203016dbb8e00149a990
Signed-off-by: Felix Singer <felix.singer@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45150
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

src/device/pci_device.c

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 6075ebe..f4608fc 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -542,7 +542,8 @@
 			dev->command |= PCI_COMMAND_MEMORY;
 		if (resource->flags & IORESOURCE_IO)
 			dev->command |= PCI_COMMAND_IO;
-		if (resource->flags & IORESOURCE_PCI_BRIDGE)
+		if (resource->flags & IORESOURCE_PCI_BRIDGE &&
+		    CONFIG(PCI_SET_BUS_MASTER_PCI_BRIDGES))
 			dev->command |= PCI_COMMAND_MASTER;
 	}