* [v3,2/5] intel_pstate: convert to use acpi_match_platform_list()
@ 2017-08-18 19:46 Toshi Kani
0 siblings, 0 replies; 4+ messages in thread
From: Toshi Kani @ 2017-08-18 19:46 UTC (permalink / raw)
To: rjw, bp
Cc: mchehab, tony.luck, lenb, linux-acpi, linux-edac, linux-kernel,
Toshi Kani, Srinivas Pandruvada
Convert to use acpi_match_platform_list() 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(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-edac" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 65ee4fc..ad713cd 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2466,39 +2466,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_platform_list plat_info[] __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) {
@@ -2507,21 +2499,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_platform_list(plat_info);
+ 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 (plat_info[idx].data) {
+ case PSS:
+ return intel_pstate_no_acpi_pss();
+ case PPC:
+ return intel_pstate_has_acpi_ppc() && !force_load;
}
return false;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [v3,2/5] intel_pstate: convert to use acpi_match_platform_list()
@ 2017-08-21 17:53 Srinivas Pandruvada
0 siblings, 0 replies; 4+ messages in thread
From: Srinivas Pandruvada @ 2017-08-21 17:53 UTC (permalink / raw)
To: Toshi Kani, rjw, bp
Cc: mchehab, tony.luck, lenb, linux-acpi, linux-edac, linux-kernel
On Fri, 2017-08-18 at 13:46 -0600, Toshi Kani wrote:
> Convert to use acpi_match_platform_list() 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>
Can't test but the change itself is OK.
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> 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 65ee4fc..ad713cd 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -2466,39 +2466,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_platform_list plat_info[] __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) {
> @@ -2507,21 +2499,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_platform_list(plat_info);
> + 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_SI
> ZE))
> - 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 (plat_info[idx].data) {
> + case PSS:
> + return intel_pstate_no_acpi_pss();
> + case PPC:
> + return intel_pstate_has_acpi_ppc() && !force_load;
> }
>
> return false;
---
To unsubscribe from this list: send the line "unsubscribe linux-edac" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [v3,2/5] intel_pstate: convert to use acpi_match_platform_list()
@ 2017-08-23 15:46 Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: Borislav Petkov @ 2017-08-23 15:46 UTC (permalink / raw)
To: Toshi Kani
Cc: rjw, mchehab, tony.luck, lenb, linux-acpi, linux-edac,
linux-kernel, Srinivas Pandruvada
On Fri, Aug 18, 2017 at 01:46:41PM -0600, Toshi Kani wrote:
> Convert to use acpi_match_platform_list() 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 65ee4fc..ad713cd 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -2466,39 +2466,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_platform_list plat_info[] __initdata = {
> + {"HP ", "ProLiant", 0, ACPI_SIG_FADT, all_versions, 0, PSS},
Btw, why is that ACPI_SIG_FADT's description not "FADT" ?
#define ACPI_SIG_FADT "FACP" /* Fixed ACPI Description Table */
More ACPI fun? I don't think I can take any more fun.
Oh well,
Reviewed-by: Borislav Petkov <bp@suse.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [v3,2/5] intel_pstate: convert to use acpi_match_platform_list()
@ 2017-08-23 15:56 Toshi Kani
0 siblings, 0 replies; 4+ messages in thread
From: Toshi Kani @ 2017-08-23 15:56 UTC (permalink / raw)
To: bp@alien8.de
Cc: linux-kernel@vger.kernel.org, mchehab@kernel.org,
rjw@rjwysocki.net, srinivas.pandruvada@linux.intel.com,
tony.luck@intel.com, lenb@kernel.org, linux-acpi@vger.kernel.org,
linux-edac@vger.kernel.org
T24gV2VkLCAyMDE3LTA4LTIzIGF0IDE3OjQ2ICswMjAwLCBCb3Jpc2xhdiBQZXRrb3Ygd3JvdGU6
DQo+IE9uIEZyaSwgQXVnIDE4LCAyMDE3IGF0IDAxOjQ2OjQxUE0gLTA2MDAsIFRvc2hpIEthbmkg
d3JvdGU6DQo+ID4gQ29udmVydCB0byB1c2UgYWNwaV9tYXRjaF9wbGF0Zm9ybV9saXN0KCkgZm9y
IHRoZSBwbGF0Zm9ybSBjaGVjay4NCj4gPiBUaGVyZSBpcyBubyBjaGFuZ2UgaW4gZnVuY3Rpb25h
bGl0eS4NCj4gPiANCiA6DQo+IA0KPiBCdHcsIHdoeSBpcyB0aGF0IEFDUElfU0lHX0ZBRFQncyBk
ZXNjcmlwdGlvbiBub3QgIkZBRFQiID8NCj4gDQo+ICNkZWZpbmUgQUNQSV9TSUdfRkFEVMKgwqDC
oMKgwqDCoMKgwqDCoMKgwqAiRkFDUCLCoMKgLyogRml4ZWQgQUNQSSBEZXNjcmlwdGlvbg0KPiBU
YWJsZSAqLw0KPiANCj4gTW9yZSBBQ1BJIGZ1bj8gSSBkb24ndCB0aGluayBJIGNhbiB0YWtlIGFu
eSBtb3JlIGZ1bi4NCg0KWWVzLCBtb3JlIEFDUEkgZnVuLiA6LSkgIEFjY29yZGluZyB0byB0aGUg
c3BlYzoNCg0K4oCYRkFDUOKAmS4gU2lnbmF0dXJlIGZvciB0aGUgRml4ZWQgQUNQSSBEZXNjcmlw
dGlvbiBUYWJsZS4gKFRoaXMgc2lnbmF0dXJlDQpwcmVkYXRlcyBBQ1BJIDEuMCwgZXhwbGFpbmlu
ZyB0aGUgbWlzbWF0Y2ggd2l0aCB0aGlzIHRhYmxlJ3MgbmFtZS4pDQoNCj4gT2ggd2VsbCwNCj4g
DQo+IFJldmlld2VkLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+DQoNClRoYW5rcyEN
Ci1Ub3NoaQ0K
---
To unsubscribe from this list: send the line "unsubscribe linux-edac" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-23 15:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-21 17:53 [v3,2/5] intel_pstate: convert to use acpi_match_platform_list() Srinivas Pandruvada
-- strict thread matches above, loose matches on Subject: below --
2017-08-23 15:56 Toshi Kani
2017-08-23 15:46 Borislav Petkov
2017-08-18 19:46 Toshi Kani
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).