Merge branch 'bugzilla-14081' into release (39340925) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/acpi/ec.c

+46 −6

Original line number	Original line	Diff line number	Diff line
	@@ -119,6 +119,8 @@ static struct acpi_ec {
	} boot_ec, first_ec;		} boot_ec, first_ec;

	static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */		static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */
			static int EC_FLAGS_VALIDATE_ECDT; /* ASUStec ECDTs need to be validated */
			static int EC_FLAGS_SKIP_DSDT_SCAN; /* Not all BIOS survive early DSDT scan */

	/* --------------------------------------------------------------------------		/* --------------------------------------------------------------------------
	Transaction Management		Transaction Management
	@@ -897,6 +899,44 @@ static const struct acpi_device_id ec_device_ids[] = {
	{"", 0},		{"", 0},
	};		};

			/* Some BIOS do not survive early DSDT scan, skip it */
			static int ec_skip_dsdt_scan(const struct dmi_system_id *id)
			{
			EC_FLAGS_SKIP_DSDT_SCAN = 1;
			return 0;
			}

			/* ASUStek often supplies us with broken ECDT, validate it */
			static int ec_validate_ecdt(const struct dmi_system_id *id)
			{
			EC_FLAGS_VALIDATE_ECDT = 1;
			return 0;
			}

			/* MSI EC needs special treatment, enable it */
			static int ec_flag_msi(const struct dmi_system_id *id)
			{
			EC_FLAGS_MSI = 1;
			EC_FLAGS_VALIDATE_ECDT = 1;
			return 0;
			}

			static struct dmi_system_id __initdata ec_dmi_table[] = {
			{
			ec_skip_dsdt_scan, "Compal JFL92", {
			DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
			DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL},
			{
			ec_flag_msi, "MSI hardware", {
			DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star"),
			DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star") }, NULL},
			{
			ec_validate_ecdt, "ASUS hardware", {
			DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
			{},
			};


	int __init acpi_ec_ecdt_probe(void)		int __init acpi_ec_ecdt_probe(void)
	{		{
	acpi_status status;		acpi_status status;
	@@ -909,11 +949,7 @@ int __init acpi_ec_ecdt_probe(void)
	/*		/*
	* Generate a boot ec context		* Generate a boot ec context
	*/		*/
	if (dmi_name_in_vendors("Micro-Star") \|\|		dmi_check_system(ec_dmi_table);
	dmi_name_in_vendors("Notebook")) {
	pr_info(PREFIX "Enabling special treatment for EC from MSI.\n");
	EC_FLAGS_MSI = 1;
	}
	status = acpi_get_table(ACPI_SIG_ECDT, 1,		status = acpi_get_table(ACPI_SIG_ECDT, 1,
	(struct acpi_table_header **)&ecdt_ptr);		(struct acpi_table_header **)&ecdt_ptr);
	if (ACPI_SUCCESS(status)) {		if (ACPI_SUCCESS(status)) {
	@@ -924,7 +960,7 @@ int __init acpi_ec_ecdt_probe(void)
	boot_ec->handle = ACPI_ROOT_OBJECT;		boot_ec->handle = ACPI_ROOT_OBJECT;
	acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);		acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);
	/* Don't trust ECDT, which comes from ASUSTek */		/* Don't trust ECDT, which comes from ASUSTek */
	if (!dmi_name_in_vendors("ASUS") && EC_FLAGS_MSI == 0)		if (!EC_FLAGS_VALIDATE_ECDT)
	goto install;		goto install;
	saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);		saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
	if (!saved_ec)		if (!saved_ec)
	@@ -932,6 +968,10 @@ int __init acpi_ec_ecdt_probe(void)
	memcpy(saved_ec, boot_ec, sizeof(struct acpi_ec));		memcpy(saved_ec, boot_ec, sizeof(struct acpi_ec));
	/* fall through */		/* fall through */
	}		}

			if (EC_FLAGS_SKIP_DSDT_SCAN)
			return -ENODEV;

	/* This workaround is needed only on some broken machines,		/* This workaround is needed only on some broken machines,
	* which require early EC, but fail to provide ECDT */		* which require early EC, but fail to provide ECDT */
	printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");