Change in coreboot[master]: Revert "cpu/x86: Add function to set `put_back_original_solution` var...

[Arthur Heymans (Code Review)]

Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/64803 )

Change subject: Revert "cpu/x86: Add function to set `put_back_original_solution` variable"
......................................................................

Revert "cpu/x86: Add function to set `put_back_original_solution` variable"

Now that mtrr_use_temp_range() can deal with multiple ranges there is no
need to expose this to restore the MTRR solution.

This reverts commit 00aaffaf470adfbaa0fbfa0ec3cc67311763810b.

Change-Id: Ib77a0f52228cd2f19f3227824f704ac690be4aba
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64803
Reviewed-by: Subrata Banik 
Reviewed-by: Lean Sheng Tan 
Tested-by: build bot (Jenkins) 
---
M src/cpu/x86/mtrr/mtrr.c
M src/include/cpu/x86/mtrr.h
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Lean Sheng Tan: Looks good to me, approved
  Subrata Banik: Looks good to me, approved

diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index d1098d9..6d4aa57 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -861,11 +861,6 @@

static bool put_back_original_solution;

-void need_restore_mtrr(void)
-{
-	put_back_original_solution = true;
-}
-
 void mtrr_use_temp_range(uintptr_t begin, size_t size, int type)
 {
    const struct range_entry *r;
@@ -935,7 +930,7 @@
    		(long long)begin, (long long)begin + size - 1,
    		(long long)size, type);
    else
-		need_restore_mtrr();
+		put_back_original_solution = true;

memranges_teardown(&addr_space);
 }
diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h
index 5397d3394..b2bc2c8 100644
--- a/src/include/cpu/x86/mtrr.h
+++ b/src/include/cpu/x86/mtrr.h
@@ -96,7 +96,6 @@
 /* Set up fixed MTRRs but do not enable them. */
 void x86_setup_fixed_mtrrs_no_enable(void);
 void x86_mtrr_check(void);
-void need_restore_mtrr(void);

/* Insert a temporary MTRR range for the duration of coreboot's runtime.
  * This function needs to be called after the first MTRR solution is derived. */