[coreboot-gerrit] Change in coreboot[master]: soc/intel/broadwell: Get rid of `cpu_is_ult`

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46708 )

Change subject: soc/intel/broadwell: Get rid of `cpu_is_ult`
......................................................................

soc/intel/broadwell: Get rid of `cpu_is_ult`

It is only used in a single file, on two functions that already check
whether coreboot is running on a Haswell or a Broadwell processor.

Change-Id: I86e1061f722e6d6855190c2fd863d85fc24a1ee0
Signed-off-by: Angel Pons 
---
M src/soc/intel/broadwell/Makefile.inc
D src/soc/intel/broadwell/cpu_info.c
M src/soc/intel/broadwell/gma.c
M src/soc/intel/broadwell/include/soc/cpu.h
4 files changed, 4 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/46708/1

diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index 75ef33f..ce1dd9c 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -19,8 +19,6 @@

ramstage-y += acpi.c
 ramstage-y += cpu.c
-ramstage-y += cpu_info.c
-smm-y += cpu_info.c
 ramstage-y += finalize.c
 ramstage-y += gma.c
 ramstage-y += memmap.c
diff --git a/src/soc/intel/broadwell/cpu_info.c b/src/soc/intel/broadwell/cpu_info.c
deleted file mode 100644
index 8814a48..0000000
--- a/src/soc/intel/broadwell/cpu_info.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <arch/cpu.h>
-#include <soc/cpu.h>
-#include <soc/msr.h>
-#include <soc/systemagent.h>
-
-/* Dynamically determine if the part is ULT. */
-int cpu_is_ult(void)
-{
-	static int ult = -1;
-
-	if (ult < 0) {
-		u32 fm = cpu_family_model();
-		if (fm == BROADWELL_FAMILY_ULT || fm == HASWELL_FAMILY_ULT)
-			ult = 1;
-		else
-			ult = 0;
-	}
-
-	return ult;
-}
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c
index c77f5c4..3889be3 100644
--- a/src/soc/intel/broadwell/gma.c
+++ b/src/soc/intel/broadwell/gma.c
@@ -364,6 +364,7 @@

/* Check for ULX GT1 or GT2 */
    const int devid = pci_read_config16(dev, PCI_DEVICE_ID);
+	const int cpu_is_ult = cpu_family_model() == HASWELL_FAMILY_ULT;
    const int gpu_is_ulx = devid == IGD_HASWELL_ULX_GT1 ||
    			devid == IGD_HASWELL_ULX_GT2;

@@ -378,7 +379,7 @@
     */
    if (gpu_is_ulx && cdclk <= GT_CDCLK_337)
    	cdclk = GT_CDCLK_337;
-	else if (gpu_is_ulx || cpu_is_ult() ||
+	else if (gpu_is_ulx || cpu_is_ult ||
    		cdclk == GT_CDCLK_337 || cdclk == GT_CDCLK_450)
    	cdclk = GT_CDCLK_450;
    else
@@ -398,6 +399,7 @@

/* Check for ULX */
    const int devid = pci_read_config16(dev, PCI_DEVICE_ID);
+	const int cpu_is_ult = cpu_family_model() == BROADWELL_FAMILY_ULT;
    const int gpu_is_ulx = devid == IGD_BROADWELL_Y_GT2;

/* Inform power controller of upcoming frequency change */
@@ -428,7 +430,7 @@
    		(gpu_is_ulx && cdclk == GT_CDCLK_DEFAULT))
    	cdclk = GT_CDCLK_450;
    else if (cdclk == GT_CDCLK_540 || gpu_is_ulx ||
-			(cpu_is_ult() && cdclk == GT_CDCLK_DEFAULT))
+			(cpu_is_ult && cdclk == GT_CDCLK_DEFAULT))
    	cdclk = GT_CDCLK_540;
    else
    	cdclk = GT_CDCLK_675;
diff --git a/src/soc/intel/broadwell/include/soc/cpu.h b/src/soc/intel/broadwell/include/soc/cpu.h
index 17eed4b..61ecf58 100644
--- a/src/soc/intel/broadwell/include/soc/cpu.h
+++ b/src/soc/intel/broadwell/include/soc/cpu.h
@@ -50,6 +50,4 @@
    return cpuid_eax(1) & 0xf;
 }

-int cpu_is_ult(void);
-
 #endif