[PATCH 0/8] typec: mux: Introduce support for multiple TypeC muxes

[PATCH 0/8] typec: mux: Introduce support for multiple TypeC muxes

[Bjorn Andersson]

This series introduces a level of indirection between the controller's view of
a typec_mux/switch and the implementation and then expands that to support
multiple drivers.

This is needed in order to support devices such as the Qualcomm Snapdragon 888
HDK, which does muxing and orientation handling in the QMP (USB+DP) PHY and SBU
muxing in the external FSA4480 chip.

Additionally integration of typec mux and switch in the QMP PHY is included in
the series, as is the new FSA4480 driver. This is done to deal with the
renaming of the driver-side typec_mux -> typec_mux_dev.

Bjorn Andersson (8):
  dt-bindings: phy: qcom,qmp-usb3-dp: Add altmode/switch properties
  phy: qcom-qmp: Register typec mux and orientation switch
  device property: Helper to match multiple connections
  device property: Use multi-connection matchers for single case
  typec: mux: Introduce indirection
  typec: mux: Allow multiple mux_devs per mux
  dt-bindings: usb: Add binding for fcs,fsa4480
  usb: typec: mux: Add On Semi fsa4480 driver

 .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml    |  14 +
 .../devicetree/bindings/usb/fcs,fsa4480.yaml  |  72 +++++
 drivers/base/property.c                       |  83 ++++--
 drivers/phy/qualcomm/phy-qcom-qmp.c           | 176 ++++++++++--
 drivers/usb/typec/bus.c                       |   2 +-
 drivers/usb/typec/mux.c                       | 257 +++++++++++++-----
 drivers/usb/typec/mux.h                       |  12 +-
 drivers/usb/typec/mux/Kconfig                 |   9 +
 drivers/usb/typec/mux/Makefile                |   1 +
 drivers/usb/typec/mux/fsa4480.c               | 220 +++++++++++++++
 drivers/usb/typec/mux/intel_pmc_mux.c         |   8 +-
 drivers/usb/typec/mux/pi3usb30532.c           |   8 +-
 include/linux/property.h                      |   5 +
 include/linux/usb/typec_mux.h                 |  22 +-
 14 files changed, 762 insertions(+), 127 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
 create mode 100644 drivers/usb/typec/mux/fsa4480.c

-- 
2.33.1

[PATCH 1/8] dt-bindings: phy: qcom,qmp-usb3-dp: Add altmode/switch properties

[Bjorn Andersson]

The QMP block deals with orientation switching and altmode switching
between USB and DisplayPort. Add the necessary properties to the binding
to allow it to be connected to a TypeC controller and trigger these
operations.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
index 60dc27834e1d..f8a745ec479c 100644
--- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
@@ -77,6 +77,20 @@ properties:
     description:
       Phandle to a regulator supply to any specific refclk pll block.
 
+  port:
+    $ref: /schemas/graph.yaml#/properties/port
+    description:
+      A port node to link the QMP to a TypeC controller for the purpose of
+      handling altmode muxing and orientation switching.
+
+  mode-switch:
+    description: Flag the port as possible handle of altmode switching
+    type: boolean
+
+  orientation-switch:
+    description: Flag the port as possible handler of orientation switching
+    type: boolean
+
 #Required nodes:
 patternProperties:
   "^usb3-phy@[0-9a-f]+$":
-- 
2.33.1

[PATCH 2/8] phy: qcom-qmp: Register typec mux and orientation switch

[Bjorn Andersson]

The QMP PHY handles muxing of USB vs DisplayPort, as well as orientation
switching of the SuperSpeed lanes. So register typec handlers for the
two types.

The TypeC mux allows switching between four lanes of DisplayPort and a
mixed USB+DP combination. This makes it possible to reach resolutions
that requires 4 lanes.

The TypeC switch allows switching the SuperSpeed pins and have been
tested with both 2 and 4 lane DisplayPort.

It's possible that in the USB mode the DP_MODE should be disabled, but
this is left untouched.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

My suggestion is that if/once this patch is deemed acceptable the PHY
maintainers could create a immutable branch/tag which can be merged into the
PHY tree as well as the USB tree.

 drivers/phy/qualcomm/phy-qcom-qmp.c | 176 +++++++++++++++++++++++++---
 1 file changed, 158 insertions(+), 18 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 7bea6a60dc54..8d8139df9d8e 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -19,6 +19,8 @@
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 #include <linux/slab.h>
+#include <linux/usb/typec_dp.h>
+#include <linux/usb/typec_mux.h>
 
 #include <dt-bindings/phy/phy.h>
 
@@ -3017,6 +3019,9 @@ struct qmp_phy_dp_clks {
  * @phy_mutex: mutex lock for PHY common block initialization
  * @init_count: phy common block initialization count
  * @ufs_reset: optional UFS PHY reset handle
+ * @sw: typec switch for receiving orientation changes
+ * @mux: typec mux for DP muxing
+ * @orientation: carries current CC orientation
  */
 struct qcom_qmp {
 	struct device *dev;
@@ -3032,6 +3037,10 @@ struct qcom_qmp {
 	int init_count;
 
 	struct reset_control *ufs_reset;
+
+	struct typec_switch *sw;
+	struct typec_mux *mux;
+	enum typec_orientation orientation;
 };
 
 static void qcom_qmp_v3_phy_dp_aux_init(struct qmp_phy *qphy);
@@ -4378,30 +4387,23 @@ static void qcom_qmp_v3_phy_configure_dp_tx(struct qmp_phy *qphy)
 
 static bool qcom_qmp_phy_configure_dp_mode(struct qmp_phy *qphy)
 {
+	const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts;
+	bool reverse = qphy->qmp->orientation == TYPEC_ORIENTATION_REVERSE;
 	u32 val;
-	bool reverse = false;
 
 	val = DP_PHY_PD_CTL_PWRDN | DP_PHY_PD_CTL_AUX_PWRDN |
 	      DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN;
 
-	/*
-	 * TODO: Assume orientation is CC1 for now and two lanes, need to
-	 * use type-c connector to understand orientation and lanes.
-	 *
-	 * Otherwise val changes to be like below if this code understood
-	 * the orientation of the type-c cable.
-	 *
-	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC2)
-	 *	val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
-	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC1)
-	 *	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
-	 * if (orientation == ORIENTATION_CC2)
-	 *	writel(0x4c, qphy->pcs + QSERDES_V3_DP_PHY_MODE);
-	 */
-	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
+	if (dp_opts->lanes == 4 || reverse)
+		val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
+	if (dp_opts->lanes == 4 || !reverse)
+		val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
 	writel(val, qphy->pcs + QSERDES_DP_PHY_PD_CTL);
 
-	writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
+	if (reverse)
+		writel(0x4c, qphy->pcs + QSERDES_DP_PHY_MODE);
+	else
+		writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
 
 	return reverse;
 }
@@ -5809,6 +5811,123 @@ static const struct dev_pm_ops qcom_qmp_phy_pm_ops = {
 			   qcom_qmp_phy_runtime_resume, NULL)
 };
 
+#if IS_ENABLED(CONFIG_TYPEC)
+static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw,
+		enum typec_orientation orientation)
+{
+	struct qcom_qmp *qmp = typec_switch_get_drvdata(sw);
+	void __iomem *dp_com = qmp->dp_com;
+
+	qmp->orientation = orientation;
+
+	if (orientation == TYPEC_ORIENTATION_REVERSE)
+		qphy_setbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
+	else
+		qphy_clrbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
+
+	return 0;
+}
+
+static int qcom_qmp_phy_typec_mux_set(struct typec_mux *mux,
+				      struct typec_mux_state *state)
+{
+	struct qcom_qmp *qmp = typec_mux_get_drvdata(mux);
+	void __iomem *dp_com = qmp->dp_com;
+	bool dp_mode;
+	bool usb_mode;
+
+	switch (state->mode) {
+	case TYPEC_STATE_SAFE:
+	case TYPEC_STATE_USB:
+		/*
+		 * TODO: Figure out if we should clear DP_MODE when we enter a
+		 * USB-only state.
+		 */
+		dp_mode = true;
+		usb_mode = true;
+		break;
+	case TYPEC_DP_STATE_A:
+	case TYPEC_DP_STATE_C:
+	case TYPEC_DP_STATE_E:
+		dp_mode = true;
+		usb_mode = false;
+		break;
+	case TYPEC_DP_STATE_B:
+	case TYPEC_DP_STATE_D:
+	case TYPEC_DP_STATE_F:
+		dp_mode = true;
+		usb_mode = true;
+		break;
+	}
+
+	qphy_setbits(dp_com, QPHY_V3_DP_COM_RESET_OVRD_CTRL,
+		     SW_DPPHY_RESET_MUX | SW_USB3PHY_RESET_MUX);
+	if (dp_mode)
+		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
+	else
+		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
+
+	if (usb_mode)
+		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
+	else
+		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
+
+	qphy_setbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
+	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SWI_CTRL, 0x03);
+	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
+
+	return 0;
+}
+
+static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
+				       const struct qmp_phy_cfg *cfg)
+{
+	struct typec_switch_desc sw_desc = {};
+	struct typec_mux_desc mux_desc = {};
+	struct device *dev = qmp->dev;
+
+	if (!cfg->has_phy_dp_com_ctrl)
+		return 0;
+
+	sw_desc.drvdata = qmp;
+	sw_desc.fwnode = dev->fwnode;
+	sw_desc.set = qcom_qmp_phy_typec_switch_set;
+	qmp->sw = typec_switch_register(dev, &sw_desc);
+	if (IS_ERR(qmp->sw)) {
+		dev_err(dev, "Error registering typec switch: %pe\n", qmp->sw);
+		return PTR_ERR(qmp->sw);
+	}
+
+	mux_desc.drvdata = qmp;
+	mux_desc.fwnode = dev->fwnode;
+	mux_desc.set = qcom_qmp_phy_typec_mux_set;
+	qmp->mux = typec_mux_register(dev, &mux_desc);
+	if (IS_ERR(qmp->mux)) {
+		dev_err(dev, "Error registering typec mux: %pe\n", qmp->mux);
+		typec_switch_unregister(qmp->sw);
+		return PTR_ERR(qmp->mux);
+	}
+
+	return 0;
+}
+
+static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
+{
+	typec_mux_unregister(qmp->mux);
+	typec_switch_unregister(qmp->sw);
+}
+#else
+static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
+				       const struct qmp_phy_cfg *cfg)
+{
+	return 0;
+}
+
+static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
+{
+}
+#endif
+
 static int qcom_qmp_phy_probe(struct platform_device *pdev)
 {
 	struct qcom_qmp *qmp;
@@ -5891,7 +6010,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	num = of_get_available_child_count(dev->of_node);
+	ret = qcom_qmp_phy_typec_register(qmp, cfg);
+	if (ret)
+		return ret;
+
+	num = 0;
+	for_each_available_child_of_node(dev->of_node, child) {
+		if (!of_node_name_eq(child, "port"))
+			num++;
+	}
 	/* do we have a rogue child node ? */
 	if (num > expected_phys)
 		return -EINVAL;
@@ -5918,6 +6045,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 			serdes = usb_serdes;
 		}
 
+		if (of_node_name_eq(child, "port"))
+			continue;
+
 		/* Create per-lane phy */
 		ret = qcom_qmp_phy_create(dev, child, id, serdes, cfg);
 		if (ret) {
@@ -5962,8 +6092,18 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
 	return ret;
 }
 
+static int qcom_qmp_phy_remove(struct platform_device *pdev)
+{
+	struct qcom_qmp *qmp = platform_get_drvdata(pdev);
+
+	qcom_qmp_phy_typec_unregister(qmp);
+
+	return 0;
+}
+
 static struct platform_driver qcom_qmp_phy_driver = {
 	.probe		= qcom_qmp_phy_probe,
+	.remove		= qcom_qmp_phy_remove,
 	.driver = {
 		.name	= "qcom-qmp-phy",
 		.pm	= &qcom_qmp_phy_pm_ops,
-- 
2.33.1

[PATCH 3/8] device property: Helper to match multiple connections

[Bjorn Andersson]

In some cases multiple connections with the same connection id
needs to be resolved from a fwnode graph.

One such example is when separate hardware is used for performing muxing and/or
orientation switching of the SuperSpeed and SBU lines in a USB-C
connector. In this case the connector needs to belong to a graph with
multiple matching remote endpoints, and the TypeC controller needs to be
able to resolve them both.

Add a new API that allows this kind of lookup.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
 include/linux/property.h |  5 +++
 2 files changed, 99 insertions(+)

diff --git a/drivers/base/property.c b/drivers/base/property.c
index cbe4fa298413..0aa0296fd991 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
 	return NULL;
 }
 
+static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
+						const char *con_id, void *data,
+						devcon_match_fn_t match,
+						void **matches,
+						unsigned int matches_len)
+{
+	struct fwnode_handle *node;
+	struct fwnode_handle *ep;
+	unsigned int count = 0;
+	void *ret;
+
+	fwnode_graph_for_each_endpoint(fwnode, ep) {
+		if (count >= matches_len) {
+			fwnode_handle_put(ep);
+			return count;
+		}
+
+		node = fwnode_graph_get_remote_port_parent(ep);
+		if (!fwnode_device_is_available(node))
+			continue;
+
+		ret = match(node, con_id, data);
+		fwnode_handle_put(node);
+
+		if (ret)
+			matches[count++] = ret;
+	}
+	return count;
+}
+
 static void *
 fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
 		    void *data, devcon_match_fn_t match)
@@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
 	return NULL;
 }
 
+static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
+					  const char *con_id, void *data,
+					  devcon_match_fn_t match,
+					  void **matches,
+					  unsigned int matches_len)
+{
+	struct fwnode_handle *node;
+	unsigned int count = 0;
+	void *ret;
+	int i;
+
+	for (i = 0; ; i++) {
+		if (count >= matches_len)
+			return count;
+
+		node = fwnode_find_reference(fwnode, con_id, i);
+		if (IS_ERR(node))
+			break;
+
+		ret = match(node, NULL, data);
+		fwnode_handle_put(node);
+
+		if (ret)
+			matches[count++] = ret;
+	}
+
+	return count;
+}
+
 /**
  * fwnode_connection_find_match - Find connection from a device node
  * @fwnode: Device node with the connection
@@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
 	return fwnode_devcon_match(fwnode, con_id, data, match);
 }
 EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
+
+/**
+ * fwnode_connection_find_matches - Find connections from a device node
+ * @fwnode: Device node with the connection
+ * @con_id: Identifier for the connection
+ * @data: Data for the match function
+ * @match: Function to check and convert the connection description
+ * @matches: Array of pointers to fill with matches
+ * @matches_len: Length of @matches
+ *
+ * Find up to @matches_len connections with unique identifier @con_id between
+ * @fwnode and other device nodes. @match will be used to convert the
+ * connection description to data the caller is expecting to be returned
+ * through the @matches array.
+ *
+ * Return: Number of matches resolved, of negative errno.
+ */
+int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
+				   const char *con_id, void *data,
+				   devcon_match_fn_t match,
+				   void **matches, unsigned int matches_len)
+{
+	unsigned int count;
+
+	if (!fwnode || !match || !matches)
+		return -EINVAL;
+
+	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
+					    matches, matches_len);
+
+	return count + fwnode_devcon_matches(fwnode, con_id, data, match,
+					     matches + count,
+					     matches_len - count);
+}
+EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
diff --git a/include/linux/property.h b/include/linux/property.h
index 16f736c698a2..59484ccb260e 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
 	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
 }
 
+int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
+				   const char *con_id, void *data,
+				   devcon_match_fn_t match,
+				   void **matches, unsigned int matches_len);
+
 /* -------------------------------------------------------------------------- */
 /* Software fwnode support - when HW description is incomplete or missing */
 
-- 
2.33.1

[PATCH 4/8] device property: Use multi-connection matchers for single case

[Bjorn Andersson]

The newly introduced helpers for searching for matches in the case of
multiple connections can be resused by the single-connection case, so do
this to save some duplication.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/base/property.c | 53 ++++-------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 0aa0296fd991..213612f7113a 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -1157,29 +1157,6 @@ const void *device_get_match_data(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(device_get_match_data);
 
-static void *
-fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
-			  void *data, devcon_match_fn_t match)
-{
-	struct fwnode_handle *node;
-	struct fwnode_handle *ep;
-	void *ret;
-
-	fwnode_graph_for_each_endpoint(fwnode, ep) {
-		node = fwnode_graph_get_remote_port_parent(ep);
-		if (!fwnode_device_is_available(node))
-			continue;
-
-		ret = match(node, con_id, data);
-		fwnode_handle_put(node);
-		if (ret) {
-			fwnode_handle_put(ep);
-			return ret;
-		}
-	}
-	return NULL;
-}
-
 static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
 						const char *con_id, void *data,
 						devcon_match_fn_t match,
@@ -1210,28 +1187,6 @@ static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
 	return count;
 }
 
-static void *
-fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
-		    void *data, devcon_match_fn_t match)
-{
-	struct fwnode_handle *node;
-	void *ret;
-	int i;
-
-	for (i = 0; ; i++) {
-		node = fwnode_find_reference(fwnode, con_id, i);
-		if (IS_ERR(node))
-			break;
-
-		ret = match(node, NULL, data);
-		fwnode_handle_put(node);
-		if (ret)
-			return ret;
-	}
-
-	return NULL;
-}
-
 static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
 					  const char *con_id, void *data,
 					  devcon_match_fn_t match,
@@ -1276,16 +1231,18 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
 				   const char *con_id, void *data,
 				   devcon_match_fn_t match)
 {
+	unsigned int count;
 	void *ret;
 
 	if (!fwnode || !match)
 		return NULL;
 
-	ret = fwnode_graph_devcon_match(fwnode, con_id, data, match);
-	if (ret)
+	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match, &ret, 1);
+	if (count)
 		return ret;
 
-	return fwnode_devcon_match(fwnode, con_id, data, match);
+	count = fwnode_devcon_matches(fwnode, con_id, data, match, &ret, 1);
+	return count ? ret : NULL;
 }
 EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
 
-- 
2.33.1

[PATCH 5/8] typec: mux: Introduce indirection

[Bjorn Andersson]

Rather than directly exposing the implementation's representation of the
typec muxes to the controller/clients, introduce an indirection object.

This enables the introduction of turning this relationship into a
one-to-many in the following patch.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c   |   8 +-
 drivers/usb/typec/bus.c               |   2 +-
 drivers/usb/typec/mux.c               | 189 ++++++++++++++++----------
 drivers/usb/typec/mux.h               |  12 +-
 drivers/usb/typec/mux/intel_pmc_mux.c |   8 +-
 drivers/usb/typec/mux/pi3usb30532.c   |   8 +-
 include/linux/usb/typec_mux.h         |  22 +--
 7 files changed, 150 insertions(+), 99 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 8d8139df9d8e..9d6ca7b5a46d 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -3038,8 +3038,8 @@ struct qcom_qmp {
 
 	struct reset_control *ufs_reset;
 
-	struct typec_switch *sw;
-	struct typec_mux *mux;
+	struct typec_switch_dev *sw;
+	struct typec_mux_dev *mux;
 	enum typec_orientation orientation;
 };
 
@@ -5812,7 +5812,7 @@ static const struct dev_pm_ops qcom_qmp_phy_pm_ops = {
 };
 
 #if IS_ENABLED(CONFIG_TYPEC)
-static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw,
+static int qcom_qmp_phy_typec_switch_set(struct typec_switch_dev *sw,
 		enum typec_orientation orientation)
 {
 	struct qcom_qmp *qmp = typec_switch_get_drvdata(sw);
@@ -5828,7 +5828,7 @@ static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw,
 	return 0;
 }
 
-static int qcom_qmp_phy_typec_mux_set(struct typec_mux *mux,
+static int qcom_qmp_phy_typec_mux_set(struct typec_mux_dev *mux,
 				      struct typec_mux_state *state)
 {
 	struct qcom_qmp *qmp = typec_mux_get_drvdata(mux);
diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c
index 78e0e78954f2..26ea2fdec17d 100644
--- a/drivers/usb/typec/bus.c
+++ b/drivers/usb/typec/bus.c
@@ -24,7 +24,7 @@ typec_altmode_set_mux(struct altmode *alt, unsigned long conf, void *data)
 	state.mode = conf;
 	state.data = data;
 
-	return alt->mux->set(alt->mux, &state);
+	return typec_mux_set(alt->mux, &state);
 }
 
 static int typec_altmode_set_state(struct typec_altmode *adev,
diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index c8340de0ed49..d0b42c297aca 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -17,9 +17,13 @@
 #include "class.h"
 #include "mux.h"
 
+struct typec_switch {
+	struct typec_switch_dev *sw_dev;
+};
+
 static int switch_fwnode_match(struct device *dev, const void *fwnode)
 {
-	if (!is_typec_switch(dev))
+	if (!is_typec_switch_dev(dev))
 		return 0;
 
 	return dev_fwnode(dev) == fwnode;
@@ -49,7 +53,7 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
 	dev = class_find_device(&typec_mux_class, NULL, fwnode,
 				switch_fwnode_match);
 
-	return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
+	return dev ? to_typec_switch_dev(dev) : ERR_PTR(-EPROBE_DEFER);
 }
 
 /**
@@ -63,12 +67,23 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
  */
 struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
 {
+	struct typec_switch_dev *sw_dev;
 	struct typec_switch *sw;
 
-	sw = fwnode_connection_find_match(fwnode, "orientation-switch", NULL,
-					  typec_switch_match);
-	if (!IS_ERR_OR_NULL(sw))
-		WARN_ON(!try_module_get(sw->dev.parent->driver->owner));
+	sw = kzalloc(sizeof(*sw), GFP_KERNEL);
+	if (!sw)
+		return ERR_PTR(-ENOMEM);
+
+	sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL,
+					      typec_switch_match);
+	if (IS_ERR_OR_NULL(sw_dev)) {
+		kfree(sw);
+		return ERR_CAST(sw_dev);
+	}
+
+	WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner));
+
+	sw->sw_dev = sw_dev;
 
 	return sw;
 }
