niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

usb: typec: tcpm: Don't block probing of consumers of "connector" nodes

Browse source 
fw_devlink expects DT device nodes with "compatible" property to have
struct devices created for them. Since the connector node might not be
populated as a device, mark it as such so that fw_devlink knows not to
wait on this fwnode being populated as a struct device.

Without this patch, USB functionality can be broken on some boards.

Fixes: f7514a6630 ("of: property: fw_devlink: Add support for remote-endpoint")
Reported-by: John Stultz <john.stultz@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20210506004423.345199-1-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Saravana Kannan 2021-05-05 17:44:22 -07:00 • committed by Greg Kroah-Hartman
parent 6efb943b86
commit 28ec344bb8
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/base/core.c
View file

@ -150,7 +150,7 @@ void fwnode_links_purge(struct fwnode_handle *fwnode)
fwnode_links_purge_consumers(fwnode); fwnode_links_purge_consumers(fwnode);
} }
static void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode) void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode)
{ {
struct fwnode_handle *child; struct fwnode_handle *child;
@ -164,6 +164,7 @@ static void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode)
fwnode_for_each_available_child_node(fwnode, child) fwnode_for_each_available_child_node(fwnode, child)
fw_devlink_purge_absent_suppliers(child); fw_devlink_purge_absent_suppliers(child);
} }
EXPORT_SYMBOL_GPL(fw_devlink_purge_absent_suppliers);
#ifdef CONFIG_SRCU #ifdef CONFIG_SRCU
static DEFINE_MUTEX(device_links_lock); static DEFINE_MUTEX(device_links_lock);

9
drivers/usb/typec/tcpm/tcpm.c
View file

@ -5754,6 +5754,15 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
if (!fwnode) if (!fwnode)
return -EINVAL; return -EINVAL;
/*
* This fwnode has a "compatible" property, but is never populated as a
* struct device. Instead we simply parse it to read the properties.
* This it breaks fw_devlink=on. To maintain backward compatibility
* with existing DT files, we work around this by deleting any
* fwnode_links to/from this fwnode.
*/
fw_devlink_purge_absent_suppliers(fwnode);
/* USB data support is optional */ /* USB data support is optional */
ret = fwnode_property_read_string(fwnode, "data-role", &cap_str); ret = fwnode_property_read_string(fwnode, "data-role", &cap_str);
if (ret == 0) { if (ret == 0) {

1
include/linux/fwnode.h
View file

@ -187,5 +187,6 @@ extern u32 fw_devlink_get_flags(void);
extern bool fw_devlink_is_strict(void); extern bool fw_devlink_is_strict(void);
int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup); int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup);
void fwnode_links_purge(struct fwnode_handle *fwnode); void fwnode_links_purge(struct fwnode_handle *fwnode);
void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode);
#endif #endif