ACPI _CRS CSI-2 and MIPI DisCo for Imaging support
Subsystems (5)
Sakari Ailus
reviewerv2 cover ACPI _CRS CSI-2 and MIPI DisCo for Imaging support
Hello all,
Here's an implementation of ACPI 6.4 _CRS CSI-2 resource descriptor and MIPI DisCo for Imaging 1.0 [1]. What the two basically provide is an officially sanctioned way to describe CSI-2 connected cameras to operating system software, something DT based systems have enjoyed for quite some time already.
The implementation digs the information from ACPI tables (_CRS descriptors and data + property extensions) and constructs software nodes that are compatible with Documentation/firmware-guide/acpi/dsd/graph.rst and Documentation/devicetree/bindings/media/video-interface-devices.yaml . No specific driver changes are needed.
These patches are on the testing branch of the linux-acpi tree where they depend on the patch constifying the ACPI pathname argument for acpi_get_handle() (commit 91fdb91ccca2b48572a1ccf1d382fd599e3e1237).
[1] https://www.mipi.org/specifications/mipi-disco-imaging
since v1:
- Update copyright notices.
- Include linux/types.h instead of linux/kernel.h in drivers/acpi/mipi.c.
- Use SWNODE_GRAPH_PORT_NAME_FMT instead of plain "port@%u" in GRAPH_PORT_NAME macro.
- Make the condition in NEXT_PROPERTY() macro easier to read.
- Unwrap lines to make them moderately longer than 80 characters.
- Use * BITS_PER_TYPE(u8) instead of << 3 to convert bytes to bits in init_port_csi2_common().
- Test ACPI framework call success using ACPI_SUCCESS() instead of comparing with AE_OK. Likewise for ACPI_FAILURE and != AE_OK.
- Use newly added SOFTWARE_NODE() macro to construct the root software node.
- Use str_has_prefix() to test for a string prefix instead of memcmp().
- Add pr_fmt() macro to drivers/acpi/property.c.
- Move logical or operators to the end of the line in acpi_properties_prepare().
- Improve bad node type error in acpi_parse_string_ref().
Sakari Ailus (8):
ACPI: property: Parse data node string references in properties
ACPI: property: Parse _CRS CSI-2 descriptor
device property: Add SOFTWARE_NODE() macro for defining software nodes
ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
ACPI: property: Dig "rotation" property for devices with CSI2 _CRS
ACPI: property: Rename parsed MIPI DisCo for Imaging properties
ACPI: property: Skip MIPI property table without "mipi-img" prefix
ACPI: property: Document _CRS CSI-2 and DisCo for Imaging support
drivers/acpi/Makefile | 2 +- drivers/acpi/internal.h | 9 + drivers/acpi/mipi.c | 761 +++++++++++++++++++++++++++++++++++++++ drivers/acpi/property.c | 128 +++++-- drivers/acpi/scan.c | 33 +- include/acpi/acpi_bus.h | 61 ++++ include/linux/property.h | 7 + 7 files changed, 972 insertions(+), 29 deletions(-) create mode 100644 drivers/acpi/mipi.c
Signature · 1 line
2.30.2
Sakari Ailus
reviewerPATCH v2 1/8 ACPI: property: Parse data node string references in properties
Add support for parsing property references using strings, besides reference objects that were previously supported. This allows also referencing data nodes which was not possible with reference objects.
Also add pr_fmt() macro to prefix printouts.
While at it, update copyright.
--- drivers/acpi/property.c | 106 ++++++++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 14 deletions(-)
drivers/acpi/property.c +92 -14
@@ -2,14 +2,17 @@/* * ACPI device specific properties support. * -* Copyright (C) 2014, Intel Corporation +* Copyright (C) 2014--2023, Intel Corporation * All rights reserved. * * Authors: Mika Westerberg <[email protected]> * Darren Hart <[email protected]> * Rafael J. Wysocki <[email protected]> +* Sakari Ailus <[email protected]> */ +#define pr_fmt (fmt) "ACPI: " fmt +#include <linux/acpi.h> #include <linux/device.h> #include <linux/export.h>
@@ -795,7 +798,8 @@ acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode,static int acpi_get_ref_args (struct fwnode_reference_args *args,struct fwnode_handle *ref_fwnode,const union acpi_object **element, -const union acpi_object *end,size_t num_args) +const union acpi_object *end,size_t num_args, +bool subnode_string) {u32 nargs =0 , i;
@@ -803,13 +807,16 @@ static int acpi_get_ref_args(struct fwnode_reference_args *args,* Find the referred data extension node under the * referred device node. */ -for (; *element < end && (*element)->type ==ACPI_TYPE_STRING ; - (*element)++) { -const char *child_name = (*element)->string.pointer; - - ref_fwnode =acpi_fwnode_get_named_child_node (ref_fwnode, child_name); -if (!ref_fwnode) -return -EINVAL ; +if (subnode_string) { +for (; *element < end && (*element)->type ==ACPI_TYPE_STRING ; + (*element)++) { +const char *child_name = (*element)->string.pointer; + + ref_fwnode =acpi_fwnode_get_named_child_node (ref_fwnode, + child_name); +if (!ref_fwnode) +return -EINVAL ; + } }/*
@@ -820,7 +827,8 @@ static int acpi_get_ref_args(struct fwnode_reference_args *args,for (i =0 ; (*element) + i < end && i < num_args; i++) {acpi_object_type type = (*element)[i].type; -if (type ==ACPI_TYPE_LOCAL_REFERENCE ) +if (type ==ACPI_TYPE_LOCAL_REFERENCE || + (!subnode_string && type ==ACPI_TYPE_STRING ))break ;if (type ==ACPI_TYPE_INTEGER )
@@ -844,6 +852,43 @@ static int acpi_get_ref_args(struct fwnode_reference_args *args,return 0 ; } +static struct fwnode_handle * +acpi_parse_string_ref (const struct fwnode_handle *fwnode,const char *refstring) +{ +acpi_handle scope, handle; +struct acpi_data_node *dn; +struct acpi_device *device; +acpi_status status; + +if (is_acpi_device_node (fwnode)) { + scope =to_acpi_device_node (fwnode)->handle; + }else if (is_acpi_data_node (fwnode)) { + scope =to_acpi_data_node (fwnode)->handle; + }else { +pr_err ("bad node type for node %pfw\n" , fwnode); +return ERR_PTR (-EINVAL ); + } + + status =acpi_get_handle (scope, refstring, &handle); +if (ACPI_FAILURE (status)) { +acpi_handle_debug (scope,"can't get handle for %s" , refstring); +return ERR_PTR (-EINVAL ); + } + + device =acpi_fetch_acpi_dev (handle); +if (device) +return acpi_fwnode_handle (device); + + status =acpi_get_data_full (handle, acpi_nondev_subnode_tag, + (void **)&dn,NULL ); +if (ACPI_FAILURE (status) || !dn) { +acpi_handle_debug (handle,"can't find subnode" ); +return ERR_PTR (-EINVAL ); + } + +return &dn->fwnode; +} +/** * __acpi_node_get_property_reference - returns handle to the referenced object * @fwnode: Firmware node to get the property from
@@ -886,6 +931,7 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,const union acpi_object *element, *end;const union acpi_object *obj;const struct acpi_device_data *data; +struct fwnode_handle *ref_fwnode;struct acpi_device *device;int ret, idx =0 ;
@@ -909,16 +955,29 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode, args->fwnode =acpi_fwnode_handle (device); args->nargs =0 ; +return 0 ; +case ACPI_TYPE_STRING : +if (index) +return -ENOENT ; + + ref_fwnode =acpi_parse_string_ref (fwnode, obj->string.pointer); +if (IS_ERR (ref_fwnode)) +return PTR_ERR (ref_fwnode); + + args->fwnode = ref_fwnode; + args->nargs =0 ; +return 0 ;case ACPI_TYPE_PACKAGE :/* * If it is not a single reference, then it is a package of -* references followed by number of ints as follows: +* references, followed by number of ints as follows: * * Package () { REF, INT, REF, INT, INT } * -* The index argument is then used to determine which reference -* the caller wants (along with the arguments). +* Here, REF may be either a local reference or a string. The +* index argument is then used to determine which reference the +* caller wants (along with the arguments). */ break ;default :
@@ -942,7 +1001,26 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode, ret =acpi_get_ref_args (idx == index ? args :NULL ,acpi_fwnode_handle (device), - &element, end, num_args); + &element, end, num_args, true); +if (ret <0 ) +return ret; + +if (idx == index) +return 0 ; + +break ; +case ACPI_TYPE_STRING : + ref_fwnode = +acpi_parse_string_ref (fwnode, + element->string.pointer); +if (IS_ERR (ref_fwnode)) +return PTR_ERR (ref_fwnode); + + element++; + + ret =acpi_get_ref_args (idx == index ? args :NULL , + ref_fwnode, &element, end, + num_args, false);if (ret <0 )return ret;
Signature · 1 line
2.30.2
Andy Shevchenko
reviewerRe: [PATCH v2 1/8] ACPI: property: Parse data node string references in properties
Quoted 7 lines · Sakari Ailus
Add support for parsing property references using strings, besides reference objects that were previously supported. This allows also referencing data nodes which was not possible with reference objects.
Also add
pr_fmt()macro to prefix printouts.While at it, update copyright.
...
Quoted 2 lines
- * Copyright (C) 2014, Intel Corporation
+ * Copyright (C) 2014--2023, Intel Corporation
Isn't one dash enough?
$ git grep -n 'opyright.*[0-9]--[0-9]' | wc -l 37
$ git grep -n 'opyright.*[0-9]-[0-9]' | wc -l 15064
Quoted 6 lines
* All rights reserved.
*
* Authors: Mika Westerberg <[email protected]>
* Darren Hart <[email protected]>
* Rafael J. Wysocki <[email protected]>
+ * Sakari Ailus <[email protected]>
Seems wrong indentation in comparison to the others.
Quoted 1 line
*/
...
drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 864
Quoted 11 lines
drivers/acpi/property.c +10
-0+static struct fwnode_handle * +acpi_parse_string_ref (const struct fwnode_handle *fwnode,const char *refstring) +{ +acpi_handle scope, handle; +struct acpi_data_node *dn; +struct acpi_device *device; +acpi_status status; + +if (is_acpi_device_node (fwnode)) { + scope =to_acpi_device_node (fwnode)->handle;
Interestingly that we have a helper for this -- ACPI_HANDLE_FWNODE()...
drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 866
Quoted 3 lines
drivers/acpi/property.c +2
-0+ }else if (is_acpi_data_node (fwnode)) { + scope =to_acpi_data_node (fwnode)->handle;
...but not for this.
Quoted 24 lines
drivers/acpi/property.c +24
-0+ }else { +pr_err ("bad node type for node %pfw\n" , fwnode); +return ERR_PTR (-EINVAL ); + } + + status =acpi_get_handle (scope, refstring, &handle); +if (ACPI_FAILURE (status)) { +acpi_handle_debug (scope,"can't get handle for %s" , refstring); +return ERR_PTR (-EINVAL ); + } + + device =acpi_fetch_acpi_dev (handle); +if (device) +return acpi_fwnode_handle (device); + + status =acpi_get_data_full (handle, acpi_nondev_subnode_tag, + (void **)&dn,NULL ); +if (ACPI_FAILURE (status) || !dn) { +acpi_handle_debug (handle,"can't find subnode" ); +return ERR_PTR (-EINVAL ); + } + +return &dn->fwnode; +}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 1/8] ACPI: property: Parse data node string references in properties
Hi Andy,
Quoted 14 lines · Andy Shevchenko
Quoted 7 lines · Sakari Ailus
Add support for parsing property references using strings, besides reference objects that were previously supported. This allows also referencing data nodes which was not possible with reference objects.
Also add
pr_fmt()macro to prefix printouts.While at it, update copyright.
...
Quoted 2 lines
- * Copyright (C) 2014, Intel Corporation
+ * Copyright (C) 2014--2023, Intel Corporation
Quoted 7 lines
Isn't one dash enough?
$ git grep -n 'opyright.*[0-9]--[0-9]' | wc -l 37$ git grep -n 'opyright.*[0-9]-[0-9]' | wc -l 15064
This is a range, not hyphenation. There's no different character in the ASCII character set for the former, commonly two regular dashes are used. There probably would be a correct Unicode character though.
Quoted 10 lines
Quoted 8 lines
* All rights reserved.
*
* Authors: Mika Westerberg <[email protected]>
* Darren Hart <[email protected]>
* Rafael J. Wysocki <[email protected]>
+ * Sakari Ailus <[email protected]>Seems wrong indentation in comparison to the others.
Tabs are preferred for intendation. I can change all the lines to use tab. How about that?
Quoted 19 lines
Quoted 2 lines
*/
...
drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 864
Quoted 11 lines
drivers/acpi/property.c +10
-0+static struct fwnode_handle * +acpi_parse_string_ref (const struct fwnode_handle *fwnode,const char *refstring) +{ +acpi_handle scope, handle; +struct acpi_data_node *dn; +struct acpi_device *device; +acpi_status status; + +if (is_acpi_device_node (fwnode)) { + scope =to_acpi_device_node (fwnode)->handle;Interestingly that we have a helper for this --
ACPI_HANDLE_FWNODE()...
Quoted 5 lines
drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 866
Quoted 3 lines
drivers/acpi/property.c +2
-0+ }else if (is_acpi_data_node (fwnode)) { + scope =to_acpi_data_node (fwnode)->handle;...but not for this.
I'd either prefer to keep them as-is, as it's easy to see what's being done there, or add a new macro --- or a function to do this. Say, acpi_fwnode_acpi_handle(), as this is clearly ACPI specific and to differentiate between ACPI handles and fwnode handles.
ACPI_HANDLE_FWNODE()'s name suggests it would do something else than it does, if you consider the current fwnode API.
Signature · 3 lines
Kind regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 1/8] ACPI: property: Parse data node string references in properties
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:10PM +0200, Sakari Ailus wrote:
...
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
- * Copyright (C) 2014, Intel Corporation
+ * Copyright (C) 2014--2023, Intel CorporationIsn't one dash enough?
$ git grep -n 'opyright.*[0-9]--[0-9]' | wc -l 37
Quoted 6 lines
Quoted 2 lines
$ git grep -n 'opyright.*[0-9]-[0-9]' | wc -l 15064This is a range, not hyphenation. There's no different character in the ASCII character set for the former, commonly two regular dashes are used. There probably would be a correct Unicode character though.
Fine, but it's not even close to be called "a common use" as I showed by running git grep.
Quoted 10 lines
Quoted 8 lines
Quoted 6 lines
* All rights reserved.
*
* Authors: Mika Westerberg <[email protected]>
* Darren Hart <[email protected]>
* Rafael J. Wysocki <[email protected]>
+ * Sakari Ailus <[email protected]>Seems wrong indentation in comparison to the others.
Tabs are preferred for intendation. I can change all the lines to use tab.
Dunno, not a maintainer. I just pointed to inconsistency in the comment lines.
Quoted 1 line
Quoted 1 line
Quoted 1 line
*/
...
Quoted 16 lines
Quoted 16 lines
drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 864
Quoted 11 lines
drivers/acpi/property.c +10
-0+static struct fwnode_handle * +acpi_parse_string_ref (const struct fwnode_handle *fwnode,const char *refstring) +{ +acpi_handle scope, handle; +struct acpi_data_node *dn; +struct acpi_device *device; +acpi_status status; + +if (is_acpi_device_node (fwnode)) { + scope =to_acpi_device_node (fwnode)->handle;Interestingly that we have a helper for this --
ACPI_HANDLE_FWNODE()...Quoted 1 line
drivers/acpi/property.c +1
-0+ }else if (is_acpi_data_node (fwnode)) {
Quoted 8 lines
Quoted 3 lines
drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 866
Quoted 1 line
drivers/acpi/property.c +1
-0+ scope =to_acpi_data_node (fwnode)->handle;...but not for this.
I'd either prefer to keep them as-is, as it's easy to see what's being done there, or add a new macro --- or a function to do this. Say,
acpi_fwnode_acpi_handle(), as this is clearly ACPI specific and to differentiate between ACPI handles and fwnode handles.
Since it's an ACPI glue layer code, I'm not insisting on changes. Just pointed out that we have a helper function for one of the cases.
Quoted 2 lines
ACPI_HANDLE_FWNODE()'s name suggests it would do something else than it does, if you consider the current fwnode API.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerPATCH v2 2/8 ACPI: property: Parse _CRS CSI-2 descriptor
In reply to Sakari AilusParse newly added ACPI _CRS CSI-2 descriptor for CSI-2 and camera configuration. For now, only figure out where the descriptor is present in order to allow adding information from it to related devices.
--- drivers/acpi/Makefile | 2 +- drivers/acpi/internal.h | 7 + drivers/acpi/mipi.c | 320 ++++++++++++++++++++++++++++++++++++++++ drivers/acpi/scan.c | 16 +- include/acpi/acpi_bus.h | 11 ++ 5 files changed, 351 insertions(+), 5 deletions(-) create mode 100644 drivers/acpi/mipi.c
drivers/acpi/Makefile +1 -1
@@ -37,7 +37,7 @@ acpi-$(CONFIG_ACPI_SLEEP) += proc.o # ACPI Bus and Device Drivers # acpi-y += bus.o glue.o -acpi-y += scan.o +acpi-y += scan.o mipi.o acpi-y += resource.o acpi-y += acpi_processor.o acpi-y += processor_core.o
drivers/acpi/internal.h +7 -0
@@ -282,4 +282,11 @@ void acpi_init_lpit(void);static inline void acpi_init_lpit (void ) { }#endif +/*-------------------------------------------------------------------------- +ACPI and MIPI DisCo for Imaging conversion +-------------------------------------------------------------------------- */ + +void acpi_crs_csi2_swnodes_del_free (void ); +void acpi_bus_scan_crs_csi2 (acpi_handle handle); +#endif /* _ACPI_INTERNAL_H_ */
drivers/acpi/mipi.c new file +320 -0
320 lines not on this page · raw message
drivers/acpi/scan.c +12 -4
@@ -2423,9 +2423,12 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_next_consumer_dev);int acpi_bus_scan (acpi_handle handle) {struct acpi_device *device =NULL ; +int ret =0 ; acpi_bus_scan_second_pass = false; +acpi_bus_scan_crs_csi2 (handle); +/* Pass 1: Avoid enumerating devices with missing dependencies. */ if (ACPI_SUCCESS (acpi_bus_check_add (handle, true, &device)))
@@ -2433,13 +2436,15 @@ int acpi_bus_scan(acpi_handle handle) acpi_bus_check_add_1,NULL ,NULL , (void **)&device); -if (!device) -return -ENODEV ; +if (!device) { + ret = -ENODEV ; + goto out_release; + }acpi_bus_attach (device, (void *)true);if (!acpi_bus_scan_second_pass) -return 0 ; + goto out_release;/* Pass 2: Enumerate all of the remaining devices. */
@@ -2452,7 +2457,10 @@ int acpi_bus_scan(acpi_handle handle)acpi_bus_attach (device,NULL ); -return 0 ; +out_release: +acpi_crs_csi2_swnodes_del_free (); + +return ret; }EXPORT_SYMBOL (acpi_bus_scan);
include/acpi/acpi_bus.h +11 -0
@@ -360,6 +360,17 @@ struct acpi_device_data {struct acpi_gpio_mapping ; +struct acpi_device_software_node_port { +unsigned int port_nr; +}; + +struct acpi_device_software_nodes { +struct acpi_device_software_node_port *ports; +struct software_node *nodes; +const struct software_node **nodeptrs; +unsigned int num_ports; +}; +/* Device */ struct acpi_device {u32 pld_crc;
Signature · 1 line
2.30.2
Andy Shevchenko
reviewerRe: [PATCH v2 2/8] ACPI: property: Parse _CRS CSI-2 descriptor
Quoted 3 lines · Sakari Ailus
Parse newly added ACPI
_CRSCSI-2 descriptor for CSI-2 and camera configuration. For now, only figure out where the descriptor is present in order to allow adding information from it to related devices.
...
drivers/acpi/mipi.c line 99
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+memcpy (inst->remote_name, csi2->resource_source.string_ptr, + csi2->resource_source.string_length);
Why don't we use strscpy()? Is it really strings? Or is it some abuse of the ACPI object type?
...
drivers/acpi/mipi.c line 118
Quoted 11 lines
drivers/acpi/mipi.c new file +10
-0+static acpi_status scan_check_crs_csi2 (acpi_handle handle,u32 nesting_level, +void *context,void **ret) +{ +struct scan_check_crs_csi2_context inst_context = { + .handle = handle, + .res_list =LIST_HEAD_INIT (inst_context.res_list), + }; +struct list_head *list = context; +struct crs_csi2 *csi2; +INIT_LIST_HEAD (&inst_context.res_list);
Why do you need this? I don't see that variable is static...
drivers/acpi/mipi.c line 132
Quoted 13 lines
drivers/acpi/mipi.c new file +13
-0+acpi_walk_resources (handle,METHOD_NAME__CRS , + scan_check_crs_csi2_instance, &inst_context); + +if (list_empty (&inst_context.res_list)) +return AE_OK ; + + csi2 =kmalloc (sizeof (*csi2),GFP_KERNEL ); +if (!csi2) +return AE_OK ; + + csi2->handle = handle; +list_replace (&inst_context.res_list, &csi2->buses); +list_add (&csi2->list, list);
Hmm... Can list_swap() be used here?
Quoted 2 lines
(quoted diff) +2
-0+ return AE_OK; +}
...
drivers/acpi/mipi.c line 214
Quoted 11 lines
drivers/acpi/mipi.c new file +10
-0+/* +* Figure out how much temporary storage we need for counting +* connections in each device. +*/ +list_for_each_entry (csi2, &crs_csi2_handles, list) { +struct crs_csi2_instance *inst; + + handle_count++; +list_for_each_entry (inst, &csi2->buses, list) + handle_count++;
list_count_nodes()?
Quoted 1 line
(quoted diff) +1
-0+ }
...
drivers/acpi/mipi.c line 248
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+sort (handle_refs, handle_count,sizeof (*handle_refs), crs_handle_cmp, +NULL );
Yes, I would leave it on one line.
...
drivers/acpi/mipi.c line 276
Quoted 4 lines
drivers/acpi/mipi.c new file +4
-0+ if (check_mul_overflow(sizeof(*ads->ports) + + sizeof(*ads->nodes) * 2 + + sizeof(*ads->nodeptrs) * 2, + (size_t)this_count, &alloc_size) ||
Can this_count be of size_t type from the beginning?
Quoted 7 lines
drivers/acpi/mipi.c new file +7
-0+ check_add_overflow(sizeof(*ads) + sizeof(*ads->nodes) + + sizeof(*ads->nodeptrs) * 2, + alloc_size, &alloc_size)) { +acpi_handle_warn (handle,"too many handles (%u)" , + this_count); +continue ; + }
...
drivers/acpi/mipi.c line 290
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+ ads->nodeptrs = (void *)(ads->nodes + + this_count *2 +1 );
Why this is not on one line? (I have got less than 80).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 2/8] ACPI: property: Parse _CRS CSI-2 descriptor
Hi Andy,
Quoted 5 lines · Andy Shevchenko
Quoted 3 lines · Sakari Ailus
Parse newly added ACPI
_CRSCSI-2 descriptor for CSI-2 and camera configuration. For now, only figure out where the descriptor is present in order to allow adding information from it to related devices.
Quoted 7 lines
...
drivers/acpi/mipi.c line 99
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+memcpy (inst->remote_name, csi2->resource_source.string_ptr, + csi2->resource_source.string_length);Why don't we use
strscpy()? Is it really strings? Or is it some abuse of the ACPI object type?
I didn't find a guarantee it would be nil terminated. Albeit I'm fine switching to strscpy() if there's such a guarantee.
Quoted 13 lines
...
Quoted 9 lines
drivers/acpi/mipi.c new file +9
-0+static acpi_status scan_check_crs_csi2 (acpi_handle handle,u32 nesting_level, +void *context,void **ret) +{ +struct scan_check_crs_csi2_context inst_context = { + .handle = handle, + .res_list =LIST_HEAD_INIT (inst_context.res_list), + }; +struct list_head *list = context; +struct crs_csi2 *csi2;
Quoted 3 lines
drivers/acpi/mipi.c line 118
Quoted 1 line
drivers/acpi/mipi.c new file +1
-0+INIT_LIST_HEAD (&inst_context.res_list);Why do you need this? I don't see that variable is static...
Ah. It's not static. But this is a leftover from development time and can be removed, it's initialised in variable declaration.
Quoted 16 lines
Quoted 4 lines
drivers/acpi/mipi.c new file +3
-0+acpi_walk_resources (handle,METHOD_NAME__CRS , + scan_check_crs_csi2_instance, &inst_context); +drivers/acpi/mipi.c line 132
Quoted 10 lines
drivers/acpi/mipi.c new file +10
-0+if (list_empty (&inst_context.res_list)) +return AE_OK ; + + csi2 =kmalloc (sizeof (*csi2),GFP_KERNEL ); +if (!csi2) +return AE_OK ; + + csi2->handle = handle; +list_replace (&inst_context.res_list, &csi2->buses); +list_add (&csi2->list, list);Hmm... Can
list_swap()be used here?
We're replacing an entry in a list and then adding an entry to another. How would you use list_swap() here?
Quoted 15 lines
Quoted 3 lines
(quoted diff) +2
-0+ return AE_OK; +}...
Quoted 8 lines
drivers/acpi/mipi.c new file +8
-0+/* +* Figure out how much temporary storage we need for counting +* connections in each device. +*/ +list_for_each_entry (csi2, &crs_csi2_handles, list) { +struct crs_csi2_instance *inst; + + handle_count++;
Quoted 4 lines
drivers/acpi/mipi.c line 214
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+list_for_each_entry (inst, &csi2->buses, list) + handle_count++;
list_count_nodes()?
Are you suggesting adding a new list API function or using one that's not in the linux-acpi/testing branch yet?
Quoted 9 lines
Quoted 2 lines
(quoted diff) +1
-0+ }...
drivers/acpi/mipi.c line 248
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+sort (handle_refs, handle_count,sizeof (*handle_refs), crs_handle_cmp, +NULL );Yes, I would leave it on one line.
Works for me.
Quoted 9 lines
...
drivers/acpi/mipi.c line 276
Quoted 4 lines
drivers/acpi/mipi.c new file +4
-0+ if (check_mul_overflow(sizeof(*ads->ports) + + sizeof(*ads->nodes) * 2 + + sizeof(*ads->nodeptrs) * 2, + (size_t)this_count, &alloc_size) ||Can
this_countbe ofsize_ttype from the beginning?
I think so.
Quoted 11 lines
Quoted 8 lines
drivers/acpi/mipi.c new file +7
-0+ check_add_overflow(sizeof(*ads) + sizeof(*ads->nodes) + + sizeof(*ads->nodeptrs) * 2, + alloc_size, &alloc_size)) { +acpi_handle_warn (handle,"too many handles (%u)" , + this_count); +continue ; + }...
Quoted 4 lines
drivers/acpi/mipi.c line 290
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+ ads->nodeptrs = (void *)(ads->nodes + + this_count *2 +1 );Why this is not on one line? (I have got less than 80).
Probably there was more on that line but I forgot to unwrap when removing whatever was there. I'll address this for v3.
Signature · 3 lines
Kind regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 2/8] ACPI: property: Parse _CRS CSI-2 descriptor
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:11PM +0200, Sakari Ailus wrote:
...
Quoted 8 lines
Quoted 5 lines
drivers/acpi/mipi.c line 99
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+memcpy (inst->remote_name, csi2->resource_source.string_ptr, + csi2->resource_source.string_length);Why don't we use
strscpy()? Is it really strings? Or is it some abuse of the ACPI object type?I didn't find a guarantee it would be nil terminated. Albeit I'm fine switching to
strscpy()if there's such a guarantee.
Following this logic neither memcpy() (and especially memcpy()!) call guarantees that. But hold on, have you actually read strscpy() documentation?
...
Quoted 7 lines
Quoted 4 lines
drivers/acpi/mipi.c line 132
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+list_replace (&inst_context.res_list, &csi2->buses); +list_add (&csi2->list, list);Hmm... Can
list_swap()be used here?We're replacing an entry in a list and then adding an entry to another. How would you use
list_swap()here?
I see, so it is about two different lists.
...
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
drivers/acpi/mipi.c new file +8
-0+/* +* Figure out how much temporary storage we need for counting +* connections in each device. +*/ +list_for_each_entry (csi2, &crs_csi2_handles, list) { +struct crs_csi2_instance *inst; + + handle_count++;
Quoted 7 lines
Quoted 4 lines
drivers/acpi/mipi.c line 214
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+list_for_each_entry (inst, &csi2->buses, list) + handle_count++;
list_count_nodes()?Are you suggesting adding a new list API function or using one that's not in the linux-acpi/testing branch yet?
It's in USB tree.
I'm fine if you switch your code later on.
Quoted 1 line
Quoted 1 line
Quoted 1 line
(quoted diff) +1
-0+ }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 2/8] ACPI: property: Parse _CRS CSI-2 descriptor
Hi Andy,
Quoted 12 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:11PM +0200, Sakari Ailus wrote:
...
Quoted 6 lines
Quoted 5 lines
drivers/acpi/mipi.c line 99
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+memcpy (inst->remote_name, csi2->resource_source.string_ptr, + csi2->resource_source.string_length);Why don't we use
strscpy()? Is it really strings? Or is it some abuse of the ACPI object type?
Quoted 5 lines
Quoted 2 lines
I didn't find a guarantee it would be nil terminated. Albeit I'm fine switching to
strscpy()if there's such a guarantee.Following this logic neither
memcpy()(and especiallymemcpy()!) call guarantees that. But hold on, have you actually readstrscpy()documentation?
Yes. And there is such a guarantee, too. The string_length contains the length of the string, including the terminating nil character. I have no problem with strscpy() but it won't affect the end result in any way. :-)
Quoted 29 lines
...
Quoted 7 lines
Quoted 4 lines
drivers/acpi/mipi.c line 132
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+list_replace (&inst_context.res_list, &csi2->buses); +list_add (&csi2->list, list);Hmm... Can
list_swap()be used here?We're replacing an entry in a list and then adding an entry to another. How would you use
list_swap()here?I see, so it is about two different lists.
...
Quoted 14 lines
Quoted 13 lines
drivers/acpi/mipi.c line 214
Quoted 11 lines
drivers/acpi/mipi.c new file +10
-0+/* +* Figure out how much temporary storage we need for counting +* connections in each device. +*/ +list_for_each_entry (csi2, &crs_csi2_handles, list) { +struct crs_csi2_instance *inst; + + handle_count++; +list_for_each_entry (inst, &csi2->buses, list) + handle_count++;
list_count_nodes()?
Quoted 5 lines
Quoted 2 lines
Are you suggesting adding a new list API function or using one that's not in the linux-acpi/testing branch yet?
It's in USB tree.
I'm fine if you switch your code later on.
Ack, I'll post a patch once this hits the linux-acpi tree.
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
(quoted diff) +1
-0+ }
Signature · 3 lines
Kind regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 2/8] ACPI: property: Parse _CRS CSI-2 descriptor
Quoted 4 lines · Sakari Ailus
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:11PM +0200, Sakari Ailus wrote:
...
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Quoted 5 lines
drivers/acpi/mipi.c line 99
Quoted 2 lines
drivers/acpi/mipi.c new file +2
-0+memcpy (inst->remote_name, csi2->resource_source.string_ptr, + csi2->resource_source.string_length);Why don't we use
strscpy()? Is it really strings? Or is it some abuse of the ACPI object type?I didn't find a guarantee it would be nil terminated. Albeit I'm fine switching to
strscpy()if there's such a guarantee.
Quoted 6 lines
Quoted 2 lines
Following this logic neither
memcpy()(and especiallymemcpy()!) call guarantees that. But hold on, have you actually readstrscpy()documentation?Yes. And there is such a guarantee, too. The
string_lengthcontains the length of the string, including the terminating nil character. I have no problem withstrscpy()but it won't affect the end result in any way. :-)
At run time won't be any differences, at reading and maintaining it has a lot. It gets rid of the confusion: "is this actually string or not?"
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerPATCH v2 3/8 device property: Add SOFTWARE_NODE() macro for defining software nodes
In reply to Sakari AilusAdd SOFTWARE_NODE() macro in order to make defining software nodes look nicer. This is analogous to different PROPERTY_ENTRY_*() macros for defining properties.
--- include/linux/property.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/linux/property.h +7 -0
@@ -477,6 +477,13 @@ struct software_node {const struct property_entry *properties; }; +#define SOFTWARE_NODE (_name_, _properties_, _parent_) \ + (struct software_node) { \ + .name = _name_, \ + .properties = _properties_, \ + .parent = _parent_, \ + } +bool is_software_node (const struct fwnode_handle *fwnode);const struct software_node *to_software_node (const struct fwnode_handle *fwnode);
Signature · 1 line
2.30.2
Re: [PATCH v2 3/8] device property: Add SOFTWARE_NODE() macro for defining software nodes
Quoted 6 lines · Sakari Ailus
Add
SOFTWARE_NODE()macro in order to make defining software nodes look nicer. This is analogous to different PROPERTY_ENTRY_*() macros for defining properties.Signed-off-by Sakari Ailus <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>
Quoted 24 lines
--- include/linux/property.h | 7 +++++++ 1 file changed, 7 insertions(+)include/linux/property.h +7
-0@@ -477,6 +477,13 @@ struct software_node {const struct property_entry *properties; }; +#define SOFTWARE_NODE (_name_, _properties_, _parent_) \ + (struct software_node) { \ + .name = _name_, \ + .properties = _properties_, \ + .parent = _parent_, \ + } +bool is_software_node (const struct fwnode_handle *fwnode);const struct software_node *to_software_node (const struct fwnode_handle *fwnode);Signature · 1 line
2.30.2
Signature · 1 line
heikki
Sakari Ailus
reviewerPATCH v2 4/8 ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
In reply to Sakari AilusGenerate software nodes for information parsed from ACPI _CRS for CSI-2 as well as MIPI DisCo for Imaging spec. The software nodes are compliant with existing ACPI or DT definitions and are parsed by relevant drivers without changes.
--- drivers/acpi/internal.h | 1 + drivers/acpi/mipi.c | 346 ++++++++++++++++++++++++++++++++++++++++ drivers/acpi/scan.c | 17 ++ include/acpi/acpi_bus.h | 49 ++++++ 4 files changed, 413 insertions(+)
drivers/acpi/internal.h +1 -0
@@ -288,5 +288,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);#endif /* _ACPI_INTERNAL_H_ */
drivers/acpi/mipi.c +346 -0
383 lines not on this page · raw message
drivers/acpi/scan.c +17 -0
@@ -449,10 +449,26 @@ static void acpi_free_power_resources_lists(struct acpi_device *device) } } +static void acpi_free_swnodes (struct acpi_device *device) +{ +struct acpi_device_software_nodes *ads = device->swnodes; + +if (!ads) +return ; + +software_node_unregister_node_group (ads->nodeptrs); +set_secondary_fwnode (&device->dev,NULL ); +kfree (ads->nodes[ACPI_DEVICE_SWNODE_ROOT ].name); +kfree (ads); + + device->swnodes =NULL ; +} +static void acpi_device_release (struct device *dev) {struct acpi_device *acpi_dev =to_acpi_device (dev); +acpi_free_swnodes (acpi_dev);acpi_free_properties (acpi_dev);acpi_free_pnp_ids (&acpi_dev->pnp);acpi_free_power_resources_lists (acpi_dev);
@@ -1771,6 +1787,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,acpi_device_get_busid (device);acpi_set_pnp_ids (handle, &device->pnp, type);acpi_init_properties (device); +acpi_init_swnodes (device);acpi_bus_get_flags (device); device->flags.match_driver = false; device->flags.initialized = true;
include/acpi/acpi_bus.h +49 -0
69 lines not on this page · raw message
Signature · 1 line
2.30.2
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Quoted 4 lines · Sakari Ailus
Generate software nodes for information parsed from ACPI
_CRSfor CSI-2 as well as MIPI DisCo for Imaging spec. The software nodes are compliant with existing ACPI or DT definitions and are parsed by relevant drivers without changes.
...
drivers/acpi/mipi.c struct crs_csi2_swnodes { · line 30
Quoted 2 lines
drivers/acpi/mipi.c +2
-0+static struct acpi_device_software_nodes * +crs_csi2_swnode_get (acpi_handle handle)
It's 81 on one line. Why not to join?
Quoted 9 lines
drivers/acpi/mipi.c +9
-0+{ +struct crs_csi2_swnodes *swnodes; + +list_for_each_entry (swnodes, &crs_csi2_swnodes, list) +if (swnodes->handle == handle) +return swnodes->ads; + +return NULL ; +}
...
Quoted 5 lines
drivers/acpi/mipi.c +3
-0+#define GRAPH_PORT_NAME (var, num) \ + (snprintf((var), sizeof(var), SWNODE_GRAPH_PORT_NAME_FMT, (num)) > \ + sizeof(var))= ?
("excluding the trailing '\0'")
...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 465
Quoted 5 lines
drivers/acpi/mipi.c +4
-0+static struct fwnode_handle *get_mipi_port_handle (struct acpi_device *device, +unsigned int port) +{ +static const char mipi_port_prefix[] ="mipi-img-port-" ;
It's used only once in this function, why not keeping it in the format string?
Quoted 12 lines
drivers/acpi/mipi.c +12
-0+char mipi_port_name[sizeof (mipi_port_prefix) +2 ]; + +if (snprintf (mipi_port_name,sizeof (mipi_port_name),"%s%u" , + mipi_port_prefix, port) >sizeof (mipi_port_name)) { +acpi_handle_info (acpi_device_handle (device), +"mipi port name too long for port %u\n" , port); +return NULL ; + } + +return fwnode_get_named_child_node (acpi_fwnode_handle (device), + mipi_port_name); +}
...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 547
Quoted 5 lines
drivers/acpi/mipi.c +5
-0+/* Move polarity bits to the lane polarity u32 array */ +for (i =0 ; i <1 + num_lanes; i++) + port->lane_polarities[i] = + (u.val8[i >>3 ] & (1 << (i &7 ))) ? +1U :0U ;
Wouldn't
port->lane_polarities[i] = !!(u.val8[i >> 3] & (1 << (i & 7)));
be better?
...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 665
Quoted 9 lines
drivers/acpi/mipi.c +8
-0+ ret =software_node_register_node_group (ads->nodeptrs); +if (ret <0 ) { +acpi_handle_warn (acpi_device_handle (device), +"cannot register software nodes (%d)!\n" , ret); + device->swnodes =NULL ; +return ; + } + device->fwnode.secondary =software_node_fwnode (ads->nodes);
struct fwnode_handle *primary; ... primary = acpi_fwnode_handle(device); primary->secondary = ...
?
The point is to avoid direct dereferences of fwnode in struct acpi_device.
...
drivers/acpi/scan.c static void acpi_free_power_resources_lists(struct acpi_device *device)
Quoted 10 lines
drivers/acpi/scan.c +9
-0+static void acpi_free_swnodes (struct acpi_device *device) +{ +struct acpi_device_software_nodes *ads = device->swnodes; + +if (!ads) +return ; + +software_node_unregister_node_group (ads->nodeptrs); +set_secondary_fwnode (&device->dev,NULL );
Interestingly you are not use same API above. Why?
Quoted 5 lines
drivers/acpi/scan.c +5
-0+kfree (ads->nodes[ACPI_DEVICE_SWNODE_ROOT ].name); +kfree (ads); + + device->swnodes =NULL ; +}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Hi Andy,
Quoted 6 lines · Andy Shevchenko
Quoted 4 lines · Sakari Ailus
Generate software nodes for information parsed from ACPI
_CRSfor CSI-2 as well as MIPI DisCo for Imaging spec. The software nodes are compliant with existing ACPI or DT definitions and are parsed by relevant drivers without changes.
Quoted 6 lines
...
drivers/acpi/mipi.c struct crs_csi2_swnodes { · line 30
Quoted 2 lines
drivers/acpi/mipi.c +2
-0+static struct acpi_device_software_nodes * +crs_csi2_swnode_get (acpi_handle handle)It's 81 on one line. Why not to join?
Works for me.
Quoted 13 lines
Quoted 10 lines
drivers/acpi/mipi.c +9
-0+{ +struct crs_csi2_swnodes *swnodes; + +list_for_each_entry (swnodes, &crs_csi2_swnodes, list) +if (swnodes->handle == handle) +return swnodes->ads; + +return NULL ; +}...
Quoted 7 lines
Quoted 5 lines
drivers/acpi/mipi.c +3
-0+#define GRAPH_PORT_NAME (var, num) \ + (snprintf((var), sizeof(var), SWNODE_GRAPH_PORT_NAME_FMT, (num)) > \ + sizeof(var))= ?
("excluding the trailing '\0'")
Thanks, indeed. A bug introduced in v2.
Quoted 10 lines
...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 465
Quoted 5 lines
drivers/acpi/mipi.c +4
-0+static struct fwnode_handle *get_mipi_port_handle (struct acpi_device *device, +unsigned int port) +{ +static const char mipi_port_prefix[] ="mipi-img-port-" ;It's used only once in this function, why not keeping it in the format string?
Twice, not once. My point was that it's critical the strings remain the same length, and certainly what that string actually is, is less important.
Quoted 24 lines
Quoted 13 lines
drivers/acpi/mipi.c +12
-0+char mipi_port_name[sizeof (mipi_port_prefix) +2 ]; + +if (snprintf (mipi_port_name,sizeof (mipi_port_name),"%s%u" , + mipi_port_prefix, port) >sizeof (mipi_port_name)) { +acpi_handle_info (acpi_device_handle (device), +"mipi port name too long for port %u\n" , port); +return NULL ; + } + +return fwnode_get_named_child_node (acpi_fwnode_handle (device), + mipi_port_name); +}...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 547
Quoted 5 lines
drivers/acpi/mipi.c +5
-0+/* Move polarity bits to the lane polarity u32 array */ +for (i =0 ; i <1 + num_lanes; i++) + port->lane_polarities[i] = + (u.val8[i >>3 ] & (1 << (i &7 ))) ? +1U :0U ;Wouldn't
Quoted 4 lines
port->lane_polarities[i] = !!(u.val8[i >> 3] & (1 << (i & 7)));be better?
It would work, yes, although the target is a u32. Casting to bool would look nicer to me. I lean towards what it is at the moment but bool seems fairly reasonable, too.
Quoted 18 lines
...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 665
Quoted 9 lines
drivers/acpi/mipi.c +8
-0+ ret =software_node_register_node_group (ads->nodeptrs); +if (ret <0 ) { +acpi_handle_warn (acpi_device_handle (device), +"cannot register software nodes (%d)!\n" , ret); + device->swnodes =NULL ; +return ; + } + device->fwnode.secondary =software_node_fwnode (ads->nodes);struct fwnode_handle *primary; ... primary = acpi_fwnode_handle(device); primary->secondary = ...
Quoted 3 lines
?
The point is to avoid direct dereferences of fwnode in struct
acpi_device.
Yes.
Quoted 13 lines
...
Quoted 8 lines
drivers/acpi/scan.c +8
-0+static void acpi_free_swnodes (struct acpi_device *device) +{ +struct acpi_device_software_nodes *ads = device->swnodes; + +if (!ads) +return ; + +software_node_unregister_node_group (ads->nodeptrs);
Quoted 3 lines
drivers/acpi/scan.c static void acpi_free_power_resources_lists(struct acpi_device *device) · line 460
Quoted 1 line
drivers/acpi/scan.c +1
-0+set_secondary_fwnode (&device->dev,NULL );Interestingly you are not use same API above. Why?
Good question.
dev->fwnode hasn't been set when assigning the secondary fwnode in acpi_init_swnodes(), therefore set_secondary_fwnode() won't do what it should.
It can be still called here as it just sets dev->fwnode->secondary NULL.
I can add a comment mentioning this.
I think it'd be better to have a set of fwnodes attached to a device rather than one primary and another secondary, with various levels of success depending on the order of assigning them. But I think it's out of scope of this set.
Quoted 6 lines
Quoted 6 lines
drivers/acpi/scan.c +5
-0+kfree (ads->nodes[ACPI_DEVICE_SWNODE_ROOT ].name); +kfree (ads); + + device->swnodes =NULL ; +}
Signature · 3 lines
Kind regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 10 lines
Quoted 7 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 465
Quoted 5 lines
drivers/acpi/mipi.c +4
-0+static struct fwnode_handle *get_mipi_port_handle (struct acpi_device *device, +unsigned int port) +{ +static const char mipi_port_prefix[] ="mipi-img-port-" ;It's used only once in this function, why not keeping it in the format string?
Twice, not once. My point was that it's critical the strings remain the same length, and certainly what that string actually is, is less important.
Still can be placed twice as is. But fine, I leave it to maintainers.
Quoted 4 lines
Quoted 4 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 469
Quoted 4 lines
drivers/acpi/mipi.c +4
-0+char mipi_port_name[sizeof (mipi_port_prefix) +2 ]; + +if (snprintf (mipi_port_name,sizeof (mipi_port_name),"%s%u" , + mipi_port_prefix, port) >sizeof (mipi_port_name)) {
Btw, seems also a candidate for >= ?
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/acpi/mipi.c +8
-0+acpi_handle_info (acpi_device_handle (device), +"mipi port name too long for port %u\n" , port); +return NULL ; + } + +return fwnode_get_named_child_node (acpi_fwnode_handle (device), + mipi_port_name); +}
...
Quoted 8 lines
Quoted 8 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 547
Quoted 5 lines
drivers/acpi/mipi.c +5
-0+/* Move polarity bits to the lane polarity u32 array */ +for (i =0 ; i <1 + num_lanes; i++) + port->lane_polarities[i] = + (u.val8[i >>3 ] & (1 << (i &7 ))) ? +1U :0U ;Wouldn't
Quoted 8 lines
Quoted 4 lines
port->lane_polarities[i] = !!(u.val8[i >> 3] & (1 << (i & 7)));be better?
It would work, yes, although the target is a u32. Casting to bool would look nicer to me. I lean towards what it is at the moment but bool seems fairly reasonable, too.
I think we can do even better and switch this to bitmap APIs.
I'll comment separately with the better context given.
...
Quoted 7 lines
dev->fwnodehasn't been set when assigning the secondary fwnode inacpi_init_swnodes(), thereforeset_secondary_fwnode()won't do what it should.It can be still called here as it just sets
dev->fwnode->secondaryNULL.I can add a comment mentioning this.
Or maybe drop the use of the specific API and rather do something similar to the above?
Quoted 4 lines
I think it'd be better to have a set of fwnodes attached to a device rather than one primary and another secondary, with various levels of success depending on the order of assigning them. But I think it's out of scope of this set.
Yeah, but it's quite a big topic out of the scope of this series.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Hi Andy,
Quoted 17 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 10 lines
Quoted 7 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 465
Quoted 5 lines
drivers/acpi/mipi.c +4
-0+static struct fwnode_handle *get_mipi_port_handle (struct acpi_device *device, +unsigned int port) +{ +static const char mipi_port_prefix[] ="mipi-img-port-" ;It's used only once in this function, why not keeping it in the format string?
Twice, not once. My point was that it's critical the strings remain the same length, and certainly what that string actually is, is less important.
Quoted 8 lines
Still can be placed twice as is. But fine, I leave it to maintainers.
Quoted 4 lines
Quoted 4 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 469
Quoted 4 lines
drivers/acpi/mipi.c +4
-0+char mipi_port_name[sizeof (mipi_port_prefix) +2 ]; + +if (snprintf (mipi_port_name,sizeof (mipi_port_name),"%s%u" , + mipi_port_prefix, port) >sizeof (mipi_port_name)) {Btw, seems also a candidate for >= ?
Good catch. snprintf() excludes '\0' from the return value.
Quoted 25 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/acpi/mipi.c +8
-0+acpi_handle_info (acpi_device_handle (device), +"mipi port name too long for port %u\n" , port); +return NULL ; + } + +return fwnode_get_named_child_node (acpi_fwnode_handle (device), + mipi_port_name); +}...
Quoted 13 lines
Quoted 12 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 547
Quoted 5 lines
drivers/acpi/mipi.c +5
-0+/* Move polarity bits to the lane polarity u32 array */ +for (i =0 ; i <1 + num_lanes; i++) + port->lane_polarities[i] = + (u.val8[i >>3 ] & (1 << (i &7 ))) ? +1U :0U ;Wouldn't
port->lane_polarities[i] = !!(u.val8[i >> 3] & (1 << (i & 7)));be better?
Quoted 7 lines
Quoted 3 lines
It would work, yes, although the target is a u32. Casting to bool would look nicer to me. I lean towards what it is at the moment but bool seems fairly reasonable, too.
I think we can do even better and switch this to bitmap APIs.
I'll comment separately with the better context given.
The problem with the bitmap APIs is that they work on unsigned long, so there are endian issues that will need to be handled. I thing it's simply not worth it: either you have temporary space for this or a new API is needed. What the line above is, after all, fairly trivial.
Quoted 7 lines
...
Quoted 4 lines
dev->fwnodehasn't been set when assigning the secondary fwnode inacpi_init_swnodes(), thereforeset_secondary_fwnode()won't do what it should.
Quoted 6 lines
Quoted 3 lines
It can be still called here as it just sets
dev->fwnode->secondaryNULL.I can add a comment mentioning this.
Or maybe drop the use of the specific API and rather do something similar to the above?
Yes, that's what I actually thought. But still a comment is good to have here, so someone doesn't try to convert this to use the functions intended for this (!).
Quoted 7 lines
Quoted 5 lines
I think it'd be better to have a set of fwnodes attached to a device rather than one primary and another secondary, with various levels of success depending on the order of assigning them. But I think it's out of scope of this set.
Yeah, but it's quite a big topic out of the scope of this series.
Yes.
Signature · 3 lines
Regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
In reply to Sakari AilusOn Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
As promised the idea of bitmap APIs.
Also I have stumbled over couple of suspicious places. See below.
...
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 489
Quoted 11 lines
drivers/acpi/mipi.c +11
-0+static void init_port_csi2_common (struct acpi_device *device, +struct fwnode_handle *mipi_port_fwnode, +unsigned int *ep_prop_index, +unsigned int port_nr) +{ +unsigned int port_index =next_csi2_port_index (device->swnodes, port_nr); +struct acpi_device_software_nodes *ads = device->swnodes; +struct acpi_device_software_node_port *port = &ads->ports[port_index]; +unsigned int num_lanes =0 ; +union { +u32 val;
// Not sure why this even exists.
// And hence why do we need union?
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 492
Quoted 3 lines
drivers/acpi/mipi.c +3
-0+/* Data lanes + the clock lane */ +u8 val8[BITS_TO_BYTES (ARRAY_SIZE (port->data_lanes) +1 )]; + } u;
Somewhere
#define MAX_LANES(port) (ARRAY_SIZE((port)->data_lanes) + 1)
u8 val8[BITS_TO_BYTES(MAX_LANES(port))];
...
/* Data lanes + the clock lane */ DECLARE_BITMAP(polarity, MAX_LANES(port)));
Quoted 12 lines
drivers/acpi/mipi.c +12
-0+int ret; + + *ep_prop_index =ACPI_DEVICE_SWNODE_EP_CLOCK_LANES ; + +if (GRAPH_PORT_NAME (port->port_name, port_nr)) +return ; + + ads->nodes[ACPI_DEVICE_SWNODE_PRT (port_index)] = +SOFTWARE_NODE (port->port_name, port->port_props, + &ads->nodes[ACPI_DEVICE_SWNODE_ROOT ]); + + ret =fwnode_property_read_u8 (mipi_port_fwnode,"mipi-img-clock-lane" , u.val8);
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 513
Quoted 10 lines
drivers/acpi/mipi.c +9
-0+if (!ret) { + port->ep_props[NEXT_PROPERTY (*ep_prop_index,EP_CLOCK_LANES )] = +PROPERTY_ENTRY_U32 ("clock-lanes" , *u.val8); + } + ret =fwnode_property_count_u8 (mipi_port_fwnode,"mipi-img-data-lanes" ); +if (ret >0 ) { + num_lanes = ret; + +if (num_lanes >ARRAY_SIZE (port->data_lanes)) {
>= MAX_LANES(port)
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 517
Quoted 4 lines
drivers/acpi/mipi.c +4
-0+acpi_handle_warn (acpi_device_handle (device), +"too many data lanes (%u)\n" , + num_lanes); + num_lanes =ARRAY_SIZE (port->data_lanes);
= MAX_LANES(port) - 1;
Quoted 11 lines
drivers/acpi/mipi.c +10
-0+ } + + ret =fwnode_property_read_u8_array (mipi_port_fwnode,"mipi-img-data-lanes" , + u.val8, num_lanes); +if (!ret) { +unsigned int i; + +for (i =0 ; i < num_lanes; i++) + port->data_lanes[i] = u.val8[i]; +
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 536
Quoted 10 lines
drivers/acpi/mipi.c +9
-0+ port->ep_props[NEXT_PROPERTY (*ep_prop_index,EP_DATA_LANES )] = +PROPERTY_ENTRY_U32_ARRAY_LEN ("data-lanes" , port->data_lanes, + num_lanes); + } + } + ret =fwnode_property_read_u8_array (mipi_port_fwnode, +"mipi-img-lane-polarities" , + u.val8,sizeof (u.val8)); +if (ret >0 ) {
How is it supposed to work?!
Quoted 12 lines
drivers/acpi/mipi.c +12
-0+unsigned int bytes = ret; + +/* Total number of lanes here is clock lane + data lanes */ +if (bytes *BITS_PER_TYPE (u8) >=1 + num_lanes) { +unsigned int i; + +/* Move polarity bits to the lane polarity u32 array */ +for (i =0 ; i <1 + num_lanes; i++) + port->lane_polarities[i] = + (u.val8[i >>3 ] & (1 << (i &7 ))) ? +1U :0U ; +
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 558
Quoted 10 lines
drivers/acpi/mipi.c +10
-0+ port->ep_props[NEXT_PROPERTY (*ep_prop_index,EP_LANE_POLARITIES )] = +PROPERTY_ENTRY_U32_ARRAY_LEN ("lane-polarities" , + port->lane_polarities, +1 + num_lanes); + }else { +acpi_handle_warn (acpi_device_handle (device), +"too few lane polarity bytes (%u)\n" , + bytes); + } + }
ret = fwnode_property_count_u8(mipi_port_fwnode, "mipi-img-dlane-polarities");
if (ret < 0) {
acpi_handle_debug(acpi_device_handle(device),
"no lane polarity provided\n");
} else if (ret < 1 + num_lanes) {
acpi_handle_warn(acpi_device_handle(device),
"too few lane polarity bytes (%u)\n", bytes);
} else {
// assuming we dropped the union and renamed to val...
ret = fwnode_property_read_u8_array(mipi_port_fwnode,
"mipi-img-lane-polarities",
val, sizeof(val));
if (ret) {
...can't read... (debug message?)
} else {
unsigned int i;
for (i = 0; i < 1 + num_lanes; i++)
bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE);
// assuming that lane_polarities is zeroed by default...
for_each_set_bit(i, polarity, 1 + num_lanes)
port->lane_polarities[i] = 1;
}
}Quoted 4 lines
drivers/acpi/mipi.c +4
-0+ ads->nodes[ACPI_DEVICE_SWNODE_EP (port_index)] = +SOFTWARE_NODE ("endpoint@0" , ads->ports[port_index].ep_props, + &ads->nodes[ACPI_DEVICE_SWNODE_PRT (port_index)]); +}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 1 line
u8 val8[BITS_TO_BYTES(MAX_LANES(port))];
Here forgot to rename
u8 val[BITS_TO_BYTES(MAX_LANES(port))];
And it seems also good to have
#define MAX_LANES_BYTES(port) BITS_TO_BYTES(MAX_LANES(port))
u8 val[MAX_LANES_BYTES(port)];
...
Quoted 10 lines
ret = fwnode_property_count_u8(mipi_port_fwnode, "mipi-img-dlane-polarities");
if (ret < 0) {
acpi_handle_debug(acpi_device_handle(device),
"no lane polarity provided\n");
} else if (ret < 1 + num_lanes) {
acpi_handle_warn(acpi_device_handle(device),
"too few lane polarity bytes (%u)\n", bytes);
} else {
// assuming we dropped the union and renamed to val...
ret = fwnode_property_read_u8_array(mipi_port_fwnode,Quoted 8 lines
"mipi-img-lane-polarities",
val, sizeof(val));
if (ret) {
...can't read... (debug message?)
} else {
unsigned int i;
for (i = 0; i < 1 + num_lanes; i++)Here something like
for (i = 0; i < MAX_LANES_BYTES(port); i++)
But I'm tired for today, please double check. I hope you got the idea.
Quoted 7 lines
bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE); // assuming that lane_polarities is zeroed by default... for_each_set_bit(i, polarity, 1 + num_lanes) port->lane_polarities[i] = 1; } }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
In reply to Andy ShevchenkoHi Andy,
Quoted 8 lines · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
As promised the idea of bitmap APIs.
Also I have stumbled over couple of suspicious places. See below.
...
Quoted 14 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 489
Quoted 11 lines
drivers/acpi/mipi.c +11
-0+static void init_port_csi2_common (struct acpi_device *device, +struct fwnode_handle *mipi_port_fwnode, +unsigned int *ep_prop_index, +unsigned int port_nr) +{ +unsigned int port_index =next_csi2_port_index (device->swnodes, port_nr); +struct acpi_device_software_nodes *ads = device->swnodes; +struct acpi_device_software_node_port *port = &ads->ports[port_index]; +unsigned int num_lanes =0 ; +union { +u32 val;// Not sure why this even exists.
// And hence why do we need union?
We could remove the union, yes, with one more u32 of stack used.
Quoted 33 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 492
Quoted 4 lines
drivers/acpi/mipi.c +3
-0+/* Data lanes + the clock lane */ +u8 val8[BITS_TO_BYTES (ARRAY_SIZE (port->data_lanes) +1 )]; + } u;Somewhere
#define
MAX_LANES(port)(ARRAY_SIZE((port)->data_lanes) + 1)u8 val8[BITS_TO_BYTES(MAX_LANES(port))];...
/* Data lanes + the clock lane */ DECLARE_BITMAP(polarity, MAX_LANES(port)));Quoted 16 lines
drivers/acpi/mipi.c +16
-0+int ret; + + *ep_prop_index =ACPI_DEVICE_SWNODE_EP_CLOCK_LANES ; + +if (GRAPH_PORT_NAME (port->port_name, port_nr)) +return ; + + ads->nodes[ACPI_DEVICE_SWNODE_PRT (port_index)] = +SOFTWARE_NODE (port->port_name, port->port_props, + &ads->nodes[ACPI_DEVICE_SWNODE_ROOT ]); + + ret =fwnode_property_read_u8 (mipi_port_fwnode,"mipi-img-clock-lane" , u.val8); +if (!ret) { + port->ep_props[NEXT_PROPERTY (*ep_prop_index,EP_CLOCK_LANES )] = +PROPERTY_ENTRY_U32 ("clock-lanes" , *u.val8); + }
Quoted 7 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 513
Quoted 5 lines
drivers/acpi/mipi.c +5
-0+ ret =fwnode_property_count_u8 (mipi_port_fwnode,"mipi-img-data-lanes" ); +if (ret >0 ) { + num_lanes = ret; + +if (num_lanes >ARRAY_SIZE (port->data_lanes)) {>= MAX_LANES(port)
I find the original better: it does this by referring to the array itself.
Quoted 25 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 517
Quoted 5 lines
drivers/acpi/mipi.c +4
-0+acpi_handle_warn (acpi_device_handle (device), +"too many data lanes (%u)\n" , + num_lanes); + num_lanes =ARRAY_SIZE (port->data_lanes);= MAX_LANES(port) - 1;Quoted 16 lines
drivers/acpi/mipi.c +15
-0+ } + + ret =fwnode_property_read_u8_array (mipi_port_fwnode,"mipi-img-data-lanes" , + u.val8, num_lanes); +if (!ret) { +unsigned int i; + +for (i =0 ; i < num_lanes; i++) + port->data_lanes[i] = u.val8[i]; + + port->ep_props[NEXT_PROPERTY (*ep_prop_index,EP_DATA_LANES )] = +PROPERTY_ENTRY_U32_ARRAY_LEN ("data-lanes" , port->data_lanes, + num_lanes); + } + }
Quoted 6 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 536
Quoted 4 lines
drivers/acpi/mipi.c +4
-0+ ret =fwnode_property_read_u8_array (mipi_port_fwnode, +"mipi-img-lane-polarities" , + u.val8,sizeof (u.val8)); +if (ret >0 ) {How is it supposed to work?!
Hmm. I think in the past, some of these functions have returned the number of the entries even when the buffer is provided (acpi_copy_property_array_string() still does!). Good catch, I'll fix this for v3.
Quoted 35 lines
Quoted 13 lines
drivers/acpi/mipi.c +12
-0+unsigned int bytes = ret; + +/* Total number of lanes here is clock lane + data lanes */ +if (bytes *BITS_PER_TYPE (u8) >=1 + num_lanes) { +unsigned int i; + +/* Move polarity bits to the lane polarity u32 array */ +for (i =0 ; i <1 + num_lanes; i++) + port->lane_polarities[i] = + (u.val8[i >>3 ] & (1 << (i &7 ))) ? +1U :0U ; +drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 558
Quoted 10 lines
drivers/acpi/mipi.c +10
-0+ port->ep_props[NEXT_PROPERTY (*ep_prop_index,EP_LANE_POLARITIES )] = +PROPERTY_ENTRY_U32_ARRAY_LEN ("lane-polarities" , + port->lane_polarities, +1 + num_lanes); + }else { +acpi_handle_warn (acpi_device_handle (device), +"too few lane polarity bytes (%u)\n" , + bytes); + } + }ret = fwnode_property_count_u8(mipi_port_fwnode, "mipi-img-dlane-polarities"); if (ret < 0) { acpi_handle_debug(acpi_device_handle(device), "no lane polarity provided\n"); } else if (ret < 1 + num_lanes) { acpi_handle_warn(acpi_device_handle(device), "too few lane polarity bytes (%u)\n", bytes); } else { // assuming we dropped the union and renamed to val... ret = fwnode_property_read_u8_array(mipi_port_fwnode, "mipi-img-lane-polarities",
Quoted 8 lines
val, sizeof(val));
if (ret) {
...can't read... (debug message?)
} else {
unsigned int i;
for (i = 0; i < 1 + num_lanes; i++)
bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE);You'll still needed to access invididual bits in val.
Quoted 11 lines
// assuming that lane_polarities is zeroed by default... for_each_set_bit(i, polarity, 1 + num_lanes) port->lane_polarities[i] = 1; } }Quoted 4 lines
drivers/acpi/mipi.c +4
-0+ ads->nodes[ACPI_DEVICE_SWNODE_EP (port_index)] = +SOFTWARE_NODE ("endpoint@0" , ads->ports[port_index].ep_props, + &ads->nodes[ACPI_DEVICE_SWNODE_PRT (port_index)]); +}
Signature · 3 lines
Kind regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 5 lines
Quoted 3 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 513
Quoted 1 line
drivers/acpi/mipi.c +1
-0+if (num_lanes >ARRAY_SIZE (port->data_lanes)) {>= MAX_LANES(port)I find the original better: it does this by referring to the array itself.
Whatever, it's just an example to show where it's being used.
Quoted 8 lines
Quoted 8 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 517
Quoted 4 lines
drivers/acpi/mipi.c +4
-0+acpi_handle_warn (acpi_device_handle (device), +"too many data lanes (%u)\n" , + num_lanes); + num_lanes =ARRAY_SIZE (port->data_lanes);= MAX_LANES(port) - 1;Quoted 1 line
(quoted diff) +1
-0+ }
...
Quoted 17 lines
Quoted 17 lines
ret = fwnode_property_count_u8(mipi_port_fwnode, "mipi-img-dlane-polarities"); if (ret < 0) { acpi_handle_debug(acpi_device_handle(device), "no lane polarity provided\n"); } else if (ret < 1 + num_lanes) { acpi_handle_warn(acpi_device_handle(device), "too few lane polarity bytes (%u)\n", bytes); } else { // assuming we dropped the union and renamed to val... ret = fwnode_property_read_u8_array(mipi_port_fwnode, "mipi-img-lane-polarities", val, sizeof(val)); if (ret) { ...can't read... (debug message?) } else { unsigned int i;
Quoted 4 lines
Quoted 2 lines
for (i = 0; i < 1 + num_lanes; i++) bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE);You'll still needed to access invididual bits in val.
I didn't get this. The below is what it does in most efficient way.
Quoted 3 lines
Quoted 3 lines
// assuming that lane_polarities is zeroed by default... for_each_set_bit(i, polarity, 1 + num_lanes) port->lane_polarities[i] = 1;
Note that his code lacks of endianess issues.
Quoted 2 lines
Quoted 2 lines
} }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Hi Andy,
Quoted 42 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 5 lines
Quoted 3 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 513
Quoted 1 line
drivers/acpi/mipi.c +1
-0+if (num_lanes >ARRAY_SIZE (port->data_lanes)) {>= MAX_LANES(port)I find the original better: it does this by referring to the array itself.
Whatever, it's just an example to show where it's being used.
Quoted 8 lines
Quoted 8 lines
drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 517
Quoted 4 lines
drivers/acpi/mipi.c +4
-0+acpi_handle_warn (acpi_device_handle (device), +"too many data lanes (%u)\n" , + num_lanes); + num_lanes =ARRAY_SIZE (port->data_lanes);= MAX_LANES(port) - 1;Quoted 1 line
(quoted diff) +1
-0+ }...
Quoted 17 lines
Quoted 17 lines
ret = fwnode_property_count_u8(mipi_port_fwnode, "mipi-img-dlane-polarities"); if (ret < 0) { acpi_handle_debug(acpi_device_handle(device), "no lane polarity provided\n"); } else if (ret < 1 + num_lanes) { acpi_handle_warn(acpi_device_handle(device), "too few lane polarity bytes (%u)\n", bytes); } else { // assuming we dropped the union and renamed to val... ret = fwnode_property_read_u8_array(mipi_port_fwnode, "mipi-img-lane-polarities", val, sizeof(val)); if (ret) { ...can't read... (debug message?) } else { unsigned int i;
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
for (i = 0; i < 1 + num_lanes; i++) bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE);You'll still needed to access invididual bits in val.
I didn't get this. The below is what it does in most efficient way.
Ah. You're assining eight bits at a time.
Then the loop ends too late as i refers to a byte, not bit. This can be addressed though. And a BUILD_BUG_ON() check for polarity being large enough will be needed.
I still find this more complicated than the original code that also does not need a temporary buffer.
Quoted 10 lines
Quoted 4 lines
Quoted 4 lines
// assuming that lane_polarities is zeroed by default... for_each_set_bit(i, polarity, 1 + num_lanes) port->lane_polarities[i] = 1;Note that his code lacks of endianess issues.
Quoted 2 lines
Quoted 2 lines
} }
Signature · 3 lines
Kind regards, Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Quoted 4 lines · Sakari Ailus
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Quoted 11 lines
// assuming we dropped the union and renamed to val... ret = fwnode_property_read_u8_array(mipi_port_fwnode, "mipi-img-lane-polarities", val, sizeof(val)); if (ret) { ...can't read... (debug message?) } else { unsigned int i; for (i = 0; i < 1 + num_lanes; i++) bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE);You'll still needed to access invididual bits in val.
Quoted 7 lines
Quoted 1 line
I didn't get this. The below is what it does in most efficient way.
Ah. You're assining eight bits at a time.
Then the loop ends too late as i refers to a byte, not bit. This can be addressed though. And a
BUILD_BUG_ON()check for polarity being large enough will be needed.
You probably meant static_assert(), but see my reply to my reply where I caught up this. Yes, the loop conditional should rely on byte count.
Quoted 2 lines
I still find this more complicated than the original code that also does not need a temporary buffer.
Your magic formula with bit shifts and conjunctions is so hard to read and error prone, that makes me think of the proper APIs in the first place. That's why I'm tending to use this code, because it's much easier to get and maintain.
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
// assuming that lane_polarities is zeroed by default... for_each_set_bit(i, polarity, 1 + num_lanes) port->lane_polarities[i] = 1;Note that his code lacks of endianess issues.
Quoted 1 line
Quoted 1 line
}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
reviewerRe: [PATCH v2 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Sakari Ailus
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:13PM +0200, Sakari Ailus wrote:
...
Quoted 25 lines
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Quoted 11 lines
// assuming we dropped the union and renamed to val... ret = fwnode_property_read_u8_array(mipi_port_fwnode, "mipi-img-lane-polarities", val, sizeof(val)); if (ret) { ...can't read... (debug message?) } else { unsigned int i; for (i = 0; i < 1 + num_lanes; i++) bitmap_set_value8(polarity, val[i], i * BITS_PER_BYTE);You'll still needed to access invididual bits in val.
Quoted 7 lines
Quoted 1 line
I didn't get this. The below is what it does in most efficient way.
Ah. You're assining eight bits at a time.
Then the loop ends too late as i refers to a byte, not bit. This can be addressed though. And a
BUILD_BUG_ON()check for polarity being large enough will be needed.You probably meant
static_assert(), but see my reply to my reply where I caught up this. Yes, the loop conditional should rely on byte count.
Quoted 11 lines
Quoted 2 lines
I still find this more complicated than the original code that also does not need a temporary buffer.
Your magic formula with bit shifts and conjunctions is so hard to read and error prone, that makes me think of the proper APIs in the first place. That's why I'm tending to use this code, because it's much easier to get and maintain.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
// assuming that lane_polarities is zeroed by default... for_each_set_bit(i, polarity, 1 + num_lanes) port->lane_polarities[i] = 1;
This even can be optimized much more if we put a constant bit numbers and if it's less than or equal to BITS_PER_LONG.
for_each_set_bit(i, polarity, MAX_LANES(port))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Note that his code lacks of endianess issues.
Quoted 1 line
Quoted 1 line
}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerPATCH v2 5/8 ACPI: property: Dig "rotation" property for devices with CSI2 _CRS
In reply to Sakari AilusDig "rotation" property value for devices with _CRS CSI2 resource descriptor. The value comes from _PLD (physical location of device) object, if it exists for the device.
This way camera sensor drivers that know the "rotation" property do not need to care about _PLD on ACPI.
--- drivers/acpi/mipi.c | 16 ++++++++++++++++ include/acpi/acpi_bus.h | 1 + 2 files changed, 17 insertions(+)
drivers/acpi/mipi.c +16 -0
@@ -628,15 +628,31 @@ static void init_port_csi2_remote(struct acpi_device *device,*/ void acpi_init_swnodes (struct acpi_device *device) { +struct fwnode_handle *fwnode =acpi_fwnode_handle (device);struct acpi_device_software_nodes *ads;struct acpi_buffer buffer = { .length =ACPI_ALLOCATE_BUFFER }; +struct acpi_pld_info *pld; +unsigned int prop_index =0 ;unsigned int i; +u32 val;int ret; device->swnodes = ads =crs_csi2_swnode_get (device->handle);if (!ads)return ; +/* +* Check if "rotation" property exists and if it doesn't but there's a +* _PLD object, then get the rotation value from there. +*/ +if (fwnode_property_read_u32 (fwnode,"rotation" , &val) && +ACPI_SUCCESS (acpi_get_physical_device_location (acpi_device_handle (device), + &pld))) { + ads->dev_props[NEXT_PROPERTY (prop_index,DEV_ROTATION )] = +PROPERTY_ENTRY_U32 ("rotation" , pld->rotation *45U ); +kfree (pld); + } +if (ACPI_FAILURE (acpi_get_name (device->handle,ACPI_FULL_PATHNAME , &buffer))) {acpi_handle_warn (acpi_device_handle (device),"cannot get path name\n" );return ;
include/acpi/acpi_bus.h +1 -0
@@ -361,6 +361,7 @@ struct acpi_device_data {struct acpi_gpio_mapping ;enum acpi_device_swnode_dev_props { +ACPI_DEVICE_SWNODE_DEV_ROTATION ,ACPI_DEVICE_SWNODE_DEV_NUM_OF ,ACPI_DEVICE_SWNODE_DEV_NUM_ENTRIES };
Signature · 1 line
2.30.2
Sakari Ailus
reviewerPATCH v2 6/8 ACPI: property: Rename parsed MIPI DisCo for Imaging properties
In reply to Sakari AilusMIPI 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.
--- drivers/acpi/internal.h | 1 + drivers/acpi/mipi.c | 37 +++++++++++++++++++++++++++++++++++++ drivers/acpi/property.c | 22 ++++++++++++---------- 3 files changed, 50 insertions(+), 10 deletions(-)
drivers/acpi/internal.h +1 -0
@@ -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_ */
drivers/acpi/mipi.c +37 -0
@@ -680,3 +680,40 @@ void acpi_init_swnodes(struct acpi_device *device) device->fwnode.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 ; + } + } +}
drivers/acpi/property.c +12 -10
@@ -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,
Signature · 1 line
2.30.2
Sakari Ailus
reviewerPATCH v2 7/8 ACPI: property: Skip MIPI property table without "mipi-img" prefix
In reply to Sakari AilusFor all _DSD properties, skip going through the MIPI DisCo for Imaging property name substitution table if the property doesn't have "mipi-img-" prefix.
--- drivers/acpi/mipi.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/acpi/mipi.c +11 -6
@@ -681,16 +681,18 @@ void acpi_init_swnodes(struct acpi_device *device) device->fwnode.secondary =software_node_fwnode (ads->nodes); } +#define MIPI_IMG_PREFIX "mipi-img-" +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" }, + {MIPI_IMG_PREFIX "lens-focus" ,"lens-focus" }, + {MIPI_IMG_PREFIX "flash-leds" ,"flash-leds" }, + {MIPI_IMG_PREFIX "clock-frequency" ,"clock-frequency" }, + {MIPI_IMG_PREFIX "led-max-current" ,"led-max-microamp" }, + {MIPI_IMG_PREFIX "flash-max-current" ,"flash-max-microamp" }, + {MIPI_IMG_PREFIX "flash-max-timeout" ,"flash-max-timeout-us" }, };/**
@@ -706,6 +708,9 @@ void acpi_properties_prepare_mipi(union acpi_object *elements) { unsigned int i; + if (!str_has_prefix(elements[0].string.pointer, MIPI_IMG_PREFIX)) + return; + /* 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,
Signature · 1 line
2.30.2
Andy Shevchenko
reviewerRe: [PATCH v2 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix
Quoted 3 lines · Sakari Ailus
For all
_DSDproperties, skip going through the MIPI DisCo for Imaging property name substitution table if the property doesn't have "mipi-img-" prefix.
...
drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 695
Quoted 12 lines
drivers/acpi/mipi.c +6
-6- { "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" }, + { MIPI_IMG_PREFIX "lens-focus", "lens-focus" }, + { MIPI_IMG_PREFIX "flash-leds", "flash-leds" }, + { MIPI_IMG_PREFIX "clock-frequency", "clock-frequency" }, + { MIPI_IMG_PREFIX "led-max-current", "led-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-current", "flash-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-timeout", "flash-max-timeout-us" },
I don't thing it ads to the readability, so I don't know why this (part of the) change is needed.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix
Quoted 7 lines · Andy Shevchenko
Quoted 3 lines · Sakari Ailus
For all
_DSDproperties, skip going through the MIPI DisCo for Imaging property name substitution table if the property doesn't have "mipi-img-" prefix....
Quoted 15 lines
drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 695
Quoted 12 lines
drivers/acpi/mipi.c +6
-6- { "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" }, + { MIPI_IMG_PREFIX "lens-focus", "lens-focus" }, + { MIPI_IMG_PREFIX "flash-leds", "flash-leds" }, + { MIPI_IMG_PREFIX "clock-frequency", "clock-frequency" }, + { MIPI_IMG_PREFIX "led-max-current", "led-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-current", "flash-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-timeout", "flash-max-timeout-us" },I don't thing it ads to the readability, so I don't know why this (part of the) change is needed.
Ok, I'll drop this chunk.
Signature · 1 line
Sakari Ailus
Andy Shevchenko
reviewerRe: [PATCH v2 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:16PM +0200, Sakari Ailus wrote:
...
Quoted 16 lines
Quoted 7 lines
Quoted 7 lines
drivers/acpi/mipi.c +1
-6- { "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" }, + { MIPI_IMG_PREFIX "lens-focus", "lens-focus" },Quoted 8 lines
drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 695
Quoted 5 lines
drivers/acpi/mipi.c +5
-0+ { MIPI_IMG_PREFIX "flash-leds", "flash-leds" }, + { MIPI_IMG_PREFIX "clock-frequency", "clock-frequency" }, + { MIPI_IMG_PREFIX "led-max-current", "led-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-current", "flash-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-timeout", "flash-max-timeout-us" },I don't thing it ads to the readability, so I don't know why this (part of the) change is needed.
Quoted 1 line
Ok, I'll drop this chunk.
Thank you. What you can do, though, is to make the second list on the same column (in the previous patch) if you consider it would be better.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Sakari Ailus
reviewerRe: [PATCH v2 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix
Quoted 22 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko
On Mon, Jan 23, 2023 at 03:46:16PM +0200, Sakari Ailus wrote:
...
Quoted 16 lines
Quoted 15 lines
drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 695
Quoted 12 lines
drivers/acpi/mipi.c +6
-6- { "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" }, + { MIPI_IMG_PREFIX "lens-focus", "lens-focus" }, + { MIPI_IMG_PREFIX "flash-leds", "flash-leds" }, + { MIPI_IMG_PREFIX "clock-frequency", "clock-frequency" }, + { MIPI_IMG_PREFIX "led-max-current", "led-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-current", "flash-max-microamp" }, + { MIPI_IMG_PREFIX "flash-max-timeout", "flash-max-timeout-us" },I don't thing it ads to the readability, so I don't know why this (part of the) change is needed.
Quoted 4 lines
Quoted 1 line
Ok, I'll drop this chunk.
Thank you. What you can do, though, is to make the second list on the same column (in the previous patch) if you consider it would be better.
Yes, makes sense.
Signature · 1 line
Sakari Ailus
Sakari Ailus
reviewerPATCH v2 8/8 ACPI: property: Document _CRS CSI-2 and DisCo for Imaging support
In reply to Sakari AilusDocument how ACPI _CRS CSI-2 and DisCo for Imaging works. It's non-trivial so such documentation can be useful.
--- drivers/acpi/mipi.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/acpi/mipi.c +37 -0
@@ -3,6 +3,43 @@* MIPI DisCo for Imaging support. * * Copyright (C) 2023 Intel Corporation +* +* _CRS CSI-2 descriptors, as defined starting from ACPI 6.4 [1], contain +* information on cross-device CSI-2 bus configuration. The descriptors are +* located under transmitter devices, and the receiver devices have no direct +* way to access them even if the information in these descriptors is equally +* important for receivers. This information is amended with MIPI DisCo for +* Imaging [2] specification that defines _DSD data nodes and properties. +* +* The support for these is based on two-fold approach, firstly renaming +* properties where semantics matches and secondly gathering information to +* generate properties using information gathered from various sources. The +* former is trivial (see acpi_properties_prepare_mipi() at the end of the +* file) whereas the latter requires a more elaborate explanation. +* +* acpi_bus_scan_crs_csi2() scans an ACPI bus for devices with _CRS CSI-2 +* descriptors and stores them to a linked list. This is done as traversing just +* this list is much smaller task than the entire DSDT. This list is then used +* to figure out how much memory is needed for swnodes related to a given ACPI +* device (handle). Further on, the same function sets the property values for +* the properties the values of which are obtained from the _CRS CSI-2 +* descriptor. The information is stored into another list where the information +* can be looked up based on device's acpi_handle as the struct acpi_device +* isn't available yet at this point (and could not, as cross-device references +* need to be set up before the devices are available for drivers to probe). +* +* For each struct acpi_device, acpi_init_swnodes() further obtains information +* required to find out the values for the rest of the properties needed by +* drivers. This includes all port and endpoint properties as the node +* structures used by DT graphs and DisCo for Imaging are different. Finally the +* function registers software nodes for the device and sets the secondary +* pointer for the ACPI device's fwnode. +* +* Access to data the structures is serialised using acpi_scan_lock in scan.c. +* +* [1] https://uefi.org/sites/default/files/resources/ACPI_Spec_6_4_Jan22.pdf +* +* [2] https://www.mipi.org/specifications/mipi-disco-imaging */ #include <linux/acpi.h>
Signature · 1 line
2.30.2