@@ -82,16 +97,22 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
  */
 void typec_switch_put(struct typec_switch *sw)
 {
-	if (!IS_ERR_OR_NULL(sw)) {
-		module_put(sw->dev.parent->driver->owner);
-		put_device(&sw->dev);
-	}
+	struct typec_switch_dev *sw_dev;
+
+	if (IS_ERR_OR_NULL(sw))
+		return;
+
+	sw_dev = sw->sw_dev;
+
+	module_put(sw_dev->dev.parent->driver->owner);
+	put_device(&sw_dev->dev);
+	kfree(sw);
 }
 EXPORT_SYMBOL_GPL(typec_switch_put);
 
 static void typec_switch_release(struct device *dev)
 {
-	kfree(to_typec_switch(dev));
+	kfree(to_typec_switch_dev(dev));
 }
 
 const struct device_type typec_switch_dev_type = {
@@ -109,82 +130,90 @@ const struct device_type typec_switch_dev_type = {
  * connector to the USB controllers. USB Type-C plugs can be inserted
  * right-side-up or upside-down.
  */
-struct typec_switch *
+struct typec_switch_dev *
 typec_switch_register(struct device *parent,
 		      const struct typec_switch_desc *desc)
 {
-	struct typec_switch *sw;
+	struct typec_switch_dev *sw_dev;
 	int ret;
 
 	if (!desc || !desc->set)
 		return ERR_PTR(-EINVAL);
 
-	sw = kzalloc(sizeof(*sw), GFP_KERNEL);
-	if (!sw)
+	sw_dev = kzalloc(sizeof(*sw_dev), GFP_KERNEL);
+	if (!sw_dev)
 		return ERR_PTR(-ENOMEM);
 
-	sw->set = desc->set;
+	sw_dev->set = desc->set;
 
-	device_initialize(&sw->dev);
-	sw->dev.parent = parent;
-	sw->dev.fwnode = desc->fwnode;
-	sw->dev.class = &typec_mux_class;
-	sw->dev.type = &typec_switch_dev_type;
-	sw->dev.driver_data = desc->drvdata;
-	dev_set_name(&sw->dev, "%s-switch",
+	device_initialize(&sw_dev->dev);
+	sw_dev->dev.parent = parent;
+	sw_dev->dev.fwnode = desc->fwnode;
+	sw_dev->dev.class = &typec_mux_class;
+	sw_dev->dev.type = &typec_switch_dev_type;
+	sw_dev->dev.driver_data = desc->drvdata;
+	dev_set_name(&sw_dev->dev, "%s-switch",
 		     desc->name ? desc->name : dev_name(parent));
 
-	ret = device_add(&sw->dev);
+	ret = device_add(&sw_dev->dev);
 	if (ret) {
 		dev_err(parent, "failed to register switch (%d)\n", ret);
-		put_device(&sw->dev);
+		put_device(&sw_dev->dev);
 		return ERR_PTR(ret);
 	}
 
-	return sw;
+	return sw_dev;
 }
 EXPORT_SYMBOL_GPL(typec_switch_register);
 
 int typec_switch_set(struct typec_switch *sw,
 		     enum typec_orientation orientation)
 {
+	struct typec_switch_dev *sw_dev;
+
 	if (IS_ERR_OR_NULL(sw))
 		return 0;
 
-	return sw->set(sw, orientation);
+	sw_dev = sw->sw_dev;
+
+	return sw_dev->set(sw_dev, orientation);
 }
 EXPORT_SYMBOL_GPL(typec_switch_set);
 
 /**
  * typec_switch_unregister - Unregister USB Type-C orientation switch
- * @sw: USB Type-C orientation switch
+ * @sw_dev: USB Type-C orientation switch
  *
  * Unregister switch that was registered with typec_switch_register().
  */
-void typec_switch_unregister(struct typec_switch *sw)
+void typec_switch_unregister(struct typec_switch_dev *sw_dev)
 {
-	if (!IS_ERR_OR_NULL(sw))
-		device_unregister(&sw->dev);
+	if (!IS_ERR_OR_NULL(sw_dev))
+		device_unregister(&sw_dev->dev);
 }
 EXPORT_SYMBOL_GPL(typec_switch_unregister);
 
-void typec_switch_set_drvdata(struct typec_switch *sw, void *data)
+void typec_switch_set_drvdata(struct typec_switch_dev *sw_dev, void *data)
 {
-	dev_set_drvdata(&sw->dev, data);
+	dev_set_drvdata(&sw_dev->dev, data);
 }
 EXPORT_SYMBOL_GPL(typec_switch_set_drvdata);
 
-void *typec_switch_get_drvdata(struct typec_switch *sw)
+void *typec_switch_get_drvdata(struct typec_switch_dev *sw_dev)
 {
-	return dev_get_drvdata(&sw->dev);
+	return dev_get_drvdata(&sw_dev->dev);
 }
 EXPORT_SYMBOL_GPL(typec_switch_get_drvdata);
 
 /* ------------------------------------------------------------------------- */
 
+struct typec_mux {
+	struct typec_mux_dev *mux_dev;
+};
+
 static int mux_fwnode_match(struct device *dev, const void *fwnode)
 {
-	if (!is_typec_mux(dev))
+	if (!is_typec_mux_dev(dev))
 		return 0;
 
 	return dev_fwnode(dev) == fwnode;
@@ -246,7 +275,7 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
 	dev = class_find_device(&typec_mux_class, NULL, fwnode,
 				mux_fwnode_match);
 
-	return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);
+	return dev ? to_typec_mux_dev(dev) : ERR_PTR(-EPROBE_DEFER);
 }
 
 /**
@@ -262,12 +291,23 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
 struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode,
 				       const struct typec_altmode_desc *desc)
 {
+	struct typec_mux_dev *mux_dev;
 	struct typec_mux *mux;
 
-	mux = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc,
-					   typec_mux_match);
-	if (!IS_ERR_OR_NULL(mux))
-		WARN_ON(!try_module_get(mux->dev.parent->driver->owner));
+	mux = kzalloc(sizeof(*mux), GFP_KERNEL);
+	if (!mux)
+		return ERR_PTR(-ENOMEM);
+
+	mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc,
+					       typec_mux_match);
+	if (IS_ERR_OR_NULL(mux_dev)) {
+		kfree(mux);
+		return ERR_CAST(mux_dev);
+	}
+
+	WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner));
+
+	mux->mux_dev = mux_dev;
 
 	return mux;
 }
@@ -281,25 +321,34 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
  */
 void typec_mux_put(struct typec_mux *mux)
 {
-	if (!IS_ERR_OR_NULL(mux)) {
-		module_put(mux->dev.parent->driver->owner);
-		put_device(&mux->dev);
-	}
+	struct typec_mux_dev *mux_dev;
+
+	if (IS_ERR_OR_NULL(mux))
+		return;
+
+	mux_dev = mux->mux_dev;
+	module_put(mux_dev->dev.parent->driver->owner);
+	put_device(&mux_dev->dev);
+	kfree(mux);
 }
 EXPORT_SYMBOL_GPL(typec_mux_put);
 
 int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
 {
+	struct typec_mux_dev *mux_dev;
+
 	if (IS_ERR_OR_NULL(mux))
 		return 0;
 
-	return mux->set(mux, state);
+	mux_dev = mux->mux_dev;
+
+	return mux_dev->set(mux_dev, state);
 }
 EXPORT_SYMBOL_GPL(typec_mux_set);
 
 static void typec_mux_release(struct device *dev)
 {
-	kfree(to_typec_mux(dev));
+	kfree(to_typec_mux_dev(dev));
 }
 
 const struct device_type typec_mux_dev_type = {
@@ -317,63 +366,63 @@ const struct device_type typec_mux_dev_type = {
  * the pins on the connector need to be reconfigured. This function registers
  * multiplexer switches routing the pins on the connector.
  */
-struct typec_mux *
+struct typec_mux_dev *
 typec_mux_register(struct device *parent, const struct typec_mux_desc *desc)
 {
-	struct typec_mux *mux;
+	struct typec_mux_dev *mux_dev;
 	int ret;
 
 	if (!desc || !desc->set)
 		return ERR_PTR(-EINVAL);
 
-	mux = kzalloc(sizeof(*mux), GFP_KERNEL);
-	if (!mux)
+	mux_dev = kzalloc(sizeof(*mux_dev), GFP_KERNEL);
+	if (!mux_dev)
 		return ERR_PTR(-ENOMEM);
 
-	mux->set = desc->set;
+	mux_dev->set = desc->set;
 
-	device_initialize(&mux->dev);
-	mux->dev.parent = parent;
-	mux->dev.fwnode = desc->fwnode;
-	mux->dev.class = &typec_mux_class;
-	mux->dev.type = &typec_mux_dev_type;
-	mux->dev.driver_data = desc->drvdata;
-	dev_set_name(&mux->dev, "%s-mux",
+	device_initialize(&mux_dev->dev);
+	mux_dev->dev.parent = parent;
+	mux_dev->dev.fwnode = desc->fwnode;
+	mux_dev->dev.class = &typec_mux_class;
+	mux_dev->dev.type = &typec_mux_dev_type;
+	mux_dev->dev.driver_data = desc->drvdata;
+	dev_set_name(&mux_dev->dev, "%s-mux",
 		     desc->name ? desc->name : dev_name(parent));
 
-	ret = device_add(&mux->dev);
+	ret = device_add(&mux_dev->dev);
 	if (ret) {
 		dev_err(parent, "failed to register mux (%d)\n", ret);
-		put_device(&mux->dev);
+		put_device(&mux_dev->dev);
 		return ERR_PTR(ret);
 	}
 
-	return mux;
+	return mux_dev;
 }
 EXPORT_SYMBOL_GPL(typec_mux_register);
 
 /**
  * typec_mux_unregister - Unregister Multiplexer Switch
- * @mux: USB Type-C Connector Multiplexer/DeMultiplexer
+ * @mux_dev: USB Type-C Connector Multiplexer/DeMultiplexer
  *
  * Unregister mux that was registered with typec_mux_register().
  */
-void typec_mux_unregister(struct typec_mux *mux)
+void typec_mux_unregister(struct typec_mux_dev *mux_dev)
 {
-	if (!IS_ERR_OR_NULL(mux))
-		device_unregister(&mux->dev);
+	if (!IS_ERR_OR_NULL(mux_dev))
+		device_unregister(&mux_dev->dev);
 }
 EXPORT_SYMBOL_GPL(typec_mux_unregister);
 
-void typec_mux_set_drvdata(struct typec_mux *mux, void *data)
+void typec_mux_set_drvdata(struct typec_mux_dev *mux_dev, void *data)
 {
-	dev_set_drvdata(&mux->dev, data);
+	dev_set_drvdata(&mux_dev->dev, data);
 }
 EXPORT_SYMBOL_GPL(typec_mux_set_drvdata);
 
-void *typec_mux_get_drvdata(struct typec_mux *mux)
+void *typec_mux_get_drvdata(struct typec_mux_dev *mux_dev)
 {
-	return dev_get_drvdata(&mux->dev);
+	return dev_get_drvdata(&mux_dev->dev);
 }
 EXPORT_SYMBOL_GPL(typec_mux_get_drvdata);
 
diff --git a/drivers/usb/typec/mux.h b/drivers/usb/typec/mux.h
index b1d6e837cb74..58f0f28b6dc8 100644
--- a/drivers/usb/typec/mux.h
+++ b/drivers/usb/typec/mux.h
@@ -5,23 +5,23 @@
 
 #include <linux/usb/typec_mux.h>
 
-struct typec_switch {
+struct typec_switch_dev {
 	struct device dev;
 	typec_switch_set_fn_t set;
 };
 
-struct typec_mux {
+struct typec_mux_dev {
 	struct device dev;
 	typec_mux_set_fn_t set;
 };
 
-#define to_typec_switch(_dev_) container_of(_dev_, struct typec_switch, dev)
-#define to_typec_mux(_dev_) container_of(_dev_, struct typec_mux, dev)
+#define to_typec_switch_dev(_dev_) container_of(_dev_, struct typec_switch_dev, dev)
+#define to_typec_mux_dev(_dev_) container_of(_dev_, struct typec_mux_dev, dev)
 
 extern const struct device_type typec_switch_dev_type;
 extern const struct device_type typec_mux_dev_type;
 
-#define is_typec_switch(dev) ((dev)->type == &typec_switch_dev_type)
-#define is_typec_mux(dev) ((dev)->type == &typec_mux_dev_type)
+#define is_typec_switch_dev(dev) ((dev)->type == &typec_switch_dev_type)
+#define is_typec_mux_dev(dev) ((dev)->type == &typec_mux_dev_type)
 
 #endif /* __USB_TYPEC_MUX__ */
diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
index 2cdd22130834..51d8f3b88128 100644
--- a/drivers/usb/typec/mux/intel_pmc_mux.c
+++ b/drivers/usb/typec/mux/intel_pmc_mux.c
@@ -121,8 +121,8 @@ struct pmc_usb_port {
 	int num;
 	u32 iom_status;
 	struct pmc_usb *pmc;
-	struct typec_mux *typec_mux;
-	struct typec_switch *typec_sw;
+	struct typec_mux_dev *typec_mux;
+	struct typec_switch_dev *typec_sw;
 	struct usb_role_switch *usb_sw;
 
 	enum typec_orientation orientation;
@@ -416,7 +416,7 @@ static int pmc_usb_connect(struct pmc_usb_port *port, enum usb_role role)
 }
 
 static int
-pmc_usb_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
+pmc_usb_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state)
 {
 	struct pmc_usb_port *port = typec_mux_get_drvdata(mux);
 
@@ -452,7 +452,7 @@ pmc_usb_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
 	return -EOPNOTSUPP;
 }
 
-static int pmc_usb_set_orientation(struct typec_switch *sw,
+static int pmc_usb_set_orientation(struct typec_switch_dev *sw,
 				   enum typec_orientation orientation)
 {
 	struct pmc_usb_port *port = typec_switch_get_drvdata(sw);
diff --git a/drivers/usb/typec/mux/pi3usb30532.c b/drivers/usb/typec/mux/pi3usb30532.c
index 7afe275b17d0..6ce9f282594e 100644
--- a/drivers/usb/typec/mux/pi3usb30532.c
+++ b/drivers/usb/typec/mux/pi3usb30532.c
@@ -23,8 +23,8 @@
 struct pi3usb30532 {
 	struct i2c_client *client;
 	struct mutex lock; /* protects the cached conf register */
-	struct typec_switch *sw;
-	struct typec_mux *mux;
+	struct typec_switch_dev *sw;
+	struct typec_mux_dev *mux;
 	u8 conf;
 };
 
@@ -45,7 +45,7 @@ static int pi3usb30532_set_conf(struct pi3usb30532 *pi, u8 new_conf)
 	return 0;
 }
 
-static int pi3usb30532_sw_set(struct typec_switch *sw,
+static int pi3usb30532_sw_set(struct typec_switch_dev *sw,
 			      enum typec_orientation orientation)
 {
 	struct pi3usb30532 *pi = typec_switch_get_drvdata(sw);
@@ -74,7 +74,7 @@ static int pi3usb30532_sw_set(struct typec_switch *sw,
 }
 
 static int
-pi3usb30532_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
+pi3usb30532_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state)
 {
 	struct pi3usb30532 *pi = typec_mux_get_drvdata(mux);
 	u8 new_conf;
diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h
index a9d9957933dc..ee57781dcf28 100644
--- a/include/linux/usb/typec_mux.h
+++ b/include/linux/usb/typec_mux.h
@@ -8,11 +8,13 @@
 
 struct device;
 struct typec_mux;
+struct typec_mux_dev;
 struct typec_switch;
+struct typec_switch_dev;
 struct typec_altmode;
 struct fwnode_handle;
 
-typedef int (*typec_switch_set_fn_t)(struct typec_switch *sw,
+typedef int (*typec_switch_set_fn_t)(struct typec_switch_dev *sw,
 				     enum typec_orientation orientation);
 
 struct typec_switch_desc {
@@ -32,13 +34,13 @@ static inline struct typec_switch *typec_switch_get(struct device *dev)
 	return fwnode_typec_switch_get(dev_fwnode(dev));
 }
 
-struct typec_switch *
+struct typec_switch_dev *
 typec_switch_register(struct device *parent,
 		      const struct typec_switch_desc *desc);
-void typec_switch_unregister(struct typec_switch *sw);
+void typec_switch_unregister(struct typec_switch_dev *sw);
 
-void typec_switch_set_drvdata(struct typec_switch *sw, void *data);
-void *typec_switch_get_drvdata(struct typec_switch *sw);
+void typec_switch_set_drvdata(struct typec_switch_dev *sw, void *data);
+void *typec_switch_get_drvdata(struct typec_switch_dev *sw);
 
 struct typec_mux_state {
 	struct typec_altmode *alt;
@@ -46,7 +48,7 @@ struct typec_mux_state {
 	void *data;
 };
 
-typedef int (*typec_mux_set_fn_t)(struct typec_mux *mux,
+typedef int (*typec_mux_set_fn_t)(struct typec_mux_dev *mux,
 				  struct typec_mux_state *state);
 
 struct typec_mux_desc {
@@ -67,11 +69,11 @@ typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc)
 	return fwnode_typec_mux_get(dev_fwnode(dev), desc);
 }
 
-struct typec_mux *
+struct typec_mux_dev *
 typec_mux_register(struct device *parent, const struct typec_mux_desc *desc);
-void typec_mux_unregister(struct typec_mux *mux);
+void typec_mux_unregister(struct typec_mux_dev *mux);
 
-void typec_mux_set_drvdata(struct typec_mux *mux, void *data);
-void *typec_mux_get_drvdata(struct typec_mux *mux);
+void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data);
+void *typec_mux_get_drvdata(struct typec_mux_dev *mux);
 
 #endif /* __USB_TYPEC_MUX */
-- 
2.33.1

[PATCH 6/8] typec: mux: Allow multiple mux_devs per mux

[Bjorn Andersson]

In the Qualcomm platforms the USB/DP PHY handles muxing and orientation
switching of the SuperSpeed lines, but the SBU lines needs to be
connected and switched by external (to the SoC) hardware.

It's therefor necessary to be able to have the TypeC controller operate
multiple TypeC muxes and switches. Use the newly introduced indirection
object to handle this, to avoid having to taint the TypeC controllers
with knowledge about the downstream hardware configuration.

The max number of devs per indirection is set to 3, based on the number
of ports defined in the usb-c-connector binding.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/typec/mux.c | 124 +++++++++++++++++++++++++++++++---------
 1 file changed, 98 insertions(+), 26 deletions(-)

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index d0b42c297aca..adf3681cf22d 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -17,8 +17,11 @@
 #include "class.h"
 #include "mux.h"
 
+#define TYPEC_MUX_MAX_DEVS	3
+
 struct typec_switch {
-	struct typec_switch_dev *sw_dev;
+	struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
+	unsigned int num_sw_devs;
 };
 
 static int switch_fwnode_match(struct device *dev, const void *fwnode)
@@ -67,25 +70,48 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
  */
 struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
 {
-	struct typec_switch_dev *sw_dev;
+	struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
 	struct typec_switch *sw;
+	int count;
+	int err;
+	int i;
 
 	sw = kzalloc(sizeof(*sw), GFP_KERNEL);
 	if (!sw)
 		return ERR_PTR(-ENOMEM);
 
-	sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL,
-					      typec_switch_match);
-	if (IS_ERR_OR_NULL(sw_dev)) {
+	count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL,
+					       typec_switch_match,
+					       (void **)sw_devs,
+					       ARRAY_SIZE(sw_devs));
+	if (count <= 0) {
 		kfree(sw);
-		return ERR_CAST(sw_dev);
+		return NULL;
 	}
 
-	WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner));
+	for (i = 0; i < count; i++) {
+		if (IS_ERR(sw_devs[i])) {
+			err = PTR_ERR(sw_devs[i]);
+			goto put_sw_devs;
+		}
+	}
+
+	for (i = 0; i < count; i++) {
+		WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner));
+		sw->sw_devs[i] = sw_devs[i];
+	}
 
-	sw->sw_dev = sw_dev;
+	sw->num_sw_devs = count;
 
 	return sw;
+
+put_sw_devs:
+	for (i = 0; i < count; i++) {
+		if (!IS_ERR(sw_devs[i]))
+			put_device(&sw_devs[i]->dev);
+	}
+
+	return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
 
@@ -98,14 +124,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
 void typec_switch_put(struct typec_switch *sw)
 {
 	struct typec_switch_dev *sw_dev;
+	unsigned int i;
 
 	if (IS_ERR_OR_NULL(sw))
 		return;
 
-	sw_dev = sw->sw_dev;
+	for (i = 0; i < sw->num_sw_devs; i++) {
+		sw_dev = sw->sw_devs[i];
 
-	module_put(sw_dev->dev.parent->driver->owner);
-	put_device(&sw_dev->dev);
+		module_put(sw_dev->dev.parent->driver->owner);
+		put_device(&sw_dev->dev);
+	}
 	kfree(sw);
 }
 EXPORT_SYMBOL_GPL(typec_switch_put);
@@ -170,13 +199,21 @@ int typec_switch_set(struct typec_switch *sw,
 		     enum typec_orientation orientation)
 {
 	struct typec_switch_dev *sw_dev;
+	unsigned int i;
+	int ret;
 
 	if (IS_ERR_OR_NULL(sw))
 		return 0;
 
-	sw_dev = sw->sw_dev;
+	for (i = 0; i < sw->num_sw_devs; i++) {
+		sw_dev = sw->sw_devs[i];
+
+		ret = sw_dev->set(sw_dev, orientation);
+		if (ret)
+			return ret;
+	}
 
-	return sw_dev->set(sw_dev, orientation);
+	return 0;
 }
 EXPORT_SYMBOL_GPL(typec_switch_set);
 
@@ -208,7 +245,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata);
 /* ------------------------------------------------------------------------- */
 
 struct typec_mux {
-	struct typec_mux_dev *mux_dev;
+	struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS];
+	unsigned int num_mux_devs;
 };
 
 static int mux_fwnode_match(struct device *dev, const void *fwnode)
@@ -291,25 +329,48 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
 struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode,
 				       const struct typec_altmode_desc *desc)
 {
-	struct typec_mux_dev *mux_dev;
+	struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS];
 	struct typec_mux *mux;
+	int count;
+	int err;
+	int i;
 
 	mux = kzalloc(sizeof(*mux), GFP_KERNEL);
 	if (!mux)
 		return ERR_PTR(-ENOMEM);
 
-	mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc,
-					       typec_mux_match);
-	if (IS_ERR_OR_NULL(mux_dev)) {
+	count = fwnode_connection_find_matches(fwnode, "mode-switch",
+					       (void *)desc, typec_mux_match,
+					       (void **)mux_devs,
+					       ARRAY_SIZE(mux_devs));
+	if (count <= 0) {
 		kfree(mux);
-		return ERR_CAST(mux_dev);
+		return NULL;
 	}
 
-	WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner));
+	for (i = 0; i < count; i++) {
+		if (IS_ERR(mux_devs[i])) {
+			err = PTR_ERR(mux_devs[i]);
+			goto put_mux_devs;
+		}
+	}
+
+	for (i = 0; i < count; i++) {
+		WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner));
+		mux->mux_devs[i] = mux_devs[i];
+	}
 
