Change in coreboot[master]: cpu/intel/model_2065x/bootblock: Remove dead code

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35810 )

Change subject: cpu/intel/model_2065x/bootblock: Remove dead code
......................................................................

cpu/intel/model_2065x/bootblock: Remove dead code

This codepath is never takes as it checks if the CPU is at least
ivybridge.

Change-Id: Id064385f0c8bb0b094714129df6d8ba36c87a307
Signed-off-by: Arthur Heymans 
---
M src/cpu/intel/model_2065x/bootblock.c
1 file changed, 0 insertions(+), 52 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/35810/1

diff --git a/src/cpu/intel/model_2065x/bootblock.c b/src/cpu/intel/model_2065x/bootblock.c
index 273c193..399f5e0 100644
--- a/src/cpu/intel/model_2065x/bootblock.c
+++ b/src/cpu/intel/model_2065x/bootblock.c
@@ -57,60 +57,8 @@
    wrmsr(MTRR_DEF_TYPE_MSR, msr);
 }

-static void set_flex_ratio_to_tdp_nominal(void)
-{
-	msr_t flex_ratio, msr;
-	u32 soft_reset;
-	u8 nominal_ratio;
-
-	/* Minimum CPU revision for configurable TDP support */
-	if (cpuid_eax(1) < IVB_CONFIG_TDP_MIN_CPUID)
-		return;
-
-	/* Check for Flex Ratio support */
-	flex_ratio = rdmsr(MSR_FLEX_RATIO);
-	if (!(flex_ratio.lo & FLEX_RATIO_EN))
-		return;
-
-	/* Check for >0 configurable TDPs */
-	msr = rdmsr(MSR_PLATFORM_INFO);
-	if (((msr.hi >> 1) & 3) == 0)
-		return;
-
-	/* Use nominal TDP ratio for flex ratio */
-	msr = rdmsr(MSR_CONFIG_TDP_NOMINAL);
-	nominal_ratio = msr.lo & 0xff;
-
-	/* See if flex ratio is already set to nominal TDP ratio */
-	if (((flex_ratio.lo >> 8) & 0xff) == nominal_ratio)
-		return;
-
-	/* Set flex ratio to nominal TDP ratio */
-	flex_ratio.lo &= ~0xff00;
-	flex_ratio.lo |= nominal_ratio << 8;
-	flex_ratio.lo |= FLEX_RATIO_LOCK;
-	wrmsr(MSR_FLEX_RATIO, flex_ratio);
-
-	/* Set flex ratio in soft reset data register bits 11:6.
-	 * RCBA region is enabled in southbridge bootblock */
-	soft_reset = RCBA32(SOFT_RESET_DATA);
-	soft_reset &= ~(0x3f << 6);
-	soft_reset |= (nominal_ratio & 0x3f) << 6;
-	RCBA32(SOFT_RESET_DATA) = soft_reset;
-
-	/* Set soft reset control to use register value */
-	RCBA32_OR(SOFT_RESET_CTRL, 1);
-
-	/* Issue warm reset, will be "CPU only" due to soft reset data */
-	outb(0x0, 0xcf9);
-	outb(0x6, 0xcf9);
-	halt();
-}
-
 static void bootblock_cpu_init(void)
 {
-	/* Set flex ratio and reset if needed */
-	set_flex_ratio_to_tdp_nominal();
    enable_rom_caching();
    intel_update_microcode_from_cbfs();
 }

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35810 )

Change subject: cpu/intel/model_2065x/bootblock: Remove dead code
......................................................................

Patch Set 1: Code-Review+2

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

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35810 )

Change subject: cpu/intel/model_2065x/bootblock: Remove dead code
......................................................................

Patch Set 1: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35810 )

Change subject: cpu/intel/model_2065x/bootblock: Remove dead code
......................................................................

Patch Set 1: Code-Review+2

zomg

[Arthur Heymans (Code Review)]

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

Change subject: cpu/intel/model_2065x/bootblock: Remove dead code
......................................................................

cpu/intel/model_2065x/bootblock: Remove dead code

This codepath is never takes as it checks if the CPU is at least
ivybridge.

Change-Id: Id064385f0c8bb0b094714129df6d8ba36c87a307
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35810
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
Reviewed-by: Kyösti Mälkki 
Reviewed-by: Angel Pons 
---
M src/cpu/intel/model_2065x/bootblock.c
1 file changed, 0 insertions(+), 52 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Patrick Rudolph: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/cpu/intel/model_2065x/bootblock.c b/src/cpu/intel/model_2065x/bootblock.c
index 273c193..399f5e0 100644
--- a/src/cpu/intel/model_2065x/bootblock.c
+++ b/src/cpu/intel/model_2065x/bootblock.c
@@ -57,60 +57,8 @@
    wrmsr(MTRR_DEF_TYPE_MSR, msr);
 }

-static void set_flex_ratio_to_tdp_nominal(void)
-{
-	msr_t flex_ratio, msr;
-	u32 soft_reset;
-	u8 nominal_ratio;
-
-	/* Minimum CPU revision for configurable TDP support */
-	if (cpuid_eax(1) < IVB_CONFIG_TDP_MIN_CPUID)
-		return;
-
-	/* Check for Flex Ratio support */
-	flex_ratio = rdmsr(MSR_FLEX_RATIO);
-	if (!(flex_ratio.lo & FLEX_RATIO_EN))
-		return;
-
-	/* Check for >0 configurable TDPs */
-	msr = rdmsr(MSR_PLATFORM_INFO);
-	if (((msr.hi >> 1) & 3) == 0)
-		return;
-
-	/* Use nominal TDP ratio for flex ratio */
-	msr = rdmsr(MSR_CONFIG_TDP_NOMINAL);
-	nominal_ratio = msr.lo & 0xff;
-
-	/* See if flex ratio is already set to nominal TDP ratio */
-	if (((flex_ratio.lo >> 8) & 0xff) == nominal_ratio)
-		return;
-
-	/* Set flex ratio to nominal TDP ratio */
-	flex_ratio.lo &= ~0xff00;
-	flex_ratio.lo |= nominal_ratio << 8;
-	flex_ratio.lo |= FLEX_RATIO_LOCK;
-	wrmsr(MSR_FLEX_RATIO, flex_ratio);
-
-	/* Set flex ratio in soft reset data register bits 11:6.
-	 * RCBA region is enabled in southbridge bootblock */
-	soft_reset = RCBA32(SOFT_RESET_DATA);
-	soft_reset &= ~(0x3f << 6);
-	soft_reset |= (nominal_ratio & 0x3f) << 6;
-	RCBA32(SOFT_RESET_DATA) = soft_reset;
-
-	/* Set soft reset control to use register value */
-	RCBA32_OR(SOFT_RESET_CTRL, 1);
-
-	/* Issue warm reset, will be "CPU only" due to soft reset data */
-	outb(0x0, 0xcf9);
-	outb(0x6, 0xcf9);
-	halt();
-}
-
 static void bootblock_cpu_init(void)
 {
-	/* Set flex ratio and reset if needed */
-	set_flex_ratio_to_tdp_nominal();
    enable_rom_caching();
    intel_update_microcode_from_cbfs();
 }