Commit 8a9bd50a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-soc', 'acpi-video' and 'acpi-apei' 

Merge ACPI SoC drivers changes, ACPI backlight driver changes and APEI
changes for 5.18-rc1:

 - Make the ACPI driver for Intel SoCs (LPSS) let the SPI driver know
   the exact type of the controller (Andy Shevchenko).

 - Force native backlight mode on Clevo NL5xRU and NL5xNU (Werner
   Sembach).

 - Fix return value of __setup handlers in the APEI code (Randy
   Dunlap).

 - Add Arm Generic Diagnostic Dump and Reset device driver (Ilkka
   Koskinen).

 - Limit printable size of BERT table data (Darren Hart).

 - Fix up HEST and GHES initialization (Shuai Xue).

* acpi-soc:
  ACPI: LPSS: Provide an SSP type to the driver
  ACPI: LPSS: Constify properties member in struct lpss_device_desc
  ACPI: platform: Constify properties parameter in acpi_create_platform_device()

* acpi-video:
  ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU

* acpi-apei:
  ACPI: AGDI: Add driver for Arm Generic Diagnostic Dump and Reset device
  ACPI/APEI: Limit printable size of BERT table data
  ACPI: APEI: fix return value of __setup handlers
  ACPI: APEI: rename ghes_init() with an "acpi_" prefix
  ACPI: APEI: explicit init of HEST and GHES in apci_init()
parents 24b2b094 620c803f c844d22f a2a591fb

drivers/acpi/acpi_lpss.c

+26 −7
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/pwm.h>

#include <linux/pxa2xx_ssp.h>

#include <linux/suspend.h>

#include <linux/delay.h>
@@ -82,7 +83,7 @@ struct lpss_device_desc { 
	const char *clk_con_id;

	unsigned int prv_offset;

	size_t prv_size_override;

	struct property_entry *properties;

	const struct property_entry *properties;

	void (*setup)(struct lpss_private_data *pdata);

	bool resume_from_noirq;

};
@@ -219,10 +220,16 @@ static void bsw_pwm_setup(struct lpss_private_data *pdata) 
	pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));

}



static const struct lpss_device_desc lpt_dev_desc = {

static const struct property_entry lpt_spi_properties[] = {

	PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_LPT_SSP),

	{ }

};



static const struct lpss_device_desc lpt_spi_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR

			| LPSS_SAVE_CTX,

	.prv_offset = 0x800,

	.properties = lpt_spi_properties,

};



static const struct lpss_device_desc lpt_i2c_dev_desc = {
@@ -282,9 +289,15 @@ static const struct lpss_device_desc bsw_uart_dev_desc = { 
	.properties = uart_properties,

};



static const struct property_entry byt_spi_properties[] = {

	PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_BYT_SSP),

	{ }

};



static const struct lpss_device_desc byt_spi_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

	.prv_offset = 0x400,

	.properties = byt_spi_properties,

};



static const struct lpss_device_desc byt_sdio_dev_desc = {
@@ -305,11 +318,17 @@ static const struct lpss_device_desc bsw_i2c_dev_desc = { 
	.resume_from_noirq = true,

};



static const struct property_entry bsw_spi_properties[] = {

	PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_BSW_SSP),

	{ }

};



static const struct lpss_device_desc bsw_spi_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX

			| LPSS_NO_D3_DELAY,

	.prv_offset = 0x400,

	.setup = lpss_deassert_reset,

	.properties = bsw_spi_properties,

};



