From nobody Tue Feb 10 00:38:45 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 0A00B429813 for ; Wed, 21 Jan 2026 05:54:37 +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=1768974879; cv=none; b=UZCjBSLTPEvlkKhZOr6LG/0RzwA+VU6iNw9f1PY9F8D2JA1a5p40cpAtFk9btjyrRwYqykH3aYCTXKhU0zrhJlQeDnDHbmlL/zTjvRnbP5b/tzFUJk7iKMgGVoxKc1jyzqRdX2dPr4XyoRirC/vg6iHyS7pPznkPNKg5jCv5Nxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768974879; c=relaxed/simple; bh=RR9FWlUz+1xVRmoePtM/Bqph/SAqgDPzbxXNpm+2Xx0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UH3l7dbfwiR/6IeuVKMQqSj4PdwydXHujrl+iJ7aGJyrGgOKV5/fLSRFrUJ2ROyc57qH9kNnBf7ik2RGk21rSP6tDi2kJHzlUqNBuFHvg42DVFwNO3jjMWJDEBpmbHEHDLTFPmAMZ+Q5JE+G6Cl8Ki9F5JmCSgAhlrkVigNpTMQ= 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=glNMt0bD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Uou0uhiN; 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="glNMt0bD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Uou0uhiN" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60KL0HJi1530571 for ; Wed, 21 Jan 2026 05:54:37 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=1ykmUyUQ1bF wmEK+dIW9dl9UbR2EOlU3YHXvC7GZAyM=; b=glNMt0bDf50Bx5hpaKQx2Ab5cl4 qhjfm4joHYToHlGUYJB2gFaz7s6BUk7g8/HTOzLZrFOiPOscU38BSiNpdb83tDcE mSsVUHgoIxYUOTxN0ADhqSRLy4YV9J2G9DJRNjMUt6hqOhvg32S0QPcE8LSdHlnA 7axvkBE2PdE5F9mCJVODD/xhZKx9CjIC4O2rRtqnYvycZODxRwB8LiJWQxxTXH7H JQiUGfki6WA7bIvfUHMByiVHKFxLVldz/DDmejsiQetTDxZwBn3RH6HK/pnhvgsl EkxZujEoowaUzhx507otl0X1nybMnPFCOjUACd1sASdnny7mOotwLX17c1w== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bth83hpyj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 21 Jan 2026 05:54:37 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c551e6fe4b4so3838852a12.3 for ; Tue, 20 Jan 2026 21:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768974876; x=1769579676; 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=1ykmUyUQ1bFwmEK+dIW9dl9UbR2EOlU3YHXvC7GZAyM=; b=Uou0uhiNtS8L+vwLqFZWtP0zS4xgE3GQ7y36Ky0mEnOPRzt+hkkf/eJ/hmWeFEI0rl htUndOxVqfTIE9j43B5Sqtda5fk1xUs6sfs6xGKNow+3i4hm8BbbHmgtDDoa8xjWdfHM srxIT2b5Gp7w7RPhFY9cr6U7qDjHzTFO2kPFYnYkT3XPItaWw67AnBipZ5Y8qS75uOQm HO8ZxHS15cnXwrH5i5mNQCZgM5oc/xhnuFGSSUpFTw17Dq+XDg0t2J+G0Vo87rIzRq/7 iWTERoQ6kTVPsN0vOjqV1eTMO2jAl6JJkc9+HmjqtTp8oUi3YkY7J6jWRuUdJr8AQ7uo 4ZZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768974876; x=1769579676; 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=1ykmUyUQ1bFwmEK+dIW9dl9UbR2EOlU3YHXvC7GZAyM=; b=qJnB6f/gp3URNCZqtHK0RysvIsrVPoEf3bLLMY6F6xG8vP/cz4UvxTkuY4QDRhN8yH A2oVyiBIdk/Okajrl/xag3l05KChkbkvjGUCUtgVg4kXrpJOvljcGJBk9VUehDsfwsqN OeheeXID2gvevGrBTFYJM4YPdzSEBAjcGaCFLZ7UlMahE4FsrcjtZjZOu07GJaxFCD3N ig8PLI7BrO52BN8ZjKhQNWLbj7mrLegyGiW1F3Fb8VbkDUfAqYy7+MfFf2tTChxSjwwO 6NO+Y6dSxGLovGaydy5mHGzCAd9xaO56sDYsvrqw5eYhfUWhFtQ2i1H2iqTtNEiVKhrn GPqg== X-Forwarded-Encrypted: i=1; AJvYcCVJYNBfK/GUR+xFIT2gAP1ZSSs5z1jPTTZxcwMcXboQZAEdoOXORgxVu3RPrLP9AAc7gMdN+u0C7g82G1s=@vger.kernel.org X-Gm-Message-State: AOJu0YwUgG+KgqnJBYQAZk5fnWuwcinYOymLWqY5H8X5BsYsHjwT+593 G9dwFvsKdY+PAEfe8WSKc2dBfqpnF5Dmf/LhMHXdXO9RmF2MsnNW2z2+c4fqB5r++h7QTmTFG0z 6nyujC0yRQgeZ2mo3R47oidFcovmDtYM6MLH19t8Q+MG21593Kw13hjgaZ6Am5tC30L0= X-Gm-Gg: AZuq6aIIdpb+I4gaBc47VBeVxxB7Jqh6LUdzqv/TlaK29xAgWK3PsxJN32uVW3urNYd 7q0JpSYaIC8EukfvO3Qw2aBNzGbQfgZQnK4r0ynoE8qJ0E6Tt/lWZPosz7Ct+Go+wtf4jIbjfJU 4C8++p5CcQ9e9WAiBvm1C19SxqtcxbTJsVuyrZHcX4OdSypkYMT9892Q/Lm6JQW8N67iVEddgqk FDkhWxcfuhChEooq0bEy1Ki+cld0v7QxV7HoaHUxQa/5Mc1QCYz4o/Rlul35OacQQ9Z+CAV90xT ysOpCUoflSjuUmOZ5GcYqxAgbxy0TEiPk+hPyU5KOOJPkZEv20xMLCdqm8YVJw55/rbobfjJ41b Ce1DLYSH2AFN8jb2CaWhblNyoZNbxjw4+3T2FytP7Gwf8 X-Received: by 2002:a17:903:3c26:b0:2a0:941a:6b08 with SMTP id d9443c01a7336-2a7175395a4mr150649705ad.21.1768974876144; Tue, 20 Jan 2026 21:54:36 -0800 (PST) X-Received: by 2002:a17:903:3c26:b0:2a0:941a:6b08 with SMTP id d9443c01a7336-2a7175395a4mr150649445ad.21.1768974875620; Tue, 20 Jan 2026 21:54:35 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-81fa1278061sm13831927b3a.44.2026.01.20.21.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 21:54:35 -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, Charan Teja Kalla , Vijayanand Jitta Subject: [PATCH v6 2/3] of: factor arguments passed to of_map_id() into a struct Date: Wed, 21 Jan 2026 11:23:59 +0530 Message-Id: <20260121055400.937856-3-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121055400.937856-1-vijayanand.jitta@oss.qualcomm.com> References: <20260121055400.937856-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-Proofpoint-GUID: sSZ2IjEvFDenAmokcgPdpfxXX2TcW-LC X-Authority-Analysis: v=2.4 cv=TeSbdBQh c=1 sm=1 tr=0 ts=69706a1d cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==: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=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTIxMDA0NiBTYWx0ZWRfX21lEBe2d3IRS Mlxiktah0ZWX0IET9dLF5DuGr4oHyduXxie7D4SESbLqD+4nh5d8ronoUW98NZBweRwvPfeadti iVJjXuDnVSf5dXZ7/f+EJSjWb7Pux2XS2AJdy1MaJDWY+cgzJVdqyVuYSzuGh4Tr+YUDmAULGal +vK2pBz2IHEbRA3etXCVReCcefEepu5zsSsCHxJFlGZAYcw6+N7PUTrhGozBaWWTtb6zTcde11Z KuL/+Vb+382TDgci2EfGNmO9ojacaB8KIsmWA0beS1lntmtpgXh38J5qMuChdCcXGTCjH5v+COs wTOx2wIrYJibJXN8cnNmJuNDfYbwLUJPxbw8JY2Hn4UUNPOMNW7ia31Zj76W1llTGDNZsyt97aH Um0q/1NvY/PRUEmkWVMTifpmHuOL0Xiw0Ee04K+rvTJeYhsA25kTfYrEAciv8SlVqKH/SQWGubZ 2Hp0/ZB7Z+J2/Obex9Q== X-Proofpoint-ORIG-GUID: sSZ2IjEvFDenAmokcgPdpfxXX2TcW-LC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.20,FMLib:17.12.100.49 definitions=2026-01-21_01,2026-01-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 bulkscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601210046 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 57420806c1a2..fa0acabfd420 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2102,8 +2102,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 @@ -2117,21 +2120,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 @@ -2173,18 +2176,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, @@ -2193,11 +2193,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