Skip to contentSkip to conversation

ACPI _CRS CSI-2 and MIPI DisCo for Imaging support

PATCH Superseded Sakari Ailus 2 participants 34 messages Jan 17, 2023 – Jan 23, 2023

Subsystems (5)

v1 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Sakari Ailus

author reviewer
#0 lore raw

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

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      | 769 +++++++++++++++++++++++++++++++++++++++
 drivers/acpi/property.c  | 121 ++++--
 drivers/acpi/scan.c      |  33 +-
 include/acpi/acpi_bus.h  |  61 ++++
 include/linux/property.h |   7 +
 7 files changed, 975 insertions(+), 27 deletions(-)
 create mode 100644 drivers/acpi/mipi.c

base-commit: 837dc62247d5e50a0724af2001f070962300c87e

Signature · 1 line
2.30.2
author reviewer
#1 lore raw

PATCH 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.

---
 drivers/acpi/property.c | 101 ++++++++++++++++++++++++++++++++++------
 1 file changed, 88 insertions(+), 13 deletions(-)
drivers/acpi/property.c +88 -13
index b8d9eb9a433ed..545f74673703d 100644
@@ -795,7 +795,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 +804,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 +824,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 +849,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("ACPI: bad node type\n");
+		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 +928,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 +952,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 +998,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
#2 lore raw

Re: [PATCH 1/8] ACPI: property: Parse data node string references in properties

Quoted 3 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.

...

drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 865

Quoted 1 line
drivers/acpi/property.c +1 -0
+		pr_err("ACPI: bad node type\n");

Looking at this I'm wondering what prevents us to have pr_fmt() defined as it's done in ~60 modules under drivers/acpi already.

Other than that, LGTM.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#3 lore raw

Re: [PATCH 1/8] ACPI: property: Parse data node string references in properties

Hi Andy,

Quoted 7 lines · Andy Shevchenko
Quoted 3 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.

...

Quoted 7 lines

