[coreboot-gerrit] Change in ...coreboot[master]: nb/intel/nehalem: Tidy quickpath_reserved calculation

[Jacob Garber (Code Review)]

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33381

Change subject: nb/intel/nehalem: Tidy quickpath_reserved calculation
......................................................................

nb/intel/nehalem: Tidy quickpath_reserved calculation

- Remove unnecessary braces
- Move variable assignment out of function call
- Do not find lowest bit set of 0, which is undefined
- Use unsigned integer when bit shifting

Change-Id: I8651f8cd04165d8d31c44f7919ad5e43499d3d4c
Signed-off-by: Jacob Garber 
Found-by: Coverity CID 1229562
---
M src/northbridge/intel/nehalem/raminit.c
1 file changed, 9 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/33381/1

diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c
index 15d6abb..af9e620 100644
--- a/src/northbridge/intel/nehalem/raminit.c
+++ b/src/northbridge/intel/nehalem/raminit.c
@@ -1431,14 +1431,17 @@
    	memory_map[2] = TOUUD | 1;
    quickpath_reserved = 0;

-	{
-		u32 t;
+	u32 t = pci_read_config32(PCI_DEV(QUICKPATH_BUS, 0, 1), 0x68);

-		gav(t = pci_read_config32(PCI_DEV(QUICKPATH_BUS, 0, 1), 0x68));
-		if (t & 0x800)
-			quickpath_reserved =
-			    (1 << find_lowest_bit_set32(t >> 20));
+	gav(t);
+
+	if (t & 0x800) {
+		u32 shift = t >> 20;
+		if (shift == 0)
+			die("Quickpath value is 0\n");
+		quickpath_reserved = (u32)1 << find_lowest_bit_set32(shift);
    }
+
    if (memory_remap)
    	TOUUD -= quickpath_reserved;