Commit 03d5c98d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pm', 'acpi-properties', 'acpi-misc' and 'acpi-x86' 

Merge ACPI power management changes, ACPI device properties handling
changes, x86-specific ACPI changes and miscellaneous ACPI changes for
5.18-rc1:

 - Add power management debug messages related to suspend-to-idle in
   two places (Rafael Wysocki).

 - Fix __acpi_node_get_property_reference() return value and clean up
   that function (Andy Shevchenko, Sakari Ailus).

 - Fix return value of the __setup handler in the ACPI PM timer clock
   source driver (Randy Dunlap).

 - Clean up double words in two comments (Tom Rix).

 - Add "skip i2c clients" quirks for Lenovo Yoga Tablet 1050F/L and
   Nextbook Ares 8 (Hans de Goede).

 - Clean up frequency invariance handling on x86 in the ACPI CPPC
   library (Huang Rui).

 - Work around broken XSDT on the Advantech DAC-BJ01 board (Mark
   Cilissen).

* acpi-pm:
  ACPI: EC / PM: Print additional debug message in acpi_ec_dispatch_gpe()
  ACPI: PM: Print additional debug message in acpi_s2idle_wake()

* acpi-properties:
  ACPI: property: Get rid of redundant 'else'
  ACPI: properties: Consistently return -ENOENT if there are no more references

* acpi-misc:
  clocksource: acpi_pm: fix return value of __setup handler
  ACPI: clean up double words in two comments

* acpi-x86:
  ACPI / x86: Work around broken XSDT on Advantech DAC-BJ01 board
  x86/ACPI: CPPC: Move init_freq_invariance_cppc() into x86 CPPC
  x86: Expose init_freq_invariance() to topology header
  x86/ACPI: CPPC: Move AMD maximum frequency ratio setting function into x86 CPPC
  x86/ACPI: CPPC: Rename cppc_msr.c to cppc.c
  ACPI / x86: Add skip i2c clients quirk for Lenovo Yoga Tablet 1050F/L
  ACPI / x86: Add skip i2c clients quirk for Nextbook Ares 8
parents 314b97cc 977dc308 9978f446 6a861abc e702196b

arch/x86/include/asm/topology.h

+12 −1
Original line number Diff line number Diff line
@@ -215,15 +215,26 @@ extern void arch_scale_freq_tick(void); 
#define arch_scale_freq_tick arch_scale_freq_tick



extern void arch_set_max_freq_ratio(bool turbo_disabled);

void init_freq_invariance(bool secondary, bool cppc_ready);

#else

static inline void arch_set_max_freq_ratio(bool turbo_disabled)

{

}

static inline void init_freq_invariance(bool secondary, bool cppc_ready)

{

}

#endif



#if defined(CONFIG_ACPI_CPPC_LIB) && defined(CONFIG_SMP)

#ifdef CONFIG_ACPI_CPPC_LIB

void init_freq_invariance_cppc(void);

#define init_freq_invariance_cppc init_freq_invariance_cppc



bool amd_set_max_freq_ratio(u64 *ratio);

#else

static inline bool amd_set_max_freq_ratio(u64 *ratio)

{

	return false;

}

#endif



#endif /* _ASM_X86_TOPOLOGY_H */

arch/x86/kernel/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
obj-$(CONFIG_ACPI)		+= boot.o

obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup_$(BITS).o

obj-$(CONFIG_ACPI_APEI)		+= apei.o

obj-$(CONFIG_ACPI_CPPC_LIB)	+= cppc_msr.o

obj-$(CONFIG_ACPI_CPPC_LIB)	+= cppc.o



ifneq ($(CONFIG_ACPI_PROCESSOR),)

obj-y				+= cstate.o

arch/x86/kernel/acpi/boot.c

+24 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,17 @@ static int __init disable_acpi_pci(const struct dmi_system_id *d) 
	return 0;

}



static int __init disable_acpi_xsdt(const struct dmi_system_id *d)

{

	if (!acpi_force) {

		pr_notice("%s detected: force use of acpi=rsdt\n", d->ident);

		acpi_gbl_do_not_use_xsdt = TRUE;

	} else {

		pr_notice("Warning: DMI blacklist says broken, but acpi XSDT forced\n");

	}

	return 0;

}



static int __init dmi_disable_acpi(const struct dmi_system_id *d)

{

	if (!acpi_force) {
@@ -1451,6 +1462,19 @@ static const struct dmi_system_id acpi_dmi_table[] __initconst = { 
		     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),

		     },

	 },

	/*

	 * Boxes that need ACPI XSDT use disabled due to corrupted tables

	 */

	{

	 .callback = disable_acpi_xsdt,

	 .ident = "Advantech DAC-BJ01",

	 .matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "NEC"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "Bearlake CRB Board"),

		     DMI_MATCH(DMI_BIOS_VERSION, "V1.12"),

		     DMI_MATCH(DMI_BIOS_DATE, "02/01/2011"),

		     },

	 },

	{}

};

arch/x86/kernel/acpi/cppc_msr.c→arch/x86/kernel/acpi/cppc.c

+103 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * cppc_msr.c:  MSR Interface for CPPC

 * cppc.c: CPPC Interface for x86

 * Copyright (c) 2016, Intel Corporation.

 */



#include <acpi/cppc_acpi.h>

#include <asm/msr.h>

#include <asm/processor.h>

