Change in coreboot[master]: nb/amd/{agesa,pi}: Clean up some math expressions

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55930 )

Change subject: nb/amd/{agesa,pi}: Clean up some math expressions
......................................................................

nb/amd/{agesa,pi}: Clean up some math expressions

Change-Id: Id6a1a6123dc0e2afd04213ece13363eed29f92c0
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55930
Tested-by: build bot (Jenkins) 
Reviewed-by: Elyes Haouas 
Reviewed-by: Martin L Roth 
---
M src/northbridge/amd/agesa/family14/northbridge.c
M src/northbridge/amd/agesa/family15tn/northbridge.c
M src/northbridge/amd/agesa/family16kb/northbridge.c
M src/northbridge/amd/pi/00730F01/northbridge.c
4 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin L Roth: Looks good to me, approved
  Elyes Haouas: Looks good to me, approved

diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index e102252..cf67d93 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -552,12 +552,12 @@
    			   basek, limitk, sizek);

/* See if we need a hole from 0xa0000 (640K) to 0xbffff (768K) */
-		if ((basek < 640) && (sizek > 768)) {
+		if (basek < 640 && sizek > 768) {
    		printk(BIOS_DEBUG,"adsr - 0xa0000 to 0xbffff resource.\n");
    		ram_resource(dev, (idx | 0), basek, 640 - basek);
    		idx += 0x10;
    		basek = 768;
-			sizek = limitk - 768;
+			sizek = limitk - basek;
    	}

printk(BIOS_DEBUG,
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 8c010ee..046f875 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -710,11 +710,11 @@
    	sizek = limitk - basek;

/* See if we need a hole from 0xa0000 (640K) to 0xbffff (768K) */
-		if ((basek < ((8*64)+(8*16))) && (sizek > ((8*64)+(16*16)))) {
-			ram_resource(dev, (idx | i), basek, ((8*64)+(8*16)) - basek);
+		if (basek < 640 && sizek > 768) {
+			ram_resource(dev, (idx | i), basek, 640 - basek);
    		idx += 0x10;
-			basek = (8*64)+(16*16);
-			sizek = limitk - ((8*64)+(16*16));
+			basek = 768;
+			sizek = limitk - basek;

}

diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index a343321..0dc3d0b 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -722,11 +722,11 @@
    	sizek = limitk - basek;

/* See if we need a hole from 0xa0000 (640K) to 0xbffff (768K) */
-		if ((basek < ((8*64)+(8*16))) && (sizek > ((8*64)+(16*16)))) {
-			ram_resource(dev, (idx | i), basek, ((8*64)+(8*16)) - basek);
+		if (basek < 640 && sizek > 768) {
+			ram_resource(dev, (idx | i), basek, 640 - basek);
    		idx += 0x10;
-			basek = (8*64)+(16*16);
-			sizek = limitk - ((8*64)+(16*16));
+			basek = 768;
+			sizek = limitk - basek;
    	}

//printk(BIOS_DEBUG, "node %d : mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk);
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 9889275..52364a2 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -811,10 +811,10 @@
    			   i, basek, limitk, sizek);

/* See if we need a hole from 0xa0000 (640K) to 0xfffff (1024K) */
-		if ((basek < (0xa0000 >> 10) && (sizek > (0x100000 >> 10)))) {
-			ram_resource(dev, (idx | i), basek, (0xa0000 >> 10) - basek);
+		if (basek < 640 && sizek > 1024) {
+			ram_resource(dev, (idx | i), basek, 640 - basek);
    		idx += 0x10;
-			basek = 0x100000 >> 10;
+			basek = 1024;
    		sizek = limitk - basek;
    	}