-	mux->mux_dev = mux_dev;
+	mux->num_mux_devs = count;
 
 	return mux;
+
+put_mux_devs:
+	for (i = 0; i < count; i++) {
+		if (!IS_ERR(mux_devs[i]))
+			put_device(&mux_devs[i]->dev);
+	}
+
+	return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
 
@@ -322,13 +383,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
 void typec_mux_put(struct typec_mux *mux)
 {
 	struct typec_mux_dev *mux_dev;
+	unsigned int i;
 
 	if (IS_ERR_OR_NULL(mux))
 		return;
 
-	mux_dev = mux->mux_dev;
-	module_put(mux_dev->dev.parent->driver->owner);
-	put_device(&mux_dev->dev);
+	for (i = 0; i < mux->num_mux_devs; i++) {
+		mux_dev = mux->mux_devs[i];
+		module_put(mux_dev->dev.parent->driver->owner);
+		put_device(&mux_dev->dev);
+	}
 	kfree(mux);
 }
 EXPORT_SYMBOL_GPL(typec_mux_put);
@@ -336,13 +400,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put);
 int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
 {
 	struct typec_mux_dev *mux_dev;
+	unsigned int i;
+	int ret;
 
 	if (IS_ERR_OR_NULL(mux))
 		return 0;
 
-	mux_dev = mux->mux_dev;
+	for (i = 0; i < mux->num_mux_devs; i++) {
+		mux_dev = mux->mux_devs[i];
+
+		ret = mux_dev->set(mux_dev, state);
+		if (ret)
+			return ret;
+	}
 
-	return mux_dev->set(mux_dev, state);
+	return 0;
 }
 EXPORT_SYMBOL_GPL(typec_mux_set);
 
-- 
2.33.1

[PATCH 7/8] dt-bindings: usb: Add binding for fcs,fsa4480

[Bjorn Andersson]

The Fairchild/ON Semiconductor FSA4480 Analog Audio switch is used in
USB Type-C configurations for muxing analog audio onto the USB
connector, and as such used to control the SBU signals for altmodes such
as DisplayPort.

Add a binding for this hardware block.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 .../devicetree/bindings/usb/fcs,fsa4480.yaml  | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml

diff --git a/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml b/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
new file mode 100644
index 000000000000..9473f26b0621
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
@@ -0,0 +1,72 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/usb/fcs,fsa4480.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: ON Semiconductor Analog Audio Switch
+
+maintainers:
+  - Bjorn Andersson <bjorn.andersson@linaro.org>
+
+properties:
+  compatible:
+    enum:
+      - fcs,fsa4480
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  vcc-supply:
+    description: power supply (2.7V-5.5V)
+
+  mode-switch:
+    description: Flag the port as possible handle of altmode switching
+    type: boolean
+
+  orientation-switch:
+    description: Flag the port as possible handler of orientation switching
+    type: boolean
+
+  port:
+    $ref: /schemas/graph.yaml#/properties/port
+    description:
+      A port node to link the FSA4480 to a TypeC controller for the purpose of
+      handling altmode muxing and orientation switching.
+
+required:
+  - compatible
+  - reg
+  - port
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    i2c13 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        fsa4480@42 {
+          compatible = "fcs,fsa4480";
+          reg = <0x42>;
+
+          interrupts-extended = <&tlmm 2 IRQ_TYPE_LEVEL_LOW>;
+
+          vcc-supply = <&vreg_bob>;
+
+          mode-switch;
+          orientation-switch;
+
+          port {
+            fsa4480_ept: endpoint {
+              remote-endpoint = <&typec_controller>;
+            };
+          };
+        };
+    };
+...
-- 
2.33.1

[PATCH 8/8] usb: typec: mux: Add On Semi fsa4480 driver

[Bjorn Andersson]

The ON Semiconductor FSA4480 is a USB Type-C port multimedia switch with
support for analog audio headsets. It allows sharing a common USB Type-C
port to pass USB2.0 signal, analog audio, sideband use wires and analog
microphone signal.

Due to lacking upstream audio support for testing, the audio muxing is
left untouched, but implementation of muxing the SBU lines is provided
as a pair of TypeC mux and switch devices. This provides the necessary
support for enabling the DisplayPort altmode on devices with this
circuit.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/typec/mux/Kconfig   |   9 ++
 drivers/usb/typec/mux/Makefile  |   1 +
 drivers/usb/typec/mux/fsa4480.c | 220 ++++++++++++++++++++++++++++++++
 3 files changed, 230 insertions(+)
 create mode 100644 drivers/usb/typec/mux/fsa4480.c

diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig
index edead555835e..5e20112c3f51 100644
--- a/drivers/usb/typec/mux/Kconfig
+++ b/drivers/usb/typec/mux/Kconfig
@@ -2,6 +2,15 @@
 
 menu "USB Type-C Multiplexer/DeMultiplexer Switch support"
 
+config TYPEC_MUX_FSA4480
+	tristate "ON Semi FSA4480 Analog Audio Switch driver"
+	depends on I2C
+	select REGMAP_I2C
+	help
+	  Driver for the ON Semiconductor FSA4480 Analog Audio Switch, which
+	  provides support for muxing analog audio and sideband signals on a
+	  common USB Type-C connector.
+
 config TYPEC_MUX_PI3USB30532
 	tristate "Pericom PI3USB30532 Type-C cross switch driver"
 	depends on I2C
diff --git a/drivers/usb/typec/mux/Makefile b/drivers/usb/typec/mux/Makefile
index 280a6f553115..e52a56c16bfb 100644
--- a/drivers/usb/typec/mux/Makefile
+++ b/drivers/usb/typec/mux/Makefile
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 
+obj-$(CONFIG_TYPEC_MUX_FSA4480)		+= fsa4480.o
 obj-$(CONFIG_TYPEC_MUX_PI3USB30532)	+= pi3usb30532.o
 obj-$(CONFIG_TYPEC_MUX_INTEL_PMC)	+= intel_pmc_mux.o
diff --git a/drivers/usb/typec/mux/fsa4480.c b/drivers/usb/typec/mux/fsa4480.c
new file mode 100644
index 000000000000..ac2d8648db6a
--- /dev/null
+++ b/drivers/usb/typec/mux/fsa4480.c
@@ -0,0 +1,220 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021 Linaro Ltd.
+ * Copyright (C) 2018-2020 The Linux Foundation
+ */
+
+#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/regmap.h>
+#include <linux/usb/typec_dp.h>
+#include <linux/usb/typec_mux.h>
+
+#define FSA4480_SWITCH_ENABLE	0x04
+#define FSA4480_SWITCH_SELECT	0x05
+#define FSA4480_SWITCH_STATUS1	0x07
+#define FSA4480_SLOW_L		0x08
+#define FSA4480_SLOW_R		0x09
+#define FSA4480_SLOW_MIC	0x0a
+#define FSA4480_SLOW_SENSE	0x0b
+#define FSA4480_SLOW_GND	0x0c
+#define FSA4480_DELAY_L_R	0x0d
+#define FSA4480_DELAY_L_MIC	0x0e
+#define FSA4480_DELAY_L_SENSE	0x0f
+#define FSA4480_DELAY_L_AGND	0x10
+#define FSA4480_RESET		0x1e
+
+#define FSA4480_ENABLE_DEVICE	BIT(7)
+#define FSA4480_ENABLE_SBU	GENMASK(6, 5)
+#define FSA4480_ENABLE_USB	GENMASK(4, 3)
+
+#define FSA4480_SEL_SBU_REVERSE	GENMASK(6, 5)
+#define FSA4480_SEL_USB		GENMASK(4, 3)
+
+struct fsa4480 {
+	struct i2c_client *client;
+
+	/* used to serialize concurrect change requests */
+	struct mutex lock;
+
+	struct typec_switch_dev *sw;
+	struct typec_mux_dev *mux;
+
+	struct regmap *regmap;
+
+	u8 cur_enable;
+	u8 cur_select;
+};
+
+static const struct regmap_config fsa4480_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.max_register = FSA4480_RESET,
+};
+
+static int fsa4480_switch_set(struct typec_switch_dev *sw,
+			      enum typec_orientation orientation)
+{
+	struct fsa4480 *fsa = typec_switch_get_drvdata(sw);
+	u8 new_sel;
+
+	mutex_lock(&fsa->lock);
+	new_sel = FSA4480_SEL_USB;
+	if (orientation == TYPEC_ORIENTATION_REVERSE)
+		new_sel |= FSA4480_SEL_SBU_REVERSE;
+
+	if (new_sel == fsa->cur_select)
+		goto out_unlock;
+
+	if (fsa->cur_enable & FSA4480_ENABLE_SBU) {
+		/* Disable SBU output while re-configuring the switch */
+		regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE,
+			     fsa->cur_enable & ~FSA4480_ENABLE_SBU);
+
+		/* 35us to allow the SBU switch to turn off */
+		usleep_range(35, 1000);
+	}
+
+	regmap_write(fsa->regmap, FSA4480_SWITCH_SELECT, new_sel);
+	fsa->cur_select = new_sel;
+
+	if (fsa->cur_enable & FSA4480_ENABLE_SBU) {
+		regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, fsa->cur_enable);
+
+		/* 15us to allow the SBU switch to turn on again */
+		usleep_range(15, 1000);
+	}
+
+out_unlock:
+	mutex_unlock(&fsa->lock);
+
+	return 0;
+}
+
+static int fsa4480_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state)
+{
+	struct fsa4480 *fsa = typec_mux_get_drvdata(mux);
+	u8 new_enable;
+
+	mutex_lock(&fsa->lock);
+
+	new_enable = FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB;
+	if (state->mode >= TYPEC_DP_STATE_A)
+		new_enable |= FSA4480_ENABLE_SBU;
+
+	if (new_enable == fsa->cur_enable)
+		goto out_unlock;
+
+	regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, new_enable);
+	fsa->cur_enable = new_enable;
+
+	if (new_enable & FSA4480_ENABLE_SBU) {
+		/* 15us to allow the SBU switch to turn off */
+		usleep_range(15, 1000);
+	}
+
+out_unlock:
+	mutex_unlock(&fsa->lock);
+
+	return 0;
+}
+
+static int fsa4480_probe(struct i2c_client *client)
+{
+	struct device *dev = &client->dev;
+	struct typec_switch_desc sw_desc = { };
+	struct typec_mux_desc mux_desc = { };
+	struct fsa4480 *fsa;
+
+	fsa = devm_kzalloc(dev, sizeof(*fsa), GFP_KERNEL);
+	if (!fsa)
+		return -ENOMEM;
+
+	fsa->client = client;
+	mutex_init(&fsa->lock);
+
+	fsa->regmap = devm_regmap_init_i2c(client, &fsa4480_regmap_config);
+	if (IS_ERR(fsa->regmap)) {
+		dev_err(dev, "failed to initialize regmap\n");
+		return PTR_ERR(fsa->regmap);
+	}
+
+	fsa->cur_enable = FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB;
+	fsa->cur_select = FSA4480_SEL_USB;
+
+	/* set default settings */
+	regmap_write(fsa->regmap, FSA4480_SLOW_L, 0x00);
+	regmap_write(fsa->regmap, FSA4480_SLOW_R, 0x00);
+	regmap_write(fsa->regmap, FSA4480_SLOW_MIC, 0x00);
+	regmap_write(fsa->regmap, FSA4480_SLOW_SENSE, 0x00);
+	regmap_write(fsa->regmap, FSA4480_SLOW_GND, 0x00);
+	regmap_write(fsa->regmap, FSA4480_DELAY_L_R, 0x00);
+	regmap_write(fsa->regmap, FSA4480_DELAY_L_MIC, 0x00);
+	regmap_write(fsa->regmap, FSA4480_DELAY_L_SENSE, 0x00);
+	regmap_write(fsa->regmap, FSA4480_DELAY_L_AGND, 0x09);
+	regmap_write(fsa->regmap, FSA4480_SWITCH_SELECT, fsa->cur_select);
+	regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, fsa->cur_enable);
+
+	sw_desc.drvdata = fsa;
+	sw_desc.fwnode = dev->fwnode;
+	sw_desc.set = fsa4480_switch_set;
+
+	fsa->sw = typec_switch_register(dev, &sw_desc);
+	if (IS_ERR(fsa->sw)) {
+		dev_err(dev, "failed to register typec switch: %ld\n", PTR_ERR(fsa->sw));
+		return PTR_ERR(fsa->sw);
+	}
+
+	mux_desc.drvdata = fsa;
+	mux_desc.fwnode = dev->fwnode;
+	mux_desc.set = fsa4480_mux_set;
+
+	fsa->mux = typec_mux_register(dev, &mux_desc);
+	if (IS_ERR(fsa->mux)) {
+		typec_switch_unregister(fsa->sw);
+		dev_err(dev, "failed to register typec mux: %ld\n", PTR_ERR(fsa->mux));
+		return PTR_ERR(fsa->mux);
+	}
+
+	i2c_set_clientdata(client, fsa);
+	return 0;
+}
+
+static int fsa4480_remove(struct i2c_client *client)
+{
+	struct fsa4480 *fsa = i2c_get_clientdata(client);
+
+	typec_mux_unregister(fsa->mux);
+	typec_switch_unregister(fsa->sw);
+
+	return 0;
+}
+
+static const struct i2c_device_id fsa4480_table[] = {
+	{ "fsa4480" },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, fsa4480_table);
+
+static const struct of_device_id fsa4480_of_table[] = {
+	{ .compatible = "fcs,fsa4480" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, fsa4480_of_table);
+
+static struct i2c_driver fsa4480_driver = {
+	.driver = {
+		.name = "fsa4480",
+		.of_match_table = fsa4480_of_table,
+	},
+	.probe_new	= fsa4480_probe,
+	.remove		= fsa4480_remove,
+	.id_table	= fsa4480_table,
+};
+
+module_i2c_driver(fsa4480_driver);
+
+MODULE_DESCRIPTION("ON Semiconductor FSA4480 driver");
+MODULE_LICENSE("GPL v2");
-- 
2.33.1

Re: [PATCH 0/8] typec: mux: Introduce support for multiple TypeC muxes

[Hans de Goede]

Hi Bjorn,

On 12/28/21 06:21, Bjorn Andersson wrote:
> This series introduces a level of indirection between the controller's view of
> a typec_mux/switch and the implementation and then expands that to support
> multiple drivers.
> 
> This is needed in order to support devices such as the Qualcomm Snapdragon 888
> HDK, which does muxing and orientation handling in the QMP (USB+DP) PHY and SBU
> muxing in the external FSA4480 chip.
> 
> Additionally integration of typec mux and switch in the QMP PHY is included in
> the series, as is the new FSA4480 driver. This is done to deal with the
> renaming of the driver-side typec_mux -> typec_mux_dev.
> 
> Bjorn Andersson (8):
>   dt-bindings: phy: qcom,qmp-usb3-dp: Add altmode/switch properties
>   phy: qcom-qmp: Register typec mux and orientation switch
>   device property: Helper to match multiple connections
>   device property: Use multi-connection matchers for single case
>   typec: mux: Introduce indirection
>   typec: mux: Allow multiple mux_devs per mux
>   dt-bindings: usb: Add binding for fcs,fsa4480
>   usb: typec: mux: Add On Semi fsa4480 driver

Thank you for your series, I will leave commenting on the
dt-bindings and typec-mux changes to others.

But what I can do is test this on an x86 device using
a pi3usb30532 mux for USB super-speed and DP-alt-mode
muxing / orientation switching.

I'm going to wait a bit with doing that till this has had
some reviews and possibly also some newer versions because
of those reviews. If you haven't received a Tested-by from me
when this looks like it is ready for merging please ping me.

Regards,

Hans


> 
>  .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml    |  14 +
>  .../devicetree/bindings/usb/fcs,fsa4480.yaml  |  72 +++++
>  drivers/base/property.c                       |  83 ++++--
>  drivers/phy/qualcomm/phy-qcom-qmp.c           | 176 ++++++++++--
>  drivers/usb/typec/bus.c                       |   2 +-
>  drivers/usb/typec/mux.c                       | 257 +++++++++++++-----
>  drivers/usb/typec/mux.h                       |  12 +-
>  drivers/usb/typec/mux/Kconfig                 |   9 +
>  drivers/usb/typec/mux/Makefile                |   1 +
>  drivers/usb/typec/mux/fsa4480.c               | 220 +++++++++++++++
>  drivers/usb/typec/mux/intel_pmc_mux.c         |   8 +-
>  drivers/usb/typec/mux/pi3usb30532.c           |   8 +-
>  include/linux/property.h                      |   5 +
>  include/linux/usb/typec_mux.h                 |  22 +-
>  14 files changed, 762 insertions(+), 127 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
>  create mode 100644 drivers/usb/typec/mux/fsa4480.c
> 

Re: [PATCH 2/8] phy: qcom-qmp: Register typec mux and orientation switch

[Dmitry Baryshkov]

On 28/12/2021 08:21, Bjorn Andersson wrote:
> The QMP PHY handles muxing of USB vs DisplayPort, as well as orientation
> switching of the SuperSpeed lanes. So register typec handlers for the
> two types.
> 
> The TypeC mux allows switching between four lanes of DisplayPort and a
> mixed USB+DP combination. This makes it possible to reach resolutions
> that requires 4 lanes.
> 
> The TypeC switch allows switching the SuperSpeed pins and have been
> tested with both 2 and 4 lane DisplayPort.
> 
> It's possible that in the USB mode the DP_MODE should be disabled, but
> this is left untouched.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

> ---
> 
> My suggestion is that if/once this patch is deemed acceptable the PHY
> maintainers could create a immutable branch/tag which can be merged into the
> PHY tree as well as the USB tree.
> 
>   drivers/phy/qualcomm/phy-qcom-qmp.c | 176 +++++++++++++++++++++++++---
>   1 file changed, 158 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 7bea6a60dc54..8d8139df9d8e 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -19,6 +19,8 @@
>   #include <linux/regulator/consumer.h>
>   #include <linux/reset.h>
>   #include <linux/slab.h>
> +#include <linux/usb/typec_dp.h>
> +#include <linux/usb/typec_mux.h>
>   
>   #include <dt-bindings/phy/phy.h>
>   
> @@ -3017,6 +3019,9 @@ struct qmp_phy_dp_clks {
>    * @phy_mutex: mutex lock for PHY common block initialization
>    * @init_count: phy common block initialization count
>    * @ufs_reset: optional UFS PHY reset handle
> + * @sw: typec switch for receiving orientation changes
> + * @mux: typec mux for DP muxing
> + * @orientation: carries current CC orientation
>    */
>   struct qcom_qmp {
>   	struct device *dev;
> @@ -3032,6 +3037,10 @@ struct qcom_qmp {
>   	int init_count;
>   
>   	struct reset_control *ufs_reset;
> +
> +	struct typec_switch *sw;
> +	struct typec_mux *mux;
> +	enum typec_orientation orientation;
>   };
>   
>   static void qcom_qmp_v3_phy_dp_aux_init(struct qmp_phy *qphy);
> @@ -4378,30 +4387,23 @@ static void qcom_qmp_v3_phy_configure_dp_tx(struct qmp_phy *qphy)
>   
>   static bool qcom_qmp_phy_configure_dp_mode(struct qmp_phy *qphy)
>   {
> +	const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts;
> +	bool reverse = qphy->qmp->orientation == TYPEC_ORIENTATION_REVERSE;
>   	u32 val;
> -	bool reverse = false;
>   
>   	val = DP_PHY_PD_CTL_PWRDN | DP_PHY_PD_CTL_AUX_PWRDN |
>   	      DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN;
>   
> -	/*
> -	 * TODO: Assume orientation is CC1 for now and two lanes, need to
> -	 * use type-c connector to understand orientation and lanes.
> -	 *
> -	 * Otherwise val changes to be like below if this code understood
> -	 * the orientation of the type-c cable.
> -	 *
> -	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC2)
> -	 *	val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
> -	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC1)
> -	 *	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> -	 * if (orientation == ORIENTATION_CC2)
> -	 *	writel(0x4c, qphy->pcs + QSERDES_V3_DP_PHY_MODE);
> -	 */
> -	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> +	if (dp_opts->lanes == 4 || reverse)
> +		val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
> +	if (dp_opts->lanes == 4 || !reverse)
> +		val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
>   	writel(val, qphy->pcs + QSERDES_DP_PHY_PD_CTL);
>   
> -	writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
> +	if (reverse)
> +		writel(0x4c, qphy->pcs + QSERDES_DP_PHY_MODE);
> +	else
> +		writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
>   
>   	return reverse;
>   }
> @@ -5809,6 +5811,123 @@ static const struct dev_pm_ops qcom_qmp_phy_pm_ops = {
>   			   qcom_qmp_phy_runtime_resume, NULL)
>   };
>   
> +#if IS_ENABLED(CONFIG_TYPEC)
> +static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw,
> +		enum typec_orientation orientation)
> +{
> +	struct qcom_qmp *qmp = typec_switch_get_drvdata(sw);
> +	void __iomem *dp_com = qmp->dp_com;
> +
> +	qmp->orientation = orientation;
> +
> +	if (orientation == TYPEC_ORIENTATION_REVERSE)
> +		qphy_setbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
> +	else
> +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
> +
> +	return 0;
> +}
> +
> +static int qcom_qmp_phy_typec_mux_set(struct typec_mux *mux,
> +				      struct typec_mux_state *state)
> +{
> +	struct qcom_qmp *qmp = typec_mux_get_drvdata(mux);
> +	void __iomem *dp_com = qmp->dp_com;
> +	bool dp_mode;
> +	bool usb_mode;
> +
> +	switch (state->mode) {
> +	case TYPEC_STATE_SAFE:
> +	case TYPEC_STATE_USB:
> +		/*
> +		 * TODO: Figure out if we should clear DP_MODE when we enter a
> +		 * USB-only state.
> +		 */
> +		dp_mode = true;
> +		usb_mode = true;
> +		break;
> +	case TYPEC_DP_STATE_A:
> +	case TYPEC_DP_STATE_C:
> +	case TYPEC_DP_STATE_E:
> +		dp_mode = true;
> +		usb_mode = false;
> +		break;
> +	case TYPEC_DP_STATE_B:
> +	case TYPEC_DP_STATE_D:
> +	case TYPEC_DP_STATE_F:
> +		dp_mode = true;
> +		usb_mode = true;
> +		break;
> +	}
> +
> +	qphy_setbits(dp_com, QPHY_V3_DP_COM_RESET_OVRD_CTRL,
> +		     SW_DPPHY_RESET_MUX | SW_USB3PHY_RESET_MUX);
> +	if (dp_mode)
> +		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
> +	else
> +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
> +
> +	if (usb_mode)
> +		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
> +	else
> +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
> +
> +	qphy_setbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
> +	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SWI_CTRL, 0x03);
> +	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
> +
> +	return 0;
> +}
> +
> +static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
> +				       const struct qmp_phy_cfg *cfg)
> +{
> +	struct typec_switch_desc sw_desc = {};
> +	struct typec_mux_desc mux_desc = {};
> +	struct device *dev = qmp->dev;
> +
> +	if (!cfg->has_phy_dp_com_ctrl)
> +		return 0;
> +
> +	sw_desc.drvdata = qmp;
> +	sw_desc.fwnode = dev->fwnode;
> +	sw_desc.set = qcom_qmp_phy_typec_switch_set;
> +	qmp->sw = typec_switch_register(dev, &sw_desc);
> +	if (IS_ERR(qmp->sw)) {
> +		dev_err(dev, "Error registering typec switch: %pe\n", qmp->sw);
> +		return PTR_ERR(qmp->sw);
> +	}
> +
> +	mux_desc.drvdata = qmp;
> +	mux_desc.fwnode = dev->fwnode;
> +	mux_desc.set = qcom_qmp_phy_typec_mux_set;
> +	qmp->mux = typec_mux_register(dev, &mux_desc);
> +	if (IS_ERR(qmp->mux)) {
> +		dev_err(dev, "Error registering typec mux: %pe\n", qmp->mux);
> +		typec_switch_unregister(qmp->sw);
> +		return PTR_ERR(qmp->mux);
> +	}
> +
> +	return 0;
> +}
> +
> +static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
> +{
> +	typec_mux_unregister(qmp->mux);
> +	typec_switch_unregister(qmp->sw);
> +}
> +#else
> +static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
> +				       const struct qmp_phy_cfg *cfg)
> +{
> +	return 0;
> +}
> +
> +static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
> +{
> +}
> +#endif
> +
>   static int qcom_qmp_phy_probe(struct platform_device *pdev)
>   {
>   	struct qcom_qmp *qmp;
> @@ -5891,7 +6010,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
>   		return ret;
>   	}
>   
> -	num = of_get_available_child_count(dev->of_node);
> +	ret = qcom_qmp_phy_typec_register(qmp, cfg);
> +	if (ret)
> +		return ret;
> +
> +	num = 0;
> +	for_each_available_child_of_node(dev->of_node, child) {
> +		if (!of_node_name_eq(child, "port"))
> +			num++;
> +	}
>   	/* do we have a rogue child node ? */
>   	if (num > expected_phys)
>   		return -EINVAL;
> @@ -5918,6 +6045,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
>   			serdes = usb_serdes;
>   		}
>   
> +		if (of_node_name_eq(child, "port"))
> +			continue;
> +
>   		/* Create per-lane phy */
>   		ret = qcom_qmp_phy_create(dev, child, id, serdes, cfg);
>   		if (ret) {
> @@ -5962,8 +6092,18 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
>   	return ret;
>   }
>   
> +static int qcom_qmp_phy_remove(struct platform_device *pdev)
> +{
> +	struct qcom_qmp *qmp = platform_get_drvdata(pdev);
> +
> +	qcom_qmp_phy_typec_unregister(qmp);
> +
> +	return 0;
> +}
> +
>   static struct platform_driver qcom_qmp_phy_driver = {
>   	.probe		= qcom_qmp_phy_probe,
> +	.remove		= qcom_qmp_phy_remove,
>   	.driver = {
>   		.name	= "qcom-qmp-phy",
>   		.pm	= &qcom_qmp_phy_pm_ops,


-- 
With best wishes
Dmitry

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Dmitry Baryshkov]

On 28/12/2021 08:21, Bjorn Andersson wrote:
> In some cases multiple connections with the same connection id
> needs to be resolved from a fwnode graph.
> 
> One such example is when separate hardware is used for performing muxing and/or
> orientation switching of the SuperSpeed and SBU lines in a USB-C
> connector. In this case the connector needs to belong to a graph with
> multiple matching remote endpoints, and the TypeC controller needs to be
> able to resolve them both.
> 
> Add a new API that allows this kind of lookup.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>   drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
>   include/linux/property.h |  5 +++
>   2 files changed, 99 insertions(+)
> 
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index cbe4fa298413..0aa0296fd991 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
>   	return NULL;
>   }
>   
> +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> +						const char *con_id, void *data,
> +						devcon_match_fn_t match,
> +						void **matches,
> +						unsigned int matches_len)
> +{
> +	struct fwnode_handle *node;
> +	struct fwnode_handle *ep;
> +	unsigned int count = 0;
> +	void *ret;
> +
> +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> +		if (count >= matches_len) {
> +			fwnode_handle_put(ep);
> +			return count;
> +		}
> +
> +		node = fwnode_graph_get_remote_port_parent(ep);
> +		if (!fwnode_device_is_available(node))
> +			continue;
> +
> +		ret = match(node, con_id, data);
> +		fwnode_handle_put(node);
> +
> +		if (ret)
> +			matches[count++] = ret;
> +	}
> +	return count;
> +}

