From nobody Mon Feb 9 20:09:32 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 957732FF66B for ; Sun, 18 Jan 2026 18:14:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768760065; cv=none; b=lWt+fZFFw1bD6Iu02jrALZy78RcXqC8BQELOZDdyYdsE/5Cfj2YgopBp88fCHgzJwUoAG0bqP8hnaH8gvK17AVpD+TDuQpDJ0ZuphfRRJ+Z6XbAHGM4ATwvY0F3O01bdmQhipdf8mI8adF0WcJ2YxDQ6PzuDVElc7wPQcpLY7BI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768760065; c=relaxed/simple; bh=TSZ/wDnFHxeXqt9KfR/SGAOinyXK0kimEehYm8g6Jkg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SqtsaBYmdghBB8K6oH0TvpJo3sBguZrjFuXAb88b4nN8TGsLj1Z373Ox2KAzmY1UXIM0bmwtbkc/O1aqIv51zl3macspk62I2U+HveN0kWKNPr+tsEhMpj679zGn+rppZmy5E3s/xs8VWaNkVO2GllwX/oEU7fgayhPupwUPj6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=YrPR4YRS; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=S+e+pDUY; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="YrPR4YRS"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="S+e+pDUY" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60I1vaYO1484228 for ; Sun, 18 Jan 2026 18:14:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=FN3oWZbw5sV GuRs9dWSdopr6ooa0/d6f+oL1v6bf4sE=; b=YrPR4YRSl2VJssPIvWcmVzJMqXw PeBlK1BthWhXB63Tvehj4cqG3jCZiyPtaYLvKLmTTQSHEwPN1prhBRBFicW3AGuG sslsiN4oZP/zcPHoi8sOYOCIAsSPIucNzsVquDEz7Tx+3uyQ0L72fhbobD56dcqB xBVwzfc+WFDfT9C4vVkcAU19TUS5mIQJIgqgkM82gLaZpmAlwwl0w6rXF8ICc3tF dd7PdCruzhI6UE57KvNHsQfMrcBtTXnz1BcsEKCYk20uq3Ak+ZmkqqFVVsPGtqHF aXbcVlTTsQ3Q8SgjO+cV9PmgAOnNTxyDjgDAFFoBJtaBEnAKgVEdmGfhf8Q== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4br2n2tunj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 18 Jan 2026 18:14:22 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c1290abb178so2223037a12.2 for ; Sun, 18 Jan 2026 10:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768760062; x=1769364862; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FN3oWZbw5sVGuRs9dWSdopr6ooa0/d6f+oL1v6bf4sE=; b=S+e+pDUYsDXnPBus/Z/5XDGJwleb/Ny1GbCfMFOkY8OB38vOuhHkspb1Jq7dD2Anuq 9MOqfoJl/siTrE2HO7A+uoRrxLZRHuj5wueMovCBeG9jlhxePf8iF9jN9ZndciPwtxs2 yW7Rqx1RkxHxmqkou5inS22ff49c856hhuF79gZMS6vg2fQ1IWQvOpsODWuG6SRPJyk7 P4SEWIiBBiVXLQcIyMgzJDsdwGwgOHDNDgqsMnCQFvXs5aFudZvAW+tRtJcymTZq2lZA 0eIEhuMastZpDEDayYl/zkrIqOuYWQejYpCjcp9JBAiLtCjw64ubzxYO6K0JCT4d2y73 PAGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768760062; x=1769364862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FN3oWZbw5sVGuRs9dWSdopr6ooa0/d6f+oL1v6bf4sE=; b=UNSFAisw4qszmkRMHp0A9uOlLJyO5Ek7g6Ubin3GTFmzeGcrAi398ANAmH3HHZkX2q n93dNWFwR3QmrWh45TNxvatWZKEkmBsDenEvl5uWPuWwaQgG2dW51CKW2O2gAGarqtpD Igv2UEWjXgVlo66EszFc4ig4fm07zXIotu4QHgSJqfj6Y1bZpvRfd3lO/X0XxYGCNW0N uFmeBPYn0jDbvoC3YYPXuaP468btWNuUArww3uDX/+k4y9Kc+Qr0krUgAbCYRkHRQoAM YOQGcidyEu/nnobhp/usW0xgzXRZCpwKH9FPt+o5teqhdYflNmdoCKGyri6XL9RvKN5z 4Shg== X-Forwarded-Encrypted: i=1; AJvYcCXsAuPPJ1X8Sd2Fal/NndNrqvxbbgmSp0NGLX55u2ZRYdRdZq+8Bvk2yG6YVLXjtrR4FOBcQsnVJboHJy4=@vger.kernel.org X-Gm-Message-State: AOJu0YxxjyTbFGUcZebmdpd5Id3LqYZb9/TNykg80rjxiMxQOcJvZkh+ HsNk9/QT+Hc6NWoUSN6LqLwHUcSFxf1H1Gxe+uIKjsOQCLfvRvbepTVavx3I0OH5hmPKVQ19ZFQ RVg45zxfPRv/Eh2ZwHislJhV6Fp8h2qgXupny8rC4RpcPTZcKzxAv36LqZ5Pd+lrGxfs= X-Gm-Gg: AY/fxX7SUJazTk8RIsnB/XWKqlbse0kst4cPWJ2tdE2bzxcz4gqjqAQkiIuKe3njhjb 98jngDWwER656WeCRXuCW9C+5cc+NPSk9Z3K1uhFdQhhl9wlVxt3r8eDoM+Ye7BwypV0bTI680y bVIx0rUQKrEW8CgooWLYkD+QtIHbgmxIntYLA0D0GSan+6hbCUsHS9A1v3DTMlM28bYx2XEe596 Kezvm3eVFUC4+N1IXBMZ17Z51p3Zp2o7//GyTiTlDXpMVcp50DQoVuVuGpPfC+sgiolbvi/Lv+M vrtW20U98nIZdDQkAXbpEApRE/t7rQ0KAKZX6+KPWotDz+Jrrjtfi0EtU7Tff81+cx2my+jZmeb 5SxzHCKUqkd5i0SStWStZ2MWEafqc+5z+83wYsMC2yH1m X-Received: by 2002:a05:6a00:22cc:b0:81f:3afe:2824 with SMTP id d2e1a72fcca58-81f9fce5d63mr8295506b3a.24.1768760061962; Sun, 18 Jan 2026 10:14:21 -0800 (PST) X-Received: by 2002:a05:6a00:22cc:b0:81f:3afe:2824 with SMTP id d2e1a72fcca58-81f9fce5d63mr8295485b3a.24.1768760061420; Sun, 18 Jan 2026 10:14:21 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-81fa1277a15sm7070759b3a.42.2026.01.18.10.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 10:14:21 -0800 (PST) From: Vijayanand Jitta To: robin.murphy@arm.com, will@kernel.org, joro@8bytes.org, robh@kernel.org, dmitry.baryshkov@oss.qualcomm.com, konrad.dybcio@oss.qualcomm.com, bjorn.andersson@oss.qualcomm.com, bod@kernel.org, conor+dt@kernel.org, krzk+dt@kernel.org, prakash.gupta@oss.qualcomm.com, vikash.garodia@oss.qualcomm.com Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, vijayanand.jitta@oss.qualcomm.com, Charan Teja Kalla Subject: [PATCH v5 2/3] of: factor arguments passed to of_map_id() into a struct Date: Sun, 18 Jan 2026 23:41:24 +0530 Message-Id: <20260118181125.1436036-3-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260118181125.1436036-1-vijayanand.jitta@oss.qualcomm.com> References: <20260118181125.1436036-1-vijayanand.jitta@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=TvvrRTXh c=1 sm=1 tr=0 ts=696d22fe cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=rukgfAGnDChJCile_RwA:9 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-ORIG-GUID: TTTuzozXpW3SMZRlPGj0cRt32G8Yui2n X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE4MDE2MCBTYWx0ZWRfX7xf+ovvgiNZo 3a7K9scF7DJZFm3nQl7yeB9OS4H/kmDcZMGTkthU3gKaCaFkahfarNQA9kEfmrp1WWuTiGin8E9 EfkizU1T66IdSyijJuVVfQqs+QegQ+Kw5UegtgKw1I2RaBeGZDQVNTRKjdN0X33dFQ9gSOWp7LE Vf61CPj6JbBjzs7aLo2qRSrBN6We7yRijhN+yOxi4sFtBQU2xNN6RfE613eCcSn63y3f0Tcwg9Q 9a5TdaI3FELJBJZnUM/AB/cfhuKs2qu22Rbybu0SrrWGoCFWXW4492Va9nKIBfCa2ZhfgNY70RQ Bih3a1H3rgdgveRxOlx/pDrFD/EHDHX7cig51N+7oqWe49LVPCeuAnTkN8m4b5yMqt7lmYblDbe UzYtoUXbdxq/GBffz0fHjON3eDXkZnbeSxVkl05cE3TK5YkRfWZrG/ZJ4VTtLOlccl97HE+2bqv hYjoXUmrjjJg1lMZQTQ== X-Proofpoint-GUID: TTTuzozXpW3SMZRlPGj0cRt32G8Yui2n X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-17_03,2026-01-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 suspectscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601180160 Content-Type: text/plain; charset="utf-8" From: Charan Teja Kalla 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) Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/cdx/cdx_msi.c | 2 +- drivers/iommu/of_iommu.c | 12 ++++++--- drivers/of/base.c | 37 +++++++++++++-------------- drivers/pci/controller/dwc/pci-imx6.c | 10 ++++++-- drivers/pci/controller/pcie-apple.c | 4 ++- drivers/xen/grant-dma-ops.c | 20 +++++++++------ include/linux/of.h | 32 ++++++++++++++++++----- 7 files changed, 75 insertions(+), 42 deletions(-) diff --git a/drivers/cdx/cdx_msi.c b/drivers/cdx/cdx_msi.c index 63b3544ec997..7ed9643f1815 100644 --- a/drivers/cdx/cdx_msi.c +++ b/drivers/cdx/cdx_msi.c @@ -124,7 +124,7 @@ static int cdx_msi_prepare(struct irq_domain *msi_domai= n, struct cdx_device *cdx_dev =3D to_cdx_device(dev); struct device *parent =3D cdx_dev->cdx->dev; struct msi_domain_info *msi_info; - u32 dev_id; + u32 dev_id =3D 0; int ret; =20 /* Retrieve device ID from requestor ID using parent device */ 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 =3D { .args_count =3D 1 }; + struct of_map_id_arg arg =3D { + .map_args =3D { + .args_count =3D 1, + }, + }; int err; =20 - err =3D of_map_iommu_id(master_np, *id, &iommu_spec.np, iommu_spec.args); + err =3D of_map_iommu_id(master_np, *id, &arg); if (err) return err; =20 - err =3D of_iommu_xlate(dev, &iommu_spec); - of_node_put(iommu_spec.np); + err =3D of_iommu_xlate(dev, &arg.map_args); + of_node_put(arg.map_args.np); return err; } =20 diff --git a/drivers/of/base.c b/drivers/of/base.c index 0b65039ece53..0c379fa051fe 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2098,8 +2098,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 @@ -2113,21 +2116,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 =3D NULL; =20 - if (!np || !map_name || (!target && !id_out)) + if (!np || !map_name || !arg) return -EINVAL; =20 map =3D 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 =3D id; + arg->map_args.args[0] =3D id; return 0; } =20 @@ -2169,18 +2172,15 @@ int of_map_id(const struct device_node *np, u32 id, if (!phandle_node) return -ENODEV; =20 - if (target) { - if (*target) - of_node_put(phandle_node); - else - *target =3D phandle_node; + if (arg->map_args.np) + of_node_put(phandle_node); + else + arg->map_args.np =3D phandle_node; =20 - if (*target !=3D phandle_node) - continue; - } + if (arg->map_args.np !=3D phandle_node) + continue; =20 - if (id_out) - *id_out =3D masked_id - id_base + out_base; + arg->map_args.args[0] =3D masked_id - id_base + out_base; =20 pr_debug("%pOF: %s, using mask %08x, id-base: %08x, out-base: %08x, leng= th: %08x, id: %08x -> %08x\n", np, map_name, map_mask, id_base, out_base, @@ -2189,11 +2189,10 @@ int of_map_id(const struct device_node *np, u32 id, } =20 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); =20 /* Bypasses translation */ - if (id_out) - *id_out =3D id; + arg->map_args.args[0] =3D 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 c3e5cb3cb846..641f9d34f7a9 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1138,12 +1138,18 @@ static int imx_pcie_add_lut_by_rid(struct imx_pcie = *imx_pcie, u32 rid) { struct device *dev =3D imx_pcie->pci->dev; struct device_node *target; - u32 sid_i, sid_m; + struct of_map_id_arg arg =3D {}; + u32 sid_i, sid_m =3D 0; int err_i, err_m; u32 sid =3D 0; =20 target =3D NULL; - err_i =3D of_map_iommu_id(dev->of_node, rid, &target, &sid_i); + + err_i =3D of_map_iommu_id(dev->of_node, rid, &arg); + if (!err_i) { + target =3D arg.map_args.np; + sid_i =3D arg.map_args.args[0]; + } if (target) { of_node_put(target); } else { diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/p= cie-apple.c index a0937b7b3c4d..2df15fe075fa 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -755,6 +755,7 @@ static int apple_pcie_enable_device(struct pci_host_bri= dge *bridge, struct pci_d { u32 sid, rid =3D pci_dev_id(pdev); struct apple_pcie_port *port; + struct of_map_id_arg arg =3D {}; int idx, err; =20 port =3D apple_pcie_get_port(pdev); @@ -764,10 +765,11 @@ static int apple_pcie_enable_device(struct pci_host_b= ridge *bridge, struct pci_d dev_dbg(&pdev->dev, "added to bus %s, index %d\n", pci_name(pdev->bus->self), port->idx); =20 - err =3D of_map_iommu_id(port->pcie->dev->of_node, rid, NULL, &sid); + err =3D of_map_iommu_id(port->pcie->dev->of_node, rid, &arg); if (err) return err; =20 + sid =3D arg.map_args.args[0]; mutex_lock(&port->pcie->lock); =20 idx =3D bitmap_find_free_region(port->sid_map, port->sid_map_sz, 0); diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 1b7696b2d762..8c332b7ff148 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -319,38 +319,42 @@ static int xen_dt_grant_init_backend_domid(struct dev= ice *dev, struct device_node *np, domid_t *backend_domid) { - struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; + struct of_map_id_arg arg =3D { + .map_args =3D { + .args_count =3D 1, + }, + }; =20 if (dev_is_pci(dev)) { struct pci_dev *pdev =3D to_pci_dev(dev); u32 rid =3D PCI_DEVID(pdev->bus->number, pdev->devfn); =20 - 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; } } =20 - if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") || - iommu_spec.args_count !=3D 1) { + if (!of_device_is_compatible(arg.map_args.np, "xen,grant-dma") || + arg.map_args.args_count !=3D 1) { dev_dbg(dev, "Incompatible IOMMU node\n"); - of_node_put(iommu_spec.np); + of_node_put(arg.map_args.np); return -ESRCH; } =20 - of_node_put(iommu_spec.np); + of_node_put(arg.map_args.np); =20 /* * The endpoint ID here means the ID of the domain where the * corresponding backend is running */ - *backend_domid =3D iommu_spec.args[0]; + *backend_domid =3D arg.map_args.args[0]; =20 return 0; } diff --git a/include/linux/of.h b/include/linux/of.h index 309c5681744b..514f4f018f99 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]; }; =20 +struct of_map_id_arg { + struct of_phandle_args map_args; +}; + struct of_phandle_iterator { /* Common iterator information */ const char *cells_name; @@ -463,7 +467,7 @@ bool of_console_check(const struct device_node *dn, cha= r *name, int index); =20 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); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -929,7 +933,7 @@ static inline void of_property_clear_flag(struct proper= ty *p, unsigned long flag =20 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; } @@ -1458,17 +1462,31 @@ static inline int of_property_read_s32(const struct= device_node *np, } =20 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); } =20 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); + int ret; + + struct of_map_id_arg arg =3D { + .map_args =3D { + .np =3D *target, + .args_count =3D 1, + .args =3D { *id_out }, + }, + }; + + ret =3D of_map_id(np, id, "msi-map", "msi-map-mask", &arg); + if (!ret) { + *target =3D arg.map_args.np; + *id_out =3D arg.map_args.args[0]; + } + + return ret; } =20 #define of_for_each_phandle(it, err, np, ln, cn, cc) \ --=20 2.34.1