Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 9f801ea

Browse files
zijun-huCarlos Llamas
authored andcommitted
UPSTREAM: of: property: Increase NR_FWNODE_REFERENCE_ARGS
[ Upstream commit eb50844 ] Currently, the following two macros have different values: // The maximal argument count for firmware node reference #define NR_FWNODE_REFERENCE_ARGS 8 // The maximal argument count for DT node reference #define MAX_PHANDLE_ARGS 16 It may cause firmware node reference's argument count out of range if directly assign DT node reference's argument count to firmware's. drivers/of/property.c:of_fwnode_get_reference_args() is doing the direct assignment, so may cause firmware's argument count @args->nargs got out of range, namely, in [9, 16]. Fix by increasing NR_FWNODE_REFERENCE_ARGS to 16 to meet DT requirement. Will align both macros later to avoid such inconsistency. Fixes: 3e3119d ("device property: Introduce fwnode_property_get_reference_args") Change-Id: I65f2717f313ac35d6a1d9ab65f62302b78e4e02b Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Link: https://lore.kernel.org/r/20250225-fix_arg_count-v4-1-13cdc519eb31@quicinc.com Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit bfcca46) Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1 parent f3f9ecf commit 9f801ea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/fwnode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct fwnode_endpoint {
9191
#define SWNODE_GRAPH_PORT_NAME_FMT "port@%u"
9292
#define SWNODE_GRAPH_ENDPOINT_NAME_FMT "endpoint@%u"
9393

94-
#define NR_FWNODE_REFERENCE_ARGS 8
94+
#define NR_FWNODE_REFERENCE_ARGS 16
9595

9696
/**
9797
* struct fwnode_reference_args - Fwnode reference with additional arguments

0 commit comments

Comments
 (0)