Merge branches 'acpi-sysfs', 'acpi-apei' and 'acpi-blacklist' (298bd7fb) · Commits · 戴 / test

drivers/acpi/apei/apei-internal.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -120,11 +120,6 @@ int apei_exec_collect_resources(struct apei_exec_context *ctx,
		struct dentry;
		struct dentry *apei_get_debugfs_dir(void);

		#define apei_estatus_for_each_section(estatus, section) \
		for (section = (struct acpi_hest_generic_data *)(estatus + 1); \
		(void )section - (void )estatus < estatus->data_length; \
		section = (void *)(section+1) + section->error_data_length)

		static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus)
		{
		if (estatus->raw_data_length)

drivers/acpi/apei/einj.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ static struct acpi_generic_address *einj_get_trigger_parameter_region(
		((char *)trigger_tab + sizeof(struct acpi_einj_trigger));
		for (i = 0; i < trigger_tab->entry_count; i++) {
		if (entry->action == ACPI_EINJ_TRIGGER_ERROR &&
		entry->instruction == ACPI_EINJ_WRITE_REGISTER_VALUE &&
		entry->instruction <= ACPI_EINJ_WRITE_REGISTER_VALUE &&
		entry->register_region.space_id ==
		ACPI_ADR_SPACE_SYSTEM_MEMORY &&
		(entry->register_region.address & param2) == (param1 & param2))

drivers/acpi/apei/ghes.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1157,7 +1157,8 @@ static int ghes_probe(struct platform_device *ghes_dev)
		generic->header.source_id);
		goto err_edac_unreg;
		}
		rc = request_irq(ghes->irq, ghes_irq_func, 0, "GHES IRQ", ghes);
		rc = request_irq(ghes->irq, ghes_irq_func, IRQF_SHARED,
		"GHES IRQ", ghes);
		if (rc) {
		pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n",
		generic->header.source_id);
		@@ -1265,9 +1266,14 @@ static int __init ghes_init(void)
		if (acpi_disabled)
		return -ENODEV;

		if (hest_disable) {
		switch (hest_disable) {
		case HEST_NOT_FOUND:
		return -ENODEV;
		case HEST_DISABLED:
		pr_info(GHES_PFX "HEST is not enabled!\n");
		return -EINVAL;
		default:
		break;
		}

		if (ghes_disable) {

drivers/acpi/apei/hest.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@

		#define HEST_PFX "HEST: "

		bool hest_disable;
		int hest_disable;
		EXPORT_SYMBOL_GPL(hest_disable);

		/* HEST table parsing */
		@@ -213,7 +213,7 @@ err:

		static int __init setup_hest_disable(char *str)
		{
		hest_disable = 1;
		hest_disable = HEST_DISABLED;
		return 0;
		}

		@@ -232,9 +232,10 @@ void __init acpi_hest_init(void)

		status = acpi_get_table(ACPI_SIG_HEST, 0,
		(struct acpi_table_header **)&hest_tab);
		if (status == AE_NOT_FOUND)
		goto err;
		else if (ACPI_FAILURE(status)) {
		if (status == AE_NOT_FOUND) {
		hest_disable = HEST_NOT_FOUND;
		return;
		} else if (ACPI_FAILURE(status)) {
		const char *msg = acpi_format_exception(status);
		pr_err(HEST_PFX "Failed to get table, %s\n", msg);
		rc = -EINVAL;
		@@ -257,5 +258,5 @@ void __init acpi_hest_init(void)
		pr_info(HEST_PFX "Table parsing has been initialized.\n");
		return;
		err:
		hest_disable = 1;
		hest_disable = HEST_DISABLED;
		}

drivers/acpi/blacklist.c

+14 −69

Original line number	Diff line number	Diff line
		@@ -30,30 +30,13 @@

		#include "internal.h"

		enum acpi_blacklist_predicates {
		all_versions,
		less_than_or_equal,
		equal,
		greater_than_or_equal,
		};

		struct acpi_blacklist_item {
		char oem_id[7];
		char oem_table_id[9];
		u32 oem_revision;
		char *table;
		enum acpi_blacklist_predicates oem_revision_predicate;
		char *reason;
		u32 is_critical_error;
		};

		static struct dmi_system_id acpi_rev_dmi_table[] __initdata;

		/*
		* POLICY: If anything doesn't work, put it on the blacklist.
		* If they are critical errors, mark it critical, and abort driver load.
		*/
		static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
		static struct acpi_platform_list acpi_blacklist[] __initdata = {
		/* Compaq Presario 1700 */
		{"PTLTD ", " DSDT ", 0x06040000, ACPI_SIG_DSDT, less_than_or_equal,
		"Multiple problems", 1},
		@@ -67,65 +50,27 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
		{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
		"Incorrect _ADR", 1},

		{""}
		{ }
		};

		int __init acpi_blacklisted(void)
		{
		int i = 0;
		int i;
		int blacklisted = 0;
		struct acpi_table_header table_header;

		while (acpi_blacklist[i].oem_id[0] != '\0') {
		if (acpi_get_table_header(acpi_blacklist[i].table, 0, &table_header)) {
		i++;
		continue;
		}

		if (strncmp(acpi_blacklist[i].oem_id, table_header.oem_id, 6)) {
		i++;
		continue;
		}

		if (strncmp
		(acpi_blacklist[i].oem_table_id, table_header.oem_table_id,
		8)) {
		i++;
		continue;
		}

		if ((acpi_blacklist[i].oem_revision_predicate == all_versions)
		\|\| (acpi_blacklist[i].oem_revision_predicate ==
		less_than_or_equal
		&& table_header.oem_revision <=
		acpi_blacklist[i].oem_revision)
		\|\| (acpi_blacklist[i].oem_revision_predicate ==
		greater_than_or_equal
		&& table_header.oem_revision >=
		acpi_blacklist[i].oem_revision)
		\|\| (acpi_blacklist[i].oem_revision_predicate == equal
		&& table_header.oem_revision ==
		acpi_blacklist[i].oem_revision)) {

		printk(KERN_ERR PREFIX
		"Vendor \"%6.6s\" System \"%8.8s\" "
		"Revision 0x%x has a known ACPI BIOS problem.\n",
		i = acpi_match_platform_list(acpi_blacklist);
		if (i >= 0) {
		pr_err(PREFIX "Vendor \"%6.6s\" System \"%8.8s\" Revision 0x%x has a known ACPI BIOS problem.\n",
		acpi_blacklist[i].oem_id,
		acpi_blacklist[i].oem_table_id,
		acpi_blacklist[i].oem_revision);

		printk(KERN_ERR PREFIX
		"Reason: %s. This is a %s error\n",
		pr_err(PREFIX "Reason: %s. This is a %s error\n",
		acpi_blacklist[i].reason,
		(acpi_blacklist[i].
		is_critical_error ? "non-recoverable" :
		"recoverable"));
		(acpi_blacklist[i].data ?
		"non-recoverable" : "recoverable"));

		blacklisted = acpi_blacklist[i].is_critical_error;
		break;
		} else {
		i++;
		}
		blacklisted = acpi_blacklist[i].data;
		}

		(void)early_acpi_osi_init();

Admin message