[coreboot-gerrit] Change in coreboot[master]: soc/intel: Obsolete mmap_region_granularity()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34696 )

Change subject: soc/intel: Obsolete mmap_region_granularity()
......................................................................

soc/intel: Obsolete mmap_region_granularity()

Change-Id: I471598d3ce61b70e35adba3bd983f5d823ba3816
Signed-off-by: Kyösti Mälkki 
---
M Documentation/Intel/SoC/soc.html
M src/drivers/intel/fsp1_1/include/fsp/memmap.h
M src/drivers/intel/fsp2_0/include/fsp/memmap.h
M src/soc/intel/braswell/memmap.c
M src/soc/intel/denverton_ns/include/soc/smm.h
M src/soc/intel/skylake/memmap.c
6 files changed, 0 insertions(+), 40 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/34696/1

diff --git a/Documentation/Intel/SoC/soc.html b/Documentation/Intel/SoC/soc.html
index fff536b..6b1bb30 100644
--- a/Documentation/Intel/SoC/soc.html
+++ b/Documentation/Intel/SoC/soc.html
@@ -148,7 +148,6 @@
   <li>Edit the src/soc/&lt;Vendor&gt;/&lt;Chip Family&gt;/memmap.c file
     <ol type="A">
       <li>Add the fsp/memmap.h include file</li>
-      <li>Add the mmap_region_granularity routine</li>
     </ol>
   </li>
   <li>Add the necessary .h files to define the necessary values and structures</li>
diff --git a/src/drivers/intel/fsp1_1/include/fsp/memmap.h b/src/drivers/intel/fsp1_1/include/fsp/memmap.h
index 965bce6..3f3850f 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/memmap.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/memmap.h
@@ -18,13 +18,6 @@

#include <types.h>

-/*
- * mmap_region_granularity must to return a size which is a positive non-zero
- * integer multiple of the SMM size when SMM is in use.  When not using SMM,
- * this value should be set to 8 MiB.
- */
-size_t mmap_region_granularity(void);
-
 /* Fills in the arguments for the entire SMM region covered by chipset
  * protections. e.g. TSEG. */
 void smm_region(void **start, size_t *size);
diff --git a/src/drivers/intel/fsp2_0/include/fsp/memmap.h b/src/drivers/intel/fsp2_0/include/fsp/memmap.h
index 965bce6..3f3850f 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/memmap.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/memmap.h
@@ -18,13 +18,6 @@

#include <types.h>

-/*
- * mmap_region_granularity must to return a size which is a positive non-zero
- * integer multiple of the SMM size when SMM is in use.  When not using SMM,
- * this value should be set to 8 MiB.
- */
-size_t mmap_region_granularity(void);
-
 /* Fills in the arguments for the entire SMM region covered by chipset
  * protections. e.g. TSEG. */
 void smm_region(void **start, size_t *size);
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index 207c843..a4692ce 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -34,13 +34,6 @@
    *size = smm_region_size();
 }

-size_t mmap_region_granularity(void)
-{
-	/* Align to TSEG size when SMM is in use, and 8MiB by default */
-	return CONFIG(HAVE_SMI_HANDLER) ? smm_region_size()
-		: 8 << 20;
-}
-
 /*
  *        Subregions within SMM
  *     +-------------------------+ BUNIT_SMRRH
diff --git a/src/soc/intel/denverton_ns/include/soc/smm.h b/src/soc/intel/denverton_ns/include/soc/smm.h
index 771c3d8..ca01cf8 100644
--- a/src/soc/intel/denverton_ns/include/soc/smm.h
+++ b/src/soc/intel/denverton_ns/include/soc/smm.h
@@ -24,13 +24,6 @@
    uint32_t smrr_mask;
 };

-/*
- * mmap_region_granularity must to return a size which is a positive non-zero
- * integer multiple of the SMM size when SMM is in use.  When not using SMM,
- * this value should be set to 8 MiB.
- */
-size_t mmap_region_granularity(void);
-
 /* Fills in the arguments for the entire SMM region covered by chipset
  * protections. e.g. TSEG. */
 void smm_region(void **start, size_t *size);
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index 5133c21..d2c223e 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -30,17 +30,6 @@

#include "chip.h"

-size_t mmap_region_granularity(void)
-{
-	if (CONFIG(HAVE_SMI_HANDLER))
-		/* Align to TSEG size when SMM is in use */
-		if (CONFIG_SMM_TSEG_SIZE != 0)
-			return CONFIG_SMM_TSEG_SIZE;
-
-	/* Make it 8MiB by default. */
-	return 8*MiB;
-}
-
 void smm_region(void **start, size_t *size)
 {
    *start = (void *)sa_get_tseg_base();