On Wednesday, March 14, 2018 7:15:56 PM CET John Garry wrote:
> Currently the ACPI scan has special handling for serial bus
> slaves, in that it makes it the responsibility of the the slave
> device's parent to enumerate the device.
>
> To support in future other types of slave devices which require
> the same special handling, but where the bus is not strictly a
> serial bus - such as devices on the HiSilicon LPC controller bus -
> rename acpi_is_serial_bus_slave() to
> acpi_device_enumeration_by_parent(), so that the name can fit the
> wider purpose.
>
> Associated device flag acpi_device_flags.serial_bus_slave is also
> renamed to .enumeration_by_parent.
>
> Signed-off-by: John Garry <john.garry@xxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> ---
> drivers/acpi/scan.c | 19 ++++++++++---------
> include/acpi/acpi_bus.h | 2 +-
> 2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 8e63d93..f9e7904 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1524,7 +1524,7 @@ static int acpi_check_serial_bus_slave(struct acpi_resource *ares, void *data)
> return -1;
> }
>
> -static bool acpi_is_serial_bus_slave(struct acpi_device *device)
> +static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
> {
> struct list_head resource_list;
> bool is_serial_bus_slave = false;
> @@ -1560,7 +1560,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
> acpi_bus_get_flags(device);
> device->flags.match_driver = false;
> device->flags.initialized = true;
> - device->flags.serial_bus_slave = acpi_is_serial_bus_slave(device);
> + device->flags.enumeration_by_parent =
> + acpi_device_enumeration_by_parent(device);
> acpi_device_clear_enumerated(device);
> device_initialize(&device->dev);
> dev_set_uevent_suppress(&device->dev, true);
> @@ -1858,10 +1859,10 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
> static void acpi_default_enumeration(struct acpi_device *device)
> {
> /*
> - * Do not enumerate SPI/I2C/UART slaves as they will be enumerated by
> - * their respective parents.
> + * Do not enumerate devices with enumeration_by_parent flag set as
> + * they will be enumerated by their respective parents.
> */
> - if (!device->flags.serial_bus_slave) {
> + if (!device->flags.enumeration_by_parent) {
> acpi_create_platform_device(device, NULL);
> acpi_device_set_enumerated(device);
> } else {
> @@ -1958,7 +1959,7 @@ static void acpi_bus_attach(struct acpi_device *device)
> return;
>
> device->flags.match_driver = true;
> - if (ret > 0 && !device->flags.serial_bus_slave) {
> + if (ret > 0 && !device->flags.enumeration_by_parent) {
> acpi_device_set_enumerated(device);
> goto ok;
> }
> @@ -1967,10 +1968,10 @@ static void acpi_bus_attach(struct acpi_device *device)
> if (ret < 0)
> return;
>
> - if (!device->pnp.type.platform_id && !device->flags.serial_bus_slave)
> - acpi_device_set_enumerated(device);
> - else
> + if (device->pnp.type.platform_id || device->flags.enumeration_by_parent)
> acpi_default_enumeration(device);
> + else
> + acpi_device_set_enumerated(device);
>
> ok:
> list_for_each_entry(child, &device->children, node)
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index c9608b0..ba4dd54 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -215,7 +215,7 @@ struct acpi_device_flags {
> u32 of_compatible_ok:1;
> u32 coherent_dma:1;
> u32 cca_seen:1;
> - u32 serial_bus_slave:1;
> + u32 enumeration_by_parent:1;
> u32 reserved:19;
> };
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
