Skip to contentSkip to conversation

ACPI: scan: MIPI DiSco for Imaging support

PATCH Superseded Rafael J. Wysocki 3 participants 11 messages May 24, 2023 – Jun 9, 2023

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover ACPI: scan: MIPI DiSco for Imaging support

Hi Folks,

This basically is a re-write of a recent patch series from Sakari:

https://lore.kernel.org/linux-acpi/[email protected]

The general idea is the same - CSI-2 resource descriptors, introduced in ACPI 6.4 and defined by

https://uefi.org/specs/ACPI/6.5/06_Device_Configuration.html#camera-serial-interface-csi-2-connection-resource-descriptor

are found and used for creating a set of software nodes that represent the CSI-2 connection graph.

These software nodes need to be available before any scan handlers or ACPI drivers are bound to any struct acpi_device objects, so all of that is done at the early stage of ACPI device enumeration, but unnecessary ACPI namespace walks are avoided.

The CSI-2 software nodes are populated with data extracted from the CSI-2 resource descriptors themselves and from device properties defined by the MIPI DiSco for Imaging specification (see https://www.mipi.org/specifications/mipi-disco-imaging).

Patches [4,6/6] come from the original series directly, but the other patches have been changes substantially, so I've decided to re-start patch series versioning from scratch.

This series is based on the patch at

https://patchwork.kernel.org/project/linux-acpi/patch/12223415.O9o76ZdvQC@kreacher/

applied on top of 6.4-rc3.

Later on, I'll put all of this material into a special git branch for easier access.

Thanks!

#1 lore raw

PATCH 1/6 ACPI: property: Support using strings in reference properties

From: Rafael J. Wysocki <[email protected]>

In order to allow referencing data nodes directly, which is not possible currently, add support for representing references in device properties as strings (relative or absolute name paths). For example, after this change, the "mipi-img-flash-leds" property in the ASL snippet below will be treated as a proper reference to the LED0 object under LEDD.

Package ()

 {
     "mipi-img-flash-leds",  "\\_SB.PCI0.I2C2.LEDD.LED0",

}

Device (LEDD)

 {
     Name (_DSD, Package ()  // _DSD: Device-Specific Data
     {
         ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"), /* Hierarchical Data Extension */,
         Package ()
         {
             Package ()
             {
                 "mipi-img-flash-led-0", 
                 "LED0",
             }
         },
     })
     Name (LED0, Package ()  // _DSD: Device-Specific Data
     {
         ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301") /* Device Properties */,
         Package ()
         {
             Package ()
             {
                 "mipi-img-max-current", 
                 1000000,
             }
         }
     })

}

Also remove the mechanism allowing data nodes to be referenced indirectly, with the help of an object reference pointing to the "ancestor" device and a path relative to it (this mechanism is not expected to be in use in any production platform firmware in the field).

Note that this change allows also using strings for referencing device objects, in addition to object references that have been supported already.

While at it, add pr_fmt() macro to prefix printouts and update copyright.

---
 drivers/acpi/property.c |  102 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 82 insertions(+), 20 deletions(-)
drivers/acpi/property.c +82 -20
Index: linux-pm/drivers/acpi/property.c
===================================================================
@@ -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>
@@ -800,27 +803,15 @@ static int acpi_get_ref_args(struct fwno
 	u32 nargs = 0, i;
 
 	/*
-	 * 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;
-	}
-
-	/*
 	 * Assume the following integer elements are all args. Stop counting on
-	 * the first reference or end of the package arguments. In case of
-	 * neither reference, nor integer, return an error, we can't parse it.
+	 * the first reference (possibly represented as a string) or end of the
+	 * package arguments. In case of neither reference, nor integer, return
+	 * an error, we can't parse it.
 	 */
 	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 || type == ACPI_TYPE_STRING)
 			break;
 
 		if (type == ACPI_TYPE_INTEGER)
@@ -844,6 +835,44 @@ static int acpi_get_ref_args(struct fwno
 	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_debug("Bad node type for node %pfw\n", fwnode);
+		return NULL;
+	}
+
+	status = acpi_get_handle(scope, refstring, &handle);
+	if (ACPI_FAILURE(status)) {
+		acpi_handle_debug(scope, "Unable to get an ACPI handle for %s\n",
+				  refstring);
+		return NULL;
+	}
+
+	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, "Subnode not found\n");
+		return NULL;
+	}
+
+	return &dn->fwnode;
+}
+
 /**
  * __acpi_node_get_property_reference - returns handle to the referenced object
  * @fwnode: Firmware node to get the property from
@@ -886,6 +915,7 @@ int __acpi_node_get_property_reference(c
 	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 +939,30 @@ int __acpi_node_get_property_reference(c
 
 		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 (!ref_fwnode)
+			return -EINVAL;
+
+		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:
@@ -946,6 +990,24 @@ int __acpi_node_get_property_reference(c
 			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 (!ref_fwnode)
+				return -EINVAL;
+
+			element++;
+
+			ret = acpi_get_ref_args(idx == index ? args : NULL,
+						ref_fwnode, &element, end,
+						num_args);
+			if (ret < 0)
+				return ret;
+
 			if (idx == index)
 				return 0;
 
#2 lore raw

PATCH 2/6 ACPI: scan: Extract CSI-2 connection graph from _CRS

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Find ACPI CSI-2 resource descriptors defined since ACPI 6.4 (for CSI-2 and camera configuration) in _CRS for all device objects in the given scope of the ACPI namespace that have them, identify the corresponding "remote endpoint" device objects for them and allocate memory for software nodes needed to create a DT-like data structure representing the CSI-2 connection graph for drivers.

The code needed to populate these software nodes will be added by subsequent change sets.

---
 drivers/acpi/Makefile             |    2 
 drivers/acpi/internal.h           |    8 
 drivers/acpi/mipi-disco-imaging.c |  305 ++++++++++++++++++++++++++++++++++++++
 drivers/acpi/scan.c               |   49 ++++--
 include/acpi/acpi_bus.h           |   11 +
 5 files changed, 365 insertions(+), 10 deletions(-)
 create mode 100644 drivers/acpi/mipi-disco-imaging.c
drivers/acpi/Makefile +1 -1
Index: linux-pm/drivers/acpi/Makefile
===================================================================
@@ -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-disco-imaging.o
 acpi-y				+= resource.o
 acpi-y				+= acpi_processor.o
 acpi-y				+= processor_core.o
drivers/acpi/internal.h +8 -0
Index: linux-pm/drivers/acpi/internal.h
===================================================================
@@ -282,4 +282,12 @@ void acpi_init_lpit(void);
 static inline void acpi_init_lpit(void) { }
 #endif
 
+/*--------------------------------------------------------------------------
+		ACPI _CRS CSI-2 and MIPI DisCo for Imaging
+  -------------------------------------------------------------------------- */
+
+void acpi_mipi_check_crs_csi2(acpi_handle handle);
+void acpi_mipi_scan_crs_csi2(void);
+void acpi_mipi_crs_csi2_cleanup(void);
+
 #endif /* _ACPI_INTERNAL_H_ */
