| Message ID | 20230208152807.3064242-7-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | ACPI _CRS CSI-2 and MIPI DisCo for Imaging support | expand |
On Wed, Feb 08, 2023 at 05:28:05PM +0200, Sakari Ailus wrote: > MIPI DisCo for Imaging defines properties for sensor-adjacent devices such > as EEPROM, LED flash or lens VCM as either device or sub-node references. > This is compliant with existing DT definitions apart from property names. > > Rename parsed MIPI-defined properties so drivers will have a unified view > of them as defined in DT and already parsed by drivers. This can be done > in-place as the MIPI-defined property strings are always longer than the > DT one. This also results in loss of constness in parser function > arguments. > > Individual bindings to devices could define the references differently > between MIPI DisCo for Imaging and DT, in terms of device or sub-node > references. This will still need to be handled in the drivers themselves. ... > +void acpi_properties_prepare_mipi(union acpi_object *elements) > +{ > + unsigned int i; > + > + /* Replace MIPI DisCo for Imaging property names with DT equivalents. */ > + for (i = 0; i < ARRAY_SIZE(mipi_disco_props); i++) { > + if (!strcmp(mipi_disco_props[i].mipi_prop, > + elements[0].string.pointer)) { /* const ? */ char *e0 = elements[0].string.pointer; ... if (!strcmp(mipi_disco_props[i].mipi_prop, e0)) { > + WARN_ON(strscpy(elements[0].string.pointer, > + mipi_disco_props[i].dt_prop, > + elements[0].string.length) < 0); WARN_ON(strscpy(e0, mipi_disco_props[i].dt_prop, elements[0].string.pointer) < 0); ? > + break; > + } > + } > +}
On Wed, Feb 08, 2023 at 06:56:27PM +0200, Andy Shevchenko wrote: > On Wed, Feb 08, 2023 at 05:28:05PM +0200, Sakari Ailus wrote: > > MIPI DisCo for Imaging defines properties for sensor-adjacent devices such > > as EEPROM, LED flash or lens VCM as either device or sub-node references. > > This is compliant with existing DT definitions apart from property names. > > > > Rename parsed MIPI-defined properties so drivers will have a unified view > > of them as defined in DT and already parsed by drivers. This can be done > > in-place as the MIPI-defined property strings are always longer than the > > DT one. This also results in loss of constness in parser function > > arguments. > > > > Individual bindings to devices could define the references differently > > between MIPI DisCo for Imaging and DT, in terms of device or sub-node > > references. This will still need to be handled in the drivers themselves. > > ... > > > +void acpi_properties_prepare_mipi(union acpi_object *elements) > > +{ > > + unsigned int i; > > + > > + /* Replace MIPI DisCo for Imaging property names with DT equivalents. */ > > + for (i = 0; i < ARRAY_SIZE(mipi_disco_props); i++) { > > + if (!strcmp(mipi_disco_props[i].mipi_prop, > > + elements[0].string.pointer)) { > > /* const ? */ char *e0 = elements[0].string.pointer; Yes, and can be placed outside the loop. > ... > > if (!strcmp(mipi_disco_props[i].mipi_prop, e0)) { > > > + WARN_ON(strscpy(elements[0].string.pointer, > > + mipi_disco_props[i].dt_prop, > > + elements[0].string.length) < 0); > > WARN_ON(strscpy(e0, mipi_disco_props[i].dt_prop, > elements[0].string.pointer) < 0); > ? > > > + break; > > + } > > + } > > +} >
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index fac87404e294c..f107094bfe16f 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -289,5 +289,6 @@ static inline void acpi_init_lpit(void) { } void acpi_crs_csi2_swnodes_del_free(void); void acpi_bus_scan_crs_csi2(acpi_handle handle); void acpi_init_swnodes(struct acpi_device *device); +void acpi_properties_prepare_mipi(union acpi_object *elements); #endif /* _ACPI_INTERNAL_H_ */ diff --git a/drivers/acpi/mipi.c b/drivers/acpi/mipi.c index 584c08c2b8989..a0d0d539ab1f0 100644 --- a/drivers/acpi/mipi.c +++ b/drivers/acpi/mipi.c @@ -725,3 +725,40 @@ void acpi_init_swnodes(struct acpi_device *device) primary = acpi_fwnode_handle(device); primary->secondary = software_node_fwnode(ads->nodes); } + +static const struct mipi_disco_prop { + const char *mipi_prop; + const char *dt_prop; +} mipi_disco_props[] = { + { "mipi-img-lens-focus", "lens-focus" }, + { "mipi-img-flash-leds", "flash-leds" }, + { "mipi-img-clock-frequency", "clock-frequency" }, + { "mipi-img-led-max-current", "led-max-microamp" }, + { "mipi-img-flash-max-current", "flash-max-microamp" }, + { "mipi-img-flash-max-timeout", "flash-max-timeout-us" }, +}; + +/** + * acpi_properties_prepare_mipi - Rename MIPI properties as commin DT ones + * + * @elements: ACPI object containing _DSD properties for a device node + * + * Renames MIPI-defined properties as common DT ones. The pre-requisite is that + * the names of all such MIPI properties are no longer than the corresponding DT + * ones. + */ +void acpi_properties_prepare_mipi(union acpi_object *elements) +{ + unsigned int i; + + /* Replace MIPI DisCo for Imaging property names with DT equivalents. */ + for (i = 0; i < ARRAY_SIZE(mipi_disco_props); i++) { + if (!strcmp(mipi_disco_props[i].mipi_prop, + elements[0].string.pointer)) { + WARN_ON(strscpy(elements[0].string.pointer, + mipi_disco_props[i].dt_prop, + elements[0].string.length) < 0); + break; + } + } +} diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 4db7701aeaf5c..af9cb849a73ac 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -124,7 +124,7 @@ static bool acpi_nondev_subnode_extract(union acpi_object *desc, } static bool acpi_nondev_subnode_data_ok(acpi_handle handle, - const union acpi_object *link, + union acpi_object *link, struct list_head *list, struct fwnode_handle *parent) { @@ -145,7 +145,7 @@ static bool acpi_nondev_subnode_data_ok(acpi_handle handle, } static bool acpi_nondev_subnode_ok(acpi_handle scope, - const union acpi_object *link, + union acpi_object *link, struct list_head *list, struct fwnode_handle *parent) { @@ -276,22 +276,24 @@ static bool acpi_property_value_ok(const union acpi_object *value) return false; } -static bool acpi_properties_format_valid(const union acpi_object *properties) +static bool acpi_properties_prepare(union acpi_object *properties) { - int i; + unsigned int i; for (i = 0; i < properties->package.count; i++) { - const union acpi_object *property; + union acpi_object *property = &properties->package.elements[i]; + union acpi_object *elements = property->package.elements; - property = &properties->package.elements[i]; /* * Only two elements allowed, the first one must be a string and * the second one has to satisfy certain conditions. */ - if (property->package.count != 2 - || property->package.elements[0].type != ACPI_TYPE_STRING - || !acpi_property_value_ok(&property->package.elements[1])) + if (property->package.count != 2 || + elements[0].type != ACPI_TYPE_STRING || + !acpi_property_value_ok(&elements[1])) return false; + + acpi_properties_prepare_mipi(elements); } return true; } @@ -523,7 +525,7 @@ static bool acpi_extract_properties(acpi_handle scope, union acpi_object *desc, * We found the matching GUID. Now validate the format of the * package immediately following it. */ - if (!acpi_properties_format_valid(properties)) + if (!acpi_properties_prepare(properties)) continue; acpi_data_add_props(data, (const guid_t *)guid->buffer.pointer,
MIPI DisCo for Imaging defines properties for sensor-adjacent devices such as EEPROM, LED flash or lens VCM as either device or sub-node references. This is compliant with existing DT definitions apart from property names. Rename parsed MIPI-defined properties so drivers will have a unified view of them as defined in DT and already parsed by drivers. This can be done in-place as the MIPI-defined property strings are always longer than the DT one. This also results in loss of constness in parser function arguments. Individual bindings to devices could define the references differently between MIPI DisCo for Imaging and DT, in terms of device or sub-node references. This will still need to be handled in the drivers themselves. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/acpi/internal.h | 1 + drivers/acpi/mipi.c | 37 +++++++++++++++++++++++++++++++++++++ drivers/acpi/property.c | 22 ++++++++++++---------- 3 files changed, 50 insertions(+), 10 deletions(-)