From patchwork Thu May 16 17:11:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Anshuman" X-Patchwork-Id: 10946941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1C811395 for ; Thu, 16 May 2019 17:16:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 888AA28C2F for ; Thu, 16 May 2019 17:16:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B18628C59; Thu, 16 May 2019 17:16:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0FF8428C2F for ; Thu, 16 May 2019 17:16:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 158BC89142; Thu, 16 May 2019 17:16:22 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64D8F89142 for ; Thu, 16 May 2019 17:16:21 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 May 2019 10:16:20 -0700 X-ExtLoop1: 1 Received: from genxfsim-desktop.iind.intel.com ([10.223.34.158]) by orsmga004.jf.intel.com with ESMTP; 16 May 2019 10:16:19 -0700 From: Anshuman Gupta To: intel-gfx@lists.freedesktop.org Date: Thu, 16 May 2019 22:41:56 +0530 Message-Id: <1558026716-26053-1-git-send-email-anshuman.gupta@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH] Revert "ICL HACK: Disable ACPI idle driver" X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ville.syrjala@intel.com, martin.peres@intel.com, daniel.vetter@intel.com MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 99b69db57544ec7ed427607f1a2a1858a7d43b61 Core-for-CI:ICL_only Disable ACPI idle driver. This hack has been provided considering the Bug assessment that ACPI idle driver page fault causes below bug. FDO https://bugs.freedesktop.org/show_bug.cgi?id=108840 But this bug is still reproducible after disabling ACPI idle driver. It looks "rcu_preempt self-detected stall on CPU" causes to hung kworker and followed by panic resulted this bug. Hence it make sense to revert this patch. Cc: martin.peres@intel.com Cc: daniel.vetter@intel.com Cc: ville.syrjala@intel.com Signed-off-by: Anshuman Gupta Reviewed-by: Aditya Swarup --- drivers/acpi/processor_driver.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index ee842a2f..9d6aff2 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -35,12 +35,6 @@ #include -/* Only for Core-for-CI so don't want ia64 to fail compilation.*/ -#ifdef CONFIG_X86 -#include -#include -#endif - #include "internal.h" #define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80 @@ -64,13 +58,6 @@ static const struct acpi_device_id processor_device_ids[] = { }; MODULE_DEVICE_TABLE(acpi, processor_device_ids); -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } -static const struct x86_cpu_id intel_cpu_ids[] = { - ICPU(INTEL_FAM6_ICELAKE_MOBILE), /* ICL */ - {} -}; -MODULE_DEVICE_TABLE(x86cpu, intel_cpu_ids); - static struct device_driver acpi_processor_driver = { .name = "processor", .bus = &cpu_subsys, @@ -239,7 +226,6 @@ static inline void acpi_pss_perf_exit(struct acpi_processor *pr, static int __acpi_processor_start(struct acpi_device *device) { struct acpi_processor *pr = acpi_driver_data(device); - const struct x86_cpu_id *id; acpi_status status; int result = 0; @@ -253,9 +239,7 @@ static int __acpi_processor_start(struct acpi_device *device) if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS)) dev_dbg(&device->dev, "CPPC data invalid or not present\n"); - id = x86_match_cpu(intel_cpu_ids); - if (!id && (!cpuidle_get_driver() || cpuidle_get_driver() == - &acpi_idle_driver)) + if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) acpi_processor_power_init(pr); result = acpi_pss_perf_init(pr, device);