From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8964FD0058 for ; Sun, 1 Mar 2026 08:36:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Mbns5ViOe94sVRFpbuwhgj3c35clcURMMrJnuCno/wA=; b=UYNqz+3JJLZmD86BkSRUBw1RKE 5BvqqLzEnceyTfFcAoX4xuogSU6ldSHbbv5dGHa2AfK4/IznaniUKGvPtyB2Ps1LEkIhXPvAxnZNm I/a7uedqi6txBiCqNu2+rdpUwZX2IaGm5QGcRaCKlmDxK8McV3nN9cpzv4BC/ydj5dq4PKPIl+VkV as4V5ttQERnRMMT8ziBSKNh0vgpxpl+HHwSzDdPODSoZGag/zRLtD/2LOYcg8HVanbqsXJ8Gw1Zba TtyWqt1waTti/0sz/TXhStO37IQ4VpioUMhUECZfdBfjbBevTiIV/36LusT/UeSuUTGK83KtW+rfe E2Hwk8dg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vwcI6-0000000Ay54-2x0g; Sun, 01 Mar 2026 08:36:42 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vwcI4-0000000Ay3p-2KZS for linux-arm-kernel@lists.infradead.org; Sun, 01 Mar 2026 08:36:41 +0000 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62130ob64148349 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 4cksg72bvc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 01 Mar 2026 08:36:39 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-35983ee9f3bso500117a91.1 for ; Sun, 01 Mar 2026 00:36:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772354198; x=1772958998; darn=lists.infradead.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=baU79TJ3ScFmaNO3wG1348BmtpD6YCctYFWljgqF74UvgTojolWzWSLK0Zvoj2+LEE 4s7yRgIn4s0O3EtV3J1F8KZdeefHBhi7PBeEw1UA5EaD+z5+p1VS8tz2f8eT9dbUIzRH xJPxb/8FLjUffja9HxtG/yjHxjfs8QSddH0C9ZSzGulgipcWjAW/efNkaxRC7GQlOiNT zY1v28RxZDIgv05AogXZBA6c4s0gG8W01ugxT7SLIZSH3AissR6nRC7AnZuXROOBA8xd hKTZU5cijn21H7JXMXl3YTZWHbA+LDvjKWvsvhbsGayqn3PTpQgC7/yAi/WzlFiGNPm9 NgIA== 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=POCwnpzMISeUqzM0nbCzwCYs+poIxN1tl4PsgM9Csrxt+YiPUHuQyTwNF8K/7S25Yl ZKdgvNzpQcF7PF05yjqyvZa5LGLMpgYhVoVxtWdyPSQFLAAeqlhZHFqlnqo4vuEBoZgi +zO2jTH3m/q/zuYofWkkQ8TNKIkYavbailFaSVGa483rio5u/ThR68IbZImuSDd/08bx hdFhp3FEbDLfCEDpsEkATLFL/Am47x46k9aNP+OVU//C6WHTYGU7B7j19RuVRlXr4zso 61230CZ2C80/AxRQOMveY9UWsKOiTPohGYhu5hLnSJp3nDSjXaTp1zUa3PE1AggutEv/ WwEA== X-Forwarded-Encrypted: i=1; AJvYcCX89KYtKij7ScKKsJITvr8Nxdn/smF5OW7PElwMS6Sn3B7vW/uRO1/YAPK3GrFhB9HcHckYSXRfVngBC6YP8wAk@lists.infradead.org X-Gm-Message-State: AOJu0YypK7iisE99pq2u8kEdCVTDskZ0EwpXhgAECe5s5UMNAj7/clKY S1kzsk1P55vKxqV+EXxjgcrqEJLCgySeB9cD49Nj4JW4pp1uSLKV+6u0qyt24dOPX6xJQFRm8yw 03kK7FSrkwhR4FO0E2JuTlDmm7uyFrEVuveO1Cghyi1/7a00zQNDQ6fy7JeJmF3wVEwe1pBXtgm k7yg== X-Gm-Gg: ATEYQzxkPizy2UM0L1xvg1TOgrxUOmZZ+FWbjPfPDWPl41RXVVf/O5iGwT8eSlmM1un /ovfU1G1LnZ2tw0HS/vS9+0grRIzSRYqTwNmfpVScZnqx09XsFPenBV+MfS2sK/CvBJwkPiZtp+ WuHzAPiqbXFSzqqmB6MqoWZANvOzC3rHN3ajPX/AASy/GiajbhDRRptD+iNmxaAJm4+2sATCBsf 58E2Rki0mLgDleEXj1925bjZLFImP1Wd9t4D7KUP0gp+N3ZrMsEY1yIS54shKBgSYCVnqNEC3RP l/TB5ltN96tnm0M6LQXuClo7PII4d+dgD1J3Qu5OWB37MPX1H7/M4HndfV+uouMU+osW48yHius GFQz6vEdv6qqXBsGyj8ynlKXzr57EaaBhHF1mAki7T4KaLz4TNhvOZA/W X-Received: by 2002:a17:90a:fc4d:b0:359:1cbd:5495 with SMTP id 98e67ed59e1d1-35965c27e66mr7272905a91.6.1772354198009; Sun, 01 Mar 2026 00:36:38 -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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-ORIG-GUID: riMzZlOdIXUtG5obRsqB3Eigf8I6sXRW X-Proofpoint-GUID: riMzZlOdIXUtG5obRsqB3Eigf8I6sXRW X-Authority-Analysis: v=2.4 cv=FaA6BZ+6 c=1 sm=1 tr=0 ts=69a3fa97 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=ZpdpYltYx_vBUK5n70dp:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=wJGdY9mNwEi-N7fqGJcA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzAxMDA3NiBTYWx0ZWRfX6rn04KDhHnZR KmTUxD6RMqSWFVWAFP2fXy0h4kFirdacJFLH03E6gkZKhCslqDo0lqbGuKbMVAdlQ9dKaLrIMiR 24rfAVFtp+YlXwO/faEPB96HiWdzhI5tHl4W94Of2CkjzjsgTQXuQMSo4dzwAWgrOMhs1gnYmrp tuqVsaMNNzqqO6iIM1aRZ+EP4ScaEvtJuZqxOmWFfhJ0g5Kc7IWYsUDgI+whmsDD/b5knveb9QA 8Q2Vu1nkuPCIdj+JWuODSSBHSDYm/Oiq0Oyx2YfdE2RsrZ5KXlvDVdPXS5YIDUoGaOAP1qRIiCp 5ZZWQfwu7tmhLKpCrZ0UJMdfRAA5htXJQ5H6Sk9DrOdr4v6F9hroPQ7p6pYT3GMz3yIPszugLsj CXyM9VkncZodefpJFHMS2G2UVDYk7Z2iaCANEi2cu1ahMG7WpEynLWiMngPz2ErEQEmkEmuZtzw dNcLOCKbCF/LmjjCKOA== 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 impostorscore=0 clxscore=1011 phishscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 bulkscore=0 adultscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603010076 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260301_003640_726497_1FDEBD63 X-CRM114-Status: GOOD ( 29.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 = { .args_count = 1 }; + struct of_phandle_args iommu_spec = {}; int err; err = 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; } +/* + * 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 = <2>; + * + * Device node: + * iommu-map = <0x0000 &smmu 0x0000 0x1>, + * <0x0100 &smmu 0x0100 0x1>; + */ +static bool of_check_bad_map(const __be32 *map, int len) +{ + __be32 phandle = map[1]; + + if (len % 4) + return false; + for (int i = 0; i < len; i += 4) { + if (map[i + 1] != phandle || map[i + 3] != 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 = 0; + bool bad_map = false; const __be32 *map = NULL; if (!np || !map_name || !arg) return -EINVAL; - map = of_get_property(np, map_name, &map_len); + map = 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; } - 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 = map_bytes / sizeof(*map); /* The default is to select all bits. */ map_mask = 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); masked_id = map_mask & id; - for ( ; map_len > 0; map_len -= 4 * sizeof(*map), map += 4) { + + while (offset < map_len) { struct device_node *phandle_node; - u32 id_base = be32_to_cpup(map + 0); - u32 phandle = be32_to_cpup(map + 1); - u32 out_base = be32_to_cpup(map + 2); - u32 id_len = be32_to_cpup(map + 3); + u32 id_base, phandle, id_len, id_off, cells = 0; + const __be32 *out_base; + + if (map_len - offset < 2) + goto err_map_len; + + id_base = be32_to_cpup(map + offset); 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; } - if (masked_id < id_base || masked_id >= id_base + id_len) - continue; - + phandle = be32_to_cpup(map + offset + 1); phandle_node = of_find_node_by_phandle(phandle); if (!phandle_node) return -ENODEV; + 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 == 0 && cells == 2) { + bad_map = 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 = 1; + } + } + + out_base = map + offset + 2; + offset += 3 + cells; + + id_len = 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 output specifier\n", + np, map_name, id_len, cells); + return -EINVAL; + } + id_off = masked_id - id_base; + if (masked_id < id_base || id_off >= 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 != phandle_node) continue; - arg->args[0] = masked_id - id_base + out_base; + for (int i = 0; i < cells; i++) + arg->args[i] = (id_off + be32_to_cpu(out_base[i])); + + arg->args_count = cells; 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, - 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; } @@ -2198,5 +2263,9 @@ int of_map_id(const struct device_node *np, u32 id, /* Bypasses translation */ arg->args[0] = 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); 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 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); phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); @@ -927,9 +927,9 @@ 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 of_phandle_args *arg) +static inline 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) { return -EINVAL; } @@ -1460,7 +1460,7 @@ 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 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", arg); } 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_node *np, u32 id, struct of_phandle_args msi_spec = { .np = *target, .args_count = 1 }; int ret; - ret = of_map_id(np, id, "msi-map", "msi-map-mask", &msi_spec); + ret = of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", &msi_spec); if (!ret) { *target = msi_spec.np; *id_out = msi_spec.args[0]; -- 2.34.1