This API doesn't let it's user know if there are more matches found in 
the device tree or not. I'd suggest to add 'count' mode that would 
return the amount of found matches if (matches == NULL) && (matches_len 
== 0).

> +
>   static void *
>   fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
>   		    void *data, devcon_match_fn_t match)
> @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
>   	return NULL;
>   }
>   
> +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> +					  const char *con_id, void *data,
> +					  devcon_match_fn_t match,
> +					  void **matches,
> +					  unsigned int matches_len)
> +{
> +	struct fwnode_handle *node;
> +	unsigned int count = 0;
> +	void *ret;
> +	int i;
> +
> +	for (i = 0; ; i++) {
> +		if (count >= matches_len)
> +			return count;
> +
> +		node = fwnode_find_reference(fwnode, con_id, i);
> +		if (IS_ERR(node))
> +			break;
> +
> +		ret = match(node, NULL, data);
> +		fwnode_handle_put(node);
> +
> +		if (ret)
> +			matches[count++] = ret;
> +	}
> +
> +	return count;
> +}
> +

Same comment applies.

>   /**
>    * fwnode_connection_find_match - Find connection from a device node
>    * @fwnode: Device node with the connection
> @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
>   	return fwnode_devcon_match(fwnode, con_id, data, match);
>   }
>   EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> +
> +/**
> + * fwnode_connection_find_matches - Find connections from a device node
> + * @fwnode: Device node with the connection
> + * @con_id: Identifier for the connection
> + * @data: Data for the match function
> + * @match: Function to check and convert the connection description
> + * @matches: Array of pointers to fill with matches
> + * @matches_len: Length of @matches
> + *
> + * Find up to @matches_len connections with unique identifier @con_id between
> + * @fwnode and other device nodes. @match will be used to convert the
> + * connection description to data the caller is expecting to be returned
> + * through the @matches array.
> + *
> + * Return: Number of matches resolved, of negative errno.
> + */
> +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> +				   const char *con_id, void *data,
> +				   devcon_match_fn_t match,
> +				   void **matches, unsigned int matches_len)
> +{
> +	unsigned int count;
> +
> +	if (!fwnode || !match || !matches)
> +		return -EINVAL;
> +
> +	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> +					    matches, matches_len);
> +
> +	return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> +					     matches + count,
> +					     matches_len - count);
> +}
> +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> diff --git a/include/linux/property.h b/include/linux/property.h
> index 16f736c698a2..59484ccb260e 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
>   	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
>   }
>   
> +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> +				   const char *con_id, void *data,
> +				   devcon_match_fn_t match,
> +				   void **matches, unsigned int matches_len);
> +
>   /* -------------------------------------------------------------------------- */
>   /* Software fwnode support - when HW description is incomplete or missing */
>   


-- 
With best wishes
Dmitry

Re: [PATCH 6/8] typec: mux: Allow multiple mux_devs per mux

[Dmitry Baryshkov]

On 28/12/2021 08:21, Bjorn Andersson wrote:
> In the Qualcomm platforms the USB/DP PHY handles muxing and orientation
> switching of the SuperSpeed lines, but the SBU lines needs to be
> connected and switched by external (to the SoC) hardware.
> 
> It's therefor necessary to be able to have the TypeC controller operate
> multiple TypeC muxes and switches. Use the newly introduced indirection
> object to handle this, to avoid having to taint the TypeC controllers
> with knowledge about the downstream hardware configuration.
> 
> The max number of devs per indirection is set to 3, based on the number
> of ports defined in the usb-c-connector binding.

If we had the 'count' ability, we wouldn't have to put limits here.
The limit 3 is a bit artificial if you consider the redriver chips.

> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>   drivers/usb/typec/mux.c | 124 +++++++++++++++++++++++++++++++---------
>   1 file changed, 98 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> index d0b42c297aca..adf3681cf22d 100644
> --- a/drivers/usb/typec/mux.c
> +++ b/drivers/usb/typec/mux.c
> @@ -17,8 +17,11 @@
>   #include "class.h"
>   #include "mux.h"
>   
> +#define TYPEC_MUX_MAX_DEVS	3
> +
>   struct typec_switch {
> -	struct typec_switch_dev *sw_dev;
> +	struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
> +	unsigned int num_sw_devs;
>   };
>   
>   static int switch_fwnode_match(struct device *dev, const void *fwnode)
> @@ -67,25 +70,48 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
>    */
>   struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
>   {
> -	struct typec_switch_dev *sw_dev;
> +	struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
>   	struct typec_switch *sw;
> +	int count;
> +	int err;
> +	int i;
>   
>   	sw = kzalloc(sizeof(*sw), GFP_KERNEL);
>   	if (!sw)
>   		return ERR_PTR(-ENOMEM);
>   
> -	sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL,
> -					      typec_switch_match);
> -	if (IS_ERR_OR_NULL(sw_dev)) {
> +	count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL,
> +					       typec_switch_match,
> +					       (void **)sw_devs,
> +					       ARRAY_SIZE(sw_devs));
> +	if (count <= 0) {
>   		kfree(sw);
> -		return ERR_CAST(sw_dev);
> +		return NULL;
>   	}
>   
> -	WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner));
> +	for (i = 0; i < count; i++) {
> +		if (IS_ERR(sw_devs[i])) {
> +			err = PTR_ERR(sw_devs[i]);
> +			goto put_sw_devs;
> +		}
> +	}
> +
> +	for (i = 0; i < count; i++) {
> +		WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner));
> +		sw->sw_devs[i] = sw_devs[i];
> +	}
>   
> -	sw->sw_dev = sw_dev;
> +	sw->num_sw_devs = count;
>   
>   	return sw;
> +
> +put_sw_devs:
> +	for (i = 0; i < count; i++) {
> +		if (!IS_ERR(sw_devs[i]))
> +			put_device(&sw_devs[i]->dev);
> +	}
> +
> +	return ERR_PTR(err);
>   }
>   EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
>   
> @@ -98,14 +124,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
>   void typec_switch_put(struct typec_switch *sw)
>   {
>   	struct typec_switch_dev *sw_dev;
> +	unsigned int i;
>   
>   	if (IS_ERR_OR_NULL(sw))
>   		return;
>   
> -	sw_dev = sw->sw_dev;
> +	for (i = 0; i < sw->num_sw_devs; i++) {
> +		sw_dev = sw->sw_devs[i];
>   
> -	module_put(sw_dev->dev.parent->driver->owner);
> -	put_device(&sw_dev->dev);
> +		module_put(sw_dev->dev.parent->driver->owner);
> +		put_device(&sw_dev->dev);
> +	}
>   	kfree(sw);
>   }
>   EXPORT_SYMBOL_GPL(typec_switch_put);
> @@ -170,13 +199,21 @@ int typec_switch_set(struct typec_switch *sw,
>   		     enum typec_orientation orientation)
>   {
>   	struct typec_switch_dev *sw_dev;
> +	unsigned int i;
> +	int ret;
>   
>   	if (IS_ERR_OR_NULL(sw))
>   		return 0;
>   
> -	sw_dev = sw->sw_dev;
> +	for (i = 0; i < sw->num_sw_devs; i++) {
> +		sw_dev = sw->sw_devs[i];
> +
> +		ret = sw_dev->set(sw_dev, orientation);
> +		if (ret)
> +			return ret;
> +	}
>   
> -	return sw_dev->set(sw_dev, orientation);
> +	return 0;
>   }
>   EXPORT_SYMBOL_GPL(typec_switch_set);
>   
> @@ -208,7 +245,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata);
>   /* ------------------------------------------------------------------------- */
>   
>   struct typec_mux {
> -	struct typec_mux_dev *mux_dev;
> +	struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS];
> +	unsigned int num_mux_devs;
>   };
>   
>   static int mux_fwnode_match(struct device *dev, const void *fwnode)
> @@ -291,25 +329,48 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
>   struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode,
>   				       const struct typec_altmode_desc *desc)
>   {
> -	struct typec_mux_dev *mux_dev;
> +	struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS];
>   	struct typec_mux *mux;
> +	int count;
> +	int err;
> +	int i;
>   
>   	mux = kzalloc(sizeof(*mux), GFP_KERNEL);
>   	if (!mux)
>   		return ERR_PTR(-ENOMEM);
>   
> -	mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc,
> -					       typec_mux_match);
> -	if (IS_ERR_OR_NULL(mux_dev)) {
> +	count = fwnode_connection_find_matches(fwnode, "mode-switch",
> +					       (void *)desc, typec_mux_match,
> +					       (void **)mux_devs,
> +					       ARRAY_SIZE(mux_devs));
> +	if (count <= 0) {
>   		kfree(mux);
> -		return ERR_CAST(mux_dev);
> +		return NULL;
>   	}
>   
> -	WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner));
> +	for (i = 0; i < count; i++) {
> +		if (IS_ERR(mux_devs[i])) {
> +			err = PTR_ERR(mux_devs[i]);
> +			goto put_mux_devs;
> +		}
> +	}
> +
> +	for (i = 0; i < count; i++) {
> +		WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner));
> +		mux->mux_devs[i] = mux_devs[i];
> +	}
>   
> -	mux->mux_dev = mux_dev;
> +	mux->num_mux_devs = count;
>   
>   	return mux;
> +
> +put_mux_devs:
> +	for (i = 0; i < count; i++) {
> +		if (!IS_ERR(mux_devs[i]))
> +			put_device(&mux_devs[i]->dev);
> +	}
> +
> +	return ERR_PTR(err);
>   }
>   EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
>   
> @@ -322,13 +383,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
>   void typec_mux_put(struct typec_mux *mux)
>   {
>   	struct typec_mux_dev *mux_dev;
> +	unsigned int i;
>   
>   	if (IS_ERR_OR_NULL(mux))
>   		return;
>   
> -	mux_dev = mux->mux_dev;
> -	module_put(mux_dev->dev.parent->driver->owner);
> -	put_device(&mux_dev->dev);
> +	for (i = 0; i < mux->num_mux_devs; i++) {
> +		mux_dev = mux->mux_devs[i];
> +		module_put(mux_dev->dev.parent->driver->owner);
> +		put_device(&mux_dev->dev);
> +	}
>   	kfree(mux);
>   }
>   EXPORT_SYMBOL_GPL(typec_mux_put);
> @@ -336,13 +400,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put);
>   int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
>   {
>   	struct typec_mux_dev *mux_dev;
> +	unsigned int i;
> +	int ret;
>   
>   	if (IS_ERR_OR_NULL(mux))
>   		return 0;
>   
> -	mux_dev = mux->mux_dev;
> +	for (i = 0; i < mux->num_mux_devs; i++) {
> +		mux_dev = mux->mux_devs[i];
> +
> +		ret = mux_dev->set(mux_dev, state);
> +		if (ret)
> +			return ret;
> +	}
>   
> -	return mux_dev->set(mux_dev, state);
> +	return 0;
>   }
>   EXPORT_SYMBOL_GPL(typec_mux_set);
>   


