Skip to content

Commit

Permalink
Merge branches 'acpi-tables', 'acpi-processor', 'acpi-property' and '…
Browse files Browse the repository at this point in the history
…acpi-thermal'

Merge ACPI tables parsing change, ACPI processor driver change, ACPI
device properties handling changes and an ACPI thermal code change for
6.9-rc1:

 - Make the NFIT parsing code use acpi_evaluate_dsm_typed() (Andy
   Shevchenko).

 - Fix a memory leak in acpi_processor_power_exit() (Armin Wolf).

 - Make it possible to quirk the CSI-2 and MIPI DisCo for Imaging
   properties parsing and add a quirk for Dell XPS 9315 (Sakari Ailus).

 - Prevent false-positive static checker warnings from triggering by
   intializing some variables in the ACPI thermal code to zero (Colin
   Ian King).

* acpi-tables:
  ACPI: NFIT: Switch to use acpi_evaluate_dsm_typed()

* acpi-processor:
  ACPI: processor_idle: Fix memory leak in acpi_processor_power_exit()

* acpi-property:
  ACPI: property: Polish ignoring bad data nodes
  ACPI: property: Ignore bad graph port nodes on Dell XPS 9315
  ACPI: utils: Make acpi_handle_path() not static

* acpi-thermal:
  ACPI: thermal_lib: Initialize temp_decik to zero
  • Loading branch information
Rafael J. Wysocki committed Mar 11, 2024
5 parents 8c34f11 + 26da9a8 + e18afcb + 8d60902 + 2b959bd commit d55cc9f
Show file tree
Hide file tree
Showing 8 changed files with 85 additions and 8 deletions.
1 change: 1 addition & 0 deletions drivers/acpi/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,5 +302,6 @@ void acpi_mipi_check_crs_csi2(acpi_handle handle);
void acpi_mipi_scan_crs_csi2(void);
void acpi_mipi_init_crs_csi2_swnodes(void);
void acpi_mipi_crs_csi2_cleanup(void);
bool acpi_graph_ignore_port(acpi_handle handle);

#endif /* _ACPI_INTERNAL_H_ */
71 changes: 71 additions & 0 deletions drivers/acpi/mipi-disco-img.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

#include <linux/acpi.h>
#include <linux/dmi.h>
#include <linux/limits.h>
#include <linux/list.h>
#include <linux/module.h>
Expand Down Expand Up @@ -723,3 +724,73 @@ void acpi_mipi_crs_csi2_cleanup(void)
list_for_each_entry_safe(csi2, csi2_tmp, &acpi_mipi_crs_csi2_list, entry)
acpi_mipi_del_crs_csi2(csi2);
}

static const struct dmi_system_id dmi_ignore_port_nodes[] = {
{
.matches = {
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS 9315"),
},
},
{ }
};

static const char *strnext(const char *s1, const char *s2)
{
s1 = strstr(s1, s2);

if (!s1)
return NULL;

return s1 + strlen(s2);
}

/**
* acpi_graph_ignore_port - Tell whether a port node should be ignored
* @handle: The ACPI handle of the node (which may be a port node)
*
* Return: true if a port node should be ignored and the data to that should
* come from other sources instead (Windows ACPI definitions and
* ipu-bridge). This is currently used to ignore bad port nodes related to IPU6
* ("IPU?") and camera sensor devices ("LNK?") in certain Dell systems with
* Intel VSC.
*/
bool acpi_graph_ignore_port(acpi_handle handle)
{
const char *path = NULL, *orig_path;
static bool dmi_tested, ignore_port;

if (!dmi_tested) {
ignore_port = dmi_first_match(dmi_ignore_port_nodes);
dmi_tested = true;
}

if (!ignore_port)
return false;

/* Check if the device is either "IPU" or "LNK" (sensor). */
orig_path = acpi_handle_path(handle);
if (!orig_path)
return false;
path = strnext(orig_path, "IPU");
if (!path)
path = strnext(orig_path, "LNK");
if (!path)
goto out_free;

if (!(isdigit(path[0]) && path[1] == '.'))
goto out_free;

/* Check if the node has a "PRT" prefix. */
path = strnext(path, "PRT");
if (path && isdigit(path[0]) && !path[1]) {
acpi_handle_debug(handle, "ignoring data node\n");

kfree(orig_path);
return true;
}

out_free:
kfree(orig_path);
return false;
}
5 changes: 2 additions & 3 deletions drivers/acpi/nfit/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1737,9 +1737,8 @@ __weak void nfit_intel_shutdown_status(struct nfit_mem *nfit_mem)
if ((nfit_mem->dsm_mask & (1 << func)) == 0)
return;

