From patchwork Tue Nov 25 04:59:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ethan zhao X-Patchwork-Id: 5371571 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6555D9F2F5 for ; Tue, 25 Nov 2014 05:01:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 933BD2017E for ; Tue, 25 Nov 2014 05:01:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6A452015A for ; Tue, 25 Nov 2014 05:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751391AbaKYFAc (ORCPT ); Tue, 25 Nov 2014 00:00:32 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:24499 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750840AbaKYFAa (ORCPT ); Tue, 25 Nov 2014 00:00:30 -0500 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id sAP50LS4011808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Nov 2014 05:00:21 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id sAP50Jih003346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 25 Nov 2014 05:00:20 GMT Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id sAP50ItK027005; Tue, 25 Nov 2014 05:00:18 GMT Received: from localhost.localdomain.com (/10.182.70.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 24 Nov 2014 21:00:18 -0800 From: Ethan Zhao To: linda.knippers@hp.com, viresh.kumar@linaro.org, rjw@rjwysocki.net, corbet@lwn.net, dirk.j.brandewie@intel.com Cc: linux-doc@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, ethan.kernel@gmail.com, Ethan Zhao Subject: [PATCH 1/2 v3] intel_pstate: skip this driver if Sun server has _PPC method Date: Tue, 25 Nov 2014 13:59:37 +0900 Message-Id: <1416891578-14171-2-git-send-email-ethan.zhao@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1416891578-14171-1-git-send-email-ethan.zhao@oracle.com> References: <1416891578-14171-1-git-send-email-ethan.zhao@oracle.com> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Oracle Sun X86 servers have dynamic power capping capability that works via ACPI _PPC method etc, so skip loading this driver if Sun server has ACPI _PPC enabled. Signed-off-by: Ethan Zhao --- v2: fix break HP Proliant issue. v3: expand the hardware vendor list. drivers/cpufreq/intel_pstate.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 27bb6d3..fa67fb3 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -943,6 +943,21 @@ static bool intel_pstate_no_acpi_pss(void) return true; } +static bool intel_pstate_has_acpi_ppc(void) +{ + int i; + + for_each_possible_cpu(i) { + struct acpi_processor *pr = per_cpu(processors, i); + + if (!pr) + continue; + if (acpi_has_method(pr->handle, "_PPC")) + return true; + } + return false; +} + struct hw_vendor_info { u16 valid; char oem_id[ACPI_OEM_ID_SIZE]; @@ -950,11 +965,26 @@ struct hw_vendor_info { }; /* Hardware vendor-specific info that has its own power management modes */ -static struct hw_vendor_info vendor_info[] = { +static struct hw_vendor_info hp_vendor_info[] = { {1, "HP ", "ProLiant"}, {0, "", ""}, }; +/* The list of Oracle Sun server that has power capping capability */ +static struct hw_vendor_info ora_vendor_info[] = { + {1, "ORACLE", "X4-2 "}, + {1, "ORACLE", "X4-2L "}, + {1, "ORACLE", "X4-2B "}, + {1, "ORACLE", "X3-2 "}, + {1, "ORACLE", "X3-2L "}, + {1, "ORACLE", "X3-2B "}, + {1, "ORACLE", "X4470M2 "}, + {1, "ORACLE", "X4270M3 "}, + {1, "ORACLE", "X4270M2 "}, + {1, "ORACLE", "X4170M2 "}, + {0, "", ""}, +}; + static bool intel_pstate_platform_pwr_mgmt_exists(void) { struct acpi_table_header hdr; @@ -963,18 +993,27 @@ static bool intel_pstate_platform_pwr_mgmt_exists(void) if (acpi_disabled || ACPI_FAILURE(acpi_get_table_header(ACPI_SIG_FADT, 0, &hdr))) return false; - - for (v_info = vendor_info; v_info->valid; v_info++) { + /* Check HP devices */ + for (v_info = hp_vendor_info; v_info->valid; v_info++) { if (!strncmp(hdr.oem_id, v_info->oem_id, ACPI_OEM_ID_SIZE) && !strncmp(hdr.oem_table_id, v_info->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) && intel_pstate_no_acpi_pss()) return true; } + /* Check Oracle Sun X86 servers */ + for (v_info = ora_vendor_info; v_info->valid; v_info++) { + if (!strncmp(hdr.oem_id, v_info->oem_id, ACPI_OEM_ID_SIZE) && + !strncmp(hdr.oem_table_id, v_info->oem_table_id, + ACPI_OEM_TABLE_ID_SIZE) && + intel_pstate_has_acpi_ppc()) + return true; + } return false; } #else /* CONFIG_ACPI not enabled */ static inline bool intel_pstate_platform_pwr_mgmt_exists(void) { return false; } +static inline bool intel_pstate_has_acpi_ppc(void) { return false; } #endif /* CONFIG_ACPI */ static int __init intel_pstate_init(void)