-- 
With best wishes
Dmitry

Re: [PATCH 6/8] typec: mux: Allow multiple mux_devs per mux

[Bjorn Andersson]

On Tue 28 Dec 08:04 PST 2021, Dmitry Baryshkov wrote:

> On 28/12/2021 08:21, Bjorn Andersson wrote:
> > In the Qualcomm platforms the USB/DP PHY handles muxing and orientation
> > switching of the SuperSpeed lines, but the SBU lines needs to be
> > connected and switched by external (to the SoC) hardware.
> > 
> > It's therefor necessary to be able to have the TypeC controller operate
> > multiple TypeC muxes and switches. Use the newly introduced indirection
> > object to handle this, to avoid having to taint the TypeC controllers
> > with knowledge about the downstream hardware configuration.
> > 
> > The max number of devs per indirection is set to 3, based on the number
> > of ports defined in the usb-c-connector binding.
> 
> If we had the 'count' ability, we wouldn't have to put limits here.
> The limit 3 is a bit artificial if you consider the redriver chips.
> 

I don't know if it's worth making it more dynamic at this point in time.
I definitely don't think it's worth taking two passes here, because
typec_switch_match will allocate objects that needs to be freed after
the "count" pass. I.e.  taking two passes is expensive (and ugly).

Also in it's current state we're wasting 16 bytes per USB connector at
worst and in the case of us having QMP muxing SuperSpeed signals and an
external redriver we have 2.


Given that we're just dealing with pointers the waste isn't that big,
but we could put say 8 (16?) entries on the stack and then dynamically
allocate the typec_switch and typec_mux arrays based on the actual
number of items returned.

Regards,
Bjorn

> > 
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> >   drivers/usb/typec/mux.c | 124 +++++++++++++++++++++++++++++++---------
> >   1 file changed, 98 insertions(+), 26 deletions(-)
> > 
> > diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> > index d0b42c297aca..adf3681cf22d 100644
> > --- a/drivers/usb/typec/mux.c
> > +++ b/drivers/usb/typec/mux.c
> > @@ -17,8 +17,11 @@
> >   #include "class.h"
> >   #include "mux.h"
> > +#define TYPEC_MUX_MAX_DEVS	3
> > +
> >   struct typec_switch {
> > -	struct typec_switch_dev *sw_dev;
> > +	struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
> > +	unsigned int num_sw_devs;
> >   };
> >   static int switch_fwnode_match(struct device *dev, const void *fwnode)
> > @@ -67,25 +70,48 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
> >    */
> >   struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
> >   {
> > -	struct typec_switch_dev *sw_dev;
> > +	struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS];
> >   	struct typec_switch *sw;
> > +	int count;
> > +	int err;
> > +	int i;
> >   	sw = kzalloc(sizeof(*sw), GFP_KERNEL);
> >   	if (!sw)
> >   		return ERR_PTR(-ENOMEM);
> > -	sw_dev = fwnode_connection_find_match(fwnode, "orientation-switch", NULL,
> > -					      typec_switch_match);
> > -	if (IS_ERR_OR_NULL(sw_dev)) {
> > +	count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL,
> > +					       typec_switch_match,
> > +					       (void **)sw_devs,
> > +					       ARRAY_SIZE(sw_devs));
> > +	if (count <= 0) {
> >   		kfree(sw);
> > -		return ERR_CAST(sw_dev);
> > +		return NULL;
> >   	}
> > -	WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner));
> > +	for (i = 0; i < count; i++) {
> > +		if (IS_ERR(sw_devs[i])) {
> > +			err = PTR_ERR(sw_devs[i]);
> > +			goto put_sw_devs;
> > +		}
> > +	}
> > +
> > +	for (i = 0; i < count; i++) {
> > +		WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner));
> > +		sw->sw_devs[i] = sw_devs[i];
> > +	}
> > -	sw->sw_dev = sw_dev;
> > +	sw->num_sw_devs = count;
> >   	return sw;
> > +
> > +put_sw_devs:
> > +	for (i = 0; i < count; i++) {
> > +		if (!IS_ERR(sw_devs[i]))
> > +			put_device(&sw_devs[i]->dev);
> > +	}
> > +
> > +	return ERR_PTR(err);
> >   }
> >   EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
> > @@ -98,14 +124,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
> >   void typec_switch_put(struct typec_switch *sw)
> >   {
> >   	struct typec_switch_dev *sw_dev;
> > +	unsigned int i;
> >   	if (IS_ERR_OR_NULL(sw))
> >   		return;
> > -	sw_dev = sw->sw_dev;
> > +	for (i = 0; i < sw->num_sw_devs; i++) {
> > +		sw_dev = sw->sw_devs[i];
> > -	module_put(sw_dev->dev.parent->driver->owner);
> > -	put_device(&sw_dev->dev);
> > +		module_put(sw_dev->dev.parent->driver->owner);
> > +		put_device(&sw_dev->dev);
> > +	}
> >   	kfree(sw);
> >   }
> >   EXPORT_SYMBOL_GPL(typec_switch_put);
> > @@ -170,13 +199,21 @@ int typec_switch_set(struct typec_switch *sw,
> >   		     enum typec_orientation orientation)
> >   {
> >   	struct typec_switch_dev *sw_dev;
> > +	unsigned int i;
> > +	int ret;
> >   	if (IS_ERR_OR_NULL(sw))
> >   		return 0;
> > -	sw_dev = sw->sw_dev;
> > +	for (i = 0; i < sw->num_sw_devs; i++) {
> > +		sw_dev = sw->sw_devs[i];
> > +
> > +		ret = sw_dev->set(sw_dev, orientation);
> > +		if (ret)
> > +			return ret;
> > +	}
> > -	return sw_dev->set(sw_dev, orientation);
> > +	return 0;
> >   }
> >   EXPORT_SYMBOL_GPL(typec_switch_set);
> > @@ -208,7 +245,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata);
> >   /* ------------------------------------------------------------------------- */
> >   struct typec_mux {
> > -	struct typec_mux_dev *mux_dev;
> > +	struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS];
> > +	unsigned int num_mux_devs;
> >   };
> >   static int mux_fwnode_match(struct device *dev, const void *fwnode)
> > @@ -291,25 +329,48 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
> >   struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode,
> >   				       const struct typec_altmode_desc *desc)
> >   {
> > -	struct typec_mux_dev *mux_dev;
> > +	struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS];
> >   	struct typec_mux *mux;
> > +	int count;
> > +	int err;
> > +	int i;
> >   	mux = kzalloc(sizeof(*mux), GFP_KERNEL);
> >   	if (!mux)
> >   		return ERR_PTR(-ENOMEM);
> > -	mux_dev = fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc,
> > -					       typec_mux_match);
> > -	if (IS_ERR_OR_NULL(mux_dev)) {
> > +	count = fwnode_connection_find_matches(fwnode, "mode-switch",
> > +					       (void *)desc, typec_mux_match,
> > +					       (void **)mux_devs,
> > +					       ARRAY_SIZE(mux_devs));
> > +	if (count <= 0) {
> >   		kfree(mux);
> > -		return ERR_CAST(mux_dev);
> > +		return NULL;
> >   	}
> > -	WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner));
> > +	for (i = 0; i < count; i++) {
> > +		if (IS_ERR(mux_devs[i])) {
> > +			err = PTR_ERR(mux_devs[i]);
> > +			goto put_mux_devs;
> > +		}
> > +	}
> > +
> > +	for (i = 0; i < count; i++) {
> > +		WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner));
> > +		mux->mux_devs[i] = mux_devs[i];
> > +	}
> > -	mux->mux_dev = mux_dev;
> > +	mux->num_mux_devs = count;
> >   	return mux;
> > +
> > +put_mux_devs:
> > +	for (i = 0; i < count; i++) {
> > +		if (!IS_ERR(mux_devs[i]))
> > +			put_device(&mux_devs[i]->dev);
> > +	}
> > +
> > +	return ERR_PTR(err);
> >   }
> >   EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
> > @@ -322,13 +383,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
> >   void typec_mux_put(struct typec_mux *mux)
> >   {
> >   	struct typec_mux_dev *mux_dev;
> > +	unsigned int i;
> >   	if (IS_ERR_OR_NULL(mux))
> >   		return;
> > -	mux_dev = mux->mux_dev;
> > -	module_put(mux_dev->dev.parent->driver->owner);
> > -	put_device(&mux_dev->dev);
> > +	for (i = 0; i < mux->num_mux_devs; i++) {
> > +		mux_dev = mux->mux_devs[i];
> > +		module_put(mux_dev->dev.parent->driver->owner);
> > +		put_device(&mux_dev->dev);
> > +	}
> >   	kfree(mux);
> >   }
> >   EXPORT_SYMBOL_GPL(typec_mux_put);
> > @@ -336,13 +400,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put);
> >   int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state)
> >   {
> >   	struct typec_mux_dev *mux_dev;
> > +	unsigned int i;
> > +	int ret;
> >   	if (IS_ERR_OR_NULL(mux))
> >   		return 0;
> > -	mux_dev = mux->mux_dev;
> > +	for (i = 0; i < mux->num_mux_devs; i++) {
> > +		mux_dev = mux->mux_devs[i];
> > +
> > +		ret = mux_dev->set(mux_dev, state);
> > +		if (ret)
> > +			return ret;
> > +	}
> > -	return mux_dev->set(mux_dev, state);
> > +	return 0;
> >   }
> >   EXPORT_SYMBOL_GPL(typec_mux_set);
> 
> 
> -- 
> With best wishes
> Dmitry

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Bjorn Andersson]

On Tue 28 Dec 05:09 PST 2021, Dmitry Baryshkov wrote:

> On 28/12/2021 08:21, Bjorn Andersson wrote:
> > In some cases multiple connections with the same connection id
> > needs to be resolved from a fwnode graph.
> > 
> > One such example is when separate hardware is used for performing muxing and/or
> > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > connector. In this case the connector needs to belong to a graph with
> > multiple matching remote endpoints, and the TypeC controller needs to be
> > able to resolve them both.
> > 
> > Add a new API that allows this kind of lookup.
> > 
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> >   drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> >   include/linux/property.h |  5 +++
> >   2 files changed, 99 insertions(+)
> > 
> > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > index cbe4fa298413..0aa0296fd991 100644
> > --- a/drivers/base/property.c
> > +++ b/drivers/base/property.c
> > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> >   	return NULL;
> >   }
> > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > +						const char *con_id, void *data,
> > +						devcon_match_fn_t match,
> > +						void **matches,
> > +						unsigned int matches_len)
> > +{
> > +	struct fwnode_handle *node;
> > +	struct fwnode_handle *ep;
> > +	unsigned int count = 0;
> > +	void *ret;
> > +
> > +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> > +		if (count >= matches_len) {
> > +			fwnode_handle_put(ep);
> > +			return count;
> > +		}
> > +
> > +		node = fwnode_graph_get_remote_port_parent(ep);
> > +		if (!fwnode_device_is_available(node))
> > +			continue;
> > +
> > +		ret = match(node, con_id, data);
> > +		fwnode_handle_put(node);
> > +
> > +		if (ret)
> > +			matches[count++] = ret;
> > +	}
> > +	return count;
> > +}
> 
> This API doesn't let it's user know if there are more matches found in the
> device tree or not. I'd suggest to add 'count' mode that would return the
> amount of found matches if (matches == NULL) && (matches_len == 0).
> 

Unfortunately in this code path we don't know how to "free" the objects
returned by match(), e.g. see how typec_switch_match() returns wrapper
of a refcounted device.

So we must return all the match results to the caller to it can free
things up based on its knowledge of what matches[] actually contains..

Regards,
Bjorn

> > +
> >   static void *
> >   fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> >   		    void *data, devcon_match_fn_t match)
> > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> >   	return NULL;
> >   }
> > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > +					  const char *con_id, void *data,
> > +					  devcon_match_fn_t match,
> > +					  void **matches,
> > +					  unsigned int matches_len)
> > +{
> > +	struct fwnode_handle *node;
> > +	unsigned int count = 0;
> > +	void *ret;
> > +	int i;
> > +
> > +	for (i = 0; ; i++) {
> > +		if (count >= matches_len)
> > +			return count;
> > +
> > +		node = fwnode_find_reference(fwnode, con_id, i);
> > +		if (IS_ERR(node))
> > +			break;
> > +
> > +		ret = match(node, NULL, data);
> > +		fwnode_handle_put(node);
> > +
> > +		if (ret)
> > +			matches[count++] = ret;
> > +	}
> > +
> > +	return count;
> > +}
> > +
> 
> Same comment applies.
> 
> >   /**
> >    * fwnode_connection_find_match - Find connection from a device node
> >    * @fwnode: Device node with the connection
> > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> >   	return fwnode_devcon_match(fwnode, con_id, data, match);
> >   }
> >   EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > +
> > +/**
> > + * fwnode_connection_find_matches - Find connections from a device node
> > + * @fwnode: Device node with the connection
> > + * @con_id: Identifier for the connection
> > + * @data: Data for the match function
> > + * @match: Function to check and convert the connection description
> > + * @matches: Array of pointers to fill with matches
> > + * @matches_len: Length of @matches
> > + *
> > + * Find up to @matches_len connections with unique identifier @con_id between
> > + * @fwnode and other device nodes. @match will be used to convert the
> > + * connection description to data the caller is expecting to be returned
> > + * through the @matches array.
> > + *
> > + * Return: Number of matches resolved, of negative errno.
> > + */
> > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > +				   const char *con_id, void *data,
> > +				   devcon_match_fn_t match,
> > +				   void **matches, unsigned int matches_len)
> > +{
> > +	unsigned int count;
> > +
> > +	if (!fwnode || !match || !matches)
> > +		return -EINVAL;
> > +
> > +	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > +					    matches, matches_len);
> > +
> > +	return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> > +					     matches + count,
> > +					     matches_len - count);
> > +}
> > +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> > diff --git a/include/linux/property.h b/include/linux/property.h
> > index 16f736c698a2..59484ccb260e 100644
> > --- a/include/linux/property.h
> > +++ b/include/linux/property.h
> > @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
> >   	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
> >   }
> > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > +				   const char *con_id, void *data,
> > +				   devcon_match_fn_t match,
> > +				   void **matches, unsigned int matches_len);
> > +
> >   /* -------------------------------------------------------------------------- */
> >   /* Software fwnode support - when HW description is incomplete or missing */
> 
> 
> -- 
> With best wishes
> Dmitry

Re: [PATCH 0/8] typec: mux: Introduce support for multiple TypeC muxes

[Bjorn Andersson]

On Tue 28 Dec 04:20 PST 2021, Hans de Goede wrote:

> Hi Bjorn,
> 
> On 12/28/21 06:21, Bjorn Andersson wrote:
> > This series introduces a level of indirection between the controller's view of
> > a typec_mux/switch and the implementation and then expands that to support
> > multiple drivers.
> > 
> > This is needed in order to support devices such as the Qualcomm Snapdragon 888
> > HDK, which does muxing and orientation handling in the QMP (USB+DP) PHY and SBU
> > muxing in the external FSA4480 chip.
> > 
> > Additionally integration of typec mux and switch in the QMP PHY is included in
> > the series, as is the new FSA4480 driver. This is done to deal with the
> > renaming of the driver-side typec_mux -> typec_mux_dev.
> > 
> > Bjorn Andersson (8):
> >   dt-bindings: phy: qcom,qmp-usb3-dp: Add altmode/switch properties
> >   phy: qcom-qmp: Register typec mux and orientation switch
> >   device property: Helper to match multiple connections
> >   device property: Use multi-connection matchers for single case
> >   typec: mux: Introduce indirection
> >   typec: mux: Allow multiple mux_devs per mux
> >   dt-bindings: usb: Add binding for fcs,fsa4480
> >   usb: typec: mux: Add On Semi fsa4480 driver
> 
> Thank you for your series, I will leave commenting on the
> dt-bindings and typec-mux changes to others.
> 
> But what I can do is test this on an x86 device using
> a pi3usb30532 mux for USB super-speed and DP-alt-mode
> muxing / orientation switching.
> 

Thanks Hans, that would be much appreciated. I realize that I failed to
mention that I don't have this hardware, so I've not been able to test
it myself.

> I'm going to wait a bit with doing that till this has had
> some reviews and possibly also some newer versions because
> of those reviews. If you haven't received a Tested-by from me
> when this looks like it is ready for merging please ping me.
> 

Will ping you when appropriate.

Thanks,
Bjorn

> Regards,
> 
> Hans
> 
> 
> > 
> >  .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml    |  14 +
> >  .../devicetree/bindings/usb/fcs,fsa4480.yaml  |  72 +++++
> >  drivers/base/property.c                       |  83 ++++--
> >  drivers/phy/qualcomm/phy-qcom-qmp.c           | 176 ++++++++++--
> >  drivers/usb/typec/bus.c                       |   2 +-
> >  drivers/usb/typec/mux.c                       | 257 +++++++++++++-----
> >  drivers/usb/typec/mux.h                       |  12 +-
> >  drivers/usb/typec/mux/Kconfig                 |   9 +
> >  drivers/usb/typec/mux/Makefile                |   1 +
> >  drivers/usb/typec/mux/fsa4480.c               | 220 +++++++++++++++
> >  drivers/usb/typec/mux/intel_pmc_mux.c         |   8 +-
> >  drivers/usb/typec/mux/pi3usb30532.c           |   8 +-
> >  include/linux/property.h                      |   5 +
> >  include/linux/usb/typec_mux.h                 |  22 +-
> >  14 files changed, 762 insertions(+), 127 deletions(-)
> >  create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
> >  create mode 100644 drivers/usb/typec/mux/fsa4480.c
> > 
> 

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Dmitry Baryshkov]

On Tue, 28 Dec 2021 at 20:03, Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
>
> On Tue 28 Dec 05:09 PST 2021, Dmitry Baryshkov wrote:
>
> > On 28/12/2021 08:21, Bjorn Andersson wrote:
> > > In some cases multiple connections with the same connection id
> > > needs to be resolved from a fwnode graph.
> > >
> > > One such example is when separate hardware is used for performing muxing and/or
> > > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > > connector. In this case the connector needs to belong to a graph with
> > > multiple matching remote endpoints, and the TypeC controller needs to be
> > > able to resolve them both.
> > >
> > > Add a new API that allows this kind of lookup.
> > >
> > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > ---
> > >   drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> > >   include/linux/property.h |  5 +++
> > >   2 files changed, 99 insertions(+)
> > >
> > > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > > index cbe4fa298413..0aa0296fd991 100644
> > > --- a/drivers/base/property.c
> > > +++ b/drivers/base/property.c
> > > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >     return NULL;
> > >   }
> > > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > > +                                           const char *con_id, void *data,
> > > +                                           devcon_match_fn_t match,
> > > +                                           void **matches,
> > > +                                           unsigned int matches_len)
> > > +{
> > > +   struct fwnode_handle *node;
> > > +   struct fwnode_handle *ep;
> > > +   unsigned int count = 0;
> > > +   void *ret;
> > > +
> > > +   fwnode_graph_for_each_endpoint(fwnode, ep) {
> > > +           if (count >= matches_len) {
> > > +                   fwnode_handle_put(ep);
> > > +                   return count;
> > > +           }
> > > +
> > > +           node = fwnode_graph_get_remote_port_parent(ep);
> > > +           if (!fwnode_device_is_available(node))
> > > +                   continue;
> > > +
> > > +           ret = match(node, con_id, data);
> > > +           fwnode_handle_put(node);
> > > +
> > > +           if (ret)
> > > +                   matches[count++] = ret;
> > > +   }
> > > +   return count;
> > > +}
> >
> > This API doesn't let it's user know if there are more matches found in the
> > device tree or not. I'd suggest to add 'count' mode that would return the
> > amount of found matches if (matches == NULL) && (matches_len == 0).
> >
>
> Unfortunately in this code path we don't know how to "free" the objects
> returned by match(), e.g. see how typec_switch_match() returns wrapper
> of a refcounted device.
>
> So we must return all the match results to the caller to it can free
> things up based on its knowledge of what matches[] actually contains..

Ugh. Then we should probably return -E2BIG, -ENOSPC or any other such error.
Another option might be to split match into match & map functions,
first one returning bool and second one returning actual corresponding
object..

