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
Type-C connector. In this case the connector needs to belong to a graph
with multiple matching remote endpoints, and the Type-C controller needs
to be able to resolve them both.
Add a new API that allows this kind of lookup.
Signed-off-by: Bjorn Andersson <[email protected]>
---
Changes since v2:
- Allow the caller of the new api to pass a matches of NULL, to count possible
matches. I previously argued that this will cause memory leaks, but Andy
pointed out that this depends on the caller and the match function.
- Fixed spelling mistakes in commit message and kernel-doc.
- Use two "count" variables to make the math clearer.
Changes since v1:
- Iterator in fwnode_devcon_matches() is now unsigned.
- fwnode_handle_put() node for unavailable nodes.
- Extended commit message on the subject of supporting dynamically sized
"matches" array.
drivers/base/property.c | 107 +++++++++++++++++++++++++++++++++++++++
include/linux/property.h | 5 ++
2 files changed, 112 insertions(+)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index c0e94cce9c29..5cda205136f6 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -1218,6 +1218,40 @@ 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 && matches) {
+ fwnode_handle_put(ep);
+ return count;
+ }
+
+ node = fwnode_graph_get_remote_port_parent(ep);
+ if (!fwnode_device_is_available(node)) {
+ fwnode_handle_put(node);
+ continue;
+ }
+
+ ret = match(node, con_id, data);
+ fwnode_handle_put(node);
+ if (ret) {
+ if (matches)
+ matches[count] = ret;
+ count++;
+ }
+ }
+ return count;
+}
+
static void *
fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id,
void *data, devcon_match_fn_t match)
@@ -1240,6 +1274,37 @@ 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;
+ unsigned int i;
+ void *ret;
+
+ for (i = 0; ; i++) {
+ if (count >= matches_len && matches)
+ 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) {
+ if (matches)
+ matches[count] = ret;
+ count++;
+ }
+ }
+
+ return count;
+}
+
/**
* fwnode_connection_find_match - Find connection from a device node
* @fwnode: Device node with the connection
@@ -1267,3 +1332,45 @@ 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 @matches is NULL @matches_len is ignored and the total number of resolved
+ * matches is returned.
+ *
+ * Return: Number of matches resolved, or 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_graph;
+ unsigned int count_ref;
+
+ if (!fwnode || !match)
+ return -EINVAL;
+
+ count_graph = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
+ matches, matches_len);
+
+ matches += count_graph;
+ matches_len -= count_graph;
+
+ count_ref = fwnode_devcon_matches(fwnode, con_id, data, match,
+ matches, matches_len);
+
+ return count_graph + count_ref;
+}
+EXPORT_SYMBOL_GPL(fwnode_connection_find_matches);
diff --git a/include/linux/property.h b/include/linux/property.h
index 4cd4b326941f..de7ff336d2c8 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -447,6 +447,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
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 Type-C mux and switch devices. This provides the necessary
support for enabling the DisplayPort altmode on devices with this
circuit.
Signed-off-by: Bjorn Andersson <[email protected]>
---
Changes since v2:
- Expanded Kconfig help text.
- Fixed copyright year
- Fixed spelling mistakes in comments
- Introduce FSA4480_MAX_REGISTER
- Use dev_err_probe()
- Removed some useless blank lines.
Changes since v1:
- None
drivers/usb/typec/mux/Kconfig | 10 ++
drivers/usb/typec/mux/Makefile | 1 +
drivers/usb/typec/mux/fsa4480.c | 216 ++++++++++++++++++++++++++++++++
3 files changed, 227 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..5eb2c17d72c1 100644
--- a/drivers/usb/typec/mux/Kconfig
+++ b/drivers/usb/typec/mux/Kconfig
@@ -2,6 +2,16 @@
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.
+ If compiled as a module, the module will be named fsa4480.
+
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..ab8d014a6b79
--- /dev/null
+++ b/drivers/usb/typec/mux/fsa4480.c
@@ -0,0 +1,216 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021-2022 Linaro Ltd.
+ * Copyright (C) 2018-2020 The Linux Foundation
+ */
+
+#include <linux/bits.h>
+#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_MAX_REGISTER 0x1f
+
+#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 concurrent 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_MAX_REGISTER,
+};
+
+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))
+ return dev_err_probe(dev, PTR_ERR(fsa->regmap), "failed to initialize regmap\n");
+
+ 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))
+ return dev_err_probe(dev, PTR_ERR(fsa->sw), "failed to register typec switch\n");
+
+ 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);
+ return dev_err_probe(dev, PTR_ERR(fsa->mux), "failed to register typec mux\n");
+ }
+
+ 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
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, which account for
being able to mux/switch the USB HS, SS and SBU lines, as per defined
defined in the usb-c-connector binding. This number could be grown if
need arrises at a later point in time.
Acked-by: Heikki Krogerus <[email protected]>
Signed-off-by: Bjorn Andersson <[email protected]>
---
Changes since v2:
- Picked up Heikki's ack.
Changes since v1:
- Improved the motivation for the 3 in the commit message.
- kfree sw and mux in error paths
drivers/usb/typec/mux.c | 128 ++++++++++++++++++++++++++++++++--------
1 file changed, 102 insertions(+), 26 deletions(-)
diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index d0b42c297aca..cf2347dd1663 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,50 @@ 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;
+ }
+ }
- sw->sw_dev = sw_dev;
+ 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->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);
+ }
+
+ kfree(sw);
+
+ return ERR_PTR(err);
}
EXPORT_SYMBOL_GPL(fwnode_typec_switch_get);
@@ -98,14 +126,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 +201,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 +247,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 +331,50 @@ 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);
+ }
+
+ kfree(mux);
+
+ return ERR_PTR(err);
}
EXPORT_SYMBOL_GPL(fwnode_typec_mux_get);
@@ -322,13 +387,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 +404,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
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.
Acked-by: Heikki Krogerus <[email protected]>
Signed-off-by: Bjorn Andersson <[email protected]>
---
Changes since v2:
- Picked up Heikki's ack.
Changes since v1:
- None
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 +--
6 files changed, 146 insertions(+), 95 deletions(-)
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
Hi Andy, Bj?rn,
On Fri, Mar 04, 2022 at 02:54:21PM +0200, Andy Shevchenko wrote:
> On Thu, Mar 03, 2022 at 02:33:46PM -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
> > Type-C connector. In this case the connector needs to belong to a graph
> > with multiple matching remote endpoints, and the Type-C controller needs
> > to be able to resolve them both.
> >
> > Add a new API that allows this kind of lookup.
>
> ...
>
> > +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 && matches) {
> > + fwnode_handle_put(ep);
> > + return count;
> > + }
>
> Wouldn't be the same as
>
> if (count >= matches_len) {
> fwnode_handle_put(ep);
> break;
> }
Don't you need to check for non-NULL matches here?
I find return above easier to read.
>
> ?
>
> > + node = fwnode_graph_get_remote_port_parent(ep);
> > + if (!fwnode_device_is_available(node)) {
> > + fwnode_handle_put(node);
> > + continue;
> > + }
> > +
> > + ret = match(node, con_id, data);
> > + fwnode_handle_put(node);
> > + if (ret) {
> > + if (matches)
> > + matches[count] = ret;
> > + count++;
> > + }
> > + }
> > + return count;
> > +}
>
> ...
>
> > +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;
> > + unsigned int i;
> > + void *ret;
> > +
> > + for (i = 0; ; i++) {
>
> > + if (count >= matches_len && matches)
> > + return count;
>
> Ditto.
>
> > + node = fwnode_find_reference(fwnode, con_id, i);
> > + if (IS_ERR(node))
> > + break;
> > +
> > + ret = match(node, NULL, data);
> > + fwnode_handle_put(node);
> > + if (ret) {
> > + if (matches)
> > + matches[count] = ret;
> > + count++;
> > + }
> > + }
> > +
> > + return count;
> > +}
>
> ...
>
> > +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_graph;
> > + unsigned int count_ref;
> > +
> > + if (!fwnode || !match)
> > + return -EINVAL;
>
> > + count_graph = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > + matches, matches_len);
>
> > + matches += count_graph;
> > + matches_len -= count_graph;
>
> No, won't work when matches == NULL.
>
> Also, matches_len is expected to be 0 in that case (or at least being ignored,
> check with vsnprintf() behaviour in similar case).
>
> So, something like this, perhaps
>
> if (matches && matches_len) {
> matches += count_graph;
> matches_len -= count_graph;
> }
Good find!
>
> > + count_ref = fwnode_devcon_matches(fwnode, con_id, data, match,
> > + matches, matches_len);
> > +
> > + return count_graph + count_ref;
> > +}
>
>
--
Regards,
Sakari Ailus
On Thu, Mar 03, 2022 at 02:33:48PM -0800, Bjorn Andersson wrote:
> 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.
...
> + dev_set_name(&sw_dev->dev, "%s-switch",
> desc->name ? desc->name : dev_name(parent));
Besides a possible shorten form of
dev_set_name(&sw_dev->dev, "%s-switch", desc->name ?: dev_name(parent));
this lacks of the error checking (it seems in original code like this and
should be fixed as preparatory patch for easy backporting).
...
> + dev_set_name(&mux_dev->dev, "%s-mux",
> desc->name ? desc->name : dev_name(parent));
Ditto.
--
With Best Regards,
Andy Shevchenko
On Thu, Mar 03, 2022 at 02:33:49PM -0800, 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, which account for
> being able to mux/switch the USB HS, SS and SBU lines, as per defined
> defined in the usb-c-connector binding. This number could be grown if
> need arrises at a later point in time.
...
> + for (i = 0; i < count; i++) {
> + if (IS_ERR(sw_devs[i])) {
> + err = PTR_ERR(sw_devs[i]);
> + goto put_sw_devs;
> + }
> + }
>
> - sw->sw_dev = sw_dev;
> + 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->num_sw_devs = count;
>
> return sw;
> +
> +put_sw_devs:
> + for (i = 0; i < count; i++) {
Shouldn't it be
while (i--)
?
> + if (!IS_ERR(sw_devs[i]))
We may get rid of this check if we guarantee that the device is NULL.
> + put_device(&sw_devs[i]->dev);
> + }
> +
> + kfree(sw);
> +
> + return ERR_PTR(err);
> }
...
> + for (i = 0; i < count; i++) {
> + if (IS_ERR(mux_devs[i])) {
> + err = PTR_ERR(mux_devs[i]);
> + goto put_mux_devs;
> + }
Ditto.
> + }
...
> +put_mux_devs:
> + for (i = 0; i < count; i++) {
> + if (!IS_ERR(mux_devs[i]))
> + put_device(&mux_devs[i]->dev);
> + }
Ditto.
--
With Best Regards,
Andy Shevchenko
On Thu, Mar 03, 2022 at 02:33:46PM -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
> Type-C connector. In this case the connector needs to belong to a graph
> with multiple matching remote endpoints, and the Type-C controller needs
> to be able to resolve them both.
>
> Add a new API that allows this kind of lookup.
...
> +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 && matches) {
> + fwnode_handle_put(ep);
> + return count;
> + }
Wouldn't be the same as
if (count >= matches_len) {
fwnode_handle_put(ep);
break;
}
?
> + node = fwnode_graph_get_remote_port_parent(ep);
> + if (!fwnode_device_is_available(node)) {
> + fwnode_handle_put(node);
> + continue;
> + }
> +
> + ret = match(node, con_id, data);
> + fwnode_handle_put(node);
> + if (ret) {
> + if (matches)
> + matches[count] = ret;
> + count++;
> + }
> + }
> + return count;
> +}
...
> +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;
> + unsigned int i;
> + void *ret;
> +
> + for (i = 0; ; i++) {
> + if (count >= matches_len && matches)
> + return count;
Ditto.
> + node = fwnode_find_reference(fwnode, con_id, i);
> + if (IS_ERR(node))
> + break;
> +
> + ret = match(node, NULL, data);
> + fwnode_handle_put(node);
> + if (ret) {
> + if (matches)
> + matches[count] = ret;
> + count++;
> + }
> + }
> +
> + return count;
> +}
...
> +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_graph;
> + unsigned int count_ref;
> +
> + if (!fwnode || !match)
> + return -EINVAL;
> + count_graph = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> + matches, matches_len);
> + matches += count_graph;
> + matches_len -= count_graph;
No, won't work when matches == NULL.
Also, matches_len is expected to be 0 in that case (or at least being ignored,
check with vsnprintf() behaviour in similar case).
So, something like this, perhaps
if (matches && matches_len) {
matches += count_graph;
matches_len -= count_graph;
}
> + count_ref = fwnode_devcon_matches(fwnode, con_id, data, match,
> + matches, matches_len);
> +
> + return count_graph + count_ref;
> +}
--
With Best Regards,
Andy Shevchenko
On Fri, Mar 04, 2022 at 03:41:33PM +0200, Sakari Ailus wrote:
> On Fri, Mar 04, 2022 at 02:54:21PM +0200, Andy Shevchenko wrote:
> > On Thu, Mar 03, 2022 at 02:33:46PM -0800, Bjorn Andersson wrote:
...
> > > + if (count >= matches_len && matches) {
> > > + fwnode_handle_put(ep);
> > > + return count;
> > > + }
> >
> > Wouldn't be the same as
> >
> > if (count >= matches_len) {
> > fwnode_handle_put(ep);
> > break;
> > }
>
> Don't you need to check for non-NULL matches here?
Right, this should be kept as in original patch.
> I find return above easier to read.
Okay, original code may work, so I have no strong opinion about return vs
break, although I find slightly better to have a single point of return in
such case.
> > ?
...
> > > + count_graph = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > > + matches, matches_len);
> >
> > > + matches += count_graph;
> > > + matches_len -= count_graph;
> >
> > No, won't work when matches == NULL.
> >
> > Also, matches_len is expected to be 0 in that case (or at least being ignored,
> > check with vsnprintf() behaviour in similar case).
> >
> > So, something like this, perhaps
> >
> > if (matches && matches_len) {
> > matches += count_graph;
> > matches_len -= count_graph;
> > }
>
> Good find!
I have checked vsnprintf() and indeed, it expects to have the size is 0 when
the resulting buffer pointer is NULL, and it doesn't do any additional checks.
> > > + count_ref = fwnode_devcon_matches(fwnode, con_id, data, match,
> > > + matches, matches_len);
--
With Best Regards,
Andy Shevchenko
On Fri 04 Mar 06:54 CST 2022, Andy Shevchenko wrote:
> On Thu, Mar 03, 2022 at 02:33:46PM -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
> > Type-C connector. In this case the connector needs to belong to a graph
> > with multiple matching remote endpoints, and the Type-C controller needs
> > to be able to resolve them both.
> >
> > Add a new API that allows this kind of lookup.
>
> ...
>
> > +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 && matches) {
> > + fwnode_handle_put(ep);
> > + return count;
> > + }
>
> Wouldn't be the same as
>
> if (count >= matches_len) {
This would cause the return value to be at most matches_len, seems
relevant to ignore (or perhaps require it to be 0) when matches is NULL.
But flipping the order of the expression seems better to me, now that
this has been sitting for a while.
> fwnode_handle_put(ep);
> break;
Right, this isn't an "early return", so nicer to have a single return at
the bottom.
> }
>
> ?
>
> > + node = fwnode_graph_get_remote_port_parent(ep);
> > + if (!fwnode_device_is_available(node)) {
> > + fwnode_handle_put(node);
> > + continue;
> > + }
> > +
> > + ret = match(node, con_id, data);
> > + fwnode_handle_put(node);
> > + if (ret) {
> > + if (matches)
> > + matches[count] = ret;
> > + count++;
> > + }
> > + }
> > + return count;
> > +}
>
> ...
>
> > +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;
> > + unsigned int i;
> > + void *ret;
> > +
> > + for (i = 0; ; i++) {
>
> > + if (count >= matches_len && matches)
> > + return count;
>
> Ditto.
>
> > + node = fwnode_find_reference(fwnode, con_id, i);
> > + if (IS_ERR(node))
> > + break;
> > +
> > + ret = match(node, NULL, data);
> > + fwnode_handle_put(node);
> > + if (ret) {
> > + if (matches)
> > + matches[count] = ret;
> > + count++;
> > + }
> > + }
> > +
> > + return count;
> > +}
>
> ...
>
> > +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_graph;
> > + unsigned int count_ref;
> > +
> > + if (!fwnode || !match)
> > + return -EINVAL;
>
> > + count_graph = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > + matches, matches_len);
>
> > + matches += count_graph;
> > + matches_len -= count_graph;
>
> No, won't work when matches == NULL.
>
Sorry about that, you're obviously correct.
> Also, matches_len is expected to be 0 in that case (or at least being ignored,
> check with vsnprintf() behaviour in similar case).
>
> So, something like this, perhaps
>
> if (matches && matches_len) {
> matches += count_graph;
> matches_len -= count_graph;
> }
Seems reasonable.
Thanks,
Bjorn
>
> > + count_ref = fwnode_devcon_matches(fwnode, con_id, data, match,
> > + matches, matches_len);
> > +
> > + return count_graph + count_ref;
> > +}
>
>
> --
> With Best Regards,
> Andy Shevchenko
>
>
On Fri 04 Mar 07:52 CST 2022, Andy Shevchenko wrote:
> On Fri, Mar 04, 2022 at 03:41:33PM +0200, Sakari Ailus wrote:
> > On Fri, Mar 04, 2022 at 02:54:21PM +0200, Andy Shevchenko wrote:
> > > On Thu, Mar 03, 2022 at 02:33:46PM -0800, Bjorn Andersson wrote:
>
> ...
>
> > > > + if (count >= matches_len && matches) {
> > > > + fwnode_handle_put(ep);
> > > > + return count;
> > > > + }
> > >
> > > Wouldn't be the same as
> > >
> > > if (count >= matches_len) {
> > > fwnode_handle_put(ep);
> > > break;
> > > }
> >
> > Don't you need to check for non-NULL matches here?
>
> Right, this should be kept as in original patch.
>
> > I find return above easier to read.
>
> Okay, original code may work, so I have no strong opinion about return vs
> break, although I find slightly better to have a single point of return in
> such case.
>
I like using early returns when possible, but this is not an early
return and it is in the loop so it makes more sense to me to break out.
> > > ?
>
> ...
>
> > > > + count_graph = fwnode_graph_devcon_matches(fwnode, con_id, data, match,
> > > > + matches, matches_len);
> > >
> > > > + matches += count_graph;
> > > > + matches_len -= count_graph;
> > >
> > > No, won't work when matches == NULL.
> > >
> > > Also, matches_len is expected to be 0 in that case (or at least being ignored,
> > > check with vsnprintf() behaviour in similar case).
> > >
> > > So, something like this, perhaps
> > >
> > > if (matches && matches_len) {
> > > matches += count_graph;
> > > matches_len -= count_graph;
> > > }
> >
> > Good find!
>
> I have checked vsnprintf() and indeed, it expects to have the size is 0 when
> the resulting buffer pointer is NULL, and it doesn't do any additional checks.
>
Per the vsnprintf() semantics it's not the destination buffer being NULL
that's significant, but rather just the length being 0 that matters.
To follow that, I should fill @matches_len entries in @matches and then
just continue counting without storing anything in @matches.
But that won't work in this case, because in the event that the @match
function returns something that has to be freed (such as the refcounted
objects returned by the typec_mux code), dropping this in favor of just
counting it would cause memory/reference leaks.
As such, I think this should differ in that @matches = NULL is
significant, and it's nice to not have matches_len turn negative/bogus
in the count case.
So I like your suggestion.
Thanks,
Bjorn
> > > > + count_ref = fwnode_devcon_matches(fwnode, con_id, data, match,
> > > > + matches, matches_len);
>
> --
> With Best Regards,
> Andy Shevchenko
>
>
On Fri 04 Mar 07:54 CST 2022, Andy Shevchenko wrote:
> On Thu, Mar 03, 2022 at 02:33:49PM -0800, 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, which account for
> > being able to mux/switch the USB HS, SS and SBU lines, as per defined
> > defined in the usb-c-connector binding. This number could be grown if
> > need arrises at a later point in time.
>
> ...
>
> > + for (i = 0; i < count; i++) {
> > + if (IS_ERR(sw_devs[i])) {
> > + err = PTR_ERR(sw_devs[i]);
> > + goto put_sw_devs;
> > + }
> > + }
> >
> > - sw->sw_dev = sw_dev;
> > + 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->num_sw_devs = count;
> >
> > return sw;
> > +
> > +put_sw_devs:
> > + for (i = 0; i < count; i++) {
>
> Shouldn't it be
>
> while (i--)
>
> ?
fwnode_connection_find_matches() "returned" count number of sw_devs, we
need to put_device() them all. So that form could have been
while (count--)
but as it's not the typical "unrolling" I think the untypical form is
more useful.
>
> > + if (!IS_ERR(sw_devs[i]))
>
> We may get rid of this check if we guarantee that the device is NULL.
>
In the event that the USB Type-C controller probes before some of the
muxes, this array might contain one or more entries of EPROBE_DEFER.
So we need to either put this conditional here, or we need to loop
through all entries to turn IS_ERR() into NULL, for the sake of not
having it here.
So to me this looks cleaner...
Regards,
Bjorn
> > + put_device(&sw_devs[i]->dev);
> > + }
> > +
> > + kfree(sw);
> > +
> > + return ERR_PTR(err);
> > }
>
> ...
>
> > + for (i = 0; i < count; i++) {
> > + if (IS_ERR(mux_devs[i])) {
> > + err = PTR_ERR(mux_devs[i]);
> > + goto put_mux_devs;
> > + }
>
> Ditto.
>
> > + }
>
> ...
>
> > +put_mux_devs:
> > + for (i = 0; i < count; i++) {
> > + if (!IS_ERR(mux_devs[i]))
> > + put_device(&mux_devs[i]->dev);
> > + }
>
> Ditto.
>
> --
> With Best Regards,
> Andy Shevchenko
>
>
On Sun, Mar 06, 2022 at 08:18:24PM -0600, Bjorn Andersson wrote:
> On Fri 04 Mar 07:52 CST 2022, Andy Shevchenko wrote:
> > On Fri, Mar 04, 2022 at 03:41:33PM +0200, Sakari Ailus wrote:
...
> > I have checked vsnprintf() and indeed, it expects to have the size is 0 when
> > the resulting buffer pointer is NULL, and it doesn't do any additional checks.
>
> Per the vsnprintf() semantics it's not the destination buffer being NULL
> that's significant, but rather just the length being 0 that matters.
Actually the main point is to have buffer to be NULL. But at the same
time size also has to be 0.
When the size is 0, but buffer is not NULL, it's a different story.
> To follow that, I should fill @matches_len entries in @matches and then
> just continue counting without storing anything in @matches.
>
> But that won't work in this case, because in the event that the @match
> function returns something that has to be freed (such as the refcounted
> objects returned by the typec_mux code), dropping this in favor of just
> counting it would cause memory/reference leaks.
>
> As such, I think this should differ in that @matches = NULL is
> significant, and it's nice to not have matches_len turn negative/bogus
> in the count case.
>
> So I like your suggestion.
--
With Best Regards,
Andy Shevchenko