#include <asm/topology.h>



/* Refer to drivers/acpi/cppc_acpi.c for the description of functions */
@@ -47,3 +49,55 @@ int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val) 
	}

	return err;

}



bool amd_set_max_freq_ratio(u64 *ratio)

{

	struct cppc_perf_caps perf_caps;

	u64 highest_perf, nominal_perf;

	u64 perf_ratio;

	int rc;



	if (!ratio)

		return false;



	rc = cppc_get_perf_caps(0, &perf_caps);

	if (rc) {

		pr_debug("Could not retrieve perf counters (%d)\n", rc);

		return false;

	}



	highest_perf = amd_get_highest_perf();

	nominal_perf = perf_caps.nominal_perf;



	if (!highest_perf || !nominal_perf) {

		pr_debug("Could not retrieve highest or nominal performance\n");

		return false;

	}



	perf_ratio = div_u64(highest_perf * SCHED_CAPACITY_SCALE, nominal_perf);

	/* midpoint between max_boost and max_P */

	perf_ratio = (perf_ratio + SCHED_CAPACITY_SCALE) >> 1;

	if (!perf_ratio) {

		pr_debug("Non-zero highest/nominal perf values led to a 0 ratio\n");

		return false;

	}



	*ratio = perf_ratio;

	arch_set_max_freq_ratio(false);



	return true;

}



static DEFINE_MUTEX(freq_invariance_lock);



void init_freq_invariance_cppc(void)

{

	static bool secondary;



	mutex_lock(&freq_invariance_lock);



	init_freq_invariance(secondary, true);

	secondary = true;



	mutex_unlock(&freq_invariance_lock);

}

arch/x86/kernel/smpboot.c

+2 −70
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ 
#include <asm/hw_irq.h>

#include <asm/stackprotector.h>



#ifdef CONFIG_ACPI_CPPC_LIB

#include <acpi/cppc_acpi.h>

#endif



/* representing HT siblings of each logical CPU */

DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
@@ -155,8 +151,6 @@ static inline void smpboot_restore_warm_reset_vector(void) 
	*((volatile u32 *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0;

}



static void init_freq_invariance(bool secondary, bool cppc_ready);



/*

 * Report back to the Boot Processor during boot time or to the caller processor

 * during CPU online.
@@ -2097,48 +2091,6 @@ static bool intel_set_max_freq_ratio(void) 
	return true;

}



#ifdef CONFIG_ACPI_CPPC_LIB

static bool amd_set_max_freq_ratio(void)

{

	struct cppc_perf_caps perf_caps;

	u64 highest_perf, nominal_perf;

	u64 perf_ratio;

	int rc;



	rc = cppc_get_perf_caps(0, &perf_caps);

	if (rc) {

		pr_debug("Could not retrieve perf counters (%d)\n", rc);

		return false;

	}



	highest_perf = amd_get_highest_perf();

	nominal_perf = perf_caps.nominal_perf;



	if (!highest_perf || !nominal_perf) {

		pr_debug("Could not retrieve highest or nominal performance\n");

		return false;

	}



	perf_ratio = div_u64(highest_perf * SCHED_CAPACITY_SCALE, nominal_perf);

	/* midpoint between max_boost and max_P */

	perf_ratio = (perf_ratio + SCHED_CAPACITY_SCALE) >> 1;

	if (!perf_ratio) {

		pr_debug("Non-zero highest/nominal perf values led to a 0 ratio\n");

		return false;

	}



	arch_turbo_freq_ratio = perf_ratio;

	arch_set_max_freq_ratio(false);



	return true;

}

#else

static bool amd_set_max_freq_ratio(void)

{

	return false;

}

#endif



static void init_counter_refs(void)

{

	u64 aperf, mperf;
@@ -2167,7 +2119,7 @@ static void register_freq_invariance_syscore_ops(void) 
static inline void register_freq_invariance_syscore_ops(void) {}

#endif



static void init_freq_invariance(bool secondary, bool cppc_ready)

void init_freq_invariance(bool secondary, bool cppc_ready)

{

	bool ret = false;
@@ -2187,7 +2139,7 @@ static void init_freq_invariance(bool secondary, bool cppc_ready) 
		if (!cppc_ready) {

			return;

		}

		ret = amd_set_max_freq_ratio();

		ret = amd_set_max_freq_ratio(&arch_turbo_freq_ratio);

	}



	if (ret) {
@@ -2200,22 +2152,6 @@ static void init_freq_invariance(bool secondary, bool cppc_ready) 
	}

}



#ifdef CONFIG_ACPI_CPPC_LIB

static DEFINE_MUTEX(freq_invariance_lock);



void init_freq_invariance_cppc(void)

{

	static bool secondary;



	mutex_lock(&freq_invariance_lock);



	init_freq_invariance(secondary, true);

	secondary = true;



	mutex_unlock(&freq_invariance_lock);

}

#endif



static void disable_freq_invariance_workfn(struct work_struct *work)

{

	static_branch_disable(&arch_scale_freq_key);
@@ -2264,8 +2200,4 @@ void arch_scale_freq_tick(void) 
	pr_warn("Scheduler frequency invariance went wobbly, disabling!\n");

	schedule_work(&disable_freq_invariance_work);

}

#else

static inline void init_freq_invariance(bool secondary, bool cppc_ready)

{

}

#endif /* CONFIG_X86_64 */