From nobody Thu Apr 9 15:00:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1772998502; cv=none; d=zohomail.com; s=zohoarc; b=Jzti47sZ+4b26TNQrqgufmxa7VOQPWUFUyQ7Q0IaQAFyXmALN5fSvgCBeNFEPiUMp86oT/OiQjQZb6s/ETNw2kY0rfSzXv917Lpnjgtx12frdbzWtUY8iQuU77e1Bgpl6dXV2SsYg5lDfMevX1NmnU3C2SJ/YVZJ+i8aGr/S5QY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772998502; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pdnRU8Mu/D+Ngm/KfTZjC7mxZZbYL4Ii8ecgzHXdwuA=; b=N3/pByqcG4aca234EN3d7VZ9rL0MjIt1FCa4j29CvbHor232iEMff6/Mgy83KqVnrFqXZLXLAcdT2l/HqKXW98RwIiZCsofFt/ixKtGrJ/7WQJBcfjHX6SOjCdBbFKVyfBsZz+qAgyj6HZgyeXeNUdaK3xjwVrhH7xq+H+NMbLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1772998502518794.9706499064702; Sun, 8 Mar 2026 12:35:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1249008.1546565 (Exim 4.92) (envelope-from ) id 1vzJtn-0004Es-7J; Sun, 08 Mar 2026 19:34:47 +0000 Received: by outflank-mailman (output) from mailman id 1249008.1546565; Sun, 08 Mar 2026 19:34:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzJtn-0004El-4M; Sun, 08 Mar 2026 19:34:47 +0000 Received: by outflank-mailman (input) for mailman id 1249008; Sun, 08 Mar 2026 19:34:45 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vzJtl-0003hg-Gz for xen-devel@lists.xenproject.org; Sun, 08 Mar 2026 19:34:45 +0000 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dae3d967-1b25-11f1-9ccf-f158ae23cfc8; Sun, 08 Mar 2026 20:34:43 +0100 (CET) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6286exNW1519313 for ; Sun, 8 Mar 2026 19:34:42 GMT Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4crcd8axqv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 08 Mar 2026 19:34:41 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-82983c9d78aso10365773b3a.2 for ; Sun, 08 Mar 2026 12:34:41 -0700 (PDT) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829a4676593sm7818909b3a.28.2026.03.08.12.34.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2026 12:34:39 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: dae3d967-1b25-11f1-9ccf-f158ae23cfc8 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= pdnRU8Mu/D+Ngm/KfTZjC7mxZZbYL4Ii8ecgzHXdwuA=; b=Qn5FjJJTz3lhNSgk g+Xt+RefjAhFAGk8IMl3Nz87OMmFmqqVgGIlvCDYIYsIZ1R9wj2wP+84HY2GztvF F/FJSoE9BKC5iNrQxU2X1FnZiI9puYMJpYY2zNAl78Af4GzVoOgCfHARbzlpOL4Y tgqBoXCfvtz5rONb4E/I7j3AGf4MOeDtq/csOfsp4e3+F5hUoS5c14HkA0wJNNXK XL7vSzDw2uA2UJ6HwJDSJj9mYD3ZllkH8AmHZ7XJK5C+z9R9z7qeOSuv/QiNZisk i6ko4i8XVHP3aWdp5x21ymdYEDxk5bJUWXcNsLn/QWRrGC0NptqHrLYvkcd0LZrQ D1wT+w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772998481; x=1773603281; darn=lists.xenproject.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=pdnRU8Mu/D+Ngm/KfTZjC7mxZZbYL4Ii8ecgzHXdwuA=; b=Kjgo3/TR3x11TOtVydQkDVR9BrXB5JcUr2w+HSy8uyJ+I6/sVTYEClxOeWe9evdZoH X1Rh3YDFzZGxGLATgJmS62xRsLsY/6SVhF/jFVsjS3eatH2C9R7bQ0YrFk2oiZ8/PDxr M0hznNaXw5/whVyS8oxKgDlzTxWwydBtbfBET4hSqrt7QA2c84JvzGl4hy8HwsWnSPLC XrWUiPYhjlZCSDSsSW10SM9wUviFb3So/VAnS64uq0wn+O9ysDcKR15NJkJTF0sdpiF8 dsfDp3UDDgPNH3NrEiDGndVFcGi9ozZU9PWlMqE9SnfUev0b5VvKn+/sakKU8lfNYncc UW5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772998481; x=1773603281; 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=pdnRU8Mu/D+Ngm/KfTZjC7mxZZbYL4Ii8ecgzHXdwuA=; b=xRoSy9F6HEIdboqdymB1c+oVxhh1v+B40T1fAbEdzi0zE7t5PVrFIvfaFsDlCMrWdd 5LrGj9QBaP2GV+bMddt8BEc46ECV+uEi7FzNwvoE+WRkQT+Ek5UliKars/W6dFzpbi4J 34TO1FD+Qf46niBbMPcUgf4Ad+kIPMopcuiVkWYFuspfKFYdIKDySdqSC35AQWJG5fbk XsAzHBk7c79GZdiilL4twimpPtN64ANc/GFhxsCe9X73YgqOw6p5WVCeo7GBAxSzwcve PAUhkDUHTcfE+EjnAujL0n7r9K7IUzNq3Jv+LBSzcQlh5Uj8d9jVIe//WhPTbQeIrOiJ SCig== X-Forwarded-Encrypted: i=1; AJvYcCXG7a6PBMNAK1MSLwzyTShkde6+SGStDZWcP6UrQc82MOAFMgy26SAYLAFqVqqsnWreqbhGTRQWSG4=@lists.xenproject.org X-Gm-Message-State: AOJu0Yzt6BPKjajRPkLZJ4Xrr3/nrFj5B8QXCuIzN9BNTUTPzIFo8cCP 8DejTGGg7Y6gGLX/kMyaJ8/NB+KbWQFgJt+9rbLY0QFPavhwGjTMAT7MfAR67kIRfk5U6FGQUcE vTCWjAwSwDCrJHj0d1eJGpNCZ9qAQgd2zl2VSDSYGWS/oDMdBPNLJyxNi7brjrkQjSJ903w== X-Gm-Gg: ATEYQzwx/pAPzk0cqsufRPcCqvCqTKiFyYlM+xPAfgIvF87h/UPD3NnHUoE1Kl0kq8Q 7+cdj4nxtb6H2YMszTweYtXbsQv4nkzSPpI8NhAWosZrdWm2P2uizfjkwa7E+kq9ATmXPdkOGIM 8Sf4B1MOFCYwAatbSe6Rbc2WMaI0T5+bNdoyOKVy4j3N7yWieBbIdKhFEWNA4Xm4oVlJTYpxL8l KkxtZ7IA/2OQsBsoB/K32n7+EcwVlt8AN1TV+pycMA2AZuKn7Vib/k7gpbTLMqqTj/lWw6z6+za 7LEm+oAHG2ko/qTndbo+dKn1gVp/dOXzw8yp5U++PHeHvV8oaHmPu2bAwmKLtfUk/AkOm2zjh/R pjiKE1nCLTczaxHZ4Kg0zLwcJkzt0WIn3VkabJZxOhL8MQgfw3OiN3KR6 X-Received: by 2002:a05:6a00:7483:b0:829:710d:a46b with SMTP id d2e1a72fcca58-829a2f7b48emr7158305b3a.41.1772998480883; Sun, 08 Mar 2026 12:34:40 -0700 (PDT) X-Received: by 2002:a05:6a00:7483:b0:829:710d:a46b with SMTP id d2e1a72fcca58-829a2f7b48emr7158286b3a.41.1772998480388; Sun, 08 Mar 2026 12:34:40 -0700 (PDT) From: Vijayanand Jitta Date: Mon, 09 Mar 2026 01:03:39 +0530 Subject: [PATCH v10 3/3] of: Respect #{iommu,msi}-cells in maps MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260309-parse_iommu_cells-v10-3-c62fcaa5a1d8@oss.qualcomm.com> References: <20260309-parse_iommu_cells-v10-0-c62fcaa5a1d8@oss.qualcomm.com> In-Reply-To: <20260309-parse_iommu_cells-v10-0-c62fcaa5a1d8@oss.qualcomm.com> To: Nipun Gupta , Nikhil Agarwal , Joerg Roedel , Will Deacon , Robin Murphy , Marc Zyngier , Lorenzo Pieralisi , Thomas Gleixner , 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, linux-arm-msm@vger.kernel.org, Vijayanand Jitta , Charan Teja Kalla X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772998436; l=10158; i=vijayanand.jitta@oss.qualcomm.com; s=20260301; h=from:subject:message-id; bh=Y3y9pnEGS/egnRkn7PRxW9/ZOSrIlXJJq3NDQFYUkD4=; b=JZchFxd3ySsovmwflK1CY4cBpmFZDZuap26lOuWwIhv+ZaGNWH/gkD4Mmfup1E8EbC1OrXdH4 VkkiDPdY1+8At/dTkuN9k5uBn4Rr7Byfuai9q397xPmXXKr22BEBwBT X-Developer-Key: i=vijayanand.jitta@oss.qualcomm.com; a=ed25519; pk=Lpi7Cs3wHe8KZtqvyci7FTOLzsKpEHKGCaPNZw+1zRI= X-Proofpoint-ORIG-GUID: rAqveGw91SEypSAsSTClqs5-1YdkwrYc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA4MDE4MSBTYWx0ZWRfX4U33t7S8rava xhtu05KdxPmtfwh9t2JOMvSeEjT31Nsrv8pcnck49unloq10KcHvAtlcYuH9vQFdflV8KoFJ0+V F3iwuDZxMtJ3KU22IZGigrQ1j26XgiqkdBhT0CumV0pZB7gRFGFbCGVxUgRNxCnUPzT6aTGMB9z HEcEPdzYq2KjTjquOdiJwDl8Fm8+P+G5z+h2AVadwi+J8GzWbL5ERXNkt+a01sIdQT92x54aKBq vmhBdCY7PoV/OklhXLf1HkNB7SZp70UJ29jpyL7TgFTAF99Mzz/eXsd3qB0SBSC7w1jx3y5s1HB Bj5eyQirpCQxsfhfncvxyv8UcgXHmHCRAV1GgXq5ZKbPYPfvrgSAyszCTmdX+zhePbFJTX3Rb1T W5VZQvUN5+T3DOLlM0rRoIPTXmKAsA61oWcBjWycido+8nV3nbFmN4gdr1JlvoWDJ83gczsSa2v 5sQ1JMumDw8tFEahNHw== X-Authority-Analysis: v=2.4 cv=O/w0fR9W c=1 sm=1 tr=0 ts=69adcf51 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=wJGdY9mNwEi-N7fqGJcA:9 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-GUID: rAqveGw91SEypSAsSTClqs5-1YdkwrYc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-08_05,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 impostorscore=0 bulkscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603080181 X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1772998503504158500 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 | 129 ++++++++++++++++++++++++++++++++++++++-----= ---- include/linux/of.h | 6 ++- 3 files changed, 109 insertions(+), 28 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 b6e07c5fe715..9c44eb6d445d 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2096,16 +2096,46 @@ 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: pointer to a &struct of_phandle_args. On input, @arg->np may be * set to a target device node to match, or NULL to match any. On * success, @arg->np will be set to the matched target node (with a - * reference held) and @arg->args[0] will contain the translated ID. + * reference held), @arg->args_count will be set to the number of + * output specifier cells as defined by @cells_name in the target node, + * and @arg->args[0..args_count-1] will contain the translated output + * specifier values. * * Given a device ID, look up the appropriate implementation-defined * platform ID and/or the target device which receives transactions on that @@ -2117,17 +2147,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, + 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; @@ -2136,11 +2168,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; @@ -2153,27 +2183,69 @@ 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); + of_node_put(phandle_node); + return -EINVAL; + } + + if (map_len - offset < 3 + cells) { + of_node_put(phandle_node); + 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); + of_node_put(phandle_node); + return -EINVAL; + } + id_off =3D masked_id - id_base; + if (masked_id < id_base || id_off >=3D id_len) { + of_node_put(phandle_node); + continue; + } + if (arg->np) of_node_put(phandle_node); else @@ -2182,11 +2254,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 @@ -2196,6 +2271,10 @@ 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); =20 @@ -2214,7 +2293,7 @@ EXPORT_SYMBOL_GPL(of_map_id); 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); } EXPORT_SYMBOL_GPL(of_map_iommu_id); =20 @@ -2233,6 +2312,6 @@ EXPORT_SYMBOL_GPL(of_map_iommu_id); int of_map_msi_id(const struct device_node *np, u32 id, struct of_phandle_args *arg) { - return of_map_id(np, id, "msi-map", "msi-map-mask", arg); + return of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", arg); } EXPORT_SYMBOL_GPL(of_map_msi_id); diff --git a/include/linux/of.h b/include/linux/of.h index f50d7a3a3b28..953f2dbe0e86 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -462,7 +462,8 @@ 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); =20 int of_map_id(const struct device_node *np, u32 id, - const char *map_name, const char *map_mask_name, + const char *map_name, const char *cells_name, + const char *map_mask_name, struct of_phandle_args *arg); =20 int of_map_iommu_id(const struct device_node *np, u32 id, @@ -934,7 +935,8 @@ 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, + const char *map_name, const char *cells_name, + const char *map_mask_name, struct of_phandle_args *arg) { return -EINVAL; --=20 2.34.1