out_obj = acpi_evaluate_dsm(handle, guid, revid, func, &in_obj);
if (!out_obj || out_obj->type != ACPI_TYPE_BUFFER
|| out_obj->buffer.length < sizeof(smart)) {
out_obj = acpi_evaluate_dsm_typed(handle, guid, revid, func, &in_obj, ACPI_TYPE_BUFFER);
if (!out_obj || out_obj->buffer.length < sizeof(smart)) {
dev_dbg(dev->parent, "%s: failed to retrieve initial health\n",
dev_name(dev));
ACPI_FREE(out_obj);
Expand Down
2 changes: 2 additions & 0 deletions drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,8 @@ int acpi_processor_power_exit(struct acpi_processor *pr)
acpi_processor_registered--;
if (acpi_processor_registered == 0)
cpuidle_unregister_driver(&acpi_idle_driver);

kfree(dev);
}

pr->flags.power_setup_done = 0;
Expand Down
3 changes: 3 additions & 0 deletions drivers/acpi/property.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ static bool acpi_nondev_subnode_extract(union acpi_object *desc,
struct acpi_data_node *dn;
bool result;

if (acpi_graph_ignore_port(handle))
return false;

dn = kzalloc(sizeof(*dn), GFP_KERNEL);
if (!dn)
return false;
Expand Down
8 changes: 4 additions & 4 deletions drivers/acpi/thermal_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static int thermal_temp(int error, int temp_decik, int *ret_temp)
*/
int thermal_acpi_active_trip_temp(struct acpi_device *adev, int id, int *ret_temp)
{
int temp_decik;
int temp_decik = 0;
int ret = acpi_active_trip_temp(adev, id, &temp_decik);

return thermal_temp(ret, temp_decik, ret_temp);
Expand All @@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(thermal_acpi_active_trip_temp);
*/
int thermal_acpi_passive_trip_temp(struct acpi_device *adev, int *ret_temp)
{
int temp_decik;
int temp_decik = 0;
int ret = acpi_passive_trip_temp(adev, &temp_decik);

return thermal_temp(ret, temp_decik, ret_temp);
Expand All @@ -139,7 +139,7 @@ EXPORT_SYMBOL_GPL(thermal_acpi_passive_trip_temp);
*/
int thermal_acpi_hot_trip_temp(struct acpi_device *adev, int *ret_temp)
{
int temp_decik;
int temp_decik = 0;
int ret = acpi_hot_trip_temp(adev, &temp_decik);

return thermal_temp(ret, temp_decik, ret_temp);
Expand All @@ -158,7 +158,7 @@ EXPORT_SYMBOL_GPL(thermal_acpi_hot_trip_temp);
*/
int thermal_acpi_critical_trip_temp(struct acpi_device *adev, int *ret_temp)
{
int temp_decik;
int temp_decik = 0;
int ret = acpi_critical_trip_temp(adev, &temp_decik);

return thermal_temp(ret, temp_decik, ret_temp);
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ EXPORT_SYMBOL(acpi_evaluate_ost);
*
* Caller must free the returned buffer
*/
static char *acpi_handle_path(acpi_handle handle)
char *acpi_handle_path(acpi_handle handle)
{
struct acpi_buffer buffer = {
.length = ACPI_ALLOCATE_BUFFER,
Expand Down
1 change: 1 addition & 0 deletions include/linux/acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,7 @@ static inline void acpi_ec_set_gpe_wake_mask(u8 action) {}
#endif

#ifdef CONFIG_ACPI
char *acpi_handle_path(acpi_handle handle);
__printf(3, 4)
void acpi_handle_printk(const char *level, acpi_handle handle,
const char *fmt, ...);
Expand Down

0 comments on commit d55cc9f

Please sign in to comment.