static const struct x86_cpu_id lpss_cpu_ids[] = {
@@ -329,8 +348,8 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 
	{ "INTL9C60", LPSS_ADDR(lpss_dma_desc) },



	/* Lynxpoint LPSS devices */

	{ "INT33C0", LPSS_ADDR(lpt_dev_desc) },

	{ "INT33C1", LPSS_ADDR(lpt_dev_desc) },

	{ "INT33C0", LPSS_ADDR(lpt_spi_dev_desc) },

	{ "INT33C1", LPSS_ADDR(lpt_spi_dev_desc) },

	{ "INT33C2", LPSS_ADDR(lpt_i2c_dev_desc) },

	{ "INT33C3", LPSS_ADDR(lpt_i2c_dev_desc) },

	{ "INT33C4", LPSS_ADDR(lpt_uart_dev_desc) },
@@ -356,8 +375,8 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 
	{ "808622C1", LPSS_ADDR(bsw_i2c_dev_desc) },



	/* Broadwell LPSS devices */

	{ "INT3430", LPSS_ADDR(lpt_dev_desc) },

	{ "INT3431", LPSS_ADDR(lpt_dev_desc) },

	{ "INT3430", LPSS_ADDR(lpt_spi_dev_desc) },

	{ "INT3431", LPSS_ADDR(lpt_spi_dev_desc) },

	{ "INT3432", LPSS_ADDR(lpt_i2c_dev_desc) },

	{ "INT3433", LPSS_ADDR(lpt_i2c_dev_desc) },

	{ "INT3434", LPSS_ADDR(lpt_uart_dev_desc) },
@@ -366,7 +385,7 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 
	{ "INT3437", },



	/* Wildcat Point LPSS devices */

	{ "INT3438", LPSS_ADDR(lpt_dev_desc) },

	{ "INT3438", LPSS_ADDR(lpt_spi_dev_desc) },



	{ }

};

drivers/acpi/acpi_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, 
 * Name of the platform device will be the same as @adev's.

 */

struct platform_device *acpi_create_platform_device(struct acpi_device *adev,

					struct property_entry *properties)

						    const struct property_entry *properties)

{

	struct platform_device *pdev = NULL;

	struct platform_device_info pdevinfo;

drivers/acpi/apei/bert.c

+7 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#undef pr_fmt

#define pr_fmt(fmt) "BERT: " fmt

#define ACPI_BERT_PRINT_MAX_LEN 1024



static int bert_disable;
@@ -58,8 +59,11 @@ static void __init bert_print_all(struct acpi_bert_region *region, 
		}



		pr_info_once("Error records from previous boot:\n");



		if (region_len < ACPI_BERT_PRINT_MAX_LEN)

			cper_estatus_print(KERN_INFO HW_ERR, estatus);

		else

			pr_info_once("Max print length exceeded, table data is available at:\n"

				     "/sys/firmware/acpi/tables/data/BERT");



		/*

		 * Because the boot error source is "one-time polled" type,
@@ -77,7 +81,7 @@ static int __init setup_bert_disable(char *str) 
{

	bert_disable = 1;



	return 0;

	return 1;

}

__setup("bert_disable", setup_bert_disable);

drivers/acpi/apei/erst.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(erst_clear); 
static int __init setup_erst_disable(char *str)

{

	erst_disable = 1;

	return 0;

	return 1;

}



__setup("erst_disable", setup_erst_disable);

drivers/acpi/apei/ghes.c

+8 −11
Original line number Diff line number Diff line
@@ -1457,33 +1457,35 @@ static struct platform_driver ghes_platform_driver = { 
	.remove		= ghes_remove,

};



static int __init ghes_init(void)

void __init acpi_ghes_init(void)

{

	int rc;



	sdei_init();



	if (acpi_disabled)

		return -ENODEV;

		return;



	switch (hest_disable) {

	case HEST_NOT_FOUND:

		return -ENODEV;

		return;

	case HEST_DISABLED:

		pr_info(GHES_PFX "HEST is not enabled!\n");

		return -EINVAL;

		return;

	default:

		break;

	}



	if (ghes_disable) {

		pr_info(GHES_PFX "GHES is not enabled!\n");

		return -EINVAL;

		return;

	}



	ghes_nmi_init_cxt();



	rc = platform_driver_register(&ghes_platform_driver);

	if (rc)

		goto err;

		return;



	rc = apei_osc_setup();

	if (rc == 0 && osc_sb_apei_support_acked)
@@ -1494,9 +1496,4 @@ static int __init ghes_init(void) 
		pr_info(GHES_PFX "APEI firmware first mode is enabled by APEI bit.\n");

	else

		pr_info(GHES_PFX "Failed to enable APEI firmware first mode.\n");



	return 0;

err:

	return rc;

}
 
device_initcall(ghes_init);