summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2015-03-13 11:28:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-03-16 05:29:32 +0100
commiteab9e4cdd9648b8b795ba04ec56cb842deac564e (patch)
tree3d15fe5fef0bd480764f3176129b8e4cfc2ab7bf /drivers/pci/pci.c
parent5dd5884801669b17705cd030e9e82a4f1de50296 (diff)
downloadbarebox-eab9e4cdd9648b8b795ba04ec56cb842deac564e.tar.gz
barebox-eab9e4cdd9648b8b795ba04ec56cb842deac564e.tar.xz
PCI: fix bad bugs in bridge setup code
Add the required brackets, so that we don't write unused registers with potentially bogus values. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5b848eeb2..1f5dc78b3 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -259,15 +259,17 @@ static void postscan_setup_bridge(struct pci_dev *dev)
/* limit subordinate to last used bus number */
pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, bus_index - 1);
- if (last_mem)
+ if (last_mem) {
last_mem = ALIGN(last_mem, SZ_1M);
pci_write_config_word(dev, PCI_MEMORY_LIMIT,
((last_mem - 1) & 0xfff00000) >> 16);
+ }
- if (last_mem_pref)
+ if (last_mem_pref) {
last_mem_pref = ALIGN(last_mem_pref, SZ_1M);
pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT,
((last_mem_pref - 1) & 0xfff00000) >> 16);
+ }
if (last_io) {
last_io = ALIGN(last_io, SZ_4K);