drivers/acpi/property.c static int acpi_get_ref_args(struct fwnode_reference_args *args, · line 865

Quoted 1 line
drivers/acpi/property.c +1 -0
+		pr_err("ACPI: bad node type\n");

Looking at this I'm wondering what prevents us to have pr_fmt() defined as it's done in ~60 modules under drivers/acpi already.

Other than that, LGTM.

Thanks for the review.

I'll add pr_fmt() here, plus print the name of the troubling node.

Signature · 1 line
Sakari Ailus
author reviewer
#4 lore raw

PATCH 2/8 ACPI: property: Parse _CRS CSI-2 descriptor

In reply to Sakari Ailus

Parse 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     | 318 ++++++++++++++++++++++++++++++++++++++++
 drivers/acpi/scan.c     |  16 +-
 include/acpi/acpi_bus.h |  11 ++
 5 files changed, 349 insertions(+), 5 deletions(-)
 create mode 100644 drivers/acpi/mipi.c
drivers/acpi/Makefile +1 -1
index a5b649e71ab1b..a98fa1bc15548 100644
@@ -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
index ec584442fb298..1ec4aa92bf17a 100644
@@ -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 +318 -0

318 lines not on this page · raw message

drivers/acpi/scan.c +12 -4
index 0c6f06abe3f47..50de874b8f208 100644
@@ -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
index e44be31115a67..a05fe22c1175c 100644
@@ -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
#5 lore raw

Re: [PATCH 2/8] ACPI: property: Parse _CRS CSI-2 descriptor

Quoted 3 lines · Sakari Ailus

Parse 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.

...

Quoted 4 lines

+/*
+ * MIPI DisCo for Imaging support.
+ *
+ * Copyright (C) 2022 Intel Corporation

2023?

Quoted 1 line

+ */

...

drivers/acpi/mipi.c line 10

Quoted 4 lines
drivers/acpi/mipi.c new file +3 -0
+#include <linux/acpi.h>
+#include <linux/module.h>
 
+#include <linux/kernel.h>

Not sure why you need this one instead of corresponding types.h and might be a few others (seems list.h, string.h at least).

Quoted 3 lines
drivers/acpi/mipi.c new file +3 -0
+#include <linux/overflow.h>
+#include <linux/slab.h>
+#include <linux/sort.h>
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#6 lore raw

Re: [PATCH 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 _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.

Quoted 8 lines

...

Quoted 4 lines

+/*
+ * MIPI DisCo for Imaging support.
+ *
+ * Copyright (C) 2022 Intel Corporation

2023?

Yes.

Quoted 5 lines
Quoted 2 lines

+ */

...

Quoted 7 lines

drivers/acpi/mipi.c line 10

Quoted 4 lines
drivers/acpi/mipi.c new file +3 -0
+#include <linux/acpi.h>
+#include <linux/module.h>
 
+#include <linux/kernel.h>

Not sure why you need this one instead of corresponding types.h and might be a few others (seems list.h, string.h at least).

Good catch.

I'll fix these for v2.

Quoted 4 lines
Quoted 4 lines
drivers/acpi/mipi.c new file +3 -0
+#include <linux/overflow.h>
+#include <linux/slab.h>
+#include <linux/sort.h>
Signature · 1 line
Sakari Ailus
author reviewer
#7 lore raw

PATCH 3/8 device property: Add SOFTWARE_NODE() macro for defining software nodes

In reply to 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.

---
 include/linux/property.h | 7 +++++++
 1 file changed, 7 insertions(+)
include/linux/property.h +7 -0
index 37179e3abad5c..6745a86bc9b97 100644
@@ -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
#8 lore raw

Re: [PATCH 3/8] device property: Add SOFTWARE_NODE() macro for defining software nodes

Quoted 3 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.

...

include/linux/property.h struct software_node { · line 484

Quoted 6 lines
include/linux/property.h +5 -0
+#define SOFTWARE_NODE(_name_, _properties_, _parent_)	\
+	(struct software_node) {			\
 
+		.name = _name_,				\
+		.properties = _properties_,		\
+		.parent = _parent_,			\

Missed parentheses?

include/linux/property.h struct software_node { · line 485

Quoted 1 line
include/linux/property.h +1 -0
+	}

Otherwise LGTM.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#9 lore raw

Re: [PATCH 3/8] device property: Add SOFTWARE_NODE() macro for defining software nodes

Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:39PM +0200, Sakari Ailus wrote:

...

Quoted 5 lines

include/linux/property.h struct software_node { · line 484

Quoted 3 lines
include/linux/property.h +3 -0
+		.name = _name_,				\
+		.properties = _properties_,		\
+		.parent = _parent_,			\

Missed parentheses?

Hmm... It seems the current style in the entire file like this. Okay.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
reviewer Reviewed-by on v1 3/8
#10 lore raw

Re: [PATCH 3/8] device property: Add SOFTWARE_NODE() macro for defining software nodes

In reply to Sakari Ailus
Quoted 3 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.

Quoted 26 lines
---
 include/linux/property.h | 7 +++++++
 1 file changed, 7 insertions(+)
include/linux/property.h +7 -0
index 37179e3abad5c..6745a86bc9b97 100644
@@ -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 · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#11 lore raw

PATCH 4/8 ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging

In reply to Sakari Ailus

Generate 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     | 354 ++++++++++++++++++++++++++++++++++++++++
 drivers/acpi/scan.c     |  17 ++
 include/acpi/acpi_bus.h |  49 ++++++
 4 files changed, 421 insertions(+)
drivers/acpi/internal.h +1 -0
index 1ec4aa92bf17a..fac87404e294c 100644
@@ -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 +354 -0

391 lines not on this page · raw message

drivers/acpi/scan.c +17 -0
index 50de874b8f208..29ef8200b50bb 100644
@@ -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
#12 lore raw

Re: [PATCH 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 _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/mipi.c struct acpi_handle_ref { · line 179

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+#define GRAPH_PORT_NAME(var, num) \
+	(snprintf((var), sizeof(var), "port@%u", (num)) > sizeof(var))

SWNODE_GRAPH_PORT_NAME_FMT ?

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 456

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+#define NEXT_PROPERTY(index, max)			   \
+	(WARN_ON(++(index) > ACPI_DEVICE_SWNODE_##max + 1) ?	\

'>' -- > '>=' and drop ' + 1'?

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	 ACPI_DEVICE_SWNODE_##max : (index) - 1)

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 462

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	static const char mipi_port_prefix[] = "mipi-img-port-";

It's harder to read in the code, please put it in place.

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 528

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+			port->ep_props[NEXT_PROPERTY(*ep_prop_index,
+						     EP_DATA_LANES)] =

It's hard to read, taking into account that you split on index of the array.

How much a new monitor costs for you? Maybe I can donate to make you use more than 80 from time to time? :-)

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+				PROPERTY_ENTRY_U32_ARRAY_LEN("data-lanes",
+							     port->data_lanes,
+							     num_lanes);

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 541

Quoted 8 lines
drivers/acpi/mipi.c +8 -0
+	ret = fwnode_property_read_u8_array(mipi_port_fwnode,
+					    "mipi-img-lane-polarities",
+					    u.val8, sizeof(u.val8));
+	if (ret > 0) {
+		unsigned int bytes = ret;
+
+		/* Total number of lanes here is clock lane + data lanes */
+		if (bytes << 3 >= 1 + num_lanes) {

bytes * BITS_PER_BYTE? Or if you want to be super precise BITS_PER_TYPE(u8).

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 551

Quoted 10 lines
drivers/acpi/mipi.c +9 -0
+			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;
 
+			port->ep_props[NEXT_PROPERTY(*ep_prop_index,
+						     EP_LANE_POLARITIES)] =

Index on one line?

Quoted 9 lines
drivers/acpi/mipi.c +9 -0
+				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);
+		}
+	}

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 571

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	unsigned int port_index = next_csi2_port_index(device->swnodes,
+						       port_nr);

One line easier to read.

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 596

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		if (!ret)

Why not positive conditional?
Also seems like {} are missing since the body is multi-line.

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 598

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+			port->ep_props[NEXT_PROPERTY(ep_prop_index,
+						     EP_LINK_FREQUENCIES)] =

Index on one line?

Quoted 7 lines
drivers/acpi/mipi.c +7 -0
+				PROPERTY_ENTRY_U64_ARRAY_LEN("link-frequencies",
+							     port->link_frequencies,
+							     num_link_freqs);
+		else
+			acpi_handle_info(acpi_device_handle(device),
+					 "can't get link frequencies (%d)\n",
+					 ret);

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 644

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	if (acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK) {

We have ACPI_SUCCESS() / ACPI_FAILURE()

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+		acpi_handle_warn(acpi_device_handle(device), "cannot get path name\n");
+		return;
+	}

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 652

Quoted 4 lines
drivers/acpi/mipi.c +4 -0
+	ads->nodes[ACPI_DEVICE_SWNODE_ROOT] = (struct software_node) {
+		.name = buffer.pointer,
+		.properties = ads->dev_props,
+	};

Aren't you provided a macro for this?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#13 lore raw

Re: [PATCH 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 _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.

Quoted 6 lines

...

drivers/acpi/mipi.c struct acpi_handle_ref { · line 179

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+#define GRAPH_PORT_NAME(var, num) \
+	(snprintf((var), sizeof(var), "port@%u", (num)) > sizeof(var))

SWNODE_GRAPH_PORT_NAME_FMT ?

The name is not used anywhere else. I would keep it as-is.

Quoted 7 lines

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 456

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+#define NEXT_PROPERTY(index, max)			   \
+	(WARN_ON(++(index) > ACPI_DEVICE_SWNODE_##max + 1) ?	\

'>' -- > '>=' and drop ' + 1'?

Yeah.

Quoted 8 lines
Quoted 2 lines
drivers/acpi/mipi.c +1 -0
+	 ACPI_DEVICE_SWNODE_##max : (index) - 1)

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 462

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	static const char mipi_port_prefix[] = "mipi-img-port-";

It's harder to read in the code, please put it in place.

There are multiple uses of it. It's better there's a single definition.

Quoted 10 lines

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 528

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+			port->ep_props[NEXT_PROPERTY(*ep_prop_index,
+						     EP_DATA_LANES)] =

It's hard to read, taking into account that you split on index of the array.

How much a new monitor costs for you? Maybe I can donate to make you use more than 80 from time to time? :-)

You know newspaper pages are split into multiple columns for a reason, similarly web pages with text columns very seldom span the entire page width. The number of characters per line tends to be less than --- you might be surprised --- 80. The reason is readability.

Quoted 8 lines
Quoted 4 lines
drivers/acpi/mipi.c +3 -0
+				PROPERTY_ENTRY_U32_ARRAY_LEN("data-lanes",
+							     port->data_lanes,
+							     num_lanes);

...

Quoted 10 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 541

Quoted 8 lines
drivers/acpi/mipi.c +8 -0
+	ret = fwnode_property_read_u8_array(mipi_port_fwnode,
+					    "mipi-img-lane-polarities",
+					    u.val8, sizeof(u.val8));
+	if (ret > 0) {
+		unsigned int bytes = ret;
+
+		/* Total number of lanes here is clock lane + data lanes */
+		if (bytes << 3 >= 1 + num_lanes) {

bytes * BITS_PER_BYTE? Or if you want to be super precise BITS_PER_TYPE(u8).

I think of these two, BITS_PER_TYPE(u8) looks better.

Quoted 31 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 551

Quoted 11 lines
drivers/acpi/mipi.c +9 -0
+			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;
 
+			port->ep_props[NEXT_PROPERTY(*ep_prop_index,
+						     EP_LANE_POLARITIES)] =

Index on one line?

Quoted 9 lines
drivers/acpi/mipi.c +9 -0
+				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);
+		}
+	}

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 571

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	unsigned int port_index = next_csi2_port_index(device->swnodes,
+						       port_nr);

One line easier to read.

Quoted 5 lines

...

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 596

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		if (!ret)

Why not positive conditional?

The success case is handled first.

Quoted 1 line

Also seems like {} are missing since the body is multi-line.

Multiple lines as such isn't a reason to add braces (per coding style).

Quoted 5 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 598

Quoted 3 lines
drivers/acpi/mipi.c +2 -0
+			port->ep_props[NEXT_PROPERTY(ep_prop_index,
+						     EP_LINK_FREQUENCIES)] =

Index on one line?

This is more or less random.

Quoted 11 lines
Quoted 8 lines
drivers/acpi/mipi.c +7 -0
+				PROPERTY_ENTRY_U64_ARRAY_LEN("link-frequencies",
+							     port->link_frequencies,
+							     num_link_freqs);
+		else
+			acpi_handle_info(acpi_device_handle(device),
+					 "can't get link frequencies (%d)\n",
+					 ret);

...

Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 644

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	if (acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK) {

We have ACPI_SUCCESS() / ACPI_FAILURE()

Yes.

Quoted 7 lines
Quoted 4 lines
drivers/acpi/mipi.c +3 -0
+		acpi_handle_warn(acpi_device_handle(device), "cannot get path name\n");
+		return;
+	}

...

Quoted 6 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 652

Quoted 4 lines
drivers/acpi/mipi.c +4 -0
+	ads->nodes[ACPI_DEVICE_SWNODE_ROOT] = (struct software_node) {
+		.name = buffer.pointer,
+		.properties = ads->dev_props,
+	};

Aren't you provided a macro for this?

I think I added a macro for this but forgot to use it. I'll address this (and other issues) in v2.

Signature · 3 lines
Regards,

Sakari Ailus
#14 lore raw

Re: [PATCH 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging

Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:40PM +0200, Sakari Ailus wrote:

...

Quoted 6 lines
Quoted 4 lines

drivers/acpi/mipi.c struct acpi_handle_ref { · line 179

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+#define GRAPH_PORT_NAME(var, num) \
+	(snprintf((var), sizeof(var), "port@%u", (num)) > sizeof(var))

SWNODE_GRAPH_PORT_NAME_FMT ?

The name is not used anywhere else. I would keep it as-is.

It repeats the same string literal which is the part of the firmware node graph representation, right? I think you can rename the above mentioned format macro and use it in your code. We will reduce the possible deviation and amount of points of error.

...

Quoted 5 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 462

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	static const char mipi_port_prefix[] = "mipi-img-port-";

It's harder to read in the code, please put it in place.

There are multiple uses of it. It's better there's a single definition.

Yes and without this definition one read exact value of the property without too much brain power, now I need to go first to remember the prefix, then concatenate it without typo in my brain and think about the result.

...

Quoted 5 lines
Quoted 5 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 528

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+			port->ep_props[NEXT_PROPERTY(*ep_prop_index,
+						     EP_DATA_LANES)] =

It's hard to read, taking into account that you split on index of the array.

Quoted 7 lines
Quoted 2 lines

How much a new monitor costs for you? Maybe I can donate to make you use more than 80 from time to time? :-)

You know newspaper pages are split into multiple columns for a reason, similarly web pages with text columns very seldom span the entire page width. The number of characters per line tends to be less than --- you might be surprised --- 80. The reason is readability.

Surprisingly to you, the newspaper and the limit is for quick reading the text. The code differs to the SciFi book, for example. And doesn't have same requirements. Code has different tokenisation which you break when splitting in the middle of the token. That's why one line is better than silly 80 characters limit. It _increases_ readability of the *code*.

Quoted 3 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 531

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+				PROPERTY_ENTRY_U32_ARRAY_LEN("data-lanes",
+							     port->data_lanes,
+							     num_lanes);

Ditto for all other similar cases.

...

Quoted 5 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 596

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		if (!ret)

Why not positive conditional?

The success case is handled first.

And in kernel we usually check for error first. Esp. taking into account that here you have both cases under 'if'.

...

Quoted 5 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 644

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	if (acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK) {

We have ACPI_SUCCESS() / ACPI_FAILURE()

Yes.

Why not using them?

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+		acpi_handle_warn(acpi_device_handle(device), "cannot get path name\n");
+		return;
+	}
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#15 lore raw

Re: [PATCH 4/8] ACPI: property: Generate camera swnodes for ACPI and DisCo for Imaging

Hi Andy,

Quoted 11 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:40PM +0200, Sakari Ailus wrote:

...

Quoted 5 lines
Quoted 4 lines

drivers/acpi/mipi.c struct acpi_handle_ref { · line 179

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+#define GRAPH_PORT_NAME(var, num) \
+	(snprintf((var), sizeof(var), "port@%u", (num)) > sizeof(var))

SWNODE_GRAPH_PORT_NAME_FMT ?

Quoted 6 lines
Quoted 1 line

The name is not used anywhere else. I would keep it as-is.

It repeats the same string literal which is the part of the firmware node graph representation, right? I think you can rename the above mentioned format macro and use it in your code. We will reduce the possible deviation and amount of points of error.

Ah, I thought you had suggested using a new one. Yes, I'll use the existing macro.

Quoted 7 lines

...

Quoted 4 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 462

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	static const char mipi_port_prefix[] = "mipi-img-port-";

It's harder to read in the code, please put it in place.

Quoted 5 lines
Quoted 1 line

There are multiple uses of it. It's better there's a single definition.

Yes and without this definition one read exact value of the property without too much brain power, now I need to go first to remember the prefix, then concatenate it without typo in my brain and think about the result.

Still having them exactly the same is of utmost importance and a common definition reliably achieves that. What the string actually is is of secondary importance.

Quoted 16 lines

...

Quoted 5 lines
Quoted 5 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 528

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+			port->ep_props[NEXT_PROPERTY(*ep_prop_index,
+						     EP_DATA_LANES)] =

It's hard to read, taking into account that you split on index of the array.

Quoted 7 lines
Quoted 2 lines

How much a new monitor costs for you? Maybe I can donate to make you use more than 80 from time to time? :-)

You know newspaper pages are split into multiple columns for a reason, similarly web pages with text columns very seldom span the entire page width. The number of characters per line tends to be less than --- you might be surprised --- 80. The reason is readability.

Quoted 5 lines

Surprisingly to you, the newspaper and the limit is for quick reading the text. The code differs to the SciFi book, for example. And doesn't have same requirements. Code has different tokenisation which you break when splitting in the middle of the token. That's why one line is better than silly 80 characters limit. It _increases_ readability of the *code*.

I disagree. Do you know if studies have been made on the topic?

I can make some a little longer if that makes you happy (depending on other comments, too), but I won't make the lines e.g. 200 characters long.

Quoted 9 lines
Quoted 4 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 531

Quoted 4 lines
drivers/acpi/mipi.c +3 -0
+				PROPERTY_ENTRY_U32_ARRAY_LEN("data-lanes",
+							     port->data_lanes,
+							     num_lanes);

Ditto for all other similar cases.

...

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 596

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		if (!ret)

Why not positive conditional?

The success case is handled first.

And in kernel we usually check for error first. Esp. taking into account that here you have both cases under 'if'.

The other assignments take place just before this, so it's closer to them. I can change this though.

Quoted 10 lines

...

Quoted 5 lines
Quoted 3 lines

drivers/acpi/mipi.c void acpi_bus_scan_crs_csi2(acpi_handle handle) · line 644

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+	if (acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK) {

We have ACPI_SUCCESS() / ACPI_FAILURE()

Yes.

Why not using them?

Yes, in v2.

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/acpi/mipi.c +3 -0
+		acpi_handle_warn(acpi_device_handle(device), "cannot get path name\n");
+		return;
+	}
Signature · 3 lines
Kind regards,

Sakari Ailus
author reviewer
#16 lore raw

PATCH 5/8 ACPI: property: Dig "rotation" property for devices with CSI2 _CRS

In reply to Sakari Ailus

Dig "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     | 17 +++++++++++++++++
 include/acpi/acpi_bus.h |  1 +
 2 files changed, 18 insertions(+)
drivers/acpi/mipi.c +17 -0
index cc80d79f4a381..bd09eac0a52e4 100644
@@ -632,15 +632,32 @@ 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_get_physical_device_location(acpi_device_handle(device),
+					      &pld) == AE_OK) {
+		ads->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] =
+			PROPERTY_ENTRY_U32("rotation",
+					   (u32)pld->rotation * 45U);
+		kfree(pld);
+	}
+
 	if (acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer) != AE_OK) {
 		acpi_handle_warn(acpi_device_handle(device), "cannot get path name\n");
 		return;
include/acpi/acpi_bus.h +1 -0
index 9a7729e96d14c..3c4a1daed33f1 100644
@@ -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
#17 lore raw

Re: [PATCH 5/8] ACPI: property: Dig "rotation" property for devices with CSI2 _CRS

Quoted 6 lines · Sakari Ailus

Dig "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 static void init_port_csi2_remote(struct acpi_device *device, · line 654

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+	if (fwnode_property_read_u32(fwnode, "rotation", &val) &&
+	    acpi_get_physical_device_location(acpi_device_handle(device),
+					      &pld) == AE_OK) {

ACPI_SUCCESS() ?

...

drivers/acpi/mipi.c static void init_port_csi2_remote(struct acpi_device *device, · line 657

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+		ads->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] =
+			PROPERTY_ENTRY_U32("rotation",
+					   (u32)pld->rotation * 45U);

Why do you need casting?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#18 lore raw

Re: [PATCH 5/8] ACPI: property: Dig "rotation" property for devices with CSI2 _CRS

Hi Andy,

Quoted 8 lines · Andy Shevchenko
Quoted 6 lines · Sakari Ailus

Dig "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.

Quoted 7 lines

...

drivers/acpi/mipi.c static void init_port_csi2_remote(struct acpi_device *device, · line 654

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+	if (fwnode_property_read_u32(fwnode, "rotation", &val) &&
+	    acpi_get_physical_device_location(acpi_device_handle(device),
+					      &pld) == AE_OK) {

ACPI_SUCCESS() ?

Yes.

Quoted 8 lines

...

drivers/acpi/mipi.c static void init_port_csi2_remote(struct acpi_device *device, · line 657

Quoted 3 lines
drivers/acpi/mipi.c +3 -0
+		ads->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] =
+			PROPERTY_ENTRY_U32("rotation",
+					   (u32)pld->rotation * 45U);

Why do you need casting?

I think it's actually not needed.

Signature · 1 line
Sakari Ailus
author reviewer
#19 lore raw

PATCH 6/8 ACPI: property: Rename parsed MIPI DisCo for Imaging properties

In reply to Sakari Ailus

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.

---
 drivers/acpi/internal.h |  1 +
 drivers/acpi/mipi.c     | 37 +++++++++++++++++++++++++++++++++++++
 drivers/acpi/property.c | 20 +++++++++++---------
 3 files changed, 49 insertions(+), 9 deletions(-)
drivers/acpi/internal.h +1 -0
index fac87404e294c..f107094bfe16f 100644
@@ -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
index bd09eac0a52e4..2174e03a2eafd 100644
@@ -687,3 +687,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 +11 -9
index 545f74673703d..92fdc2adcac3d 100644
@@ -121,7 +121,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)
 {
@@ -142,7 +142,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)
 {
@@ -273,22 +273,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]))
+		    || elements[0].type != ACPI_TYPE_STRING
+		    || !acpi_property_value_ok(&elements[1]))
 			return false;
+
+		acpi_properties_prepare_mipi(elements);
 	}
 	return true;
 }
@@ -520,7 +522,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
#20 lore raw

Re: [PATCH 6/8] ACPI: property: Rename parsed MIPI DisCo for Imaging properties

Quoted 13 lines · Sakari Ailus

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.

...

drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 701

Quoted 11 lines
drivers/acpi/mipi.c +11 -0
+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" },
+};

If we split this to 2 arrays (with static_assert() against their sizes)...

...

drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 719

Quoted 8 lines
drivers/acpi/mipi.c +8 -0
+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)) {

...we can utilise match_string() here.

Quoted 7 lines
drivers/acpi/mipi.c +7 -0
+			WARN_ON(strscpy(elements[0].string.pointer,
+					mipi_disco_props[i].dt_prop,
+					elements[0].string.length) < 0);
+			break;
+		}
+	}
+}