>
> Regards,
> Bjorn
>
> > > +
> > >   static void *
> > >   fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >                 void *data, devcon_match_fn_t match)
> > > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >     return NULL;
> > >   }
> > > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > > +                                     const char *con_id, void *data,
> > > +                                     devcon_match_fn_t match,
> > > +                                     void **matches,
> > > +                                     unsigned int matches_len)
> > > +{
> > > +   struct fwnode_handle *node;
> > > +   unsigned int count = 0;
> > > +   void *ret;
> > > +   int i;
> > > +
> > > +   for (i = 0; ; i++) {
> > > +           if (count >= matches_len)
> > > +                   return count;
> > > +
> > > +           node = fwnode_find_reference(fwnode, con_id, i);
> > > +           if (IS_ERR(node))
> > > +                   break;
> > > +
> > > +           ret = match(node, NULL, data);
> > > +           fwnode_handle_put(node);
> > > +
> > > +           if (ret)
> > > +                   matches[count++] = ret;
> > > +   }
> > > +
> > > +   return count;
> > > +}
> > > +
> >
> > Same comment applies.
> >
> > >   /**
> > >    * fwnode_connection_find_match - Find connection from a device node
> > >    * @fwnode: Device node with the connection
> > > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> > >     return fwnode_devcon_match(fwnode, con_id, data, match);
> > >   }
> > >   EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > > +
> > > +/**
> > > + * fwnode_connection_find_matches - Find connections from a device node
> > > + * @fwnode: Device node with the connection
> > > + * @con_id: Identifier for the connection
> > > + * @data: Data for the match function
> > > + * @match: Function to check and convert the connection description
> > > + * @matches: Array of pointers to fill with matches
> > > + * @matches_len: Length of @matches
> > > + *
> > > + * Find up to @matches_len connections with unique identifier @con_id between
> > > + * @fwnode and other device nodes. @match will be used to convert the
> > > + * connection description to data the caller is expecting to be returned
> > > + * through the @matches array.
> > > + *
> > > + * Return: Number of matches resolved, of negative errno.
> > > + */
> > > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > > +                              const char *con_id, void *data,
> > > +                              devcon_match_fn_t match,
> > > +                              void **matches, unsigned int matches_len)
> > > +{
> > > +   unsigned int count;
> > > +
> > > +   if (!fwnode || !match || !matches)
> > > +           return -EINVAL;
> > > +
> > > +   count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > > +                                       matches, matches_len);
> > > +
> > > +   return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> > > +                                        matches + count,
> > > +                                        matches_len - count);
> > > +}
> > > +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> > > diff --git a/include/linux/property.h b/include/linux/property.h
> > > index 16f736c698a2..59484ccb260e 100644
> > > --- a/include/linux/property.h
> > > +++ b/include/linux/property.h
> > > @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
> > >     return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
> > >   }
> > > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > > +                              const char *con_id, void *data,
> > > +                              devcon_match_fn_t match,
> > > +                              void **matches, unsigned int matches_len);
> > > +
> > >   /* -------------------------------------------------------------------------- */
> > >   /* Software fwnode support - when HW description is incomplete or missing */
> >
> >
> > --
> > With best wishes
> > Dmitry



-- 
With best wishes
Dmitry

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Bjorn Andersson]

On Tue 28 Dec 10:24 PST 2021, Dmitry Baryshkov wrote:

> On Tue, 28 Dec 2021 at 20:03, Bjorn Andersson
> <bjorn.andersson@linaro.org> wrote:
> >
> > On Tue 28 Dec 05:09 PST 2021, Dmitry Baryshkov wrote:
> >
> > > On 28/12/2021 08:21, Bjorn Andersson wrote:
> > > > In some cases multiple connections with the same connection id
> > > > needs to be resolved from a fwnode graph.
> > > >
> > > > One such example is when separate hardware is used for performing muxing and/or
> > > > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > > > connector. In this case the connector needs to belong to a graph with
> > > > multiple matching remote endpoints, and the TypeC controller needs to be
> > > > able to resolve them both.
> > > >
> > > > Add a new API that allows this kind of lookup.
> > > >
> > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > > ---
> > > >   drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> > > >   include/linux/property.h |  5 +++
> > > >   2 files changed, 99 insertions(+)
> > > >
> > > > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > > > index cbe4fa298413..0aa0296fd991 100644
> > > > --- a/drivers/base/property.c
> > > > +++ b/drivers/base/property.c
> > > > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > >     return NULL;
> > > >   }
> > > > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > > > +                                           const char *con_id, void *data,
> > > > +                                           devcon_match_fn_t match,
> > > > +                                           void **matches,
> > > > +                                           unsigned int matches_len)
> > > > +{
> > > > +   struct fwnode_handle *node;
> > > > +   struct fwnode_handle *ep;
> > > > +   unsigned int count = 0;
> > > > +   void *ret;
> > > > +
> > > > +   fwnode_graph_for_each_endpoint(fwnode, ep) {
> > > > +           if (count >= matches_len) {
> > > > +                   fwnode_handle_put(ep);
> > > > +                   return count;
> > > > +           }
> > > > +
> > > > +           node = fwnode_graph_get_remote_port_parent(ep);
> > > > +           if (!fwnode_device_is_available(node))
> > > > +                   continue;
> > > > +
> > > > +           ret = match(node, con_id, data);
> > > > +           fwnode_handle_put(node);
> > > > +
> > > > +           if (ret)
> > > > +                   matches[count++] = ret;
> > > > +   }
> > > > +   return count;
> > > > +}
> > >
> > > This API doesn't let it's user know if there are more matches found in the
> > > device tree or not. I'd suggest to add 'count' mode that would return the
> > > amount of found matches if (matches == NULL) && (matches_len == 0).
> > >
> >
> > Unfortunately in this code path we don't know how to "free" the objects
> > returned by match(), e.g. see how typec_switch_match() returns wrapper
> > of a refcounted device.
> >
> > So we must return all the match results to the caller to it can free
> > things up based on its knowledge of what matches[] actually contains..
> 
> Ugh. Then we should probably return -E2BIG, -ENOSPC or any other such error.
> Another option might be to split match into match & map functions,
> first one returning bool and second one returning actual corresponding
> object..
> 

If I get an errno back from a function like this I generally expect this
kind of API to have done the cleanup for me, which can't be done. So I
fear that it would be more error prone than the current proposal - which
potentially might (silently) fail to detect that you have 4+ orientation
switches attached to your USB port.

My imagination doesn't isn't able to come up with a large enough
of_graph where the client would need to provide an matches array that's
larger than what would fit on the stack. Perhaps someone can provide a
real use case where it would be necessary to support arbitrary sizes of
matches[]?

Regards,
Bjorn

> >
> > Regards,
> > Bjorn
> >
> > > > +
> > > >   static void *
> > > >   fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > >                 void *data, devcon_match_fn_t match)
> > > > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > >     return NULL;
> > > >   }
> > > > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > > > +                                     const char *con_id, void *data,
> > > > +                                     devcon_match_fn_t match,
> > > > +                                     void **matches,
> > > > +                                     unsigned int matches_len)
> > > > +{
> > > > +   struct fwnode_handle *node;
> > > > +   unsigned int count = 0;
> > > > +   void *ret;
> > > > +   int i;
> > > > +
> > > > +   for (i = 0; ; i++) {
> > > > +           if (count >= matches_len)
> > > > +                   return count;
> > > > +
> > > > +           node = fwnode_find_reference(fwnode, con_id, i);
> > > > +           if (IS_ERR(node))
> > > > +                   break;
> > > > +
> > > > +           ret = match(node, NULL, data);
> > > > +           fwnode_handle_put(node);
> > > > +
> > > > +           if (ret)
> > > > +                   matches[count++] = ret;
> > > > +   }
> > > > +
> > > > +   return count;
> > > > +}
> > > > +
> > >
> > > Same comment applies.
> > >
> > > >   /**
> > > >    * fwnode_connection_find_match - Find connection from a device node
> > > >    * @fwnode: Device node with the connection
> > > > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> > > >     return fwnode_devcon_match(fwnode, con_id, data, match);
> > > >   }
> > > >   EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > > > +
> > > > +/**
> > > > + * fwnode_connection_find_matches - Find connections from a device node
> > > > + * @fwnode: Device node with the connection
> > > > + * @con_id: Identifier for the connection
> > > > + * @data: Data for the match function
> > > > + * @match: Function to check and convert the connection description
> > > > + * @matches: Array of pointers to fill with matches
> > > > + * @matches_len: Length of @matches
> > > > + *
> > > > + * Find up to @matches_len connections with unique identifier @con_id between
> > > > + * @fwnode and other device nodes. @match will be used to convert the
> > > > + * connection description to data the caller is expecting to be returned
> > > > + * through the @matches array.
> > > > + *
> > > > + * Return: Number of matches resolved, of negative errno.
> > > > + */
> > > > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > > > +                              const char *con_id, void *data,
> > > > +                              devcon_match_fn_t match,
> > > > +                              void **matches, unsigned int matches_len)
> > > > +{
> > > > +   unsigned int count;
> > > > +
> > > > +   if (!fwnode || !match || !matches)
> > > > +           return -EINVAL;
> > > > +
> > > > +   count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > > > +                                       matches, matches_len);
> > > > +
> > > > +   return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> > > > +                                        matches + count,
> > > > +                                        matches_len - count);
> > > > +}
> > > > +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> > > > diff --git a/include/linux/property.h b/include/linux/property.h
> > > > index 16f736c698a2..59484ccb260e 100644
> > > > --- a/include/linux/property.h
> > > > +++ b/include/linux/property.h
> > > > @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
> > > >     return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
> > > >   }
> > > > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > > > +                              const char *con_id, void *data,
> > > > +                              devcon_match_fn_t match,
> > > > +                              void **matches, unsigned int matches_len);
> > > > +
> > > >   /* -------------------------------------------------------------------------- */
> > > >   /* Software fwnode support - when HW description is incomplete or missing */
> > >
> > >
> > > --
> > > With best wishes
> > > Dmitry
> 
> 
> 
> -- 
> With best wishes
> Dmitry

Re: [PATCH 2/8] phy: qcom-qmp: Register typec mux and orientation switch

[Vinod Koul]

On 27-12-21, 21:21, Bjorn Andersson wrote:
> The QMP PHY handles muxing of USB vs DisplayPort, as well as orientation
> switching of the SuperSpeed lanes. So register typec handlers for the
> two types.
> 
> The TypeC mux allows switching between four lanes of DisplayPort and a
> mixed USB+DP combination. This makes it possible to reach resolutions
> that requires 4 lanes.
> 
> The TypeC switch allows switching the SuperSpeed pins and have been
> tested with both 2 and 4 lane DisplayPort.
> 
> It's possible that in the USB mode the DP_MODE should be disabled, but
> this is left untouched.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> 
> My suggestion is that if/once this patch is deemed acceptable the PHY
> maintainers could create a immutable branch/tag which can be merged into the
> PHY tree as well as the USB tree.
> 
>  drivers/phy/qualcomm/phy-qcom-qmp.c | 176 +++++++++++++++++++++++++---
>  1 file changed, 158 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 7bea6a60dc54..8d8139df9d8e 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -19,6 +19,8 @@
>  #include <linux/regulator/consumer.h>
>  #include <linux/reset.h>
>  #include <linux/slab.h>
> +#include <linux/usb/typec_dp.h>
> +#include <linux/usb/typec_mux.h>
>  
>  #include <dt-bindings/phy/phy.h>
>  
> @@ -3017,6 +3019,9 @@ struct qmp_phy_dp_clks {
>   * @phy_mutex: mutex lock for PHY common block initialization
>   * @init_count: phy common block initialization count
>   * @ufs_reset: optional UFS PHY reset handle
> + * @sw: typec switch for receiving orientation changes
> + * @mux: typec mux for DP muxing
> + * @orientation: carries current CC orientation
>   */
>  struct qcom_qmp {
>  	struct device *dev;
> @@ -3032,6 +3037,10 @@ struct qcom_qmp {
>  	int init_count;
>  
>  	struct reset_control *ufs_reset;
> +
> +	struct typec_switch *sw;
> +	struct typec_mux *mux;
> +	enum typec_orientation orientation;
>  };
>  
>  static void qcom_qmp_v3_phy_dp_aux_init(struct qmp_phy *qphy);
> @@ -4378,30 +4387,23 @@ static void qcom_qmp_v3_phy_configure_dp_tx(struct qmp_phy *qphy)
>  
>  static bool qcom_qmp_phy_configure_dp_mode(struct qmp_phy *qphy)
>  {
> +	const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts;
> +	bool reverse = qphy->qmp->orientation == TYPEC_ORIENTATION_REVERSE;
>  	u32 val;
> -	bool reverse = false;
>  
>  	val = DP_PHY_PD_CTL_PWRDN | DP_PHY_PD_CTL_AUX_PWRDN |
>  	      DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN;
>  
> -	/*
> -	 * TODO: Assume orientation is CC1 for now and two lanes, need to
> -	 * use type-c connector to understand orientation and lanes.
> -	 *
> -	 * Otherwise val changes to be like below if this code understood
> -	 * the orientation of the type-c cable.
> -	 *
> -	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC2)
> -	 *	val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
> -	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC1)
> -	 *	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> -	 * if (orientation == ORIENTATION_CC2)
> -	 *	writel(0x4c, qphy->pcs + QSERDES_V3_DP_PHY_MODE);
> -	 */
> -	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> +	if (dp_opts->lanes == 4 || reverse)
> +		val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
> +	if (dp_opts->lanes == 4 || !reverse)
> +		val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
>  	writel(val, qphy->pcs + QSERDES_DP_PHY_PD_CTL);
>  
> -	writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
> +	if (reverse)
> +		writel(0x4c, qphy->pcs + QSERDES_DP_PHY_MODE);
> +	else
> +		writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
>  
>  	return reverse;
>  }
> @@ -5809,6 +5811,123 @@ static const struct dev_pm_ops qcom_qmp_phy_pm_ops = {
>  			   qcom_qmp_phy_runtime_resume, NULL)
>  };
>  
> +#if IS_ENABLED(CONFIG_TYPEC)
> +static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw,
> +		enum typec_orientation orientation)

pls align to preceding open brace (here and other places)

> +{
> +	struct qcom_qmp *qmp = typec_switch_get_drvdata(sw);
> +	void __iomem *dp_com = qmp->dp_com;
> +
> +	qmp->orientation = orientation;
> +
> +	if (orientation == TYPEC_ORIENTATION_REVERSE)
> +		qphy_setbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
> +	else
> +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
> +
> +	return 0;
> +}
> +
> +static int qcom_qmp_phy_typec_mux_set(struct typec_mux *mux,
> +				      struct typec_mux_state *state)
> +{
> +	struct qcom_qmp *qmp = typec_mux_get_drvdata(mux);
> +	void __iomem *dp_com = qmp->dp_com;
> +	bool dp_mode;
> +	bool usb_mode;
> +
> +	switch (state->mode) {
> +	case TYPEC_STATE_SAFE:
> +	case TYPEC_STATE_USB:
> +		/*
> +		 * TODO: Figure out if we should clear DP_MODE when we enter a
> +		 * USB-only state.
> +		 */
> +		dp_mode = true;

should this be false for these states?

> +		usb_mode = true;
> +		break;
> +	case TYPEC_DP_STATE_A:
> +	case TYPEC_DP_STATE_C:
> +	case TYPEC_DP_STATE_E:
> +		dp_mode = true;
> +		usb_mode = false;
> +		break;
> +	case TYPEC_DP_STATE_B:
> +	case TYPEC_DP_STATE_D:
> +	case TYPEC_DP_STATE_F:
> +		dp_mode = true;
> +		usb_mode = true;
> +		break;
> +	}

looks like dp_mode is true always. And only for DP state A C E, usb_mode
is false...

> +
> +	qphy_setbits(dp_com, QPHY_V3_DP_COM_RESET_OVRD_CTRL,
> +		     SW_DPPHY_RESET_MUX | SW_USB3PHY_RESET_MUX);
> +	if (dp_mode)
> +		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
> +	else
> +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
> +
> +	if (usb_mode)
> +		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
> +	else
> +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
> +
> +	qphy_setbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
> +	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SWI_CTRL, 0x03);
> +	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
> +
> +	return 0;
> +}
> +
> +static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
> +				       const struct qmp_phy_cfg *cfg)
> +{
> +	struct typec_switch_desc sw_desc = {};
> +	struct typec_mux_desc mux_desc = {};
> +	struct device *dev = qmp->dev;
> +
> +	if (!cfg->has_phy_dp_com_ctrl)
> +		return 0;
> +
> +	sw_desc.drvdata = qmp;
> +	sw_desc.fwnode = dev->fwnode;
> +	sw_desc.set = qcom_qmp_phy_typec_switch_set;
> +	qmp->sw = typec_switch_register(dev, &sw_desc);
> +	if (IS_ERR(qmp->sw)) {
> +		dev_err(dev, "Error registering typec switch: %pe\n", qmp->sw);
> +		return PTR_ERR(qmp->sw);
> +	}
> +
> +	mux_desc.drvdata = qmp;
> +	mux_desc.fwnode = dev->fwnode;
> +	mux_desc.set = qcom_qmp_phy_typec_mux_set;
> +	qmp->mux = typec_mux_register(dev, &mux_desc);
> +	if (IS_ERR(qmp->mux)) {
> +		dev_err(dev, "Error registering typec mux: %pe\n", qmp->mux);
> +		typec_switch_unregister(qmp->sw);
> +		return PTR_ERR(qmp->mux);
> +	}
> +
> +	return 0;
> +}
> +
> +static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
> +{
> +	typec_mux_unregister(qmp->mux);
> +	typec_switch_unregister(qmp->sw);
> +}
> +#else

empty line here pls

> +static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
> +				       const struct qmp_phy_cfg *cfg)
> +{
> +	return 0;
> +}
> +
> +static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
> +{
> +}
> +#endif
> +
>  static int qcom_qmp_phy_probe(struct platform_device *pdev)
>  {
>  	struct qcom_qmp *qmp;
> @@ -5891,7 +6010,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
>  		return ret;
>  	}
>  
> -	num = of_get_available_child_count(dev->of_node);
> +	ret = qcom_qmp_phy_typec_register(qmp, cfg);
> +	if (ret)
> +		return ret;
> +
> +	num = 0;
> +	for_each_available_child_of_node(dev->of_node, child) {
> +		if (!of_node_name_eq(child, "port"))
> +			num++;
> +	}
>  	/* do we have a rogue child node ? */
>  	if (num > expected_phys)
>  		return -EINVAL;
> @@ -5918,6 +6045,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
>  			serdes = usb_serdes;
>  		}
>  
> +		if (of_node_name_eq(child, "port"))
> +			continue;
> +
>  		/* Create per-lane phy */
>  		ret = qcom_qmp_phy_create(dev, child, id, serdes, cfg);
>  		if (ret) {
> @@ -5962,8 +6092,18 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> +static int qcom_qmp_phy_remove(struct platform_device *pdev)
> +{
> +	struct qcom_qmp *qmp = platform_get_drvdata(pdev);
> +
> +	qcom_qmp_phy_typec_unregister(qmp);
> +
> +	return 0;
> +}
> +
>  static struct platform_driver qcom_qmp_phy_driver = {
>  	.probe		= qcom_qmp_phy_probe,
> +	.remove		= qcom_qmp_phy_remove,
>  	.driver = {
>  		.name	= "qcom-qmp-phy",
>  		.pm	= &qcom_qmp_phy_pm_ops,
> -- 
> 2.33.1

-- 
~Vinod

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Vinod Koul]

On 28-12-21, 09:04, Bjorn Andersson wrote:
> On Tue 28 Dec 05:09 PST 2021, Dmitry Baryshkov wrote:
> 
> > On 28/12/2021 08:21, Bjorn Andersson wrote:
> > > In some cases multiple connections with the same connection id
> > > needs to be resolved from a fwnode graph.
> > > 
> > > One such example is when separate hardware is used for performing muxing and/or
> > > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > > connector. In this case the connector needs to belong to a graph with
> > > multiple matching remote endpoints, and the TypeC controller needs to be
> > > able to resolve them both.
> > > 
> > > Add a new API that allows this kind of lookup.
> > > 
> > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > ---
> > >   drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> > >   include/linux/property.h |  5 +++
> > >   2 files changed, 99 insertions(+)
> > > 
> > > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > > index cbe4fa298413..0aa0296fd991 100644
> > > --- a/drivers/base/property.c
> > > +++ b/drivers/base/property.c
> > > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >   	return NULL;
> > >   }
> > > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > > +						const char *con_id, void *data,
> > > +						devcon_match_fn_t match,
> > > +						void **matches,
> > > +						unsigned int matches_len)
> > > +{
> > > +	struct fwnode_handle *node;
> > > +	struct fwnode_handle *ep;
> > > +	unsigned int count = 0;
> > > +	void *ret;
> > > +
> > > +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> > > +		if (count >= matches_len) {
> > > +			fwnode_handle_put(ep);
> > > +			return count;
> > > +		}
> > > +
> > > +		node = fwnode_graph_get_remote_port_parent(ep);
> > > +		if (!fwnode_device_is_available(node))
> > > +			continue;
> > > +
> > > +		ret = match(node, con_id, data);
> > > +		fwnode_handle_put(node);
> > > +
> > > +		if (ret)
> > > +			matches[count++] = ret;
> > > +	}
> > > +	return count;
> > > +}
> > 
> > This API doesn't let it's user know if there are more matches found in the
> > device tree or not. I'd suggest to add 'count' mode that would return the
> > amount of found matches if (matches == NULL) && (matches_len == 0).

