shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

driver core: Add FWLINK_FLAG_IGNORE to completely ignore a fwnode link

Browse Source 
[ Upstream commit b7e1241d8f77ed64404a5e4450f43a319310fc91 ]

A fwnode link between specific supplier-consumer fwnodes can be added
multiple times for multiple reasons. If that dependency doesn't exist,
deleting the fwnode link once doesn't guarantee that it won't get created
again.

So, add FWLINK_FLAG_IGNORE flag to mark a fwnode link as one that needs to
be completely ignored. Since a fwnode link's flags is an OR of all the
flags passed to all the fwnode_link_add() calls to create that specific
fwnode link, the FWLINK_FLAG_IGNORE flag is preserved and can be used to
mark a fwnode link as on that need to be completely ignored until it is
deleted.

Signed-off-by: Saravana Kannan <saravanak@google.com>
Acked-by: "Rafael J. Wysocki" <rafael@kernel.org>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20240305050458.1400667-3-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: bac3b10b78e5 ("driver core: fw_devlink: Stop trying to optimize cycle detection logic")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Saravana Kannan
2024-03-04 21:04:55 -08:00
committed by Greg Kroah-Hartman
parent 84bdb88f70
commit a3284739bb
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/core.c
View File

@@ -1082,7 +1082,8 @@ static struct fwnode_handle *fwnode_links_check_suppliers(
return NULL; return NULL;
list_for_each_entry(link, &fwnode->suppliers, c_hook) list_for_each_entry(link, &fwnode->suppliers, c_hook)
if (!(link->flags & FWLINK_FLAG_CYCLE)) if (!(link->flags &
(FWLINK_FLAG_CYCLE | FWLINK_FLAG_IGNORE)))
return link->supplier; return link->supplier;
return NULL; return NULL;
@@ -1973,6 +1974,9 @@ static bool __fw_devlink_relax_cycles(struct device *con,
} }
list_for_each_entry(link, &sup_handle->suppliers, c_hook) { list_for_each_entry(link, &sup_handle->suppliers, c_hook) {
if (link->flags & FWLINK_FLAG_IGNORE)
continue;
if (__fw_devlink_relax_cycles(con, link->supplier)) { if (__fw_devlink_relax_cycles(con, link->supplier)) {
__fwnode_link_cycle(link); __fwnode_link_cycle(link);
ret = true; ret = true;
@@ -2051,6 +2055,9 @@ static int fw_devlink_create_devlink(struct device *con,
int ret = 0; int ret = 0;
u32 flags; u32 flags;
if (link->flags & FWLINK_FLAG_IGNORE)
return 0;
if (con->fwnode == link->consumer) if (con->fwnode == link->consumer)
flags = fw_devlink_get_flags(link->flags); flags = fw_devlink_get_flags(link->flags);
else else

2
include/linux/fwnode.h
View File

@@ -51,8 +51,10 @@ struct fwnode_handle {
* fwnode link flags * fwnode link flags
* *
* CYCLE: The fwnode link is part of a cycle. Don't defer probe. * CYCLE: The fwnode link is part of a cycle. Don't defer probe.
* IGNORE: Completely ignore this link, even during cycle detection.
*/ */
#define FWLINK_FLAG_CYCLE BIT(0) #define FWLINK_FLAG_CYCLE BIT(0)
#define FWLINK_FLAG_IGNORE BIT(1)
struct fwnode_link { struct fwnode_link {
struct fwnode_handle *supplier; struct fwnode_handle *supplier;