...

Quoted 5 lines
drivers/acpi/property.c +2 -1
 	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;
 

drivers/acpi/property.c static bool acpi_property_value_ok(const union acpi_object *value) · line 290

Quoted 10 lines
drivers/acpi/property.c +2 -3
-		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]))
+		    || elements[0].type != ACPI_TYPE_STRING
+		    || !acpi_property_value_ok(&elements[1]))

While at it you can mode ||:s on the respective previous lines.

Quoted 4 lines
drivers/acpi/property.c +2 -0
 			return false;
+
+		acpi_properties_prepare_mipi(elements);
 	}
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#21 lore raw

Re: [PATCH 6/8] ACPI: property: Rename parsed MIPI DisCo for Imaging properties

Hi Andy,

Quoted 33 lines · Andy Shevchenko
Quoted 13 lines · Sakari Ailus

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.

...

drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 701

Quoted 11 lines
drivers/acpi/mipi.c +11 -0
+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" },
+};

If we split this to 2 arrays (with static_assert() against their sizes)...

...

Quoted 10 lines

drivers/acpi/mipi.c void acpi_init_swnodes(struct acpi_device *device) · line 719

Quoted 8 lines
drivers/acpi/mipi.c +8 -0
+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)) {

...we can utilise match_string() here.

We could, yes.

I'd prefer to keep them separate still, the table is easier to maintain that way. And I'd say it's the table above that matters more than this function.

The current spec does not use more than these properties but I'd expect to be added more of these in the future.

Quoted 16 lines
Quoted 8 lines
drivers/acpi/mipi.c +7 -0
+			WARN_ON(strscpy(elements[0].string.pointer,
+					mipi_disco_props[i].dt_prop,
+					elements[0].string.length) < 0);
+			break;
+		}
+	}
+}

