From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 4 Jun 2018 08:43:34 +0000 (+0200)
Subject: Merge branches 'acpi-cppc', 'acpi-misc', 'acpi-battery' and 'acpi-ac'
X-Git-Tag: v5.15~8726^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e;p=platform%2Fkernel%2Flinux-starfive.git

Merge branches 'acpi-cppc', 'acpi-misc', 'acpi-battery' and 'acpi-ac'

* acpi-cppc:
  mailbox: PCC: erroneous error message when parsing ACPI PCCT
  ACPI / CPPC: Fix invalid PCC channel status errors
  ACPI / CPPC: Document CPPC sysfs interface
  cpufreq / CPPC: Support for CPPC v3
  ACPI / CPPC: Check for valid PCC subspace only if PCC is used
  ACPI / CPPC: Add support for CPPC v3

* acpi-misc:
  ACPI: Add missing prototype_for arch_post_acpi_subsys_init()
  ACPI: add missing newline to printk

* acpi-battery:
  ACPI / battery: Add quirk to avoid checking for PMIC with native driver
  ACPI / battery: Ignore AC state in handle_discharging on systems where it is broken
  ACPI / battery: Add handling for devices which wrongly report discharging state
  ACPI / battery: Remove initializer for unused ident dmi_system_id
  ACPI / AC: Remove initializer for unused ident dmi_system_id

* acpi-ac:
  ACPI / AC: Add quirk to avoid checking for PMIC with native driver
---

6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e
diff --cc drivers/acpi/ac.c
index 2d8de2f,2d8de2f,2d8de2f,9e4463d,e3101b1..b823a86
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@@@@@ -316,10 -316,10 -316,10 -316,10 -317,16 +317,16 @@@@@@ static int __init thinkpad_e530_quirk(c
     	return 0;
     }
     
---- static const struct dmi_system_id ac_dmi_table[] = {
++++ static int __init ac_do_not_check_pmic_quirk(const struct dmi_system_id *d)
++++ {
++++ 	ac_check_pmic = 0;
++++ 	return 0;
++++ }
++++ 
++++ static const struct dmi_system_id ac_dmi_table[]  __initconst = {
     	{
+++ +	/* Thinkpad e530 */
     	.callback = thinkpad_e530_quirk,
--- -	.ident = "thinkpad e530",
     	.matches = {
     		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
     		DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),
diff --cc drivers/cpufreq/cppc_cpufreq.c
index b15115a,e67e94b,bc5fc16,bc5fc16,b15115a..3464580
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@@@@@ -201,11 -214,11 -158,12 -158,12 -201,11 +257,10 @@@@@@ static int cppc_cpufreq_cpu_init(struc
     	 * available if userspace wants to use any perf between lowest & lowest
     	 * nonlinear perf
     	 */
- ---	policy->cpuinfo.min_freq = cpu->perf_caps.lowest_perf * cppc_dmi_max_khz /
- ---		cpu->perf_caps.highest_perf;
- ---	policy->cpuinfo.max_freq = cppc_dmi_max_khz;
+ +++	policy->cpuinfo.min_freq = cppc_cpufreq_perf_to_khz(cpu, cpu->perf_caps.lowest_perf);
+ +++	policy->cpuinfo.max_freq = cppc_cpufreq_perf_to_khz(cpu, cpu->perf_caps.highest_perf);
     
 --- 	policy->transition_delay_us = cppc_get_transition_latency(cpu_num) /
 --- 		NSEC_PER_USEC;
 +++ 	policy->transition_delay_us = cppc_cpufreq_get_transition_delay_us(cpu_num);
     	policy->shared_type = cpu->shared_type;
     
     	if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {