Commit 0d573c6a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-x86', 'acpi-cppc' and 'acpi-soc' 

* acpi-x86:
  x86: ACPI: make variable names clearer in acpi_parse_madt_lapic_entries()
  x86: ACPI: remove extraneous white space after semicolon

* acpi-cppc:
  ACPI / CPPC: Support PCC with interrupt flag
  ACPI / CPPC: Add prefix cppc to cpudata structure name
  ACPI / CPPC: Add support for functional fixed hardware address
  ACPI / CPPC: Don't return on CPPC probe failure
  ACPI / CPPC: Allow build with ACPI_CPU_FREQ_PSS config
  ACPI / CPPC: check for error bit in PCC status field
  ACPI / CPPC: move all PCC related information into pcc_data
  ACPI / CPPC: add sysfs support to compute delivered performance
  ACPI / CPPC: set a non-zero value for transition_latency
  ACPI / CPPC: support for batching CPPC requests
  ACPI / CPPC: acquire pcc_lock only while accessing PCC subspace
  ACPI / CPPC: restructure read/writes for efficient sys mapped reg ops
  mailbox: pcc: Support HW-Reduced Communication Subspace type 2

* acpi-soc:
  ACPI / APD: constify local structures
  ACPI / APD: Add device HID for Vulcan SPI controller
parents 4ec9e289 c12f29a5 b59c4b3d a217726a

arch/x86/kernel/acpi/Makefile

+1 −0
Original line number Diff line number Diff line 
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



ifneq ($(CONFIG_ACPI_PROCESSOR),)

obj-y				+= cstate.o

arch/x86/kernel/acpi/boot.c

+3 −3
Original line number Diff line number Diff line
@@ -1031,8 +1031,8 @@ static int __init acpi_parse_madt_lapic_entries(void) 
			return ret;

		}



		x2count = madt_proc[0].count;

		count = madt_proc[1].count;

		count = madt_proc[0].count;

		x2count = madt_proc[1].count;

	}

	if (!count && !x2count) {

		printk(KERN_ERR PREFIX "No LAPIC entries present\n");

arch/x86/kernel/acpi/cppc_msr.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * cppc_msr.c:  MSR Interface for CPPC

 * Copyright (c) 2016, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 */



#include <acpi/cppc_acpi.h>

#include <asm/msr.h>



/* Refer to drivers/acpi/cppc_acpi.c for the description of functions */



bool cpc_ffh_supported(void)

{

	return true;

}



int cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val)

{

	int err;



	err = rdmsrl_safe_on_cpu(cpunum, reg->address, val);

	if (!err) {

		u64 mask = GENMASK_ULL(reg->bit_offset + reg->bit_width - 1,

				       reg->bit_offset);



		*val &= mask;

		*val >>= reg->bit_offset;

	}

	return err;

}



int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val)

{

	u64 rd_val;

	int err;



	err = rdmsrl_safe_on_cpu(cpunum, reg->address, &rd_val);

	if (!err) {

		u64 mask = GENMASK_ULL(reg->bit_offset + reg->bit_width - 1,

				       reg->bit_offset);



		val <<= reg->bit_offset;

		val &= mask;

		rd_val &= ~mask;

		rd_val |= val;

		err = wrmsrl_safe_on_cpu(cpunum, reg->address, rd_val);

	}

	return err;

}

drivers/acpi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ config ACPI_MCFG 
config ACPI_CPPC_LIB

	bool

	depends on ACPI_PROCESSOR

	depends on !ACPI_CPU_FREQ_PSS

	select MAILBOX

	select PCC

	help

drivers/acpi/acpi_apd.c

+9 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int acpi_apd_setup(struct apd_private_data *pdata) 
}



#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE

static struct apd_device_desc cz_i2c_desc = {

static const struct apd_device_desc cz_i2c_desc = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 133000000,

};
@@ -84,7 +84,7 @@ static struct property_entry uart_properties[] = { 
	{ },

};



static struct apd_device_desc cz_uart_desc = {

static const struct apd_device_desc cz_uart_desc = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 48000000,

	.properties = uart_properties,
@@ -92,10 +92,15 @@ static struct apd_device_desc cz_uart_desc = { 
#endif



#ifdef CONFIG_ARM64

static struct apd_device_desc xgene_i2c_desc = {

static const struct apd_device_desc xgene_i2c_desc = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 100000000,

};



static const struct apd_device_desc vulcan_spi_desc = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 133000000,

};

#endif



#else
@@ -164,6 +169,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
#endif

#ifdef CONFIG_ARM64

	{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },

	{ "BRCM900D", APD_ADDR(vulcan_spi_desc) },

#endif

	{ }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE