From patchwork Mon May 24 06:33:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1482638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FpS8k172mz9sW4; Mon, 24 May 2021 16:33:39 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ll49c-0006Ce-Da; Mon, 24 May 2021 06:33:32 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ll49Y-0006CF-KO for kernel-team@lists.ubuntu.com; Mon, 24 May 2021 06:33:28 +0000 Received: from 1-171-216-162.dynamic-ip.hinet.net ([1.171.216.162] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ll49X-0002Eu-Q2 for kernel-team@lists.ubuntu.com; Mon, 24 May 2021 06:33:28 +0000 From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] Revert "UBUNTU: SAUCE: ACPI / idle: override and update c-state latency when not conformance with s0ix" Date: Mon, 24 May 2021 14:33:17 +0800 Message-Id: <20210524063318.1060189-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524063318.1060189-1-kai.heng.feng@canonical.com> References: <20210524063318.1060189-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1928694 This reverts commit 0ae8145fddf4a20218b2a0237d586dc8b5807c8b. Signed-off-by: Kai-Heng Feng --- 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);