Merge branches 'pm-cpuidle' and 'acpi-pm' (4c84515d) · Commits · 戴 / test

drivers/acpi/device_pm.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -1314,9 +1314,19 @@ static void acpi_dev_pm_detach(struct device *dev, bool power_off)
		*/
		int acpi_dev_pm_attach(struct device *dev, bool power_on)
		{
		/*
		* Skip devices whose ACPI companions match the device IDs below,
		* because they require special power management handling incompatible
		* with the generic ACPI PM domain.
		*/
		static const struct acpi_device_id special_pm_ids[] = {
		{"PNP0C0B", }, /* Generic ACPI fan */
		{"INT3404", }, /* Fan */
		{}
		};
		struct acpi_device *adev = ACPI_COMPANION(dev);

		if (!adev)
		if (!adev \|\| !acpi_match_device_ids(adev, special_pm_ids))
		return 0;

		/*

+2 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,8 @@ u64 cpuidle_poll_time(struct cpuidle_driver *drv,
		if (dev->states_usage[i].disable)
		continue;

		limit_ns = (u64)drv->states[i].target_residency_ns;
		limit_ns = drv->states[i].target_residency_ns;
		break;
		}

		dev->poll_limit_ns = limit_ns;

+10 −0

Original line number	Diff line number	Diff line
		@@ -403,6 +403,13 @@ void cpuidle_driver_state_disabled(struct cpuidle_driver *drv, int idx,

		mutex_lock(&cpuidle_lock);

		spin_lock(&cpuidle_driver_lock);

		if (!drv->cpumask) {
		drv->states[idx].flags \|= CPUIDLE_FLAG_UNUSABLE;
		goto unlock;
		}

		for_each_cpu(cpu, drv->cpumask) {
		struct cpuidle_device *dev = per_cpu(cpuidle_devices, cpu);

		@@ -415,5 +422,8 @@ void cpuidle_driver_state_disabled(struct cpuidle_driver *drv, int idx,
		dev->states_usage[idx].disable &= ~CPUIDLE_STATE_DISABLED_BY_DRIVER;
		}

		unlock:
		spin_unlock(&cpuidle_driver_lock);

		mutex_unlock(&cpuidle_lock);
		}