From: Charan Teja Kalla <charan.kalla@oss.qualcomm.com>
Introduce a new struct type where the optional arguments passed to
of_map_id() are Currently embedded as of_phandle_args struct.
Subsequent patches add additional arguments to the struct that the
caller expects to be filled of_map_id().
Suggested-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Charan Teja Kalla <charan.kalla@oss.qualcomm.com>
Signed-off-by: Vijayanand Jitta <vijayanand.jitta@oss.qualcomm.com>
---
drivers/iommu/of_iommu.c | 12 ++++++---
drivers/of/base.c | 37 +++++++++++++--------------
drivers/pci/controller/dwc/pci-imx6.c | 6 ++++-
drivers/pci/controller/pcie-apple.c | 5 +++-
drivers/xen/grant-dma-ops.c | 20 +++++++++------
include/linux/of.h | 24 ++++++++++++-----
6 files changed, 64 insertions(+), 40 deletions(-)
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index a511ecf21fcd..646ac5a67475 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -45,15 +45,19 @@ static int of_iommu_configure_dev_id(struct device_node *master_np,
struct device *dev,
const u32 *id)
{
- struct of_phandle_args iommu_spec = { .args_count = 1 };
+ struct of_map_id_arg arg = {
+ .map_args = {
+ .args_count = 1,
+ },
+ };
int err;
- err = of_map_iommu_id(master_np, *id, &iommu_spec.np, iommu_spec.args);
+ err = of_map_iommu_id(master_np, *id, &arg);
if (err)
return err;
- err = of_iommu_xlate(dev, &iommu_spec);
- of_node_put(iommu_spec.np);
+ err = of_iommu_xlate(dev, &arg.map_args);
+ of_node_put(arg.map_args.np);
return err;
}
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 7043acd971a0..9f327c6b4f6b 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2051,8 +2051,11 @@ int of_find_last_cache_level(unsigned int cpu)
* @id: device ID to map.
* @map_name: property name of the map to use.
* @map_mask_name: optional property name of the mask to use.
- * @target: optional pointer to a target device node.
- * @id_out: optional pointer to receive the translated ID.
+ * @arg: contains the optional params, wrapped in a struct of_phandle_args,
+ * which includes:
+ * np: pointer to the target device node
+ * args_count: number of arguments
+ * args[]: array to receive the translated ID(s).
*
* Given a device ID, look up the appropriate implementation-defined
* platform ID and/or the target device which receives transactions on that
@@ -2066,21 +2069,21 @@ int of_find_last_cache_level(unsigned int cpu)
*/
int of_map_id(const struct device_node *np, u32 id,
const char *map_name, const char *map_mask_name,
- struct device_node **target, u32 *id_out)
+ struct of_map_id_arg *arg)
{
u32 map_mask, masked_id;
int map_len;
const __be32 *map = NULL;
- if (!np || !map_name || (!target && !id_out))
+ if (!np || !map_name || !arg)
return -EINVAL;
map = of_get_property(np, map_name, &map_len);
if (!map) {
- if (target)
+ if (arg->map_args.np)
return -ENODEV;
/* Otherwise, no map implies no translation */
- *id_out = id;
+ arg->map_args.args[0] = id;
return 0;
}
@@ -2122,18 +2125,15 @@ int of_map_id(const struct device_node *np, u32 id,
if (!phandle_node)
return -ENODEV;
- if (target) {
- if (*target)
- of_node_put(phandle_node);
- else
- *target = phandle_node;
+ if (arg->map_args.np)
+ of_node_put(phandle_node);
+ else
+ arg->map_args.np = phandle_node;
- if (*target != phandle_node)
- continue;
- }
+ if (arg->map_args.np != phandle_node)
+ continue;
- if (id_out)
- *id_out = masked_id - id_base + out_base;
+ arg->map_args.args[0] = masked_id - id_base + out_base;
pr_debug("%pOF: %s, using mask %08x, id-base: %08x, out-base: %08x, length: %08x, id: %08x -> %08x\n",
np, map_name, map_mask, id_base, out_base,
@@ -2142,11 +2142,10 @@ int of_map_id(const struct device_node *np, u32 id,
}
pr_info("%pOF: no %s translation for id 0x%x on %pOF\n", np, map_name,
- id, target && *target ? *target : NULL);
+ id, arg->map_args.np ? arg->map_args.np : NULL);
/* Bypasses translation */
- if (id_out)
- *id_out = id;
+ arg->map_args.args[0] = id;
return 0;
}
EXPORT_SYMBOL_GPL(of_map_id);
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index c8da2e88e9c6..8dcdde2efb8a 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1101,12 +1101,16 @@ static int imx_pcie_add_lut_by_rid(struct imx_pcie *imx_pcie, u32 rid)
{
struct device *dev = imx_pcie->pci->dev;
struct device_node *target;
+ struct of_map_id_arg arg = {};
u32 sid_i, sid_m;
int err_i, err_m;
u32 sid = 0;
target = NULL;
- err_i = of_map_iommu_id(dev->of_node, rid, &target, &sid_i);
+
+ arg.map_args.np = target;
+ arg.map_args.args[0] = sid_i;
+ err_i = of_map_iommu_id(dev->of_node, rid, &arg);
if (target) {
of_node_put(target);
} else {
diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c
index ce21728d6e51..dea4a38cb4bb 100644
--- a/drivers/pci/controller/pcie-apple.c
+++ b/drivers/pci/controller/pcie-apple.c
@@ -782,6 +782,7 @@ static int apple_pcie_enable_device(struct pci_host_bridge *bridge, struct pci_d
{
u32 sid, rid = pci_dev_id(pdev);
struct apple_pcie_port *port;
+ struct of_map_id_arg arg = {};
int idx, err;
port = apple_pcie_get_port(pdev);
@@ -791,7 +792,9 @@ static int apple_pcie_enable_device(struct pci_host_bridge *bridge, struct pci_d
dev_dbg(&pdev->dev, "added to bus %s, index %d\n",
pci_name(pdev->bus->self), port->idx);
- err = of_map_iommu_id(port->pcie->dev->of_node, rid, NULL, &sid);
+ arg.map_args.np = NULL;
+ arg.map_args.args[0] = sid;
+ err = of_map_iommu_id(port->pcie->dev->of_node, rid, &arg);
if (err)
return err;
diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c
index b661f9c1f4fe..86edb11d8d26 100644
--- a/drivers/xen/grant-dma-ops.c
+++ b/drivers/xen/grant-dma-ops.c
@@ -315,38 +315,42 @@ static int xen_dt_grant_init_backend_domid(struct device *dev,
struct device_node *np,
domid_t *backend_domid)
{
- struct of_phandle_args iommu_spec = { .args_count = 1 };
+ struct of_map_id_arg arg = {
+ .map_args = {
+ .args_count = 1,
+ },
+ };
if (dev_is_pci(dev)) {
struct pci_dev *pdev = to_pci_dev(dev);
u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);
- if (of_map_iommu_id(np, rid, &iommu_spec.np, iommu_spec.args)) {
+ if (of_map_iommu_id(np, rid, &arg)) {
dev_dbg(dev, "Cannot translate ID\n");
return -ESRCH;
}
} else {
if (of_parse_phandle_with_args(np, "iommus", "#iommu-cells",
- 0, &iommu_spec)) {
+ 0, &arg.map_args)) {
dev_dbg(dev, "Cannot parse iommus property\n");
return -ESRCH;
}
}
- if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") ||
- iommu_spec.args_count != 1) {
+ if (!of_device_is_compatible(arg.map_args.np, "xen,grant-dma") ||
+ arg.map_args.args_count != 1) {
dev_dbg(dev, "Incompatible IOMMU node\n");
- of_node_put(iommu_spec.np);
+ of_node_put(arg.map_args.np);
return -ESRCH;
}
- of_node_put(iommu_spec.np);
+ of_node_put(arg.map_args.np);
/*
* The endpoint ID here means the ID of the domain where the
* corresponding backend is running
*/
- *backend_domid = iommu_spec.args[0];
+ *backend_domid = arg.map_args.args[0];
return 0;
}
diff --git a/include/linux/of.h b/include/linux/of.h
index 8cd486d89da2..0b0d545b80a3 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -74,6 +74,10 @@ struct of_phandle_args {
uint32_t args[MAX_PHANDLE_ARGS];
};
+struct of_map_id_arg {
+ struct of_phandle_args map_args;
+};
+
struct of_phandle_iterator {
/* Common iterator information */
const char *cells_name;
@@ -458,7 +462,7 @@ bool of_console_check(const struct device_node *dn, char *name, int index);
int of_map_id(const struct device_node *np, u32 id,
const char *map_name, const char *map_mask_name,
- struct device_node **target, u32 *id_out);
+ struct of_map_id_arg *arg);
phys_addr_t of_dma_get_max_cpu_address(struct device_node *np);
@@ -907,7 +911,7 @@ static inline void of_property_clear_flag(struct property *p, unsigned long flag
static inline int of_map_id(const struct device_node *np, u32 id,
const char *map_name, const char *map_mask_name,
- struct device_node **target, u32 *id_out)
+ struct of_map_id_arg *arg)
{
return -EINVAL;
}
@@ -1436,17 +1440,23 @@ static inline int of_property_read_s32(const struct device_node *np,
}
static inline int of_map_iommu_id(const struct device_node *np, u32 id,
- struct device_node **target, u32 *id_out)
+ struct of_map_id_arg *arg)
{
- return of_map_id(np, id, "iommu-map", "iommu-map-mask",
- target, id_out);
+ return of_map_id(np, id, "iommu-map", "iommu-map-mask", arg);
}
static inline int of_map_msi_id(const struct device_node *np, u32 id,
struct device_node **target, u32 *id_out)
{
- return of_map_id(np, id, "msi-map", "msi-map-mask",
- target, id_out);
+ struct of_map_id_arg arg = {
+ .map_args = {
+ .np = *target,
+ .args_count = 1,
+ .args = { *id_out },
+ },
+ };
+
+ return of_map_id(np, id, "msi-map", "msi-map-mask", &arg);
}
#define of_for_each_phandle(it, err, np, ln, cn, cc) \
--
2.34.1Hi Vijayanand,
kernel test robot noticed the following build warnings:
[auto build test WARNING on xen-tip/linux-next]
[cannot apply to robh/for-next pci/next pci/for-linus linus/master v6.19-rc4 next-20260106]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Vijayanand-Jitta/of-Add-convenience-wrappers-for-of_map_id/20251231-194928
base: https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git linux-next
patch link: https://lore.kernel.org/r/20251231114257.2382820-3-vijayanand.jitta%40oss.qualcomm.com
patch subject: [PATCH v4 2/3] of: factor arguments passed to of_map_id() into a struct
config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20260106/202601062128.BCmw1wNO-lkp@intel.com/config)
compiler: alpha-linux-gcc (GCC) 15.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260106/202601062128.BCmw1wNO-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601062128.BCmw1wNO-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/cdx/cdx_msi.c:8:
In function 'of_map_msi_id',
inlined from 'cdx_msi_prepare' at drivers/cdx/cdx_msi.c:131:8:
>> include/linux/of.h:1451:30: warning: 'dev_id' is used uninitialized [-Wuninitialized]
1451 | struct of_map_id_arg arg = {
| ^~~
drivers/cdx/cdx_msi.c: In function 'cdx_msi_prepare':
drivers/cdx/cdx_msi.c:127:13: note: 'dev_id' was declared here
127 | u32 dev_id;
| ^~~~~~
--
drivers/pci/controller/dwc/pci-imx6.c: In function 'imx_pcie_add_lut_by_rid':
>> drivers/pci/controller/dwc/pci-imx6.c:1112:30: warning: 'sid_i' is used uninitialized [-Wuninitialized]
1112 | arg.map_args.args[0] = sid_i;
| ~~~~~~~~~~~~~~~~~~~~~^~~~~~~
drivers/pci/controller/dwc/pci-imx6.c:1105:13: note: 'sid_i' was declared here
1105 | u32 sid_i, sid_m;
| ^~~~~
>> drivers/pci/controller/dwc/pci-imx6.c:1126:17: warning: 'sid_m' is used uninitialized [-Wuninitialized]
1126 | err_m = of_map_msi_id(dev->of_node, rid, &target, &sid_m);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/pci/controller/dwc/pci-imx6.c:1105:20: note: 'sid_m' was declared here
1105 | u32 sid_i, sid_m;
| ^~~~~
vim +/dev_id +1451 include/linux/of.h
1447
1448 static inline int of_map_msi_id(const struct device_node *np, u32 id,
1449 struct device_node **target, u32 *id_out)
1450 {
> 1451 struct of_map_id_arg arg = {
1452 .map_args = {
1453 .np = *target,
1454 .args_count = 1,
1455 .args = { *id_out },
1456 },
1457 };
1458
1459 return of_map_id(np, id, "msi-map", "msi-map-mask", &arg);
1460 }
1461
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.