But the API does call each match
> 
> Unfortunately in this code path we don't know how to "free" the objects
> returned by match(), e.g. see how typec_switch_match() returns wrapper
> of a refcounted device.
> 
> So we must return all the match results to the caller to it can free
> things up based on its knowledge of what matches[] actually contains..

ACPI walk has similar APIs, I can think of acpi_walk_namespace() which I
have used in past and does similar walk in namespace but for devices and
calls the match()

-- 
~Vinod

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Heikki Krogerus]

+Andy, Dan and Sakari

On Mon, Dec 27, 2021 at 09:21:11PM -0800, Bjorn Andersson wrote:
> In some cases multiple connections with the same connection id
> needs to be resolved from a fwnode graph.
> 
> One such example is when separate hardware is used for performing muxing and/or
> orientation switching of the SuperSpeed and SBU lines in a USB-C
> connector. In this case the connector needs to belong to a graph with
> multiple matching remote endpoints, and the TypeC controller needs to be
> able to resolve them both.
> 
> Add a new API that allows this kind of lookup.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
>  include/linux/property.h |  5 +++
>  2 files changed, 99 insertions(+)
> 
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index cbe4fa298413..0aa0296fd991 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
>  	return NULL;
>  }
>  
> +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> +						const char *con_id, void *data,
> +						devcon_match_fn_t match,
> +						void **matches,
> +						unsigned int matches_len)
> +{
> +	struct fwnode_handle *node;
> +	struct fwnode_handle *ep;
> +	unsigned int count = 0;
> +	void *ret;
> +
> +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> +		if (count >= matches_len) {
> +			fwnode_handle_put(ep);
> +			return count;
> +		}
> +
> +		node = fwnode_graph_get_remote_port_parent(ep);
> +		if (!fwnode_device_is_available(node))
> +			continue;
> +
> +		ret = match(node, con_id, data);
> +		fwnode_handle_put(node);
> +
> +		if (ret)
> +			matches[count++] = ret;
> +	}
> +	return count;
> +}
> +
>  static void *
>  fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
>  		    void *data, devcon_match_fn_t match)
> @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
>  	return NULL;
>  }
>  
> +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> +					  const char *con_id, void *data,
> +					  devcon_match_fn_t match,
> +					  void **matches,
> +					  unsigned int matches_len)
> +{
> +	struct fwnode_handle *node;
> +	unsigned int count = 0;
> +	void *ret;
> +	int i;
> +
> +	for (i = 0; ; i++) {
> +		if (count >= matches_len)
> +			return count;
> +
> +		node = fwnode_find_reference(fwnode, con_id, i);
> +		if (IS_ERR(node))
> +			break;
> +
> +		ret = match(node, NULL, data);
> +		fwnode_handle_put(node);
> +
> +		if (ret)
> +			matches[count++] = ret;
> +	}
> +
> +	return count;
> +}
> +
>  /**
>   * fwnode_connection_find_match - Find connection from a device node
>   * @fwnode: Device node with the connection
> @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
>  	return fwnode_devcon_match(fwnode, con_id, data, match);
>  }
>  EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> +
> +/**
> + * fwnode_connection_find_matches - Find connections from a device node
> + * @fwnode: Device node with the connection
> + * @con_id: Identifier for the connection
> + * @data: Data for the match function
> + * @match: Function to check and convert the connection description
> + * @matches: Array of pointers to fill with matches
> + * @matches_len: Length of @matches
> + *
> + * Find up to @matches_len connections with unique identifier @con_id between
> + * @fwnode and other device nodes. @match will be used to convert the
> + * connection description to data the caller is expecting to be returned
> + * through the @matches array.
> + *
> + * Return: Number of matches resolved, of negative errno.
> + */
> +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> +				   const char *con_id, void *data,
> +				   devcon_match_fn_t match,
> +				   void **matches, unsigned int matches_len)
> +{
> +	unsigned int count;
> +
> +	if (!fwnode || !match || !matches)
> +		return -EINVAL;
> +
> +	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> +					    matches, matches_len);
> +
> +	return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> +					     matches + count,
> +					     matches_len - count);
> +}
> +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> diff --git a/include/linux/property.h b/include/linux/property.h
> index 16f736c698a2..59484ccb260e 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
>  	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
>  }
>  
> +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> +				   const char *con_id, void *data,
> +				   devcon_match_fn_t match,
> +				   void **matches, unsigned int matches_len);
> +
>  /* -------------------------------------------------------------------------- */
>  /* Software fwnode support - when HW description is incomplete or missing */
>  
> -- 
> 2.33.1

-- 
heikki

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Sakari Ailus]

Hi Björn,

(And thanks to Heikki for cc'ing me!)

On Thu, Dec 30, 2021 at 11:26:34AM +0200, Heikki Krogerus wrote:
> +Andy, Dan and Sakari
> 
> On Mon, Dec 27, 2021 at 09:21:11PM -0800, Bjorn Andersson wrote:
> > In some cases multiple connections with the same connection id
> > needs to be resolved from a fwnode graph.
> > 
> > One such example is when separate hardware is used for performing muxing and/or
> > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > connector. In this case the connector needs to belong to a graph with
> > multiple matching remote endpoints, and the TypeC controller needs to be
> > able to resolve them both.
> > 
> > Add a new API that allows this kind of lookup.
> > 
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> >  drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> >  include/linux/property.h |  5 +++
> >  2 files changed, 99 insertions(+)
> > 
> > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > index cbe4fa298413..0aa0296fd991 100644
> > --- a/drivers/base/property.c
> > +++ b/drivers/base/property.c
> > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> >  	return NULL;
> >  }
> >  
> > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > +						const char *con_id, void *data,
> > +						devcon_match_fn_t match,
> > +						void **matches,
> > +						unsigned int matches_len)
> > +{
> > +	struct fwnode_handle *node;
> > +	struct fwnode_handle *ep;
> > +	unsigned int count = 0;
> > +	void *ret;
> > +
> > +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> > +		if (count >= matches_len) {
> > +			fwnode_handle_put(ep);
> > +			return count;
> > +		}
> > +
> > +		node = fwnode_graph_get_remote_port_parent(ep);
> > +		if (!fwnode_device_is_available(node))

The reference to node needs to be put here.

> > +			continue;
> > +
> > +		ret = match(node, con_id, data);
> > +		fwnode_handle_put(node);
> > +
> > +		if (ret)
> > +			matches[count++] = ret;
> > +	}
> > +	return count;
> > +}
> > +
> >  static void *
> >  fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> >  		    void *data, devcon_match_fn_t match)
> > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> >  	return NULL;
> >  }
> >  
> > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > +					  const char *con_id, void *data,
> > +					  devcon_match_fn_t match,
> > +					  void **matches,
> > +					  unsigned int matches_len)
> > +{
> > +	struct fwnode_handle *node;
> > +	unsigned int count = 0;
> > +	void *ret;
> > +	int i;

unsigned int, please.

> > +
> > +	for (i = 0; ; i++) {
> > +		if (count >= matches_len)
> > +			return count;
> > +
> > +		node = fwnode_find_reference(fwnode, con_id, i);
> > +		if (IS_ERR(node))
> > +			break;
> > +
> > +		ret = match(node, NULL, data);
> > +		fwnode_handle_put(node);
> > +
> > +		if (ret)
> > +			matches[count++] = ret;
> > +	}
> > +
> > +	return count;
> > +}
> > +
> >  /**
> >   * fwnode_connection_find_match - Find connection from a device node
> >   * @fwnode: Device node with the connection
> > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> >  	return fwnode_devcon_match(fwnode, con_id, data, match);
> >  }
> >  EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > +
> > +/**
> > + * fwnode_connection_find_matches - Find connections from a device node
> > + * @fwnode: Device node with the connection
> > + * @con_id: Identifier for the connection
> > + * @data: Data for the match function
> > + * @match: Function to check and convert the connection description
> > + * @matches: Array of pointers to fill with matches
> > + * @matches_len: Length of @matches
> > + *
> > + * Find up to @matches_len connections with unique identifier @con_id between
> > + * @fwnode and other device nodes. @match will be used to convert the
> > + * connection description to data the caller is expecting to be returned
> > + * through the @matches array.

If the caller allocates the matches array, how does it know how large it
should be? Is there a need to provide a way to count the matches before
writing them to an array? Most similar functions do that by just setting the
array (matches) to NULL.

> > + *
> > + * Return: Number of matches resolved, of negative errno.
> > + */
> > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > +				   const char *con_id, void *data,
> > +				   devcon_match_fn_t match,
> > +				   void **matches, unsigned int matches_len)
> > +{
> > +	unsigned int count;
> > +
> > +	if (!fwnode || !match || !matches)
> > +		return -EINVAL;
> > +
> > +	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > +					    matches, matches_len);
> > +
> > +	return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> > +					     matches + count,
> > +					     matches_len - count);
> > +}
> > +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> > diff --git a/include/linux/property.h b/include/linux/property.h
> > index 16f736c698a2..59484ccb260e 100644
> > --- a/include/linux/property.h
> > +++ b/include/linux/property.h
> > @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
> >  	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
> >  }
> >  
> > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > +				   const char *con_id, void *data,
> > +				   devcon_match_fn_t match,
> > +				   void **matches, unsigned int matches_len);
> > +
> >  /* -------------------------------------------------------------------------- */
> >  /* Software fwnode support - when HW description is incomplete or missing */
> >  

-- 
Kind regards,

Sakari Ailus

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Bjorn Andersson]

On Fri 31 Dec 01:09 PST 2021, Sakari Ailus wrote:

> Hi Björn,
> 
> (And thanks to Heikki for cc'ing me!)
> 
> On Thu, Dec 30, 2021 at 11:26:34AM +0200, Heikki Krogerus wrote:
> > +Andy, Dan and Sakari
> > 
> > On Mon, Dec 27, 2021 at 09:21:11PM -0800, Bjorn Andersson wrote:
> > > In some cases multiple connections with the same connection id
> > > needs to be resolved from a fwnode graph.
> > > 
> > > One such example is when separate hardware is used for performing muxing and/or
> > > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > > connector. In this case the connector needs to belong to a graph with
> > > multiple matching remote endpoints, and the TypeC controller needs to be
> > > able to resolve them both.
> > > 
> > > Add a new API that allows this kind of lookup.
> > > 
> > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > ---
> > >  drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> > >  include/linux/property.h |  5 +++
> > >  2 files changed, 99 insertions(+)
> > > 
> > > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > > index cbe4fa298413..0aa0296fd991 100644
> > > --- a/drivers/base/property.c
> > > +++ b/drivers/base/property.c
> > > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >  	return NULL;
> > >  }
> > >  
> > > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > > +						const char *con_id, void *data,
> > > +						devcon_match_fn_t match,
> > > +						void **matches,
> > > +						unsigned int matches_len)
> > > +{
> > > +	struct fwnode_handle *node;
> > > +	struct fwnode_handle *ep;
> > > +	unsigned int count = 0;
> > > +	void *ret;
> > > +
> > > +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> > > +		if (count >= matches_len) {
> > > +			fwnode_handle_put(ep);
> > > +			return count;
> > > +		}
> > > +
> > > +		node = fwnode_graph_get_remote_port_parent(ep);
> > > +		if (!fwnode_device_is_available(node))
> 
> The reference to node needs to be put here.
> 

You're right, thanks!

> > > +			continue;
> > > +
> > > +		ret = match(node, con_id, data);
> > > +		fwnode_handle_put(node);
> > > +
> > > +		if (ret)
> > > +			matches[count++] = ret;
> > > +	}
> > > +	return count;
> > > +}
> > > +
> > >  static void *
> > >  fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >  		    void *data, devcon_match_fn_t match)
> > > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > >  	return NULL;
> > >  }
> > >  
> > > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > > +					  const char *con_id, void *data,
> > > +					  devcon_match_fn_t match,
> > > +					  void **matches,
> > > +					  unsigned int matches_len)
> > > +{
> > > +	struct fwnode_handle *node;
> > > +	unsigned int count = 0;
> > > +	void *ret;
> > > +	int i;
> 
> unsigned int, please.
> 

Sounds good.

> > > +
> > > +	for (i = 0; ; i++) {
> > > +		if (count >= matches_len)
> > > +			return count;
> > > +
> > > +		node = fwnode_find_reference(fwnode, con_id, i);
> > > +		if (IS_ERR(node))
> > > +			break;
> > > +
> > > +		ret = match(node, NULL, data);
> > > +		fwnode_handle_put(node);
> > > +
> > > +		if (ret)
> > > +			matches[count++] = ret;
> > > +	}
> > > +
> > > +	return count;
> > > +}
> > > +
> > >  /**
> > >   * fwnode_connection_find_match - Find connection from a device node
> > >   * @fwnode: Device node with the connection
> > > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> > >  	return fwnode_devcon_match(fwnode, con_id, data, match);
> > >  }
> > >  EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > > +
> > > +/**
> > > + * fwnode_connection_find_matches - Find connections from a device node
> > > + * @fwnode: Device node with the connection
> > > + * @con_id: Identifier for the connection
> > > + * @data: Data for the match function
> > > + * @match: Function to check and convert the connection description
> > > + * @matches: Array of pointers to fill with matches
> > > + * @matches_len: Length of @matches
> > > + *
> > > + * Find up to @matches_len connections with unique identifier @con_id between
> > > + * @fwnode and other device nodes. @match will be used to convert the
> > > + * connection description to data the caller is expecting to be returned
> > > + * through the @matches array.
> 
> If the caller allocates the matches array, how does it know how large it
> should be? Is there a need to provide a way to count the matches before
> writing them to an array? Most similar functions do that by just setting the
> array (matches) to NULL.
> 

This is a very relevant comment and I did look for ways to handle this
as I came up with the patch.

I think the typical mechanism would be to allow @matches to be NULL, in
which case we iterate over objects and return the number of matches, so
that the caller can allocate an appropriately sized array and call the
API again.

But the "match" function simply returns a pointer to something and
looking at the example of the typec_{mux,switch} this pointer points to
a member of an object which has a struct device which is refcounted.

As such, we can't simply discard the returned object. We have to pass it
back to the caller, whom knows what "match" did and is able to reverse
that.

I looked at changing the callback and I looked at using krealloc() to
grow an array dynamically.


But looking at the use case in mind; finding entities that might need to
react to a USB Type-C event I have a need for 2 matches, and 3 seems
plausible. Beyond that the largest of_graph I have ever dealt with has 6
endpoints.

While it isn't relevant to use this API for my 6-endpoint case, it would
result in @matches having to be 48 bytes of pointers. And once the call
returns, the actual number of pointers needed is known and the long-term
storage can be re-allocated as necessary based on the return value.

As such, I dropped the idea of making something fancier and more
dynamic, for the sake of simplicity. Perhaps I'm missing some cool use
case where this is infeasible?

Regards,
Bjorn

> > > + *
> > > + * Return: Number of matches resolved, of negative errno.
> > > + */
> > > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > > +				   const char *con_id, void *data,
> > > +				   devcon_match_fn_t match,
> > > +				   void **matches, unsigned int matches_len)
> > > +{
> > > +	unsigned int count;
> > > +
> > > +	if (!fwnode || !match || !matches)
> > > +		return -EINVAL;
> > > +
> > > +	count = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > > +					    matches, matches_len);
> > > +
> > > +	return count + fwnode_devcon_matches(fwnode, con_id, data, match,
> > > +					     matches + count,
> > > +					     matches_len - count);
> > > +}
> > > +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
> > > diff --git a/include/linux/property.h b/include/linux/property.h
> > > index 16f736c698a2..59484ccb260e 100644
> > > --- a/include/linux/property.h
> > > +++ b/include/linux/property.h
> > > @@ -444,6 +444,11 @@ static inline void *device_connection_find_match(struct device *dev,
> > >  	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);
> > >  }
> > >  
> > > +int fwnode_connection_find_matches(struct fwnode_handle *fwnode,
> > > +				   const char *con_id, void *data,
> > > +				   devcon_match_fn_t match,
> > > +				   void **matches, unsigned int matches_len);
> > > +
> > >  /* -------------------------------------------------------------------------- */
> > >  /* Software fwnode support - when HW description is incomplete or missing */
> > >  
> 
> -- 
> Kind regards,
> 
> Sakari Ailus

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Sakari Ailus]

