From nobody Tue Mar 3 05:12:30 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 79B753328FB for ; Sun, 1 Mar 2026 08:36:39 +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=1772354201; cv=none; b=LenUXBYKWTB3gAfIwYs4Krq74stysXtevJpg3gDODLwhLq9J++I3wgPmDcf1ibYQ0sCYQNXHZUBPxsVSqh0YtOaBmAcIea0mUjXR7Kr+piHJ9G5j9xalThjDNHsp2Y7nrtHgl6ap+8DyP7iEUPLSlSpHDMAEB6uiWqZppypUq/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772354201; c=relaxed/simple; bh=NfNLrzNrGymqGMB2uOcdB5Nw6djQzkbMXLBiAj+f/q4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W0sx8vKvWHxF/bBagpepGjs8P67MTi/zpwHk81YdRhwHhSgeLr9KvKX+/RlX5rD9xmucEPwUH0hU+lMaaSQ1MqEPpuzufU3z/fhWLoIw0vKx7taojPzWfpeMAWJ+E6xUiuH15LLQC+7ZKgKBci+rbyBXTSN/W2LA4IJYHo6YU4o= 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=fTkYFz6C; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WNRNYyfa; 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="fTkYFz6C"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WNRNYyfa" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6217vngL1230077 for ; Sun, 1 Mar 2026 08:36:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Mbns5ViOe94sVRFpbuwhgj3c35clcURMMrJnuCno/wA=; b=fTkYFz6CiVqazCX2 HTXagNtEtcQRIN6wvUVsLdCw07hKyjPEewUZRvCwa8dDai/5kVaxSvtL8RKefS+T gQWEc4/o7mm6EGM1OSBic7RRsSrE6yPDZnZOXIG21FB0RUWI4o7S460/jm0zcLqN SPTr19hsIvyM6Dd8+CT9kv8I1NHPPhC/hnmDV8rG34uIDV7vKYv+yl2pIzs3WGDr bvjjEoQ22tDCxT9GWSjMqvRnQ2oFi84m6HLbMMm82jnxb21SDTuSQclkO+aB96a4 JJADZsd994wcfFx2VQb0uneydrRhfFZr7EMD0/wnDmjhxtDew0TMThwOoOCZhRbH CaB1SA== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ckshd2f3v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 01 Mar 2026 08:36:38 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3598ab49242so85427a91.3 for ; Sun, 01 Mar 2026 00:36:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772354198; x=1772958998; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Mbns5ViOe94sVRFpbuwhgj3c35clcURMMrJnuCno/wA=; b=WNRNYyfaX+QNFP39ZVsrF4oiRaU/b/oJefXxUUQv2fNCDcKfNy53bEMC5eVA4itNdw MgN9PPRd+oC7stxerp4Kx1PMRiHOF5sPdUc2oSs+rdhaONmU3GjborGOyvkKuGEKuWHU SNiJD7sp0b5npw5DLMQQAED0WzNMy0Vf7JXfQjBqcr7fBZSJrDzZt32AunnSdhy4alqu ANUc/PD02EueTQKm1hLRdMUCI2rl5Q8tO1iZhRnFMdzAlUyAsOkNWp1UFR9vU8iw62NO y7/kdysjGKWJS+BTs+MGbMCgiUYy2lzeIF2Rs3ipGi/79YZV4cfV932oT1QO5tB1uD2q fFGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772354198; x=1772958998; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Mbns5ViOe94sVRFpbuwhgj3c35clcURMMrJnuCno/wA=; b=q1XCflYX+MIgvI9chZP4LJnivklFzbAkKPAm5R30kmKS9FJJ0WLfClwd7UzMMoZhC4 NvpY+0aQFeEXadA5oFUQP/h3maha2Krj9B02oKlS5ROblmApMeHtauNzr9jq4hCmyqgi v0RixYjTKW35t44/Jndc+yVFpHv7Vc0FhXeHqUOMKRqgRirfZiO3R22ar6ynUYlmKima l3C85AQ7bomVGX+GWEnkz2zJSEiPFDw4bvu53TVCUFUV+jjydenE+td2WtwKr/qLFH6/ 3nkB9UHvHXuD3TGCDwI6NtGPbqgr2NddbPU8/U8c4imCiErNvcF8mG/X+0jy0azgYOgG lNHA== X-Gm-Message-State: AOJu0YxPkd+cXOjUTqWa+ayTB6LvyUJUbitq8qvliExPX0EFh6B3M3Wr rV3X4oqVyCjVgiOZtdIcXHUFgDxUA6ichhh8EsXUmILGLCr7bw/zHkO/6ttC225c4sundhv9YIw Ya35Y0LlRSST39Yv6g3YPBo1pPwmsVWUtU4hx/cd6TFFL41X90M/3bEpL6gvWsfHt7HY= X-Gm-Gg: ATEYQzwDcA1osrhDnz2EII5AiyuF38MXjeKUX4jX+Ps4CxeGqFD9Hy/xbsQ1fqb233S MoDcchLwXYHd0yk5NPiTLq6J7tt7gIhaARbHav5XAcM2glGdHVktK80V+3vVjIZU54EKK8QRvrY nRTRkOHdbNOHlCKGkXWdJTVmm1SguMeEf8wtrlRNt1jCE072PQf90Vm/n7A65YytAbkiloxzNrq AzCYvFaHg/S8+OV8v/sWvz8V13p93LuAtt2l0rtzETInEWZYokqGgKKPdsdhmvz5qwdvggUIOd7 WRr1oVcsWy+uI8mbGU8PVYCJoItpCMaCLqTn9xKgcwvmmjTY79HsTafWQ8mBLOuiCIzKlt2qHRw tKgJNnbHmDOy02EKmDzAouVF/GfzK4Uio0xW5LoPpEIchq57POpKCMHLx X-Received: by 2002:a17:90a:fc4d:b0:359:1cbd:5495 with SMTP id 98e67ed59e1d1-35965c27e66mr7272875a91.6.1772354197988; Sun, 01 Mar 2026 00:36:37 -0800 (PST) X-Received: by 2002:a17:90a:fc4d:b0:359:1cbd:5495 with SMTP id 98e67ed59e1d1-35965c27e66mr7272861a91.6.1772354197416; Sun, 01 Mar 2026 00:36:37 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70fa82dd09sm9177300a12.28.2026.03.01.00.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2026 00:36:36 -0800 (PST) From: Vijayanand Jitta Date: Sun, 01 Mar 2026 14:04:21 +0530 Subject: [PATCH v9 3/3] of: Respect #{iommu,msi}-cells in maps Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260301-parse_iommu_cells-v9-3-4d1bceecc5e1@oss.qualcomm.com> References: <20260301-parse_iommu_cells-v9-0-4d1bceecc5e1@oss.qualcomm.com> In-Reply-To: <20260301-parse_iommu_cells-v9-0-4d1bceecc5e1@oss.qualcomm.com> To: Nipun Gupta , Nikhil Agarwal , Joerg Roedel , Will Deacon , Robin Murphy , Marc Zyngier , Lorenzo Pieralisi , Thomas Gleixner , Rob Herring , Saravana Kannan , Richard Zhu , Lucas Stach , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , Bjorn Helgaas , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dmitry Baryshkov , Konrad Dybcio , Bjorn Andersson , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Prakash Gupta , Vikash Garodia Cc: linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, imx@lists.linux.dev, xen-devel@lists.xenproject.org, Vijayanand Jitta , linux-arm-msm@vger.kernel.org, Charan Teja Kalla X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772354153; l=9839; i=vijayanand.jitta@oss.qualcomm.com; s=20260301; h=from:subject:message-id; bh=rMn0oPM33QyWz+pe9qSYvRaJ0TXg29twIWDnLRGtMmg=; b=2gF3YAzuiCPKTO4QehGinqQzgmCnP6QEz+si20I/lunzZCq8Cuhj6wMkXGjkBYmw7DwgsA73Z YR8Sh/N7qN1BvB2nlbfl7LdbKSKjVZ5LyP7xBrBDdJgMrAY97DdwrpT X-Developer-Key: i=vijayanand.jitta@oss.qualcomm.com; a=ed25519; pk=Lpi7Cs3wHe8KZtqvyci7FTOLzsKpEHKGCaPNZw+1zRI= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzAxMDA3NiBTYWx0ZWRfX/zm5ycieYDg7 ZuX59pyYhKlSBUEFgaUCgG5S4+5I0Sxpy9Ono6AhbdWYFOnfYfWu5wIupWHnLBdpJbHgEuzT1jo 18iWIxaaPUNH88oYVHbli/udFx7I690oJFz+raTQPLuJjHaKSvzqBtUjB34O7+eybzeIqZ6NqlO YFLiyZDGKUtZBWob4zfmMvUUW8bAKBgFAIBYVm2qIx6Vu/xW1mq9UTGgF2ZQBsqWeZ/fejCoZd6 PoomJ+1bPFygJZx84Uub6h6wxOAcxgn92JnF3KYVgHyfL7cxC6ml1/tRiOaxwbaodm1Z/1jkE5K +TE2BB/AyhYKOOin8hVSTVnQ57HS5dY64BhaoLnSYbBSVh3Ve0JDQlDd3jT1Xes11RYAcK7cTgr c+bHuzSgySShqfUUitkUhdB1cgOhYJfD1e/UusqUWDXASfqCtTv+sFi4ju8qHgK07Jm9KSj2LJe VwxTdQRxJZZjObL44iQ== X-Proofpoint-ORIG-GUID: 3N5PwsLpLaWqyvboTMOzuxanDRbr2It_ X-Proofpoint-GUID: 3N5PwsLpLaWqyvboTMOzuxanDRbr2It_ X-Authority-Analysis: v=2.4 cv=COYnnBrD c=1 sm=1 tr=0 ts=69a3fa96 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=wJGdY9mNwEi-N7fqGJcA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-01_01,2026-02-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603010076 From: Robin Murphy So far our parsing of {iommu,msi}-map properites has always blindly assumed that the output specifiers will always have exactly 1 cell. This typically does happen to be the case, but is not actually enforced (and the PCI msi-map binding even explicitly states support for 0 or 1 cells) - as a result we've now ended up with dodgy DTs out in the field which depend on this behaviour to map a 1-cell specifier for a 2-cell provider, despite that being bogus per the bindings themselves. Since there is some potential use in being able to map at least single input IDs to multi-cell output specifiers (and properly support 0-cell outputs as well), add support for properly parsing and using the target nodes' #cells values, albeit with the unfortunate complication of still having to work around expectations of the old behaviour too. Since there are multi-cell output specifiers, the callers of of_map_id() may need to get the exact cell output value for further processing. Added support for that part --charan Signed-off-by: Robin Murphy Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/iommu/of_iommu.c | 2 +- drivers/of/base.c | 117 +++++++++++++++++++++++++++++++++++++------= ---- include/linux/of.h | 16 +++---- 3 files changed, 102 insertions(+), 33 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index d255d0f58e8c..a18bb60f6f3d 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -45,7 +45,7 @@ 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_phandle_args iommu_spec =3D {}; int err; =20 err =3D of_map_iommu_id(master_np, *id, &iommu_spec); diff --git a/drivers/of/base.c b/drivers/of/base.c index 6c3628255908..596bcf993dcb 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2096,11 +2096,38 @@ int of_find_last_cache_level(unsigned int cpu) return cache_level; } =20 +/* + * Some DTs have an iommu-map targeting a 2-cell IOMMU node while + * specifying only 1 cell. Fortunately they all consist of value '1' + * as the 2nd cell entry with the same target, so check for that pattern. + * + * Example: + * IOMMU node: + * #iommu-cells =3D <2>; + * + * Device node: + * iommu-map =3D <0x0000 &smmu 0x0000 0x1>, + * <0x0100 &smmu 0x0100 0x1>; + */ +static bool of_check_bad_map(const __be32 *map, int len) +{ + __be32 phandle =3D map[1]; + + if (len % 4) + return false; + for (int i =3D 0; i < len; i +=3D 4) { + if (map[i + 1] !=3D phandle || map[i + 3] !=3D cpu_to_be32(1)) + return false; + } + return true; +} + /** * of_map_id - Translate an ID through a downstream mapping. * @np: root complex device node. * @id: device ID to map. * @map_name: property name of the map to use. + * @cells_name: property name of target specifier cells. * @map_mask_name: optional property name of the mask to use. * @arg: of_phandle_args structure, * which includes: @@ -2118,18 +2145,19 @@ int of_find_last_cache_level(unsigned int cpu) * * Return: 0 on success or a standard error code on failure. */ -int of_map_id(const struct device_node *np, u32 id, - const char *map_name, const char *map_mask_name, - struct of_phandle_args *arg) +int of_map_id(const struct device_node *np, u32 id, const char *map_name, + const char *cells_name, const char *map_mask_name, + struct of_phandle_args *arg) { u32 map_mask, masked_id; - int map_len; + int map_bytes, map_len, offset =3D 0; + bool bad_map =3D false; const __be32 *map =3D NULL; =20 if (!np || !map_name || !arg) return -EINVAL; =20 - map =3D of_get_property(np, map_name, &map_len); + map =3D of_get_property(np, map_name, &map_bytes); if (!map) { if (arg->np) return -ENODEV; @@ -2138,11 +2166,9 @@ int of_map_id(const struct device_node *np, u32 id, return 0; } =20 - if (!map_len || map_len % (4 * sizeof(*map))) { - pr_err("%pOF: Error: Bad %s length: %d\n", np, - map_name, map_len); - return -EINVAL; - } + if (map_bytes % sizeof(*map)) + goto err_map_len; + map_len =3D map_bytes / sizeof(*map); =20 /* The default is to select all bits. */ map_mask =3D 0xffffffff; @@ -2155,27 +2181,63 @@ int of_map_id(const struct device_node *np, u32 id, of_property_read_u32(np, map_mask_name, &map_mask); =20 masked_id =3D map_mask & id; - for ( ; map_len > 0; map_len -=3D 4 * sizeof(*map), map +=3D 4) { + + while (offset < map_len) { struct device_node *phandle_node; - u32 id_base =3D be32_to_cpup(map + 0); - u32 phandle =3D be32_to_cpup(map + 1); - u32 out_base =3D be32_to_cpup(map + 2); - u32 id_len =3D be32_to_cpup(map + 3); + u32 id_base, phandle, id_len, id_off, cells =3D 0; + const __be32 *out_base; + + if (map_len - offset < 2) + goto err_map_len; + + id_base =3D be32_to_cpup(map + offset); =20 if (id_base & ~map_mask) { - pr_err("%pOF: Invalid %s translation - %s-mask (0x%x) ignores id-base (= 0x%x)\n", - np, map_name, map_name, - map_mask, id_base); + pr_err("%pOF: Invalid %s translation - %s (0x%x) ignores id-base (0x%x)= \n", + np, map_name, map_mask_name, map_mask, id_base); return -EFAULT; } =20 - if (masked_id < id_base || masked_id >=3D id_base + id_len) - continue; - + phandle =3D be32_to_cpup(map + offset + 1); phandle_node =3D of_find_node_by_phandle(phandle); if (!phandle_node) return -ENODEV; =20 + if (!bad_map && of_property_read_u32(phandle_node, cells_name, &cells)) { + pr_err("%pOF: missing %s property\n", phandle_node, cells_name); + return -EINVAL; + } + + if (map_len - offset < 3 + cells) + goto err_map_len; + + if (offset =3D=3D 0 && cells =3D=3D 2) { + bad_map =3D of_check_bad_map(map, map_len); + if (bad_map) { + pr_warn_once("%pOF: %s mismatches target %s, assuming extra cell of 0\= n", + np, map_name, cells_name); + cells =3D 1; + } + } + + out_base =3D map + offset + 2; + offset +=3D 3 + cells; + + id_len =3D be32_to_cpup(map + offset - 1); + if (id_len > 1 && cells > 1) { + /* + * With 1 output cell we reasonably assume its value + * has a linear relationship to the input; with more, + * we'd need help from the provider to know what to do. + */ + pr_err("%pOF: Unsupported %s - cannot handle %d-ID range with %d-cell o= utput specifier\n", + np, map_name, id_len, cells); + return -EINVAL; + } + id_off =3D masked_id - id_base; + if (masked_id < id_base || id_off >=3D id_len) + continue; + if (arg->np) of_node_put(phandle_node); else @@ -2184,11 +2246,14 @@ int of_map_id(const struct device_node *np, u32 id, if (arg->np !=3D phandle_node) continue; =20 - arg->args[0] =3D masked_id - id_base + out_base; + for (int i =3D 0; i < cells; i++) + arg->args[i] =3D (id_off + be32_to_cpu(out_base[i])); + + arg->args_count =3D cells; =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, - id_len, id, masked_id - id_base + out_base); + np, map_name, map_mask, id_base, be32_to_cpup(out_base), + id_len, id, id_off + be32_to_cpup(out_base)); return 0; } =20 @@ -2198,5 +2263,9 @@ int of_map_id(const struct device_node *np, u32 id, /* Bypasses translation */ arg->args[0] =3D id; return 0; + +err_map_len: + pr_err("%pOF: Error: Bad %s length: %d\n", np, map_name, map_bytes); + return -EINVAL; } EXPORT_SYMBOL_GPL(of_map_id); diff --git a/include/linux/of.h b/include/linux/of.h index 9d72d76f909d..5b5b5dc2d3f3 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -461,9 +461,9 @@ const char *of_prop_next_string(const struct property *= prop, const char *cur); =20 bool of_console_check(const struct device_node *dn, char *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 of_phandle_args *arg); +int of_map_id(const struct device_node *np, u32 id, const char *map_name, + const char *cells_name, const char *map_mask_name, + struct of_phandle_args *arg); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -927,9 +927,9 @@ 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 of_phandle_args *arg) +static inline int of_map_id(const struct device_node *np, u32 id, const ch= ar *map_name, + const char *cells_name, const char *map_mask_name, + struct of_phandle_args *arg) { return -EINVAL; } @@ -1460,7 +1460,7 @@ static inline int of_property_read_s32(const struct d= evice_node *np, static inline int of_map_iommu_id(const struct device_node *np, u32 id, struct of_phandle_args *arg) { - return of_map_id(np, id, "iommu-map", "iommu-map-mask", arg); + return of_map_id(np, id, "iommu-map", "#iommu-cells", "iommu-map-mask", a= rg); } =20 static inline int of_map_msi_id(const struct device_node *np, u32 id, @@ -1469,7 +1469,7 @@ static inline int of_map_msi_id(const struct device_n= ode *np, u32 id, struct of_phandle_args msi_spec =3D { .np =3D *target, .args_count =3D 1 = }; int ret; =20 - ret =3D of_map_id(np, id, "msi-map", "msi-map-mask", &msi_spec); + ret =3D of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", &msi_s= pec); if (!ret) { *target =3D msi_spec.np; *id_out =3D msi_spec.args[0]; --=20 2.34.1