From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 8F5EA126C03 for ; Wed, 8 Apr 2026 03:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775620068; cv=none; b=H+Eljj8wp8ihi7iwDTGVFCSmwFDmIU5kdDa3WQtIZzI3oDocgT44VtVqb9DHp1bRy42LYicz8Wjw9o7p0JonkkVXcfFhaME0KwJN9uS7Z0rMP2glvk4Tdiln2le2/xi9S/3Ff9OMaMcyDsSmzR8K2NDF2NqCjgNmnyRZIrfrvoE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775620068; c=relaxed/simple; bh=pMFX+LeFgJSTxxETFjnvpRUhBrVx0ucO51SY4a1q804=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ujatdoD5a0fNDi2jKlqsu9HMixsZLaJ9tGlgV3jGZxVJ+ZlFyVjdle74WnUxtgyIeKPn+SJBIDKWRteK/Q7sZpKuAwX55MdSQ4pQRn+DytyiX3WWqbI9eIj6w9S8tbLaINuTx9JxvCJpa3BHzdEvoeYtQEfBc4FTdW+IHGpkQhI= 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=DquyzA2V; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=R1HqIgA/; arc=none smtp.client-ip=205.220.180.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="DquyzA2V"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="R1HqIgA/" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6383B3152411864 for ; Wed, 8 Apr 2026 03:47:45 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= Y5GqDnKn52rUOOKe43UhTsLV1PBh6CrPSK05M/M7TzU=; b=DquyzA2Vf1Yevkcc ZrdAzF3JRX7sEPuqvNjEnuv1kpB8b+YREurAOYRZx5WAt/g2Js1VA6rI27HSqMXo UMCb/9cM5rt1ZYjcsuvGWl2bfqRYXkdb/uVuBsVv3S9WknVIqfKnJh6lfLpIHCJg 9IUQE2nY6cFF2ypn1jieQjuymNiOogMutndGk2dlGUlGS9lKWQbZFXA6LWU8q1dZ JiZzeXWLO5CBHRwd4dylqnu+RedxsoYjO2jX/EAPejAgrwafivbwjW3SC6L+Fp8O 3xC1heXYvzX0c/k2zPTwagU3QWjOOJOVusysRZvZevb+NHOwl9fcbbA3SAZY8wti /0h3NA== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dd61v9und-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 08 Apr 2026 03:47:45 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2b249541063so55993895ad.3 for ; Tue, 07 Apr 2026 20:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775620064; x=1776224864; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Y5GqDnKn52rUOOKe43UhTsLV1PBh6CrPSK05M/M7TzU=; b=R1HqIgA/mdHU2hTEfEEIHj7EtXRAJ2voMK3FJVFJ1AmyB5VTUX7Hrso5WBNuexeKKm kgVGDtZ2zKN5cQfp4WOOVE1XdGuOnqniTX7VeJosyeExOWbCzw8KhPpwYCibln/MrKW6 7tKcbi8ahe/CEw8dl7iBE4Xc8uBfrMyC1Ohz+KcsHP7/3FqcmzLL1ZzNdQAVy0bfI+LZ 1psQcN7M5tnEjLzqiXtvFXy+BrTZIMEGkRYNiMMyni6SmHRD8OOmolVMb8U2pdoZNvzL e3VYKkzIeM0tZfdSZSCZquf0VUU5jnaPnPOcH78th9cU3LHyCcuBoUuRsOA3j99/LZ7l fUXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775620064; x=1776224864; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y5GqDnKn52rUOOKe43UhTsLV1PBh6CrPSK05M/M7TzU=; b=gkuIQygTHToWZdm/taeIspaHbd2Ag7lcrNxNGknLPdXLxnYjwnIy19Un8nAstSzyk+ OmvVRoO0hh+0MTE16Echn0eThl3ipQX/HvZAkJ2d2FnhO6qHJIWs+vh5dBVL21iFZ5xt wTW/MA5hgSSFaXXEQ09oMdN0u3+4T4OCOeliVYh1pYFDC/fDZqzSjIjmgdmTItjCon2y yFlGBP8+Ad7x43MHnjgJd+J4VE8oPoTbMCuBqLF/PQNDkJaOXl3YxiGsNzfMIitrWPaF bSmGNxsdPGGiWgkzs1YHJmEax+BPKfzYNvPOwYsuHTn+Bla5J0DSc2RELj8zQkEmPMb6 8bhg== X-Gm-Message-State: AOJu0YxRLAEin/tgHdrZukbdE3L4YJf+qoNyx42/f1L+VVNVKr/aJPlS +F0uUjNhj4Qx4PcW/AIGiTe1A5dKQrfMl4n9fa9Y0myLji8o8DqRvD67AyVPUeIAHEdG4ATp/Xk caXIYoJQL9ar9+I1GM5VJWoVg6pDYI5jNmhPbOdPSEhbKfPLisCZWTIJRs8W/XNjE6xI= X-Gm-Gg: AeBDievoWwK5v/1MrWJd+6SOzS/Bj+SBfUGhe+z0CCLuJveXVA/xZAa3mS1tbx2J2eo qydohrA3pbkBPVG/7DxalWLusDic1IzPRpvb/BD0/Dm/+/+uN8EyQxpVeOU7e/3P494rHm+82P/ 78N5fXt2FshdjcarGs5ZjaFi79vh0EOMudZ3Y2/KUCn0A6MDIBSWUWr+0of/fOtJhpBQymHJNze EQGgSOU+MyPDwn5LAKz2QGhWNFUwERS05U+qXi34liDeKe86aMvvz0Lt1IsWG/9M9VDDJKfXy3/ 9yo0TaixLCLTvaAR/6fR++yUD8JkwUfstS9idZ/y9tgi61mgF2MYhKDtcJPmher3qpuDHj+bAAU D/0cTRDPMt6jiU9rLhXmTHqtIAtWLDScQJ//T/esZiBxKG+CzSw9K3yLM X-Received: by 2002:a17:903:2ec7:b0:2b2:454f:b951 with SMTP id d9443c01a7336-2b28176a3cemr203121805ad.29.1775620064297; Tue, 07 Apr 2026 20:47:44 -0700 (PDT) X-Received: by 2002:a17:903:2ec7:b0:2b2:454f:b951 with SMTP id d9443c01a7336-2b28176a3cemr203121315ad.29.1775620063681; Tue, 07 Apr 2026 20:47:43 -0700 (PDT) Received: from [10.219.57.109] ([202.46.23.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27478b64csm194156625ad.30.2026.04.07.20.47.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Apr 2026 20:47:43 -0700 (PDT) Message-ID: <92ee00a9-0094-4481-9156-709b94ba3b82@oss.qualcomm.com> Date: Wed, 8 Apr 2026 09:16:39 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v12 3/3] of: Respect #{iommu,msi}-cells in maps 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, Charan Teja Kalla References: <20260331-parse_iommu_cells-v12-0-decfd305eea9@oss.qualcomm.com> <20260331-parse_iommu_cells-v12-3-decfd305eea9@oss.qualcomm.com> Content-Language: en-US From: Vijayanand Jitta In-Reply-To: <20260331-parse_iommu_cells-v12-3-decfd305eea9@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA4MDAzMSBTYWx0ZWRfX7tBdXvD/5KND c5Vc6i+cvf1ef5krDzZcinqih17QSDzwBIE9+laLl+Ejaz8jsS7YsQh12FUAqqV3rIhlIOo6KZz 46dtJuALwWejf/UOTkRHPOGbIMF7CEhiJ7GTA4MyF2dFF91bN4r3nxlXm+w9/jPO4jw5OTXjoiA 8Iqlu4Av1Y+A79/jZeAZG61ERgbKTbDctEj1+HU7iPC/r24bkTfi6oSRIxHjb83mdvy5RlVkchy 28j+cmLWfMlSvJQp2JB4VVkdZ1QUISoWjelgA2uSY25rlkh8687q/zueeDaMHgERZjdTxPGXoyz EJKvSBzBpDCUDuAqWvkOSWP09L+lPMG+Btt93hcghqQxiXXjwJjCk9FQ/WojjANOEFIiGfJRpkM Ko92T8X7noE+PCzRyHwV4NtZFjsAUY6CLNrw0B7DbCxfueRwPykTrYkgyQZ0IvVVx3y2pg9yGdM V6yv63Z8xa0RyvLFuHQ== X-Authority-Analysis: v=2.4 cv=FecHAp+6 c=1 sm=1 tr=0 ts=69d5cfe1 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=j4ogTh8yFefVWWEFDRgCtg==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=OsyBWCJeBE2wmg0BnjgA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-ORIG-GUID: bd-qHnA19HQodk2V0jZPK3tUA1C-1Tv5 X-Proofpoint-GUID: bd-qHnA19HQodk2V0jZPK3tUA1C-1Tv5 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-04-08_01,2026-04-07_05,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604080031 On 3/31/2026 7:34 PM, Vijayanand Jitta wrote: > From: Robin Murphy > > So far our parsing of {iommu,msi}-map properties 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. > Update of_map_id() to set args_count in the output to reflect the actual > number of output specifier cells. > > Signed-off-by: Robin Murphy > Signed-off-by: Charan Teja Kalla > Signed-off-by: Vijayanand Jitta > --- > drivers/of/base.c | 155 ++++++++++++++++++++++++++++++++++++++++------------- > include/linux/of.h | 6 ++- > 2 files changed, 123 insertions(+), 38 deletions(-) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index b3d002015192..7b22e2484e1c 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -2096,18 +2096,48 @@ 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. > * @filter_np: optional device node to filter matches by, or NULL to match any. > * If non-NULL, only map entries targeting this node will be matched. > * @arg: pointer to a &struct of_phandle_args for the result. On success, > - * @arg->args[0] will contain the translated ID. If a map entry was > - * matched, @arg->np will be set to the target node with a reference > - * held that the caller must release with of_node_put(). > + * @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. If a map entry was matched, @arg->np will be set > + * to the target node with a reference held that the caller must release > + * with of_node_put(). > * > * Given a device ID, look up the appropriate implementation-defined > * platform ID and/or the target device which receives transactions on that > @@ -2116,17 +2146,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, > const struct device_node *filter_np, 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 (filter_np) > return -ENODEV; > @@ -2136,11 +2168,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; > @@ -2153,39 +2183,82 @@ 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); > + of_node_put(phandle_node); > + return -EINVAL; > + } > + > + if (map_len - offset < 3 + cells) { > + of_node_put(phandle_node); > + 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); > + of_node_put(phandle_node); > + return -EINVAL; > + } > + id_off = masked_id - id_base; > + if (masked_id < id_base || id_off >= id_len) { > + of_node_put(phandle_node); > + continue; > + } > + > if (filter_np && filter_np != phandle_node) { > of_node_put(phandle_node); > continue; > } > > arg->np = phandle_node; > - arg->args[0] = masked_id - id_base + out_base; > - arg->args_count = 1; > + 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; > } > > @@ -2196,6 +2269,10 @@ int of_map_id(const struct device_node *np, u32 id, > arg->args[0] = id; > arg->args_count = 1; > 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); > > @@ -2205,18 +2282,21 @@ EXPORT_SYMBOL_GPL(of_map_id); > * @id: Requester ID of the device (e.g. PCI RID/BDF or a platform > * stream/device ID) used as the lookup key in the iommu-map table. > * @arg: pointer to a &struct of_phandle_args for the result. On success, > - * @arg->args[0] contains the translated ID. If a map entry was matched, > - * @arg->np holds a reference to the target node that the caller must > - * release with of_node_put(). > + * @arg->args_count will be set to the number of output specifier cells > + * and @arg->args[0..args_count-1] will contain the translated output > + * specifier values. If a map entry was matched, @arg->np holds a > + * reference to the target node that the caller must release with > + * of_node_put(). > * > - * Convenience wrapper around of_map_id() using "iommu-map" and "iommu-map-mask". > + * Convenience wrapper around of_map_id() using "iommu-map", "#iommu-cells", > + * and "iommu-map-mask". > * > * Return: 0 on success or a standard error code on failure. > */ > 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", NULL, arg); > + return of_map_id(np, id, "iommu-map", "#iommu-cells", "iommu-map-mask", NULL, arg); > } > EXPORT_SYMBOL_GPL(of_map_iommu_id); > > @@ -2229,17 +2309,20 @@ EXPORT_SYMBOL_GPL(of_map_iommu_id); > * to match any. If non-NULL, only map entries targeting this node will > * be matched. > * @arg: pointer to a &struct of_phandle_args for the result. On success, > - * @arg->args[0] contains the translated ID. If a map entry was matched, > - * @arg->np holds a reference to the target node that the caller must > - * release with of_node_put(). > + * @arg->args_count will be set to the number of output specifier cells > + * and @arg->args[0..args_count-1] will contain the translated output > + * specifier values. If a map entry was matched, @arg->np holds a > + * reference to the target node that the caller must release with > + * of_node_put(). > * > - * Convenience wrapper around of_map_id() using "msi-map" and "msi-map-mask". > + * Convenience wrapper around of_map_id() using "msi-map", "#msi-cells", > + * and "msi-map-mask". > * > * Return: 0 on success or a standard error code on failure. > */ > int of_map_msi_id(const struct device_node *np, u32 id, > const struct device_node *filter_np, struct of_phandle_args *arg) > { > - return of_map_id(np, id, "msi-map", "msi-map-mask", filter_np, arg); > + return of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", filter_np, arg); > } > EXPORT_SYMBOL_GPL(of_map_msi_id); > diff --git a/include/linux/of.h b/include/linux/of.h > index 8548cd9eb4f1..51ac8539f2c3 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); > > 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, > const struct device_node *filter_np, struct of_phandle_args *arg); > > int of_map_iommu_id(const struct device_node *np, u32 id, > @@ -934,7 +935,8 @@ 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, > + const char *map_name, const char *cells_name, > + const char *map_mask_name, > const struct device_node *filter_np, > struct of_phandle_args *arg) > { > Gentle ping. Thanks, Vijay