On Wed, Jan 05, 2022 at 12:43:28PM -0800, Bjorn Andersson wrote:
> On Fri 31 Dec 01:09 PST 2021, Sakari Ailus wrote:
> 
> > Hi Björn,
> > 
> > (And thanks to Heikki for cc'ing me!)
> > 
> > On Thu, Dec 30, 2021 at 11:26:34AM +0200, Heikki Krogerus wrote:
> > > +Andy, Dan and Sakari
> > > 
> > > On Mon, Dec 27, 2021 at 09:21:11PM -0800, Bjorn Andersson wrote:
> > > > In some cases multiple connections with the same connection id
> > > > needs to be resolved from a fwnode graph.
> > > > 
> > > > One such example is when separate hardware is used for performing muxing and/or
> > > > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > > > connector. In this case the connector needs to belong to a graph with
> > > > multiple matching remote endpoints, and the TypeC controller needs to be
> > > > able to resolve them both.
> > > > 
> > > > Add a new API that allows this kind of lookup.
> > > > 
> > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > > ---
> > > >  drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> > > >  include/linux/property.h |  5 +++
> > > >  2 files changed, 99 insertions(+)
> > > > 
> > > > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > > > index cbe4fa298413..0aa0296fd991 100644
> > > > --- a/drivers/base/property.c
> > > > +++ b/drivers/base/property.c
> > > > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > >  	return NULL;
> > > >  }
> > > >  
> > > > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > > > +						const char *con_id, void *data,
> > > > +						devcon_match_fn_t match,
> > > > +						void **matches,
> > > > +						unsigned int matches_len)
> > > > +{
> > > > +	struct fwnode_handle *node;
> > > > +	struct fwnode_handle *ep;
> > > > +	unsigned int count = 0;
> > > > +	void *ret;
> > > > +
> > > > +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> > > > +		if (count >= matches_len) {
> > > > +			fwnode_handle_put(ep);
> > > > +			return count;
> > > > +		}
> > > > +
> > > > +		node = fwnode_graph_get_remote_port_parent(ep);
> > > > +		if (!fwnode_device_is_available(node))
> > 
> > The reference to node needs to be put here.
> > 
> 
> You're right, thanks!
> 
> > > > +			continue;
> > > > +
> > > > +		ret = match(node, con_id, data);
> > > > +		fwnode_handle_put(node);
> > > > +
> > > > +		if (ret)
> > > > +			matches[count++] = ret;
> > > > +	}
> > > > +	return count;
> > > > +}
> > > > +
> > > >  static void *
> > > >  fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > >  		    void *data, devcon_match_fn_t match)
> > > > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > >  	return NULL;
> > > >  }
> > > >  
> > > > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > > > +					  const char *con_id, void *data,
> > > > +					  devcon_match_fn_t match,
> > > > +					  void **matches,
> > > > +					  unsigned int matches_len)
> > > > +{
> > > > +	struct fwnode_handle *node;
> > > > +	unsigned int count = 0;
> > > > +	void *ret;
> > > > +	int i;
> > 
> > unsigned int, please.
> > 
> 
> Sounds good.
> 
> > > > +
> > > > +	for (i = 0; ; i++) {
> > > > +		if (count >= matches_len)
> > > > +			return count;
> > > > +
> > > > +		node = fwnode_find_reference(fwnode, con_id, i);
> > > > +		if (IS_ERR(node))
> > > > +			break;
> > > > +
> > > > +		ret = match(node, NULL, data);
> > > > +		fwnode_handle_put(node);
> > > > +
> > > > +		if (ret)
> > > > +			matches[count++] = ret;
> > > > +	}
> > > > +
> > > > +	return count;
> > > > +}
> > > > +
> > > >  /**
> > > >   * fwnode_connection_find_match - Find connection from a device node
> > > >   * @fwnode: Device node with the connection
> > > > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> > > >  	return fwnode_devcon_match(fwnode, con_id, data, match);
> > > >  }
> > > >  EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > > > +
> > > > +/**
> > > > + * fwnode_connection_find_matches - Find connections from a device node
> > > > + * @fwnode: Device node with the connection
> > > > + * @con_id: Identifier for the connection
> > > > + * @data: Data for the match function
> > > > + * @match: Function to check and convert the connection description
> > > > + * @matches: Array of pointers to fill with matches
> > > > + * @matches_len: Length of @matches
> > > > + *
> > > > + * Find up to @matches_len connections with unique identifier @con_id between
> > > > + * @fwnode and other device nodes. @match will be used to convert the
> > > > + * connection description to data the caller is expecting to be returned
> > > > + * through the @matches array.
> > 
> > If the caller allocates the matches array, how does it know how large it
> > should be? Is there a need to provide a way to count the matches before
> > writing them to an array? Most similar functions do that by just setting the
> > array (matches) to NULL.
> > 
> 
> This is a very relevant comment and I did look for ways to handle this
> as I came up with the patch.
> 
> I think the typical mechanism would be to allow @matches to be NULL, in
> which case we iterate over objects and return the number of matches, so
> that the caller can allocate an appropriately sized array and call the
> API again.
> 
> But the "match" function simply returns a pointer to something and
> looking at the example of the typec_{mux,switch} this pointer points to
> a member of an object which has a struct device which is refcounted.
> 
> As such, we can't simply discard the returned object. We have to pass it
> back to the caller, whom knows what "match" did and is able to reverse
> that.
> 
> I looked at changing the callback and I looked at using krealloc() to
> grow an array dynamically.

krealloc() may also fail...

> 
> 
> But looking at the use case in mind; finding entities that might need to
> react to a USB Type-C event I have a need for 2 matches, and 3 seems
> plausible. Beyond that the largest of_graph I have ever dealt with has 6
> endpoints.
> 
> While it isn't relevant to use this API for my 6-endpoint case, it would
> result in @matches having to be 48 bytes of pointers. And once the call
> returns, the actual number of pointers needed is known and the long-term
> storage can be re-allocated as necessary based on the return value.
> 
> As such, I dropped the idea of making something fancier and more
> dynamic, for the sake of simplicity. Perhaps I'm missing some cool use
> case where this is infeasible?

Another option would be to use a fixed-size array for the purpose. Assuming
this will remain a small number, a single global macro could be used to set
the maximum number that could be also easily increased if needed.

On the other hand, if this number remains specific to the caller as it
would seem, then I guess a caller-set value (as implemented now) remains a
fine option, too.

-- 
Kind regards,

Sakari Ailus

Re: [PATCH 3/8] device property: Helper to match multiple connections

[Bjorn Andersson]

On Fri 07 Jan 06:33 PST 2022, Sakari Ailus wrote:

> On Wed, Jan 05, 2022 at 12:43:28PM -0800, Bjorn Andersson wrote:
> > On Fri 31 Dec 01:09 PST 2021, Sakari Ailus wrote:
> > 
> > > Hi Björn,
> > > 
> > > (And thanks to Heikki for cc'ing me!)
> > > 
> > > On Thu, Dec 30, 2021 at 11:26:34AM +0200, Heikki Krogerus wrote:
> > > > +Andy, Dan and Sakari
> > > > 
> > > > On Mon, Dec 27, 2021 at 09:21:11PM -0800, Bjorn Andersson wrote:
> > > > > In some cases multiple connections with the same connection id
> > > > > needs to be resolved from a fwnode graph.
> > > > > 
> > > > > One such example is when separate hardware is used for performing muxing and/or
> > > > > orientation switching of the SuperSpeed and SBU lines in a USB-C
> > > > > connector. In this case the connector needs to belong to a graph with
> > > > > multiple matching remote endpoints, and the TypeC controller needs to be
> > > > > able to resolve them both.
> > > > > 
> > > > > Add a new API that allows this kind of lookup.
> > > > > 
> > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > > > ---
> > > > >  drivers/base/property.c  | 94 ++++++++++++++++++++++++++++++++++++++++
> > > > >  include/linux/property.h |  5 +++
> > > > >  2 files changed, 99 insertions(+)
> > > > > 
> > > > > diff --git a/drivers/base/property.c b/drivers/base/property.c
> > > > > index cbe4fa298413..0aa0296fd991 100644
> > > > > --- a/drivers/base/property.c
> > > > > +++ b/drivers/base/property.c
> > > > > @@ -1180,6 +1180,36 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > > >  	return NULL;
> > > > >  }
> > > > >  
> > > > > +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,
> > > > > +						const char *con_id, void *data,
> > > > > +						devcon_match_fn_t match,
> > > > > +						void **matches,
> > > > > +						unsigned int matches_len)
> > > > > +{
> > > > > +	struct fwnode_handle *node;
> > > > > +	struct fwnode_handle *ep;
> > > > > +	unsigned int count = 0;
> > > > > +	void *ret;
> > > > > +
> > > > > +	fwnode_graph_for_each_endpoint(fwnode, ep) {
> > > > > +		if (count >= matches_len) {
> > > > > +			fwnode_handle_put(ep);
> > > > > +			return count;
> > > > > +		}
> > > > > +
> > > > > +		node = fwnode_graph_get_remote_port_parent(ep);
> > > > > +		if (!fwnode_device_is_available(node))
> > > 
> > > The reference to node needs to be put here.
> > > 
> > 
> > You're right, thanks!
> > 
> > > > > +			continue;
> > > > > +
> > > > > +		ret = match(node, con_id, data);
> > > > > +		fwnode_handle_put(node);
> > > > > +
> > > > > +		if (ret)
> > > > > +			matches[count++] = ret;
> > > > > +	}
> > > > > +	return count;
> > > > > +}
> > > > > +
> > > > >  static void *
> > > > >  fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > > >  		    void *data, devcon_match_fn_t match)
> > > > > @@ -1202,6 +1232,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
> > > > >  	return NULL;
> > > > >  }
> > > > >  
> > > > > +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,
> > > > > +					  const char *con_id, void *data,
> > > > > +					  devcon_match_fn_t match,
> > > > > +					  void **matches,
> > > > > +					  unsigned int matches_len)
> > > > > +{
> > > > > +	struct fwnode_handle *node;
> > > > > +	unsigned int count = 0;
> > > > > +	void *ret;
> > > > > +	int i;
> > > 
> > > unsigned int, please.
> > > 
> > 
> > Sounds good.
> > 
> > > > > +
> > > > > +	for (i = 0; ; i++) {
> > > > > +		if (count >= matches_len)
> > > > > +			return count;
> > > > > +
> > > > > +		node = fwnode_find_reference(fwnode, con_id, i);
> > > > > +		if (IS_ERR(node))
> > > > > +			break;
> > > > > +
> > > > > +		ret = match(node, NULL, data);
> > > > > +		fwnode_handle_put(node);
> > > > > +
> > > > > +		if (ret)
> > > > > +			matches[count++] = ret;
> > > > > +	}
> > > > > +
> > > > > +	return count;
> > > > > +}
> > > > > +
> > > > >  /**
> > > > >   * fwnode_connection_find_match - Find connection from a device node
> > > > >   * @fwnode: Device node with the connection
> > > > > @@ -1229,3 +1288,38 @@ void *fwnode_connection_find_match(struct fwnode_handle *fwnode,
> > > > >  	return fwnode_devcon_match(fwnode, con_id, data, match);
> > > > >  }
> > > > >  EXPORT_SYMBOL_GPL(fwnode_connection_find_match);
> > > > > +
> > > > > +/**
> > > > > + * fwnode_connection_find_matches - Find connections from a device node
> > > > > + * @fwnode: Device node with the connection
> > > > > + * @con_id: Identifier for the connection
> > > > > + * @data: Data for the match function
> > > > > + * @match: Function to check and convert the connection description
> > > > > + * @matches: Array of pointers to fill with matches
> > > > > + * @matches_len: Length of @matches
> > > > > + *
> > > > > + * Find up to @matches_len connections with unique identifier @con_id between
> > > > > + * @fwnode and other device nodes. @match will be used to convert the
> > > > > + * connection description to data the caller is expecting to be returned
> > > > > + * through the @matches array.
> > > 
> > > If the caller allocates the matches array, how does it know how large it
> > > should be? Is there a need to provide a way to count the matches before
> > > writing them to an array? Most similar functions do that by just setting the
> > > array (matches) to NULL.
> > > 
> > 
> > This is a very relevant comment and I did look for ways to handle this
> > as I came up with the patch.
> > 
> > I think the typical mechanism would be to allow @matches to be NULL, in
> > which case we iterate over objects and return the number of matches, so
> > that the caller can allocate an appropriately sized array and call the
> > API again.
> > 
> > But the "match" function simply returns a pointer to something and
> > looking at the example of the typec_{mux,switch} this pointer points to
> > a member of an object which has a struct device which is refcounted.
> > 
> > As such, we can't simply discard the returned object. We have to pass it
> > back to the caller, whom knows what "match" did and is able to reverse
> > that.
> > 
> > I looked at changing the callback and I looked at using krealloc() to
> > grow an array dynamically.
> 
> krealloc() may also fail...
> 

Exactly.

> > 
> > 
> > But looking at the use case in mind; finding entities that might need to
> > react to a USB Type-C event I have a need for 2 matches, and 3 seems
> > plausible. Beyond that the largest of_graph I have ever dealt with has 6
> > endpoints.
> > 
> > While it isn't relevant to use this API for my 6-endpoint case, it would
> > result in @matches having to be 48 bytes of pointers. And once the call
> > returns, the actual number of pointers needed is known and the long-term
> > storage can be re-allocated as necessary based on the return value.
> > 
> > As such, I dropped the idea of making something fancier and more
> > dynamic, for the sake of simplicity. Perhaps I'm missing some cool use
> > case where this is infeasible?
> 
> Another option would be to use a fixed-size array for the purpose. Assuming
> this will remain a small number, a single global macro could be used to set
> the maximum number that could be also easily increased if needed.
> 
> On the other hand, if this number remains specific to the caller as it
> would seem, then I guess a caller-set value (as implemented now) remains a
> fine option, too.
> 

Sounds good.

I will try to capture these arguments in the commit message as I post
the next version.

Thanks,
Bjorn

> -- 
> Kind regards,
> 
> Sakari Ailus

Re: [PATCH 2/8] phy: qcom-qmp: Register typec mux and orientation switch

[Bjorn Andersson]

On Tue 28 Dec 21:27 PST 2021, Vinod Koul wrote:

> On 27-12-21, 21:21, Bjorn Andersson wrote:
> > The QMP PHY handles muxing of USB vs DisplayPort, as well as orientation
> > switching of the SuperSpeed lanes. So register typec handlers for the
> > two types.
> > 
> > The TypeC mux allows switching between four lanes of DisplayPort and a
> > mixed USB+DP combination. This makes it possible to reach resolutions
> > that requires 4 lanes.
> > 
> > The TypeC switch allows switching the SuperSpeed pins and have been
> > tested with both 2 and 4 lane DisplayPort.
> > 
> > It's possible that in the USB mode the DP_MODE should be disabled, but
> > this is left untouched.
> > 
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> > 
> > My suggestion is that if/once this patch is deemed acceptable the PHY
> > maintainers could create a immutable branch/tag which can be merged into the
> > PHY tree as well as the USB tree.
> > 
> >  drivers/phy/qualcomm/phy-qcom-qmp.c | 176 +++++++++++++++++++++++++---
> >  1 file changed, 158 insertions(+), 18 deletions(-)
> > 
> > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> > index 7bea6a60dc54..8d8139df9d8e 100644
> > --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> > @@ -19,6 +19,8 @@
> >  #include <linux/regulator/consumer.h>
> >  #include <linux/reset.h>
> >  #include <linux/slab.h>
> > +#include <linux/usb/typec_dp.h>
> > +#include <linux/usb/typec_mux.h>
> >  
> >  #include <dt-bindings/phy/phy.h>
> >  
> > @@ -3017,6 +3019,9 @@ struct qmp_phy_dp_clks {
> >   * @phy_mutex: mutex lock for PHY common block initialization
> >   * @init_count: phy common block initialization count
> >   * @ufs_reset: optional UFS PHY reset handle
> > + * @sw: typec switch for receiving orientation changes
> > + * @mux: typec mux for DP muxing
> > + * @orientation: carries current CC orientation
> >   */
> >  struct qcom_qmp {
> >  	struct device *dev;
> > @@ -3032,6 +3037,10 @@ struct qcom_qmp {
> >  	int init_count;
> >  
> >  	struct reset_control *ufs_reset;
> > +
> > +	struct typec_switch *sw;
> > +	struct typec_mux *mux;
> > +	enum typec_orientation orientation;
> >  };
> >  
> >  static void qcom_qmp_v3_phy_dp_aux_init(struct qmp_phy *qphy);
> > @@ -4378,30 +4387,23 @@ static void qcom_qmp_v3_phy_configure_dp_tx(struct qmp_phy *qphy)
> >  
> >  static bool qcom_qmp_phy_configure_dp_mode(struct qmp_phy *qphy)
> >  {
> > +	const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts;
> > +	bool reverse = qphy->qmp->orientation == TYPEC_ORIENTATION_REVERSE;
> >  	u32 val;
> > -	bool reverse = false;
> >  
> >  	val = DP_PHY_PD_CTL_PWRDN | DP_PHY_PD_CTL_AUX_PWRDN |
> >  	      DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN;
> >  
> > -	/*
> > -	 * TODO: Assume orientation is CC1 for now and two lanes, need to
> > -	 * use type-c connector to understand orientation and lanes.
> > -	 *
> > -	 * Otherwise val changes to be like below if this code understood
> > -	 * the orientation of the type-c cable.
> > -	 *
> > -	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC2)
> > -	 *	val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
> > -	 * if (lane_cnt == 4 || orientation == ORIENTATION_CC1)
> > -	 *	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> > -	 * if (orientation == ORIENTATION_CC2)
> > -	 *	writel(0x4c, qphy->pcs + QSERDES_V3_DP_PHY_MODE);
> > -	 */
> > -	val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> > +	if (dp_opts->lanes == 4 || reverse)
> > +		val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN;
> > +	if (dp_opts->lanes == 4 || !reverse)
> > +		val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN;
> >  	writel(val, qphy->pcs + QSERDES_DP_PHY_PD_CTL);
> >  
> > -	writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
> > +	if (reverse)
> > +		writel(0x4c, qphy->pcs + QSERDES_DP_PHY_MODE);
> > +	else
> > +		writel(0x5c, qphy->pcs + QSERDES_DP_PHY_MODE);
> >  
> >  	return reverse;
> >  }
> > @@ -5809,6 +5811,123 @@ static const struct dev_pm_ops qcom_qmp_phy_pm_ops = {
> >  			   qcom_qmp_phy_runtime_resume, NULL)
> >  };
> >  
> > +#if IS_ENABLED(CONFIG_TYPEC)
> > +static int qcom_qmp_phy_typec_switch_set(struct typec_switch *sw,
> > +		enum typec_orientation orientation)
> 
> pls align to preceding open brace (here and other places)
> 

Sure thing.

> > +{
> > +	struct qcom_qmp *qmp = typec_switch_get_drvdata(sw);
> > +	void __iomem *dp_com = qmp->dp_com;
> > +
> > +	qmp->orientation = orientation;
> > +
> > +	if (orientation == TYPEC_ORIENTATION_REVERSE)
> > +		qphy_setbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
> > +	else
> > +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_TYPEC_CTRL, 0x01);
> > +
> > +	return 0;
> > +}
> > +
> > +static int qcom_qmp_phy_typec_mux_set(struct typec_mux *mux,
> > +				      struct typec_mux_state *state)
> > +{
> > +	struct qcom_qmp *qmp = typec_mux_get_drvdata(mux);
> > +	void __iomem *dp_com = qmp->dp_com;
> > +	bool dp_mode;
> > +	bool usb_mode;
> > +
> > +	switch (state->mode) {
> > +	case TYPEC_STATE_SAFE:
> > +	case TYPEC_STATE_USB:
> > +		/*
> > +		 * TODO: Figure out if we should clear DP_MODE when we enter a
> > +		 * USB-only state.
> > +		 */
> > +		dp_mode = true;
> 
> should this be false for these states?
> 

I think it should, but figured that I better change the behavior in a
separate follow-up commit. Might also be that SAFE should be
false/false - or in some other way turning off the output.

Hence the TODO.

> > +		usb_mode = true;
> > +		break;
> > +	case TYPEC_DP_STATE_A:
> > +	case TYPEC_DP_STATE_C:
> > +	case TYPEC_DP_STATE_E:
> > +		dp_mode = true;
> > +		usb_mode = false;
> > +		break;
> > +	case TYPEC_DP_STATE_B:
> > +	case TYPEC_DP_STATE_D:
> > +	case TYPEC_DP_STATE_F:
> > +		dp_mode = true;
> > +		usb_mode = true;
> > +		break;
> > +	}
> 
> looks like dp_mode is true always. And only for DP state A C E, usb_mode
> is false...
> 

A, C and E are 4-lanes DP, while B, D, F are 2-lane DP and 2-lane USB.

> > +
> > +	qphy_setbits(dp_com, QPHY_V3_DP_COM_RESET_OVRD_CTRL,
> > +		     SW_DPPHY_RESET_MUX | SW_USB3PHY_RESET_MUX);
> > +	if (dp_mode)
> > +		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
> > +	else
> > +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, DP_MODE);
> > +
> > +	if (usb_mode)
> > +		qphy_setbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
> > +	else
> > +		qphy_clrbits(dp_com, QPHY_V3_DP_COM_PHY_MODE_CTRL, USB3_MODE);
> > +
> > +	qphy_setbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
> > +	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SWI_CTRL, 0x03);
> > +	qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
> > +
> > +	return 0;
> > +}
> > +
> > +static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
> > +				       const struct qmp_phy_cfg *cfg)
> > +{
> > +	struct typec_switch_desc sw_desc = {};
> > +	struct typec_mux_desc mux_desc = {};
> > +	struct device *dev = qmp->dev;
> > +
> > +	if (!cfg->has_phy_dp_com_ctrl)
> > +		return 0;
> > +
> > +	sw_desc.drvdata = qmp;
> > +	sw_desc.fwnode = dev->fwnode;
> > +	sw_desc.set = qcom_qmp_phy_typec_switch_set;
> > +	qmp->sw = typec_switch_register(dev, &sw_desc);
> > +	if (IS_ERR(qmp->sw)) {
> > +		dev_err(dev, "Error registering typec switch: %pe\n", qmp->sw);
> > +		return PTR_ERR(qmp->sw);
> > +	}
> > +
> > +	mux_desc.drvdata = qmp;
> > +	mux_desc.fwnode = dev->fwnode;
> > +	mux_desc.set = qcom_qmp_phy_typec_mux_set;
> > +	qmp->mux = typec_mux_register(dev, &mux_desc);
> > +	if (IS_ERR(qmp->mux)) {
> > +		dev_err(dev, "Error registering typec mux: %pe\n", qmp->mux);
> > +		typec_switch_unregister(qmp->sw);
> > +		return PTR_ERR(qmp->mux);
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
> > +{
> > +	typec_mux_unregister(qmp->mux);
> > +	typec_switch_unregister(qmp->sw);
> > +}
> > +#else
> 
> empty line here pls
> 

Okay.

Thanks,
Bjorn

> > +static int qcom_qmp_phy_typec_register(struct qcom_qmp *qmp,
> > +				       const struct qmp_phy_cfg *cfg)
> > +{
> > +	return 0;
> > +}
> > +
> > +static void qcom_qmp_phy_typec_unregister(struct qcom_qmp *qmp)
> > +{
> > +}
> > +#endif
> > +
> >  static int qcom_qmp_phy_probe(struct platform_device *pdev)
> >  {
> >  	struct qcom_qmp *qmp;
> > @@ -5891,7 +6010,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
> >  		return ret;
> >  	}
> >  
> > -	num = of_get_available_child_count(dev->of_node);
> > +	ret = qcom_qmp_phy_typec_register(qmp, cfg);
> > +	if (ret)
> > +		return ret;
> > +
> > +	num = 0;
> > +	for_each_available_child_of_node(dev->of_node, child) {
> > +		if (!of_node_name_eq(child, "port"))
> > +			num++;
> > +	}
> >  	/* do we have a rogue child node ? */
> >  	if (num > expected_phys)
> >  		return -EINVAL;
> > @@ -5918,6 +6045,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
> >  			serdes = usb_serdes;
> >  		}
> >  
> > +		if (of_node_name_eq(child, "port"))
> > +			continue;
> > +
> >  		/* Create per-lane phy */
> >  		ret = qcom_qmp_phy_create(dev, child, id, serdes, cfg);
> >  		if (ret) {
> > @@ -5962,8 +6092,18 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
> >  	return ret;
> >  }
> >  
> > +static int qcom_qmp_phy_remove(struct platform_device *pdev)
> > +{
> > +	struct qcom_qmp *qmp = platform_get_drvdata(pdev);
> > +
> > +	qcom_qmp_phy_typec_unregister(qmp);
> > +
> > +	return 0;
> > +}
> > +
> >  static struct platform_driver qcom_qmp_phy_driver = {
> >  	.probe		= qcom_qmp_phy_probe,
> > +	.remove		= qcom_qmp_phy_remove,
> >  	.driver = {
> >  		.name	= "qcom-qmp-phy",
> >  		.pm	= &qcom_qmp_phy_pm_ops,
> > -- 
> > 2.33.1
> 
> -- 
> ~Vinod