Unverified Commit 70246f89 authored by Mario Limonciello's avatar Mario Limonciello Committed by Ilpo Järvinen
Browse files

ACPI: platform_profile: Check all profile handler to calculate next 



As multiple platform profile handlers might not all support the same
profile, cycling to the next profile could have a different result
depending on what handler are registered.

Check what is active and supported by all handlers to decide what
to do.

Reviewed-by: default avatarArmin Wolf <W_Armin@gmx.de>
Tested-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20241206031918.1537-19-mario.limonciello@amd.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent e836b7df

drivers/acpi/platform_profile.c

+21 −9
Original line number Diff line number Diff line
@@ -418,25 +418,37 @@ EXPORT_SYMBOL_GPL(platform_profile_notify); 


int platform_profile_cycle(void)

{

	enum platform_profile_option profile;

	enum platform_profile_option next;

	enum platform_profile_option next = PLATFORM_PROFILE_LAST;

	enum platform_profile_option profile = PLATFORM_PROFILE_LAST;

	unsigned long choices[BITS_TO_LONGS(PLATFORM_PROFILE_LAST)];

	int err;



	set_bit(PLATFORM_PROFILE_LAST, choices);

	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {

		if (!cur_profile)

			return -ENODEV;

		err = class_for_each_device(&platform_profile_class, NULL,

					    &profile, _aggregate_profiles);

		if (err)

			return err;



		err = cur_profile->profile_get(cur_profile, &profile);

		if (profile == PLATFORM_PROFILE_CUSTOM ||

		    profile == PLATFORM_PROFILE_LAST)

			return -EINVAL;



		err = class_for_each_device(&platform_profile_class, NULL,

					    choices, _aggregate_choices);

		if (err)

			return err;



		next = find_next_bit_wrap(cur_profile->choices, PLATFORM_PROFILE_LAST,

		/* never iterate into a custom if all drivers supported it */

		clear_bit(PLATFORM_PROFILE_CUSTOM, choices);



		next = find_next_bit_wrap(choices,

					  PLATFORM_PROFILE_LAST,

					  profile + 1);



		if (WARN_ON(next == PLATFORM_PROFILE_LAST))

			return -EINVAL;

		err = class_for_each_device(&platform_profile_class, NULL, &next,

					    _store_and_notify);



		err = cur_profile->profile_set(cur_profile, next);

		if (err)

			return err;

	}