[PATCH 1/2] Revert "UBUNTU: SAUCE: ACPI / idle: override and update c-state latency when not conformance with s0ix"

[Kai-Heng Feng]

BugLink: https://bugs.launchpad.net/bugs/1928694

This reverts commit 0ae8145fddf4a20218b2a0237d586dc8b5807c8b.

Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
 drivers/acpi/processor_idle.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index d29b36089a27..fb161a21d0ae 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -389,16 +389,10 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
 	return;
 }
 
-static bool acpi_processor_vendor_amd(void)
-{
-	return boot_cpu_data.x86_vendor == X86_VENDOR_AMD;
-}
-
 static int acpi_processor_power_verify(struct acpi_processor *pr)
 {
 	unsigned int i;
 	unsigned int working = 0;
-	u32 latency2, latency3;
 
 	pr->power.timer_broadcast_on_state = INT_MAX;
 
@@ -414,11 +408,9 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 			if (!cx->address)
 				break;
 			cx->valid = 1;
-			latency2 = cx->latency;
 			break;
 
 		case ACPI_STATE_C3:
-			latency3 = cx->latency;
 			acpi_processor_power_verify_c3(pr, cx);
 			break;
 		}
@@ -430,15 +422,6 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 		working++;
 	}
 
-	/* Some AMD BIOSes mistakenly have higher C2 latencies than C3 latencies.
-	 * In order to properly support S0ix, the platform needs to not skip C states.
-	 * Correct the latencies here.
-	 */
-	if (acpi_processor_vendor_amd() && (latency2 >= latency3)) {
-		pr->power.states[2].latency = 18;
-		pr->power.states[3].latency = 350;
-	}
-
 	lapic_timer_propagate_broadcast(pr);
 
 	return (working);
-- 
2.31.1