Commit 4cd9da8a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-tables', 'acpi-soc', 'acpi-apei' and 'acpi-misc' 

* acpi-tables:
  ACPI / tables: Add an ifdef around amlcode and dsdt_amlcode
  ACPI / tables: add DSDT AmlCode new declaration name support
  ACPI: SPCR: Consider baud rate 0 as preconfigured state

* acpi-soc:
  ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
  ACPI / APD: Add clock frequency for Hisilicon Hip08 SPI controller

* acpi-apei:
  ACPI/APEI: Clear GHES block_status before panic()
  ACPI, APEI, EINJ: Change to use DEFINE_SHOW_ATTRIBUTE macro

* acpi-misc:
  ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion()
parents 1027fb0f 1f000e1b 1a2fa02f 98cff8b2 f8c6d140

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ config ACPI_CUSTOM_DSDT_FILE 
	  See Documentation/acpi/dsdt-override.txt



	  Enter the full path name to the file which includes the AmlCode

	  declaration.

	  or dsdt_aml_code declaration.



	  If unsure, don't enter a file name.

drivers/acpi/acpi_apd.c

+6 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ static const struct apd_device_desc thunderx2_i2c_desc = { 
	.setup = acpi_apd_setup,

	.fixed_clk_rate = 125000000,

};



static const struct apd_device_desc hip08_spi_desc = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 250000000,

};

#endif



#else
@@ -234,6 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
	{ "CAV9007",  APD_ADDR(thunderx2_i2c_desc) },

	{ "HISI02A1", APD_ADDR(hip07_i2c_desc) },

	{ "HISI02A2", APD_ADDR(hip08_i2c_desc) },

	{ "HISI0173", APD_ADDR(hip08_spi_desc) },

#endif

	{ }

};

drivers/acpi/acpi_lpss.c

+1 −6
Original line number Diff line number Diff line
@@ -673,12 +673,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
	 * have _PS0 and _PS3 without _PSC (and no power resources), so

	 * acpi_bus_init_power() will assume that the BIOS has put them into D0.

	 */

	ret = acpi_device_fix_up_power(adev);

	if (ret) {

		/* Skip the device, but continue the namespace scan. */

		ret = 0;

		goto err_out;

	}

	acpi_device_fix_up_power(adev);



	adev->driver_data = pdata;

	pdev = acpi_create_platform_device(adev, dev_desc->properties);

drivers/acpi/apei/einj.c

+1 −11
Original line number Diff line number Diff line
@@ -607,17 +607,7 @@ static int available_error_type_show(struct seq_file *m, void *v) 
	return 0;

}



static int available_error_type_open(struct inode *inode, struct file *file)

{

	return single_open(file, available_error_type_show, NULL);

}



static const struct file_operations available_error_type_fops = {

	.open		= available_error_type_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

DEFINE_SHOW_ATTRIBUTE(available_error_type);



static int error_type_get(void *data, u64 *val)

{

drivers/acpi/apei/ghes.c

+2 −0
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ static void __ghes_panic(struct ghes *ghes) 
{

	__ghes_print_estatus(KERN_EMERG, ghes->generic, ghes->estatus);



	ghes_clear_estatus(ghes);



	/* reboot to log the error! */

	if (!panic_timeout)

		panic_timeout = ghes_panic_timeout;

CRA Git | Maintained and supported by SUSTech CRA and CCSE