[coreboot-gerrit] Patch set updated for coreboot: 281eb7c tegra132: fix carveout address calculation >= 4GiB

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8923

-gerrit

commit 281eb7c9c33281460d7e19f2a3b5449ec4cfe60e
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Tue Aug 12 10:38:16 2014 -0500

    tegra132: fix carveout address calculation >= 4GiB
    
    The high address field was being shifted in the wrong direction
    resulting in the lower 12 bits of the upper address being dropped.
    
    BUG=chrome-os-partner:30572
    BRANCH=None
    TEST=Was able to run on ryu and not hang while wiping memory.
    
    Change-Id: If1d7ef1c63ce79c143af3c5012b206ee297cd889
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 6b0da6fa391db2ec2bc1e0bec9325f4e74b5286c
    Original-Change-Id: I7bf173bb0373d2d25ce9014c80236fb55cc8e17e
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/211941
    Original-Reviewed-by: Tom Warren <twarren at nvidia.com>
---
 src/soc/nvidia/tegra132/addressmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/soc/nvidia/tegra132/addressmap.c b/src/soc/nvidia/tegra132/addressmap.c
index 6537187..4933484 100644
--- a/src/soc/nvidia/tegra132/addressmap.c
+++ b/src/soc/nvidia/tegra132/addressmap.c
@@ -61,7 +61,7 @@ static void carveout_from_regs(uintptr_t *base_mib, size_t *size_mib,
 
 	*size_mib = size;
 	bom >>= 20;
-	bom |= bom_hi >> (32 - 20);
+	bom |= bom_hi << (32 - 20);
 
 	*base_mib = bom;
 }