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

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
...@@ -22,11 +22,13 @@ ...@@ -22,11 +22,13 @@
default: 0 default: 0
acpi_backlight= [HW,ACPI] acpi_backlight= [HW,ACPI]
acpi_backlight=vendor { vendor | video | native | none }
acpi_backlight=video If set to vendor, prefer vendor-specific driver
If set to vendor, prefer vendor specific driver
(e.g. thinkpad_acpi, sony_acpi, etc.) instead (e.g. thinkpad_acpi, sony_acpi, etc.) instead
of the ACPI video.ko driver. 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 acpi_force_32bit_fadt_addr
force FADT to use 32 bit addresses rather than the force FADT to use 32 bit addresses rather than the
......
...@@ -438,13 +438,10 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) ...@@ -438,13 +438,10 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data)
* domain info. * domain info.
*/ */
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = all_cpu_data[i];
if (!pr)
continue;
if (cpumask_test_cpu(i, covered_cpus)) if (cpumask_test_cpu(i, covered_cpus))
continue; continue;
pr = all_cpu_data[i];
cpc_ptr = per_cpu(cpc_desc_ptr, i); cpc_ptr = per_cpu(cpc_desc_ptr, i);
if (!cpc_ptr) { if (!cpc_ptr) {
retval = -EFAULT; retval = -EFAULT;
...@@ -495,44 +492,28 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) ...@@ -495,44 +492,28 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data)
cpumask_set_cpu(j, pr->shared_cpu_map); cpumask_set_cpu(j, pr->shared_cpu_map);
} }
for_each_possible_cpu(j) { for_each_cpu(j, pr->shared_cpu_map) {
if (i == j) if (i == j)
continue; continue;
match_pr = all_cpu_data[j]; 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; match_pr->shared_type = pr->shared_type;
cpumask_copy(match_pr->shared_cpu_map, cpumask_copy(match_pr->shared_cpu_map,
pr->shared_cpu_map); pr->shared_cpu_map);
} }
} }
goto out;
err_ret: err_ret:
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = all_cpu_data[i]; pr = all_cpu_data[i];
if (!pr)
continue;
/* Assume no coordination on any error parsing domain info */ /* Assume no coordination on any error parsing domain info */
if (retval) { cpumask_clear(pr->shared_cpu_map);
cpumask_clear(pr->shared_cpu_map); cpumask_set_cpu(i, pr->shared_cpu_map);
cpumask_set_cpu(i, pr->shared_cpu_map); pr->shared_type = CPUFREQ_SHARED_TYPE_ALL;
pr->shared_type = CPUFREQ_SHARED_TYPE_ALL;
}
} }
out:
free_cpumask_var(covered_cpus); free_cpumask_var(covered_cpus);
return retval; return retval;
} }
......
...@@ -1321,8 +1321,8 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) ...@@ -1321,8 +1321,8 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
*/ */
static const struct acpi_device_id special_pm_ids[] = { static const struct acpi_device_id special_pm_ids[] = {
{"PNP0C0B", }, /* Generic ACPI fan */ {"PNP0C0B", }, /* Generic ACPI fan */
{"INT1044", }, /* Fan for Tiger Lake generation */
{"INT3404", }, /* Fan */ {"INT3404", }, /* Fan */
{"INTC1044", }, /* Fan for Tiger Lake generation */
{} {}
}; };
struct acpi_device *adev = ACPI_COMPANION(dev); struct acpi_device *adev = ACPI_COMPANION(dev);
......
...@@ -97,8 +97,8 @@ static int dptf_power_remove(struct platform_device *pdev) ...@@ -97,8 +97,8 @@ static int dptf_power_remove(struct platform_device *pdev)
} }
static const struct acpi_device_id int3407_device_ids[] = { static const struct acpi_device_id int3407_device_ids[] = {
{"INT1047", 0},
{"INT3407", 0}, {"INT3407", 0},
{"INTC1047", 0},
{"", 0}, {"", 0},
}; };
MODULE_DEVICE_TABLE(acpi, int3407_device_ids); MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
......
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
#define INT3401_DEVICE 0X01 #define INT3401_DEVICE 0X01
static const struct acpi_device_id int340x_thermal_device_ids[] = { static const struct acpi_device_id int340x_thermal_device_ids[] = {
{"INT1040"},
{"INT1043"},
{"INT1044"},
{"INT1047"},
{"INT3400"}, {"INT3400"},
{"INT3401", INT3401_DEVICE}, {"INT3401", INT3401_DEVICE},
{"INT3402"}, {"INT3402"},
...@@ -28,6 +24,10 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { ...@@ -28,6 +24,10 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
{"INT3409"}, {"INT3409"},
{"INT340A"}, {"INT340A"},
{"INT340B"}, {"INT340B"},
{"INTC1040"},
{"INTC1043"},
{"INTC1044"},
{"INTC1047"},
{""}, {""},
}; };
......
...@@ -352,6 +352,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { ...@@ -352,6 +352,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"), DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"),
}, },
}, },
{
.callback = video_detect_force_native,
.ident = "Acer Aspire 5738z",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
DMI_MATCH(DMI_BOARD_NAME, "JV50"),
},
},
/* /*
* Desktops which falsely report a backlight and which our heuristics * Desktops which falsely report a backlight and which our heuristics
......
...@@ -19,8 +19,8 @@ MODULE_LICENSE("GPL"); ...@@ -19,8 +19,8 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Alex Hung"); MODULE_AUTHOR("Alex Hung");
static const struct acpi_device_id intel_hid_ids[] = { static const struct acpi_device_id intel_hid_ids[] = {
{"INT1051", 0},
{"INT33D5", 0}, {"INT33D5", 0},
{"INTC1051", 0},
{"", 0}, {"", 0},
}; };
......
...@@ -369,8 +369,8 @@ static int int3400_thermal_remove(struct platform_device *pdev) ...@@ -369,8 +369,8 @@ static int int3400_thermal_remove(struct platform_device *pdev)
} }
static const struct acpi_device_id int3400_thermal_match[] = { static const struct acpi_device_id int3400_thermal_match[] = {
{"INT1040", 0},
{"INT3400", 0}, {"INT3400", 0},
{"INTC1040", 0},
{} {}
}; };
......
...@@ -282,8 +282,8 @@ static int int3403_remove(struct platform_device *pdev) ...@@ -282,8 +282,8 @@ static int int3403_remove(struct platform_device *pdev)
} }
static const struct acpi_device_id int3403_device_ids[] = { static const struct acpi_device_id int3403_device_ids[] = {
{"INT1043", 0},
{"INT3403", 0}, {"INT3403", 0},
{"INTC1043", 0},
{"", 0}, {"", 0},
}; };
MODULE_DEVICE_TABLE(acpi, int3403_device_ids); MODULE_DEVICE_TABLE(acpi, int3403_device_ids);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment