Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8e725f3 authored by Marco Aurelio da Costa's avatar Marco Aurelio da Costa Committed by Len Brown
Browse files

ACPI: Ignore invalid _PSS entries, but use valid ones 



The EliteBook 8560W has non-initialized entries in its _PSS ACPI
table. Instead of bailing out when the first non-initialized entry is
found, ignore it and use only  the valid entries. Only bail out if there
is no valid entry at all.

[v3: Fixes suggested by Konrad]

Signed-off-by: default avatarMarco Aurelio da Costa <costa@gamic.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent febb72a6

drivers/acpi/processor_perflib.c

+25 −5
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr) 
	struct acpi_buffer state = { 0, NULL };

	union acpi_object *pss = NULL;

	int i;

	int last_invalid = -1;





	status = acpi_evaluate_object(pr->handle, "_PSS", NULL, &buffer);
@@ -394,14 +395,33 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr) 
		    ((u32)(px->core_frequency * 1000) !=

		     (px->core_frequency * 1000))) {

			printk(KERN_ERR FW_BUG PREFIX

			       "Invalid BIOS _PSS frequency: 0x%llx MHz\n",

			       px->core_frequency);

			       "Invalid BIOS _PSS frequency found for processor %d: 0x%llx MHz\n",

			       pr->id, px->core_frequency);

			if (last_invalid == -1)

				last_invalid = i;

		} else {

			if (last_invalid != -1) {

				/*

				 * Copy this valid entry over last_invalid entry

				 */

				memcpy(&(pr->performance->states[last_invalid]),

				       px, sizeof(struct acpi_processor_px));

				++last_invalid;

			}

		}

	}



	if (last_invalid == 0) {

		printk(KERN_ERR FW_BUG PREFIX

		       "No valid BIOS _PSS frequency found for processor %d\n", pr->id);

		result = -EFAULT;

		kfree(pr->performance->states);

			goto end;

		}

		pr->performance->states = NULL;

	}



	if (last_invalid > 0)

		pr->performance->state_count = last_invalid;



      end:

	kfree(buffer.pointer);