Skip to content

Commit 1d52f10

Browse files
Sakari Ailusrafaeljw
authored andcommitted
ACPI: property: Tie data nodes to acpi handles
ACPICA allows associating additional information (i.e. pointers with specific tag) to acpi_handles. The acpi_device's are associated to acpi_handle's in acpi_tie_acpi_dev() in scan.c, do the same here for the _DSD data nodes. This allows direct data node references in properties, implemented later on in the series. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 85140ef commit 1d52f10

File tree

1 file changed

+41
-1
lines changed

1 file changed

+41
-1
lines changed

drivers/acpi/property.c

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,43 @@ acpi_data_add_props(struct acpi_device_data *data, const guid_t *guid,
340340
return props;
341341
}
342342

343+
static void acpi_nondev_subnode_tag(acpi_handle handle, void *context)
344+
{
345+
}
346+
347+
static void acpi_untie_nondev_subnodes(struct acpi_device_data *data)
348+
{
349+
struct acpi_data_node *dn;
350+
351+
list_for_each_entry(dn, &data->subnodes, sibling) {
352+
acpi_detach_data(dn->handle, acpi_nondev_subnode_tag);
353+
354+
acpi_untie_nondev_subnodes(&dn->data);
355+
}
356+
}
357+
358+
static bool acpi_tie_nondev_subnodes(struct acpi_device_data *data)
359+
{
360+
struct acpi_data_node *dn;
361+
362+
list_for_each_entry(dn, &data->subnodes, sibling) {
363+
acpi_status status;
364+
bool ret;
365+
366+
status = acpi_attach_data(dn->handle, acpi_nondev_subnode_tag, dn);
367+
if (ACPI_FAILURE(status)) {
368+
acpi_handle_err(dn->handle, "Can't tag data node\n");
369+
return false;
370+
}
371+
372+
ret = acpi_tie_nondev_subnodes(&dn->data);
373+
if (!ret)
374+
return ret;
375+
}
376+
377+
return true;
378+
}
379+
343380
static bool acpi_extract_properties(const union acpi_object *desc,
344381
struct acpi_device_data *data)
345382
{
@@ -419,7 +456,9 @@ void acpi_init_properties(struct acpi_device *adev)
419456
&adev->data, acpi_fwnode_handle(adev)))
420457
adev->data.pointer = buf.pointer;
421458

422-
if (!adev->data.pointer) {
459+
if (!adev->data.pointer ||
460+
!acpi_tie_nondev_subnodes(&adev->data)) {
461+
acpi_untie_nondev_subnodes(&adev->data);
423462
acpi_handle_debug(adev->handle, "Invalid _DSD data, skipping\n");
424463
ACPI_FREE(buf.pointer);
425464
}
@@ -462,6 +501,7 @@ static void acpi_destroy_nondev_subnodes(struct list_head *list)
462501

463502
void acpi_free_properties(struct acpi_device *adev)
464503
{
504+
acpi_untie_nondev_subnodes(&adev->data);
465505
acpi_destroy_nondev_subnodes(&adev->data.subnodes);
466506
ACPI_FREE((void *)adev->data.pointer);
467507
adev->data.of_compatible = NULL;

0 commit comments

Comments
 (0)