Commit 33ae7f71 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-cppc', 'acpi-video' and 'acpi-drivers' 

* acpi-cppc:
  ACPI: CPPC: clean up acpi_get_psd_map()

* acpi-video:
  ACPI: video: Use native backlight on Acer Aspire 5783z
  ACPI: video: Docs update for "acpi_backlight" kernel parameter options

* acpi-drivers:
  thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs
  platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID
  ACPI: Update Tiger Lake ACPI device IDs
parents fd036058 b17b8064 1c8fbc1f 26d8bec1

Documentation/admin-guide/kernel-parameters.txt

+5 −3
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ 
			default: 0



	acpi_backlight=	[HW,ACPI]

			acpi_backlight=vendor

			acpi_backlight=video

			If set to vendor, prefer vendor specific driver

			{ vendor | video | native | none }

			If set to vendor, prefer vendor-specific driver

			(e.g. thinkpad_acpi, sony_acpi, etc.) instead

			of the ACPI video.ko driver.

			If set to video, use the ACPI video.ko driver.

			If set to native, use the device's native backlight mode.

			If set to none, disable the ACPI backlight interface.



	acpi_force_32bit_fadt_addr

			force FADT to use 32 bit addresses rather than the

drivers/acpi/cppc_acpi.c

+7 −26
Original line number Diff line number Diff line
@@ -438,13 +438,10 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) 
	 * domain info.

	 */

	for_each_possible_cpu(i) {

		pr = all_cpu_data[i];

		if (!pr)

			continue;



		if (cpumask_test_cpu(i, covered_cpus))

			continue;



		pr = all_cpu_data[i];

		cpc_ptr = per_cpu(cpc_desc_ptr, i);

		if (!cpc_ptr) {

			retval = -EFAULT;
@@ -495,44 +492,28 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) 
			cpumask_set_cpu(j, pr->shared_cpu_map);

		}



		for_each_possible_cpu(j) {

		for_each_cpu(j, pr->shared_cpu_map) {

			if (i == j)

				continue;



			match_pr = all_cpu_data[j];

			if (!match_pr)

				continue;



			match_cpc_ptr = per_cpu(cpc_desc_ptr, j);

			if (!match_cpc_ptr) {

				retval = -EFAULT;

				goto err_ret;

			}



			match_pdomain = &(match_cpc_ptr->domain_info);

			if (match_pdomain->domain != pdomain->domain)

				continue;



			match_pr->shared_type = pr->shared_type;

			cpumask_copy(match_pr->shared_cpu_map,

				     pr->shared_cpu_map);

		}

	}

	goto out;



err_ret:

	for_each_possible_cpu(i) {

		pr = all_cpu_data[i];

		if (!pr)

			continue;



		/* Assume no coordination on any error parsing domain info */

		if (retval) {

		cpumask_clear(pr->shared_cpu_map);

		cpumask_set_cpu(i, pr->shared_cpu_map);

		pr->shared_type = CPUFREQ_SHARED_TYPE_ALL;

	}

	}



out:

	free_cpumask_var(covered_cpus);

	return retval;

}

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,8 +1321,8 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) 
	 */

	static const struct acpi_device_id special_pm_ids[] = {

		{"PNP0C0B", }, /* Generic ACPI fan */

		{"INT1044", }, /* Fan for Tiger Lake generation */

		{"INT3404", }, /* Fan */

		{"INTC1044", }, /* Fan for Tiger Lake generation */

		{}

	};

	struct acpi_device *adev = ACPI_COMPANION(dev);

drivers/acpi/dptf/dptf_power.c

+1 −1
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static int dptf_power_remove(struct platform_device *pdev) 
}



static const struct acpi_device_id int3407_device_ids[] = {

	{"INT1047", 0},

	{"INT3407", 0},

	{"INTC1047", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, int3407_device_ids);

drivers/acpi/dptf/int340x_thermal.c

+4 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ 


#define INT3401_DEVICE 0X01

static const struct acpi_device_id int340x_thermal_device_ids[] = {

	{"INT1040"},

	{"INT1043"},

	{"INT1044"},

	{"INT1047"},

	{"INT3400"},

	{"INT3401", INT3401_DEVICE},

	{"INT3402"},
@@ -28,6 +24,10 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
	{"INT3409"},

	{"INT340A"},

	{"INT340B"},

	{"INTC1040"},

	{"INTC1043"},

	{"INTC1044"},

	{"INTC1047"},

	{""},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE