From nobody Mon Feb 9 23:57:53 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 52FD7266576 for ; Sun, 21 Dec 2025 21:36:38 +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=1766353000; cv=none; b=jzNmrBiQevuxT3u0c2lqD3/j2zz2OAeYma0l0D5CINmtpcKYntBeA0etC3D+Tb3I247flF/fYVv6109SFXXnYoUGvYq1mQCWZbKs0YzqEBOny4coYctgMNV4K9zy8Numgj1e0Xid+Y85QvzrvkDJ9PirTWc0daBAUyifi0yWSvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766353000; c=relaxed/simple; bh=16TSlotBLzuOien7sfW4ukR/bjvgeC0dcRNpEifG7Xg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MPTbJl9ooRcm+1f6yxx8mKC/yAyUApi51QZNtVjS69EW2lLOZUYm8NupeyzYHM1xGVC3+yg17qolQA8lTQrnjExHSt93fydOgjkdVI7IIKFAvN+KO7i5bdD7ZiD98O8lVRStBqrIfZ5JXeyFyXzSixak5H7o7WJdfxAjMbJVZ+A= 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=ViGoJeBV; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=S//9AJ0X; 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="ViGoJeBV"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="S//9AJ0X" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BLGQYiG598033 for ; Sun, 21 Dec 2025 21:36: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=RqYSFgOLrB+ uWxpGTvI492+ogxltyaVnqIFarGItNPU=; b=ViGoJeBVoo+qMjadqwFLZObEOSO c00Y2HktniIFEq7cDO15DlfG7N6peWCm303j3V+pt6McZ+dQQk7/CIz48FnFz7YZ YByPWAFSF1EnoBZ+UoXSecWN3nPqeCCfVkUNnWLnwds9uSp3tzhMbGiwLg//U5uP hAg9W8PFX8UhcAyMPkxORyt35iWoSE/J9Zr+lppIItgSJPD7AXAcB5CoveSa0VvC eSbdXDDgeW4pQGD3JcBWgRZslfFGCqRelubASSamIFvqi11RPXRuX8QKpu9cSvps gVgpOs/kNFcY5cawOgWXj2Jj0TBud6NbHQblZc5PS/Vcze74viE5NjFRZOg== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b5mydtwn2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 21 Dec 2025 21:36:37 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-29f27176aa7so71739435ad.2 for ; Sun, 21 Dec 2025 13:36:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1766352997; x=1766957797; 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=RqYSFgOLrB+uWxpGTvI492+ogxltyaVnqIFarGItNPU=; b=S//9AJ0X9KJIMM6D9bUfAvcTq18OKokPVM1Ynb3nZYxzbcBtMmYEnmaApUK2z980j8 qYf27fQY1ij7IlXnOdOL/1AGU9M5W5174ODgWFX8KEqCcls/Q4OhwUGbWvktrQa8LUUQ IaoUfAIUuHw3Z3fOhOjo8N3h+3i1vj8bx3iIa194CFgnnkNtxLLK28LQlNjgMzPf8Xer IXIZnPWYQ8iXe4LaTva3zavqqcRWFA26uhAGgQL3Gj8fNVsi4m0a486d2UPpTqfKzolB WpRlkcak69l5eGkWO/0sFrnscQaTsEKgob8kkMPGpP42NRlrf/WcT6G0TW8s44JT/6C6 gF8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766352997; x=1766957797; 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=RqYSFgOLrB+uWxpGTvI492+ogxltyaVnqIFarGItNPU=; b=pXRkZ86Rg69Jg2tgLUqbDIMi1auP9ecfxqit1DAL7EfMYRttoNhI8ImMj/A8cHahe8 mO04mFC5ciXk4n5YoaJloUsci1lxD7Po87cpJ+mnxXeWiFBYemMsb0+kpRxKPSoVnp18 dw5KRwtPMXYHrFKI1wKl1hPcFrR2rQRuXmbxev8C+DSld3Reks61B93bSrzO7vmBr+oy TLv9ttIcol5lBmkZk/qQP+Sli4Na0GQwxIFZ7hcyyUayQngVE+RmYN0Xxp4KIiTjVU2E rWfeKAFlputoJS7rnEtHtpoYWi3fX+YLpu1ymOfW4eXdb3L5BG8sLF10nZ99QFvVxKCo dCGQ== X-Forwarded-Encrypted: i=1; AJvYcCXUSwUB0Tyfj9jsoRGFN9CQ45p1ueE6KeheMtT8DTM/mrEMWN0ZnelbdkhBKXzud3l0SX3anc8RioOmemE=@vger.kernel.org X-Gm-Message-State: AOJu0YzqDBy0QzPcaK2q5xfLBOZ+Yp+pq1VmhTtabBOMbzfkdJWDqfjU MtglI4T6viGyGxeEAxCpt1blPciY/+CFx5gjVo6+ZNxRsWlqy/hlBM9ZFpzDY5T6GRJl+ifByXj p1i/ZMDOekisd09VypZg5pjnczPJ1fDQQvE+u9fcnEhrhrKlxiPf8iU+zG8oc4fqa09g= X-Gm-Gg: AY/fxX4XvD4+PEty2XtJxT9qi1+mpgMR9YYx+7u/Y+1NrQ8s/c6/f+UGvNNh/GLIb7k RZgHKekIiTVDwq9wfkUYIrU2LdaLZpKfVLPQoWRZN3sTYc0OOWZhZQNifWUFBiiT0CA3o5Pxksl EZKHIg1swq89+1HKbc60YQEyPW0bnjqD30KyoFbxEX4kZAW8dzNdbpErJUO27/C1jEq0zoaRXl0 hWYQIEJm/ADXylH/QeiAmkaeNj6RAmTwMpAw7LZ4Nl0ua1+N1FhZ57jdUpt6uBLvjpFTa2eF7RD U1sMEyZ8hW22WBs0H8voqqjoUCDDwZe7oO7V/N1pJdoMOsh5m8lCPEhre7EwuBvR6bX+qkoD8Br T6QYfOG+FRQDkwlrDejaa3njHWaW3zEobKil7BGJLIA8s X-Received: by 2002:a17:902:e74c:b0:24b:270e:56c7 with SMTP id d9443c01a7336-2a2f22069e3mr99336055ad.7.1766352996598; Sun, 21 Dec 2025 13:36:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEu5g6C1Tc1/CWkGZfdt5tr82xA9G23JSzp10gkHSKJVdHoKnPqLmFdhu0g4UYH98Hmqj3g+A== X-Received: by 2002:a17:902:e74c:b0:24b:270e:56c7 with SMTP id d9443c01a7336-2a2f22069e3mr99335915ad.7.1766352996108; Sun, 21 Dec 2025 13:36:36 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e70dcc7c8sm10950163a91.15.2025.12.21.13.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Dec 2025 13:36: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, saravanak@google.com, 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 v3 2/3] of: factor arguments passed to of_map_id() into a struct Date: Mon, 22 Dec 2025 03:06:01 +0530 Message-Id: <20251221213602.2413124-3-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251221213602.2413124-1-vijayanand.jitta@oss.qualcomm.com> References: <20251221213602.2413124-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: yn6VINTOUEsvXSfIum8-lKoy2VRPy0BB X-Proofpoint-ORIG-GUID: yn6VINTOUEsvXSfIum8-lKoy2VRPy0BB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjIxMDIwNCBTYWx0ZWRfX/CEwAv718Jrs 9jyoii4wKtuQiRBrToj29n5kn4QVhW77n5CI26G2UVulqHICe0wDiCiV7sfxbXmUzhkRvLybSE4 2Aql8inM5EV/udxWGqN1h668lqrB1f5kV0qEXQNN2n0RCxA3wMlzBN4wkJl36I3fZK1vhDR5mG4 Enf3LqAlL2Lu7M/Z8ZQ1qVCWY3lvldDuRDNr9ml62k6b29dp0aa9w65v85WgU2dajczi/EdBqG1 mR0TqNH3YpsA52spb74DWOJYDRLs8M/WW1rwS9BhT5iTaRLDZAvIJDXbUnQxXhDwM3Y2LQTL3D9 D76Vt9LK/+9IORHZk0J79TtyErcqpwh2DgkM7QeX1D5dBGyfN4U+fKAtimOmpxIL3YzKrUxQOMo 0+GB7Oxg/lZqRwb8jPUMV1iboKfWgi2JVfpb30J3acUExZif4gkafKZ6feKRvZDKQ/Pwvr04eix U9O39BbmrWNWMzB3T/g== X-Authority-Analysis: v=2.4 cv=N6wk1m9B c=1 sm=1 tr=0 ts=69486865 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=BO5FrL0GhfMJBgYdYhUA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-21_05,2025-12-19_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 clxscore=1015 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2512210204 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/iommu/of_iommu.c | 5 +++- drivers/of/base.c | 39 ++++++++++++++------------- drivers/pci/controller/dwc/pci-imx6.c | 6 ++++- drivers/pci/controller/pcie-apple.c | 5 +++- drivers/xen/grant-dma-ops.c | 4 ++- include/linux/of.h | 24 ++++++++++++----- 6 files changed, 53 insertions(+), 30 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index a511ecf21fcd..74779b77ba13 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -46,9 +46,12 @@ static int of_iommu_configure_dev_id(struct device_node = *master_np, const u32 *id) { struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; + struct of_map_id_arg arg =3D { + .map_args =3D iommu_spec, + }; 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 diff --git a/drivers/of/base.c b/drivers/of/base.c index 7043acd971a0..4dca3d37a34b 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2051,8 +2051,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 @@ -2066,21 +2069,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 || (!arg->map_args.np && !arg->map_args.args= )) 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 =3D id; return 0; } =20 @@ -2122,18 +2125,16 @@ 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; + if (arg->map_args.args) + *arg->map_args.args =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, @@ -2142,11 +2143,11 @@ 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; + if (arg->map_args.args) + *arg->map_args.args =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 c8da2e88e9c6..8dcdde2efb8a 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1101,12 +1101,16 @@ 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; + struct of_map_id_arg arg =3D {}; u32 sid_i, sid_m; 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); + + arg.map_args.np =3D target; + arg.map_args.args[0] =3D sid_i; + err_i =3D of_map_iommu_id(dev->of_node, rid, &arg); 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 ce21728d6e51..dea4a38cb4bb 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -782,6 +782,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); @@ -791,7 +792,9 @@ static int apple_pcie_enable_device(struct pci_host_bri= dge *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); + arg.map_args.np =3D NULL; + arg.map_args.args[0] =3D sid; + err =3D of_map_iommu_id(port->pcie->dev->of_node, rid, &arg); if (err) return err; =20 diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index b661f9c1f4fe..d455104de159 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -319,9 +319,11 @@ static int xen_dt_grant_init_backend_domid(struct devi= ce *dev, =20 if (dev_is_pci(dev)) { struct pci_dev *pdev =3D to_pci_dev(dev); + struct of_map_id_arg arg =3D {}; u32 rid =3D PCI_DEVID(pdev->bus->number, pdev->devfn); =20 - if (of_map_iommu_id(np, rid, &iommu_spec.np, iommu_spec.args)) { + arg.map_args =3D iommu_spec; + if (of_map_iommu_id(np, rid, &arg)) { dev_dbg(dev, "Cannot translate ID\n"); return -ESRCH; } diff --git a/include/linux/of.h b/include/linux/of.h index 8cd486d89da2..0b0d545b80a3 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; @@ -458,7 +462,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 @@ -907,7 +911,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; } @@ -1436,17 +1440,23 @@ 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); + struct of_map_id_arg arg =3D { + .map_args =3D { + .np =3D *target, + .args_count =3D 1, + .args =3D { *id_out }, + }, + }; + + return of_map_id(np, id, "msi-map", "msi-map-mask", &arg); } =20 #define of_for_each_phandle(it, err, np, ln, cn, cc) \ --=20 2.34.1