From nobody Fri Dec 19 19:32:45 2025 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 906BB33120A for ; Thu, 4 Dec 2025 09:55:56 +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=1764842158; cv=none; b=az4Dvivx4kaR5LAj4AANPLRIoSG2oD6BhVsSdeKBaKLZguYhARUN6BnRSSYI2O+7f9ebwpjpcjXBdnaOh1x2zJ/Xg62TwYX/q+KKHkldYJnA9i6l+Vf5Qjb7TeXg+p7jgyVwMhboBIGEBYtRdiA+UGjFbDOjyftlAcLgqnXDxgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764842158; c=relaxed/simple; bh=6PyyETF8k40quxwBmvqxGNRspbk5r7aeCKVnubAF4nA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Q0ZhbfCgzps3PAwf0OYSvXJ02mgdvGyEJRoJGB+2soG8likQZE6GwBDeMuznAvj3xEvgIqc8WHtu+SMobPg4rJ0Lme4GMTrW0/I7tOD+2575T7smBBrIt8ZWhqFmfGYgR3Bek9VlzarfFnAHBdSZXCiwspMTwRqErcmOFZxM49I= 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=Mzvi5N+g; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=evcSTP7v; 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="Mzvi5N+g"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="evcSTP7v" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5B468gKE560123 for ; Thu, 4 Dec 2025 09:55:55 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=4j1Hi40g4e6 iwRM+cXGeU/TgM79ai7droalmMWQn/KY=; b=Mzvi5N+gFxr5HBTEWfWw51cdLDK 7TfXsrxF2dcqm9s9VHEbR6pKkUY+KUzvM2vanfqRBlEdszBumkxfRA8U7ywDs4XE Hv8R7m8KWJKbeW05solzTwyiAFp+84UkrtoqVAIG8ui3k9lflcT0hDS7dIP87dHX aqTJSE2BBooufyBxa4uxT7LsiadnWWC+ViIXQa1LyLjIUBwpPnsvrijb0FV0M4vX 2dPWmSmCgZ1qhhQVqknxvitW4unl4v9EQBXGbZbtIJg2wAfKu+mmVo0TaDLhq+FT hPlin362FKJjEOsU1W3FaIsF7H80iaN8afAznjvW/EDmKXDmaxg+uio/S1w== 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 4attmhaet5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Dec 2025 09:55:55 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2980ef53fc5so18316245ad.1 for ; Thu, 04 Dec 2025 01:55:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1764842154; x=1765446954; 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=4j1Hi40g4e6iwRM+cXGeU/TgM79ai7droalmMWQn/KY=; b=evcSTP7vrMrQcViyY1t9f7p5kyyKK8vpeZM+eaoHDT2Z9Yhs+8UTKikZvyolLfT831 yI/mq4nxQzAdzglXJUuHEYM7Q0Ou4/eDtz3MyrhN0lYjuvGRYnnDxqYnTH/ENtyPuEI4 497zQtcks8xu37NyZrzqoQEoVdlGobZUNCxaY154a5A8E0JICM4+n7hC3adY93zolHmT dc001iL6sOVykbFh6f7T2sDZRVRcjQ41mn7Sm5YXR6IW2OG9yTQixuTjj935EcRAHgDn 8cC1B0W7gXghe78cFUd2mr3lOKTp2mgDamxBkAhtkogO4j83fiP21ictF1NBOtkHg55+ 3+Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764842154; x=1765446954; 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=4j1Hi40g4e6iwRM+cXGeU/TgM79ai7droalmMWQn/KY=; b=t0FxP448dJ5E1Qd4w1qmq4gyDnW0CWCcXpiBBwZ3w/zHj24+7ix6GyBK/CPaWIUSgD bNaXTDwHRBMKAL8I0mcGcQ1JsB1pbN1NDQVYhkYCLvgGqjER7nBBZ6u3QE/+j2Spj2NJ euYAdZxPXn5yXjmzymtOYuJqAMwXZrtKWVnAoGOoODARdjwSu7XrRz88BCyxS92rYy9S E3mgxdeD1kWXHXMSxWCe6AekatXGA4YgBuLqcWnTOjhw7AbY206GljyvFbbIIhZIDhiG 6fYrCMsZy2Y7u/7bawI1Xbp5qFEQxzGSCZ4IlZQwtvoZTCfx1VtZAkB6hcZKpBt03VYg r19w== X-Forwarded-Encrypted: i=1; AJvYcCVxuhKhVMf5GIBJcWTG7aj2wt3e+vMS+M0PwSQbBbGBmf4Xrlk8P+1m6o/GUTYjZK3irgPBpBGX3jzXKR8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywrdvq8aNzOVbCDqkhOT2vDuz9b0i/cpZDv9V5oQe3O3fcR4Xza qCv8rMLYhL5jP/WeHQbTj3iYMAj1t8RLtYw5ixaZhLXU+j4QHayypi0opoH03zNlYAB+P2Z9SCz W7iqr7EJVg5v//i1rkoqG6usqveTYdHLDK5MnUMt64ViSNnf96YfKuAgL66kzMoER4HM= X-Gm-Gg: ASbGncvSppnMI7E/uQd0XA2t4XcpDj7CPsmpAMFwsOgdLJ4nb/Ce+uujRNRfhp+aC40 hHQjW1DO9LhSPC9IXwuvzdvCx8JpzkrvWu2mBOCJ1y4WqnUAnNCj0ChOWijZ4ZqQEg4IxkRRBkQ MsEvDyJJpMWGV4F4U74ljHtG1SyLIUHodELub+P1B3OTStHxSOCfgjZf6MPXEe5pkUuZJFsSTpl p1Ei8+Qrp3bGeyBgND6dT8fKTtMBstsdg2u33yAYBX5PkWhnFVHVef2fdQpu/x9YseP1UL5XtQ7 m4Fl3Uu9v+G1tvHfLmM+59VErDaR3JhfLUCQVisnhMvpJefFcnvGCYIzHCNhvNevAZpiVbn6LJg rjFADEvhrvr282d311evBEMnxo6pYms9i/Cps0/XeW6lC X-Received: by 2002:a17:903:240c:b0:295:4d50:aaab with SMTP id d9443c01a7336-29d682e400cmr56474595ad.20.1764842154337; Thu, 04 Dec 2025 01:55:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmnx0tg7Ob7VxFE7lJfcQbFgCacVT6NfmWVYjlbUz1vyx71fsGDZgckt+aMRDyp2ueVvMt+g== X-Received: by 2002:a17:903:240c:b0:295:4d50:aaab with SMTP id d9443c01a7336-29d682e400cmr56474365ad.20.1764842153817; Thu, 04 Dec 2025 01:55:53 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf6817389fdsm1380436a12.1.2025.12.04.01.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Dec 2025 01:55:53 -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, charan.kalla@oss.qualcomm.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, vijayanand.jitta@oss.qualcomm.com Subject: [PATCH v2 2/3] of: factor arguments passed to of_map_id() into a struct Date: Thu, 4 Dec 2025 15:25:29 +0530 Message-Id: <20251204095530.8627-3-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251204095530.8627-1-vijayanand.jitta@oss.qualcomm.com> References: <20251204095530.8627-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: vlGHkWhlGD6h1A1QdXz4tKS7TiqARcSl X-Authority-Analysis: v=2.4 cv=NcTrFmD4 c=1 sm=1 tr=0 ts=69315aab cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=TItJH5Yx5ZyhTHJNrZAA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjA0MDA4MSBTYWx0ZWRfX/5Oud9oO6FSO 5XYN/3t2Pqihu3GlzDKD8+1bPPCK/uCDdPZ7PfxB7oU0+l+VY23G9JOQo3rB9dI4S5cGjlmiGuU 2fvdBbOvBbP2LKmd2/L17dcNJEHsmP9w1zvavR6Ri6LYKZs2ild3/rI3dsXgT0cpxCaVpnS/2mh sjXm7pqzZPBHTUNmaxcuD0HNIoZljLfu+xdrz9LQSoucWkRZZhn5yb0G8zJMS8pFN+kl4XfOUvn US5VQulE18n3BWe2XEKA1+zD5awvMUtNsurB63sgCIvceUWMhxZ/t2ihp8YYoKfOm+khj1jqoWb Xp3g+SwHjuHBr7meAvRXQkveyifpqE2drGP6RftIGrVQjRvgfCA7oHYHLo1tj+8GZAjhUyK9t0F L+EFDsJi+MIBWwe5e3Y6Fus9UUcqEQ== X-Proofpoint-ORIG-GUID: vlGHkWhlGD6h1A1QdXz4tKS7TiqARcSl 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-04_02,2025-12-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 bulkscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512040081 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 in struct. Subsequent patches add additional arguments to the struct that the caller expects to be filled of_map_id(). Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/iommu/of_iommu.c | 6 +++++- drivers/of/base.c | 31 ++++++++++++++------------- drivers/pci/controller/dwc/pci-imx6.c | 6 +++++- drivers/pci/controller/pcie-apple.c | 5 ++++- drivers/xen/grant-dma-ops.c | 5 ++++- include/linux/of.h | 23 ++++++++++++++------ 6 files changed, 50 insertions(+), 26 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index a511ecf21fcd..eac62bc441c5 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -46,9 +46,13 @@ 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 { + .target =3D &iommu_spec.np, + .id_out =3D iommu_spec.args, + }; 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..b8f78a9e6a09 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2051,8 +2051,9 @@ 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, @target which is a pointer + * to the target device node and id_out which is a pointer + * to receive the translated ID. * * Given a device ID, look up the appropriate implementation-defined * platform ID and/or the target device which receives transactions on that @@ -2066,21 +2067,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->target && !arg->id_out)) return -EINVAL; =20 map =3D of_get_property(np, map_name, &map_len); if (!map) { - if (target) + if (arg->target) return -ENODEV; /* Otherwise, no map implies no translation */ - *id_out =3D id; + *arg->id_out =3D id; return 0; } =20 @@ -2122,18 +2123,18 @@ int of_map_id(const struct device_node *np, u32 id, if (!phandle_node) return -ENODEV; =20 - if (target) { - if (*target) + if (arg->target) { + if (*arg->target) of_node_put(phandle_node); else - *target =3D phandle_node; + *arg->target =3D phandle_node; =20 - if (*target !=3D phandle_node) + if (*arg->target !=3D phandle_node) continue; } =20 - if (id_out) - *id_out =3D masked_id - id_base + out_base; + if (arg->id_out) + *arg->id_out =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->target && *arg->target ? *arg->target : NULL); =20 /* Bypasses translation */ - if (id_out) - *id_out =3D id; + if (arg->id_out) + *arg->id_out =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..7b54295e553b 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.target =3D ⌖ + arg.id_out =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..965f65ce8ad3 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.target =3D NULL; + arg.id_out =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..179f6f43a57b 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -319,9 +319,12 @@ 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.target =3D &iommu_spec.np; + arg.id_out =3D iommu_spec.args; + 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..21bdce2b37ca 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -25,6 +25,12 @@ typedef u32 phandle; typedef u32 ihandle; =20 +struct device_node; +struct of_map_id_arg { + struct device_node **target; + u32 *id_out; +}; + struct property { char *name; int length; @@ -458,7 +464,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 +913,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 +1442,20 @@ 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 { + .target =3D target, + .id_out =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