From: Toshi Kani <toshi.kani@hpe.com>
To: rjw@rjwysocki.net, bp@alien8.de
Cc: mchehab@kernel.org, tony.luck@intel.com, lenb@kernel.org,
linux-acpi@vger.kernel.org, linux-edac@vger.kernel.org,
linux-kernel@vger.kernel.org, Toshi Kani <toshi.kani@hpe.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: [PATCH v2 2/7] intel_pstate: convert to use acpi_match_oemlist()
Date: Thu, 3 Aug 2017 15:57:48 -0600 [thread overview]
Message-ID: <20170803215753.30553-3-toshi.kani@hpe.com> (raw)
In-Reply-To: <20170803215753.30553-1-toshi.kani@hpe.com>
Convert to use acpi_match_oemlist() for the platform check.
There is no change in functionality.
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
---
drivers/cpufreq/intel_pstate.c | 64 ++++++++++++++++------------------------
1 file changed, 25 insertions(+), 39 deletions(-)
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 6cd5035..7944723 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2475,39 +2475,31 @@ enum {
PPC,
};
-struct hw_vendor_info {
- u16 valid;
- char oem_id[ACPI_OEM_ID_SIZE];
- char oem_table_id[ACPI_OEM_TABLE_ID_SIZE];
- int oem_pwr_table;
-};
-
/* Hardware vendor-specific info that has its own power management modes */
-static struct hw_vendor_info vendor_info[] __initdata = {
- {1, "HP ", "ProLiant", PSS},
- {1, "ORACLE", "X4-2 ", PPC},
- {1, "ORACLE", "X4-2L ", PPC},
- {1, "ORACLE", "X4-2B ", PPC},
- {1, "ORACLE", "X3-2 ", PPC},
- {1, "ORACLE", "X3-2L ", PPC},
- {1, "ORACLE", "X3-2B ", PPC},
- {1, "ORACLE", "X4470M2 ", PPC},
- {1, "ORACLE", "X4270M3 ", PPC},
- {1, "ORACLE", "X4270M2 ", PPC},
- {1, "ORACLE", "X4170M2 ", PPC},
- {1, "ORACLE", "X4170 M3", PPC},
- {1, "ORACLE", "X4275 M3", PPC},
- {1, "ORACLE", "X6-2 ", PPC},
- {1, "ORACLE", "Sudbury ", PPC},
- {0, "", ""},
+static struct acpi_oemlist oemlist[] __initdata = {
+ {"HP ", "ProLiant", 0, ACPI_SIG_FADT, all_versions, 0, PSS},
+ {"ORACLE", "X4-2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4-2L ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4-2B ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X3-2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X3-2L ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X3-2B ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4470M2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4270M3 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4270M2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4170M2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4170 M3", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X4275 M3", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "X6-2 ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ {"ORACLE", "Sudbury ", 0, ACPI_SIG_FADT, all_versions, 0, PPC},
+ { } /* End */
};
static bool __init intel_pstate_platform_pwr_mgmt_exists(void)
{
- struct acpi_table_header hdr;
- struct hw_vendor_info *v_info;
const struct x86_cpu_id *id;
u64 misc_pwr;
+ int idx;
id = x86_match_cpu(intel_pstate_cpu_oob_ids);
if (id) {
@@ -2516,21 +2508,15 @@ static bool __init intel_pstate_platform_pwr_mgmt_exists(void)
return true;
}
- if (acpi_disabled ||
- ACPI_FAILURE(acpi_get_table_header(ACPI_SIG_FADT, 0, &hdr)))
+ idx = acpi_match_oemlist(oemlist);
+ if (idx < 0)
return false;
- for (v_info = 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))
- switch (v_info->oem_pwr_table) {
- case PSS:
- return intel_pstate_no_acpi_pss();
- case PPC:
- return intel_pstate_has_acpi_ppc() &&
- (!force_load);
- }
+ switch (oemlist[idx].data) {
+ case PSS:
+ return intel_pstate_no_acpi_pss();
+ case PPC:
+ return intel_pstate_has_acpi_ppc() && !force_load;
}
return false;
next prev parent reply other threads:[~2017-08-03 22:07 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-03 21:57 [PATCH v2 0/7] enable ghes_edac on selected platforms Toshi Kani
2017-08-03 21:57 ` [PATCH v2 1/7] ACPI / blacklist: add acpi_match_oemlist() interface Toshi Kani
2017-08-04 3:42 ` Borislav Petkov
2017-08-04 20:39 ` Kani, Toshimitsu
2017-08-05 5:12 ` Borislav Petkov
2017-08-07 14:49 ` Kani, Toshimitsu
2017-08-03 21:57 ` Toshi Kani [this message]
2017-08-03 21:57 ` [PATCH v2 3/7] ACPI / APEI: add OSC APEI bit check for ghes_edac Toshi Kani
2017-08-04 3:44 ` Borislav Petkov
2017-08-04 20:49 ` Kani, Toshimitsu
2017-08-05 5:14 ` Borislav Petkov
2017-08-07 14:50 ` Kani, Toshimitsu
2017-08-03 21:57 ` [PATCH v2 4/7] ghes_edac: avoid multiple calls to dmi_walk() Toshi Kani
2017-08-04 4:05 ` Borislav Petkov
2017-08-04 21:02 ` Kani, Toshimitsu
2017-08-05 5:16 ` Borislav Petkov
2017-08-07 17:59 ` Kani, Toshimitsu
2017-08-11 9:04 ` Borislav Petkov
2017-08-14 15:57 ` Kani, Toshimitsu
2017-08-14 16:24 ` Borislav Petkov
2017-08-14 16:48 ` Kani, Toshimitsu
2017-08-14 17:05 ` Borislav Petkov
2017-08-14 17:52 ` Kani, Toshimitsu
2017-08-14 18:05 ` Borislav Petkov
2017-08-14 18:17 ` Kani, Toshimitsu
2017-08-14 18:35 ` Borislav Petkov
2017-08-14 19:02 ` Kani, Toshimitsu
2017-08-14 19:34 ` Borislav Petkov
2017-08-14 20:17 ` Kani, Toshimitsu
2017-08-14 20:39 ` Borislav Petkov
2017-08-15 15:35 ` Kani, Toshimitsu
2017-08-15 15:48 ` Luck, Tony
2017-08-15 15:53 ` Kani, Toshimitsu
2017-08-16 8:29 ` Borislav Petkov
2017-08-16 11:29 ` Borislav Petkov
2017-08-16 13:59 ` Steven Rostedt
2017-08-16 14:03 ` Borislav Petkov
2017-08-16 14:22 ` Steven Rostedt
2017-08-16 17:31 ` Borislav Petkov
2017-08-16 15:26 ` Kani, Toshimitsu
2017-08-16 16:42 ` Borislav Petkov
2017-08-16 17:28 ` Kani, Toshimitsu
2017-08-16 17:40 ` Borislav Petkov
2017-08-16 18:01 ` Kani, Toshimitsu
2017-08-17 21:08 ` Kani, Toshimitsu
2017-08-21 9:29 ` Borislav Petkov
2017-08-15 15:50 ` Borislav Petkov
2017-08-15 16:19 ` Kani, Toshimitsu
2017-08-03 21:57 ` [PATCH v2 5/7] ghes_edac: add platform check to enable ghes_edac Toshi Kani
2017-08-04 8:31 ` Borislav Petkov
2017-08-04 21:06 ` Kani, Toshimitsu
2017-08-05 5:37 ` Borislav Petkov
2017-08-07 14:54 ` Kani, Toshimitsu
2017-08-03 21:57 ` [PATCH v2 6/7] EDAC: add edac_check_mc_owner() to check MC owner Toshi Kani
2017-08-04 8:30 ` Borislav Petkov
2017-08-04 21:35 ` Kani, Toshimitsu
2017-08-05 5:44 ` Borislav Petkov
2017-08-07 14:55 ` Kani, Toshimitsu
2017-08-04 13:06 ` kbuild test robot
2017-08-04 15:21 ` Kani, Toshimitsu
2017-08-03 21:57 ` [PATCH v2 7/7] edac drivers: add MC owner check in init Toshi Kani
2017-08-04 8:39 ` Borislav Petkov
2017-08-04 21:48 ` Kani, Toshimitsu
2017-08-05 5:49 ` Borislav Petkov
2017-08-07 14:57 ` Kani, Toshimitsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170803215753.30553-3-toshi.kani@hpe.com \
--to=toshi.kani@hpe.com \
--cc=bp@alien8.de \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).