[coreboot-gerrit] Change in coreboot[master]: region: add region_end() and region_device_end() helpers

[Aaron Durbin (Code Review)]

Aaron Durbin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36689 )

Change subject: region: add region_end() and region_device_end() helpers
......................................................................

region: add region_end() and region_device_end() helpers

Add helpers to match a pattern of open coding the offset + size
calculation for both struct region and struct region_device.
Apply the use of the helpers where the usage matches in the code.

Change-Id: Iaef5d007eef9a77f7f33b0e89298abef0197352d
Signed-off-by: Aaron Durbin 
---
M src/commonlib/include/commonlib/region.h
M src/commonlib/region.c
M src/drivers/spi/winbond.c
3 files changed, 13 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/36689/1

diff --git a/src/commonlib/include/commonlib/region.h b/src/commonlib/include/commonlib/region.h
index f27a494..39db1bb 100644
--- a/src/commonlib/include/commonlib/region.h
+++ b/src/commonlib/include/commonlib/region.h
@@ -122,6 +122,11 @@
    return r->size;
 }

+static inline size_t region_end(const struct region *r)
+{
+	return region_offset(r) + region_sz(r);
+}
+
 static inline const struct region *region_device_region(
    				const struct region_device *rdev)
 {
@@ -138,6 +143,11 @@
    return region_offset(region_device_region(rdev));
 }

+static inline size_t region_device_end(const struct region_device *rdev)
+{
+	return region_end(region_device_region(rdev));
+}
+
 /* Memory map entire region device. Same semantics as rdev_mmap() above. */
 static inline void *rdev_mmap_full(const struct region_device *rd)
 {
diff --git a/src/commonlib/region.c b/src/commonlib/region.c
index ca7b6ef..4a7e285 100644
--- a/src/commonlib/region.c
+++ b/src/commonlib/region.c
@@ -15,11 +15,6 @@
 #include <commonlib/region.h>
 #include <string.h>

-static inline size_t region_end(const struct region *r)
-{
-	return region_sz(r) + region_offset(r);
-}
-
 int region_is_subregion(const struct region *p, const struct region *c)
 {
    if (region_offset(c) < region_offset(p))
diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c
index 00a7bf9..fa9140e 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -431,8 +431,7 @@
    }

printk(BIOS_DEBUG, "WINBOND: flash protected range 0x%08zx-0x%08zx\n",
-	       region_offset(&wp_region),
-	       region_offset(&wp_region) + region_sz(&wp_region));
+	       region_offset(&wp_region), region_end(&wp_region));

return region_is_subregion(&wp_region, region);
 }
@@ -562,8 +561,7 @@
    int ret;

/* Need to touch TOP or BOTTOM */
-	if (region_offset(region) != 0 &&
-	    (region_offset(region) + region_sz(region)) != flash->size)
+	if (region_offset(region) != 0 && region_end(region) != flash->size)
    	return -1;

params = (const struct winbond_spi_flash_params *)flash->driver_private;
@@ -654,8 +652,7 @@
    	return ret;

printk(BIOS_DEBUG, "WINBOND: write-protection set to range "
-	       "0x%08zx-0x%08zx\n", region_offset(region),
-	       region_offset(region) + region_sz(region));
+	       "0x%08zx-0x%08zx\n", region_offset(region), region_end(region));

return ret;
 }