...

Quoted 5 lines
drivers/acpi/property.c +2 -1
 	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;
Quoted 12 lines

drivers/acpi/property.c static bool acpi_property_value_ok(const union acpi_object *value) · line 290

Quoted 10 lines
drivers/acpi/property.c +2 -3
-		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]))
+		    || elements[0].type != ACPI_TYPE_STRING
+		    || !acpi_property_value_ok(&elements[1]))

While at it you can mode ||:s on the respective previous lines.

Yes, I'll fix that.

Quoted 5 lines
Quoted 5 lines
drivers/acpi/property.c +2 -0
 			return false;
+
+		acpi_properties_prepare_mipi(elements);
 	}
Signature · 3 lines
Kind regards,

Sakari Ailus
author reviewer
#22 lore raw

PATCH 7/8 ACPI: property: Skip MIPI property table without "mipi-img" prefix

In reply to Sakari Ailus

For 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 | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/acpi/mipi.c +12 -6
index 2174e03a2eafd..840f565b1906f 100644
@@ -688,16 +688,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" },
 };
 
 /**
@@ -713,6 +715,10 @@ void acpi_properties_prepare_mipi(union acpi_object *elements)
 {
 	unsigned int i;
 
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))
+		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
#23 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 3 lines · Sakari Ailus

For all _DSD properties, skip going through the MIPI DisCo for Imaging property name substitution table if the property doesn't have "mipi-img-" prefix.

...

Quoted 1 line

+#define MIPI_IMG_PREFIX "mipi-img-"

I don't think this is good for readability.

...

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		return;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#24 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Hi Andy,

Quoted 10 lines · Andy Shevchenko
Quoted 3 lines · Sakari Ailus

For all _DSD properties, skip going through the MIPI DisCo for Imaging property name substitution table if the property doesn't have "mipi-img-" prefix.

...

Quoted 1 line

+#define MIPI_IMG_PREFIX "mipi-img-"

I don't think this is good for readability.

It should be used at least below, where it is referred twice.

I'm open to removing this from the table though.

Quoted 7 lines

...

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Quoted 2 lines
Quoted 2 lines
drivers/acpi/mipi.c +1 -0
+		return;
Signature · 3 lines
Regards,

Sakari Ailus
#25 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 7 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		return;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#26 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 10 lines
Quoted 7 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Probably that's the reason behind __always_inline for that function.

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/acpi/mipi.c +1 -0
+		return;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#27 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 12 lines · Andy Shevchenko
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Probably that's the reason behind __always_inline for that function.

For str_has_prefix() the reason probably is that inlining that function generates less code than when not doing so.

Signature · 1 line
Sakari Ailus
#28 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 5 lines · Sakari Ailus
Quoted 4 lines · Andy Shevchenko
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Probably that's the reason behind __always_inline for that function.

For str_has_prefix() the reason probably is that inlining that function generates less code than when not doing so.

Yes and also allows to optimize strlen() away.
So I suggest to use that function.

If assembly is different (WRT strlen("...const literal...") case), I would like to know the exact configuration options and the code that makes a call to strlen().

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#29 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

In reply to Andy Shevchenko
Quoted 11 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 5 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

Quoted 5 lines
Quoted 2 lines

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Actually not. There seem to be an implementation of strlen() in include/linux/fortify-string.h that would seem to be capable of doing that. However its use is conditional to kernel configuration.

Signature · 1 line
Sakari Ailus
#30 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 4 lines · Sakari Ailus
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Quoted 6 lines
Quoted 2 lines

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Actually not. There seem to be an implementation of strlen() in include/linux/fortify-string.h that would seem to be capable of doing that. However its use is conditional to kernel configuration.

Ah, you missed probably the ability of the complier to find constant literals and replace the strlen() with plain number.

You may play with godbolt and see how optimization (-O2) makes this happen.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author reviewer
#31 lore raw

Re: [PATCH 7/8] ACPI: property: Skip MIPI property table without "mipi-img" prefix

Quoted 19 lines · Andy Shevchenko
Quoted 4 lines · Sakari Ailus
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Sakari Ailus
Quoted 1 line · Andy Shevchenko

On Tue, Jan 17, 2023 at 02:22:43PM +0200, Sakari Ailus wrote:

...

Quoted 11 lines
Quoted 10 lines
Quoted 7 lines
Quoted 4 lines

drivers/acpi/mipi.c void acpi_properties_prepare_mipi(union acpi_object *elements) · line 719

Quoted 2 lines
drivers/acpi/mipi.c +2 -0
+	if (memcmp(elements[0].string.pointer, MIPI_IMG_PREFIX,
+		   sizeof(MIPI_IMG_PREFIX) - 1))

str_has_prefix()

str_has_prefix() calls strlen() on prefix on every call. sizeof() will generate much less code --- it's just a number.

Have you tried that? Because the strlen() over const string literals will be optimized away on compilation time.

Quoted 6 lines
Quoted 3 lines

Actually not. There seem to be an implementation of strlen() in include/linux/fortify-string.h that would seem to be capable of doing that. However its use is conditional to kernel configuration.

Ah, you missed probably the ability of the complier to find constant literals and replace the strlen() with plain number.

It seems GCC does this if -foptimize-strlen (included in -O2) is given. Fair enough, I'll replace it with str_has_prefix() for v2.

Signature · 1 line
Sakari Ailus
author reviewer
#32 lore raw

PATCH 8/8 ACPI: property: Document _CRS CSI-2 and DisCo for Imaging support

In reply to Sakari Ailus

Document 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
index 840f565b1906f..f20851400c041 100644
@@ -3,6 +3,43 @@
  * MIPI DisCo for Imaging support.
  *
  * Copyright (C) 2022 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
#33 lore raw

Re: [PATCH 8/8] ACPI: property: Document _CRS CSI-2 and DisCo for Imaging support

Quoted 2 lines · Sakari Ailus

Document how ACPI _CRS CSI-2 and DisCo for Imaging works. It's non-trivial so such documentation can be useful.

...

Quoted 1 line

* Copyright (C) 2022 Intel Corporation

2022,2023 ?

Signature · 2 lines
With Best Regards,
Andy Shevchenko