drivers/acpi/mipi-disco-imaging.c new file +305 -0

305 lines not on this page · raw message

include/acpi/acpi_bus.h +11 -0
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
@@ -363,6 +363,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 software_node *nodes;
+	const struct software_node **nodeptrs;
+	struct acpi_device_software_node_port *ports;
+	unsigned int num_ports;
+};
+
 /* Device */
 struct acpi_device {
 	u32 pld_crc;
drivers/acpi/scan.c +40 -9

93 lines not on this page · raw message

#3 lore raw

PATCH 3/6 ACPI: scan: Extract _CRS CSI-2 connection information into swnodes

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Use the connection information extracted from the _CRS CSI-2 resource descriptors for all devices that have them to populate port names and the "reg", "bus-type" and "remote-endpoint" properties in the software nodes representing the CSI-2 connection graph.

---
 drivers/acpi/mipi-disco-imaging.c |  140 ++++++++++++++++++++++++++++++++++++++
 include/acpi/acpi_bus.h           |   68 ++++++++++++++++++
 2 files changed, 208 insertions(+)
include/acpi/acpi_bus.h +68 -0
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
@@ -363,11 +363,79 @@ struct acpi_device_data {
 
 struct acpi_gpio_mapping;
 
+#define ACPI_DEVICE_CSI2_DATA_LANES		4
+
+#define ACPI_DEVICE_SWNODE_ROOT			0
+#define ACPI_DEVICE_SWNODE_PORT_NAME_LENGTH	8
+
+enum acpi_device_swnode_dev_props {
+	ACPI_DEVICE_SWNODE_DEV_NUM_OF,
+	ACPI_DEVICE_SWNODE_DEV_NUM_ENTRIES
+};
+
+enum acpi_device_swnode_port_props {
+	ACPI_DEVICE_SWNODE_PORT_REG,
+	ACPI_DEVICE_SWNODE_PORT_NUM_OF,
+	ACPI_DEVICE_SWNODE_PORT_NUM_ENTRIES
+};
+
+enum acpi_device_swnode_ep_props {
+	ACPI_DEVICE_SWNODE_EP_REMOTE_EP,
+	ACPI_DEVICE_SWNODE_EP_BUS_TYPE,
+	ACPI_DEVICE_SWNODE_EP_REG,
+	ACPI_DEVICE_SWNODE_EP_CLOCK_LANES,
+	ACPI_DEVICE_SWNODE_EP_DATA_LANES,
+	ACPI_DEVICE_SWNODE_EP_LANE_POLARITIES,
+	/* TX only */
+	ACPI_DEVICE_SWNODE_EP_LINK_FREQUENCIES,
+	ACPI_DEVICE_SWNODE_EP_NUM_OF,
+	ACPI_DEVICE_SWNODE_EP_NUM_ENTRIES
+};
+
+/*
+ * Each device has a root software node plus two times as many nodes as the
+ * number of CSI-2 ports.
+ */
+#define ACPI_DEVICE_SWNODE_PORT(port)	(1 + 2 * (port))
+#define ACPI_DEVICE_SWNODE_EP(endpoint)	\
+		(ACPI_DEVICE_SWNODE_PORT(endpoint) + 1)
+
+/**
+ * struct acpi_device_software_node_port - MIPI DisCo for Imaging CSI-2 port
+ * @port_name: Port name
+ * @data_lanes: "data-lanes" property values
+ * @lane_polarities: "lane-polarities" property values
+ * @link_frequencies: "link_frequencies" property values
+ * @port_nr: Port number
+ * @crs_crs2_local: _CRS CSI2 record present (i.e. this is a transmitter one)
+ * @port_props: Port properties
+ * @ep_props: Endpoint properties
+ * @remote_ep: Reference to the remote endpoint
+ */
 struct acpi_device_software_node_port {
+	char port_name[ACPI_DEVICE_SWNODE_PORT_NAME_LENGTH];
+	u32 data_lanes[ACPI_DEVICE_CSI2_DATA_LANES];
+	u32 lane_polarities[ACPI_DEVICE_CSI2_DATA_LANES + 1 /* clock lane */];
+	u64 link_frequencies[ACPI_DEVICE_CSI2_DATA_LANES];
 	unsigned int port_nr;
+	bool crs_csi2_local;
+
+	struct property_entry port_props[ACPI_DEVICE_SWNODE_PORT_NUM_ENTRIES];
+	struct property_entry ep_props[ACPI_DEVICE_SWNODE_EP_NUM_ENTRIES];
+
+	struct software_node_ref_args remote_ep[1];
 };
 
+/**
+ * struct acpi_device_software_nodes - Software nodes for an ACPI device
+ * @dev_props: Device properties
+ * @nodes: Software nodes for root as well as ports and endpoints
+ * @nodeprts: Array of software node pointers, for (un)registering them
+ * @ports: Information related to each port and endpoint within a port
+ * @num_ports: The number of ports
+ */
 struct acpi_device_software_nodes {
+	struct property_entry dev_props[ACPI_DEVICE_SWNODE_DEV_NUM_ENTRIES];
 	struct software_node *nodes;
 	const struct software_node **nodeptrs;
 	struct acpi_device_software_node_port *ports;
drivers/acpi/mipi-disco-imaging.c +140 -0

158 lines not on this page · raw message

#4 lore raw

PATCH 4/6 device property: Add SOFTWARE_NODE() macro for defining software nodes

In reply to Rafael J. Wysocki

From: Sakari Ailus <[email protected]>

Add SOFTWARE_NODE() macro in order to make defining software nodes look nicer. This is analogous to different PROPERTY_ENTRY_*() macros for defining properties.

---

Same as https://patchwork.kernel.org/project/linux-acpi/patch/[email protected]/

---
 include/linux/property.h |    7 +++++++
 1 file changed, 7 insertions(+)
include/linux/property.h +7 -0
Index: linux-pm/include/linux/property.h
===================================================================
@@ -476,6 +476,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);
#5 lore raw

PATCH 5/6 ACPI: scan: Extract MIPI DiSco for Imaging data into swnodes

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Add information extracted from the MIPI DiSco for Imaging device properties to software nodes created during the CSI-2 connection graph discovery.

---
 drivers/acpi/internal.h           |    1 
 drivers/acpi/mipi-disco-imaging.c |  238 +++++++++++++++++++++++++++++++++++++-
 drivers/acpi/scan.c               |    9 +
 include/acpi/acpi_bus.h           |    1 
 4 files changed, 242 insertions(+), 7 deletions(-)
drivers/acpi/mipi-disco-imaging.c +233 -5
Index: linux-pm/drivers/acpi/mipi-disco-imaging.c
===================================================================
@@ -6,12 +6,16 @@
  *
  * Support MIPI DisCo for Imaging by parsing ACPI _CRS CSI-2 records defined in
  * Section 6.4.3.8.2.4 "Camera Serial Interface (CSI-2) Connection Resource
- * Descriptor" of ACPI 6.5.
+ * Descriptor" of ACPI 6.5 and using device properties defined by the MIPI DisCo
+ * for Imaging specification.
  *
  * The implementation looks for the information in the ACPI namespace (CSI-2
  * resource descriptors in _CRS) and constructs software nodes compatible with
  * Documentation/firmware-guide/acpi/dsd/graph.rst to represent the CSI-2
- * connection graph.
+ * connection graph.  The software nodes are then populated with the data
+ * extracted from the _CRS CSI-2 resource descriptors and the MIPI DisCo
+ * for Imaging device properties present in _DSD for the ACPI device objects
+ * with CSI-2 connections.
  */
 
 #include <linux/acpi.h>
@@ -377,8 +381,219 @@ static void prepare_crs_csi2_swnodes(str
 		extract_crs_csi2_conn_info(local_handle, local_swnodes, conn);
 }
 
+/*
+ * Get the index of the next property in the property array, with a given
+ * maximum value.
+ */
+#define NEXT_PROPERTY(index, max)			\
+	(WARN_ON((index) > ACPI_DEVICE_SWNODE_##max) ?	\
+	 ACPI_DEVICE_SWNODE_##max : (index)++)
+
+static void init_csi2_port_local(struct acpi_device *adev,
+				 struct acpi_device_software_node_port *port,
+				 struct fwnode_handle *port_fwnode,
+				 unsigned int index)
+{
+	acpi_handle handle = acpi_device_handle(adev);
+	unsigned int num_link_freqs;
+	int ret;
+
+	ret = fwnode_property_count_u64(port_fwnode, "mipi-img-link-frequencies");
+	if (ret <= 0)
+		return;
+
+	num_link_freqs = ret;
+	if (num_link_freqs > ARRAY_SIZE(port->link_frequencies)) {
+		acpi_handle_info(handle, "Too many link frequencies: %u\n",
+				 num_link_freqs);
+		num_link_freqs = ARRAY_SIZE(port->link_frequencies);
+	}
+
+	ret = fwnode_property_read_u64_array(port_fwnode,
+					     "mipi-img-link-frequencies",
+					     port->link_frequencies,
+					     num_link_freqs);
+	if (ret) {
+		acpi_handle_info(handle, "Unable to get link frequencies (%d)\n",
+				 ret);
+		return;
+	}
+
+	port->ep_props[NEXT_PROPERTY(index, EP_LINK_FREQUENCIES)] =
+				PROPERTY_ENTRY_U64_ARRAY_LEN("link-frequencies",
+							     port->link_frequencies,
+							     num_link_freqs);
+}
+
+static void init_csi2_port(struct acpi_device *adev,
+			   struct acpi_device_software_nodes *swnodes,
+			   struct acpi_device_software_node_port *port,
+			   struct fwnode_handle *port_fwnode,
+			   unsigned int port_index)
+{
+	unsigned int ep_prop_index = ACPI_DEVICE_SWNODE_EP_CLOCK_LANES;
+	acpi_handle handle = acpi_device_handle(adev);
+	u8 val[ARRAY_SIZE(port->data_lanes)];
+	unsigned int num_lanes = 0;
+	int ret;
+
+	if (GRAPH_PORT_NAME(port->port_name, port->port_nr))
+		return;
+
+	swnodes->nodes[ACPI_DEVICE_SWNODE_PORT(port_index)] =
+			SOFTWARE_NODE(port->port_name, port->port_props,
+				      &swnodes->nodes[ACPI_DEVICE_SWNODE_ROOT]);
+
+	ret = fwnode_property_read_u8(port_fwnode, "mipi-img-clock-lane", val);
+	if (!ret)
+		port->ep_props[NEXT_PROPERTY(ep_prop_index, EP_CLOCK_LANES)] =
+			PROPERTY_ENTRY_U32("clock-lanes", val[0]);
+
+	ret = fwnode_property_count_u8(port_fwnode, "mipi-img-data-lanes");
+	if (ret > 0) {
+		num_lanes = ret;
+
+		if (num_lanes > ARRAY_SIZE(port->data_lanes)) {
+			acpi_handle_info(handle, "Too many data lanes: %u\n",
+					 num_lanes);
+			num_lanes = ARRAY_SIZE(port->data_lanes);
+		}
+
+		ret = fwnode_property_read_u8_array(port_fwnode,
+						    "mipi-img-data-lanes",
+						    val, num_lanes);
+		if (!ret) {
+			unsigned int i;
+
+			for (i = 0; i < num_lanes; i++)
+				port->data_lanes[i] = val[i];
+
+			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_count_u8(port_fwnode, "mipi-img-lane-polarities");
+	if (ret > 0) {
+		unsigned long mask;
+		unsigned int i;
+
+		/*
+		 * Total number of lanes here is clock lane + data lanes.
+		 * Require that number to be low enough so they all can be
+		 * covered by the bits in one byte.
+		 */
+		BUILD_BUG_ON(BITS_PER_TYPE(u8) <= ARRAY_SIZE(port->data_lanes));
+
+		fwnode_property_read_u8_array(port_fwnode,
+					      "mipi-img-lane-polarities",
+					      val, 1);
+
+		for (mask = val[0], i = 0; i < num_lanes + 1; i++)
+			port->lane_polarities[i] = test_bit(i, &mask);
+
+		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_info(handle, "No lane polarity bytes\n");
+	}
+
+	swnodes->nodes[ACPI_DEVICE_SWNODE_EP(port_index)] =
+		SOFTWARE_NODE("endpoint@0", swnodes->ports[port_index].ep_props,
+			      &swnodes->nodes[ACPI_DEVICE_SWNODE_PORT(port_index)]);
+
+	if (port->crs_csi2_local)
+		init_csi2_port_local(adev, port, port_fwnode, ep_prop_index);
+}
+
+#define MIPI_IMG_PORT_PREFIX "mipi-img-port-"
+
+static struct fwnode_handle *get_mipi_port_handle(struct fwnode_handle *adev_fwnode,
+						  unsigned int port_nr)
+{
+	char port_name[sizeof(MIPI_IMG_PORT_PREFIX) + 2];
+
+	if (snprintf(port_name, sizeof(port_name), "%s%u",
+		     MIPI_IMG_PORT_PREFIX, port_nr) >= sizeof(port_name))
+		return NULL;
+
+	return fwnode_get_named_child_node(adev_fwnode, port_name);
+}
+
+static void init_crs_csi2_swnodes(struct crs_csi2 *csi2)
+{
+	struct acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER };
+	struct acpi_device_software_nodes *swnodes = csi2->swnodes;
+	acpi_handle handle = csi2->handle;
+	struct fwnode_handle *adev_fwnode;
+	struct acpi_device *adev;
+	acpi_status status;
+	unsigned int i;
+	int ret;
+
+	adev = acpi_fetch_acpi_dev(handle);
+	if (!adev)
+		return;
+
+	adev_fwnode = acpi_fwnode_handle(adev);
+
+	status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+	if (ACPI_FAILURE(status)) {
+		acpi_handle_info(handle, "Unable to get the path name\n");
+		return;
+	}
+
+	swnodes->nodes[ACPI_DEVICE_SWNODE_ROOT] =
+			SOFTWARE_NODE(buffer.pointer, swnodes->dev_props, NULL);
+
+	for (i = 0; i < swnodes->num_ports; i++) {
+		struct acpi_device_software_node_port *port = &swnodes->ports[i];
+		struct fwnode_handle *port_fwnode;
+
+		/*
+		 * The MIPI DisCo for Imaging specification defines _DSD device
+		 * properties for providing CSI-2 port parameters that can be
+		 * accessed through the generic device properties framework.  To
+		 * access them, it is first necessary to find the data node
+		 * representing the port under the given ACPI device object.
+		 */
+		port_fwnode = get_mipi_port_handle(adev_fwnode, port->port_nr);
+		if (!port_fwnode) {
+			acpi_handle_info(handle,
+					 "MIPI port name too long for port %u\n",
+					 port->port_nr);
+			continue;
+		}
+
+		init_csi2_port(adev, swnodes, port, port_fwnode, i);
+
+		fwnode_handle_put(port_fwnode);
+	}
+
+	ret = software_node_register_node_group(swnodes->nodeptrs);
+	if (ret < 0) {
+		acpi_handle_info(handle,
+				 "Unable to register software nodes (%d)\n", ret);
+		return;
+	}
+
+	adev->swnodes = swnodes;
+	adev_fwnode->secondary = software_node_fwnode(swnodes->nodes);
+
+	/* This entry is not going to be used any more, so delete it. */
+	acpi_mipi_del_crs_csi2(csi2);
+}
+
 /**
- * acpi_mipi_scan_crs_csi2 - Allocate ACPI _CRS CSI-2 software nodes
+ * acpi_mipi_scan_crs_csi2 - Set up ACPI _CRS CSI-2 software nodes
+ *
+ * Allocate and initialize ACPI _CRS CSI-2 software nodes for the entire CSI-2
+ * connection graph except for devices the enumeration of which has been
+ * postponed due to dependencies.
  *
  * Note that this function must be called before any struct acpi_device objects
  * are bound to any ACPI drivers or scan handlers, so it cannot assume the
@@ -425,10 +640,23 @@ void acpi_mipi_scan_crs_csi2(void)
 
 	/*
 	 * Set up software node properties using data from _CRS CSI-2 resource
-	 * descriptors.
+	 * descriptors and MIPI DiSco for Imaging device properties.
 	 */
-	list_for_each_entry(csi2, &acpi_mipi_crs_csi2_list, entry)
+	list_for_each_entry_safe(csi2, csi2_tmp, &acpi_mipi_crs_csi2_list, entry) {
 		prepare_crs_csi2_swnodes(csi2);
+		init_crs_csi2_swnodes(csi2);
+	}
+}
+
+/**
+ * acpi_mipi_init_crs_csi2_swnodes - Populate _CRS CSI-2 software nodes
+ */
+void acpi_mipi_init_crs_csi2_swnodes(void)
+{
+	struct crs_csi2 *csi2, *csi2_tmp;
+
+	list_for_each_entry_safe(csi2, csi2_tmp, &acpi_mipi_crs_csi2_list, entry)
+		init_crs_csi2_swnodes(csi2);
 }
 
 /**
drivers/acpi/internal.h +1 -0
Index: linux-pm/drivers/acpi/internal.h
===================================================================
@@ -288,6 +288,7 @@ static inline void acpi_init_lpit(void)
 
 void acpi_mipi_check_crs_csi2(acpi_handle handle);
 void acpi_mipi_scan_crs_csi2(void);
+void acpi_mipi_init_crs_csi2_swnodes(void);
 void acpi_mipi_crs_csi2_cleanup(void);
 
 #endif /* _ACPI_INTERNAL_H_ */
drivers/acpi/scan.c +7 -2
Index: linux-pm/drivers/acpi/scan.c
===================================================================
@@ -2441,6 +2441,11 @@ static void acpi_scan_postponed_branch(a
 
 	acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
 			    acpi_bus_check_add_2, NULL, NULL, (void **)&adev);
+	/*
+	 * Populate the ACPI _CRS CSI-2 software nodes for the ACPI devices that
+	 * have been added above.
+	 */
+	acpi_mipi_init_crs_csi2_swnodes();
 	acpi_bus_attach(adev, NULL);
 }
 
@@ -2510,9 +2515,9 @@ int acpi_bus_scan(acpi_handle handle)
 		return -ENODEV;
 
 	/*
-	 * Allocate ACPI _CRS CSI-2 software nodes using information extracted
+	 * Set up ACPI _CRS CSI-2 software nodes using information extracted
 	 * from the _CRS CSI-2 resource descriptors during the ACPI namespace
-	 * walk above.
+	 * walk above and MIPI DiSco for Imaging device properties.
 	 */
 	acpi_mipi_scan_crs_csi2();
 
include/acpi/acpi_bus.h +1 -0
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
@@ -460,6 +460,7 @@ struct acpi_device {
 	struct acpi_device_data data;
 	struct acpi_scan_handler *handler;
 	struct acpi_hotplug_context *hp;
+	struct acpi_device_software_nodes *swnodes;
 	const struct acpi_gpio_mapping *driver_gpios;
 	void *driver_data;
 	struct device dev;
#6 lore raw

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

In reply to Rafael J. Wysocki

From: Sakari Ailus <[email protected]>

Find the "rotation" property value for devices with _CRS CSI-2 resource descriptors and use it to add the "rotation" property to the software nodes representing the CSI-2 connection graph. That value typically comes from the _PLD (Physical Location of Device) object if it is present for the given device.

This way, camera sensor drivers that know the "rotation" property do not need to care about _PLD on systems using ACPI.

[ rjw: Changelog edits ]

---

Code changes same as in

https://patchwork.kernel.org/project/linux-acpi/patch/[email protected]

changelog edited.

---
 drivers/acpi/mipi-disco-imaging.c |   17 +++++++++++++++++
 include/acpi/acpi_bus.h           |    1 +
 2 files changed, 18 insertions(+)
drivers/acpi/mipi-disco-imaging.c +17 -0
Index: linux-pm/drivers/acpi/mipi-disco-imaging.c
===================================================================
@@ -529,6 +529,7 @@ static void init_crs_csi2_swnodes(struct
 	struct acpi_buffer buffer = { .length = ACPI_ALLOCATE_BUFFER };
 	struct acpi_device_software_nodes *swnodes = csi2->swnodes;
 	acpi_handle handle = csi2->handle;
+	unsigned int prop_index = 0;
 	struct fwnode_handle *adev_fwnode;
 	struct acpi_device *adev;
 	acpi_status status;
@@ -541,6 +542,22 @@ static void init_crs_csi2_swnodes(struct
 
 	adev_fwnode = acpi_fwnode_handle(adev);
 
+	/*
+	 * If the "rotation" property is not present, but _PLD is there,
+	 * evaluate it to get the "rotation" value.
+	 */
+	if (!fwnode_property_present(adev_fwnode, "rotation")) {
+		struct acpi_pld_info *pld;
+
+		status = acpi_get_physical_device_location(handle, &pld);
+		if (ACPI_SUCCESS(status)) {
+			swnodes->dev_props[NEXT_PROPERTY(prop_index, DEV_ROTATION)] =
+					PROPERTY_ENTRY_U32("rotation",
+							   pld->rotation * 45U);
+			kfree(pld);
+		}
+	}
+
 	status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 	if (ACPI_FAILURE(status)) {
 		acpi_handle_info(handle, "Unable to get the path name\n");
include/acpi/acpi_bus.h +1 -0
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
@@ -369,6 +369,7 @@ struct acpi_gpio_mapping;
 #define ACPI_DEVICE_SWNODE_PORT_NAME_LENGTH	8
 
 enum acpi_device_swnode_dev_props {
+	ACPI_DEVICE_SWNODE_DEV_ROTATION,
 	ACPI_DEVICE_SWNODE_DEV_NUM_OF,
 	ACPI_DEVICE_SWNODE_DEV_NUM_ENTRIES
 };
#7 lore raw
In reply to Rafael J. Wysocki
Quoted 19 lines · Rafael J. Wysocki

Hi Folks,

This basically is a re-write of a recent patch series from Sakari:

https://lore.kernel.org/linux-acpi/[email protected]

The general idea is the same - CSI-2 resource descriptors, introduced in ACPI 6.4 and defined by

https://uefi.org/specs/ACPI/6.5/06_Device_Configuration.html#camera-serial-interface-csi-2-connection-resource-descriptor

are found and used for creating a set of software nodes that represent the CSI-2 connection graph.

These software nodes need to be available before any scan handlers or ACPI drivers are bound to any struct acpi_device objects, so all of that is done at the early stage of ACPI device enumeration, but unnecessary ACPI namespace walks are avoided.

Quoted 7 lines

The CSI-2 software nodes are populated with data extracted from the CSI-2 resource descriptors themselves and from device properties defined by the MIPI DiSco for Imaging specification (see https://www.mipi.org/specifications/mipi-disco-imaging).

Patches [4,6/6] come from the original series directly, but the other patches have been changes substantially, so I've decided to re-start patch series versioning from scratch.

I should have mentioned that the following two patches are not included:

https://patchwork.kernel.org/project/linux-acpi/patch/[email protected]/
https://patchwork.kernel.org/project/linux-acpi/patch/[email protected]/

because I don't agree with the idea of renaming device properties in place.

Also not included is the documentation patch, because comments are added by the individual patches making changes in the code.

Thanks!

#8 lore raw
In reply to Rafael J. Wysocki
Quoted 27 lines · Rafael J. Wysocki

Hi Folks,

This basically is a re-write of a recent patch series from Sakari:

https://lore.kernel.org/linux-acpi/[email protected]

The general idea is the same - CSI-2 resource descriptors, introduced in ACPI 6.4 and defined by

https://uefi.org/specs/ACPI/6.5/06_Device_Configuration.html#camera-serial-interface-csi-2-connection-resource-descriptor

are found and used for creating a set of software nodes that represent the CSI-2 connection graph.

These software nodes need to be available before any scan handlers or ACPI drivers are bound to any struct acpi_device objects, so all of that is done at the early stage of ACPI device enumeration, but unnecessary ACPI namespace walks are avoided.

The CSI-2 software nodes are populated with data extracted from the CSI-2 resource descriptors themselves and from device properties defined by the MIPI DiSco for Imaging specification (see https://www.mipi.org/specifications/mipi-disco-imaging).

Patches [4,6/6] come from the original series directly, but the other patches have been changes substantially, so I've decided to re-start patch series versioning from scratch.

Quoted 8 lines

This series is based on the patch at

https://patchwork.kernel.org/project/linux-acpi/patch/12223415.O9o76ZdvQC@kreacher/

applied on top of 6.4-rc3.

Later on, I'll put all of this material into a special git branch for easier access.

The patches are now available from the acpi-mipi-disco-imaging branch in the linux-pm.git tree at kernel.org.

Thanks!

reviewer
#9 lore raw

Hi Rafael,

Quoted 32 lines · Rafael J. Wysocki
Quoted 31 lines · Rafael J. Wysocki

Hi Folks,

This basically is a re-write of a recent patch series from Sakari:

https://lore.kernel.org/linux-acpi/[email protected]

The general idea is the same - CSI-2 resource descriptors, introduced in ACPI 6.4 and defined by

https://uefi.org/specs/ACPI/6.5/06_Device_Configuration.html#camera-serial-interface-csi-2-connection-resource-descriptor

are found and used for creating a set of software nodes that represent the CSI-2 connection graph.

These software nodes need to be available before any scan handlers or ACPI drivers are bound to any struct acpi_device objects, so all of that is done at the early stage of ACPI device enumeration, but unnecessary ACPI namespace walks are avoided.

The CSI-2 software nodes are populated with data extracted from the CSI-2 resource descriptors themselves and from device properties defined by the MIPI DiSco for Imaging specification (see https://www.mipi.org/specifications/mipi-disco-imaging).

Patches [4,6/6] come from the original series directly, but the other patches have been changes substantially, so I've decided to re-start patch series versioning from scratch.

This series is based on the patch at

https://patchwork.kernel.org/project/linux-acpi/patch/12223415.O9o76ZdvQC@kreacher/

Quoted 7 lines
Quoted 4 lines

applied on top of 6.4-rc3.

Later on, I'll put all of this material into a special git branch for easier access.

The patches are now available from the acpi-mipi-disco-imaging branch in the linux-pm.git tree at kernel.org.

I've been doing some testing on this version.

It oopses and that's relatively easy to fix by removing the kfree() that releases memory of the software nodes and properties.

It doesn't work with that change either, it would seem like that the _CRS CSI2 data is (most of the time) released before it gets used for creating the software nodes, leading node registration to fail. This appears to be taking place in different processes --- there's a work queue.

Moving the release of the _CRS CSI-2 resources to where they are no longer needed makes the system crash early at boot. I've yet to debug this further.

Signature · 3 lines
Regards,

Sakari Ailus
#10 lore raw

Hi Sakari,

Quoted 38 lines · Sakari Ailus

Hi Rafael,

Quoted 34 lines · Rafael J. Wysocki
Quoted 33 lines · Rafael J. Wysocki

Hi Folks,

This basically is a re-write of a recent patch series from Sakari:

https://lore.kernel.org/linux-acpi/[email protected]

The general idea is the same - CSI-2 resource descriptors, introduced in ACPI 6.4 and defined by

https://uefi.org/specs/ACPI/6.5/06_Device_Configuration.html#camera-serial-interface-csi-2-connection-resource-descriptor

are found and used for creating a set of software nodes that represent the CSI-2 connection graph.

These software nodes need to be available before any scan handlers or ACPI drivers are bound to any struct acpi_device objects, so all of that is done at the early stage of ACPI device enumeration, but unnecessary ACPI namespace walks are avoided.

The CSI-2 software nodes are populated with data extracted from the CSI-2 resource descriptors themselves and from device properties defined by the MIPI DiSco for Imaging specification (see https://www.mipi.org/specifications/mipi-disco-imaging).

Patches [4,6/6] come from the original series directly, but the other patches have been changes substantially, so I've decided to re-start patch series versioning from scratch.

This series is based on the patch at

https://patchwork.kernel.org/project/linux-acpi/patch/12223415.O9o76ZdvQC@kreacher/

applied on top of 6.4-rc3.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Later on, I'll put all of this material into a special git branch for easier access.

The patches are now available from the acpi-mipi-disco-imaging branch in the linux-pm.git tree at kernel.org.

I've been doing some testing on this version.

Thanks for testing!

Quoted 2 lines

It oopses and that's relatively easy to fix by removing the kfree() that releases memory of the software nodes and properties.

It would be good to check which of the patches introduces the crash.

Quoted 8 lines

It doesn't work with that change either, it would seem like that the _CRS CSI2 data is (most of the time) released before it gets used for creating the software nodes, leading node registration to fail. This appears to be taking place in different processes --- there's a work queue.

Moving the release of the _CRS CSI-2 resources to where they are no longer needed makes the system crash early at boot. I've yet to debug this further.

OK, thanks!

I think that the way to go would be to check if the results of the first patch are as expected and if so, move to the next one etc.