From mboxrd@z Thu Jan 1 00:00:00 1970 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 B0349369D42 for ; Fri, 7 Aug 2026 18:17:24 +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=1786126646; cv=none; b=StE/CpMYte5dTui0mcqHSXx6K5ZOi+FlqM9eESrJ8vAwpyuTcr3eU/2ImRdv1wzhkliBDBRGNfV7W2M9Db8jmmpPjd+ND7L3KV/y38z1rpvbrnikeCbxRUdb6lXvhK1CDwVZsblQUyy5v0YyLK3vynPD1I80RmQG9b5oZERYlVo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786126646; c=relaxed/simple; bh=9EGuLpu2rrLebak5AKTd1A8lZwUe/E1CF88M0FnXyiI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WUFXAoi858UjHRXCiDIoVR1e9uT3W6W6nVgnzyOq6q/D7hS5QxnAXF6qqKLmWfGNCiCVkd9xfnW2CxK4Rmfc83+H3mNPNm0vefvhC4bDthllR9ng8LZGRyJ1MpJA+CTA27cvypbElwjG5q6IHAPx6uTHiuy7D3VVIPsuavbygwo= 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=GyH/4Jug; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EoQRHaVO; 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="GyH/4Jug"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EoQRHaVO" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 677GOCv42039882 for ; Fri, 7 Aug 2026 18:17:24 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=KeYmM5yv2MK 4UCiDBc1w2bwCqxx0z614RMMGa5CBgiI=; b=GyH/4JugRUtBo93g9QQZKnGW1pd WT7ukbymRVd4+4vjjM4yWbJ1jRE/fl8zd0wwxk3pyIe0tr9lp0bwnY2O8sxyO+xK Mxz0cz+NmCHlsZnr0A203T1oaQ6JgbJGgewry3QkbL7XFRGe8yQ7I1Qh29ACycs1 szINdcy+vlUpcqKKd38aFGNjDyUzyzV51o3CcRdnSrmzxuhc16z0SIOFNEB6UyQr 8KWyB+UoIQkxPjd7iyhmH/JXCHVREcBavrjdARnswPr91nzOtA3dSB2O/uwZMSvt x7UNixOBoDivfUQqo1vKf7vb9f8E9+scrTMLcw1y0bVGJDB+WB0DZLb8HtQ== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fwcjb272y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 07 Aug 2026 18:17:23 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c0f0a0760so62195061cf.2 for ; Fri, 07 Aug 2026 11:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786126643; x=1786731443; 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:content-type; bh=KeYmM5yv2MK4UCiDBc1w2bwCqxx0z614RMMGa5CBgiI=; b=EoQRHaVOPUjKVVAx6pY/JsBZjVfvguu7XhpGfmtmg3+tU9hFo5ufFOlK5IcwF1kHc6 nAlphFis4Q2nMMrpvOVafs6cHeDHCe1MwSgqgW/fHwVNzUShBcwpmHuAxFObAG1zBbuu +D0oK727O0Zr8hCg/HLros8cct9ITCEF0AOGwK9ANLC026AzkgMrpafGpvqqbmS3ia31 3L05UA5eTohCGvl6/+aMxFUHXO/dMGnZXlKeIFE0YPpUSL2nk0pYPRxj8a/PtIkxBivo lNJsPLiF1ibz3msIFOnuj5dwvjTvbToCv2EdNB9Vv8B7ikOsTakV0RsUPEK3CcHGCcG5 OyyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786126643; x=1786731443; 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:content-type; bh=KeYmM5yv2MK4UCiDBc1w2bwCqxx0z614RMMGa5CBgiI=; b=LVBB9bwxXJgD/b0KVleYFhIqDKHi7GnTLJxxX99mVz9ziwEjCJC7nmwTXfVXBjsnUW MpQHLnKeG/2T4e1aDW5YBGsZIByqFnTxv6+lKEeVO66/mKYSaJmVIVS6m4L3EhFyXfAA 0I8p3wQV1uR33glLne7wsgwSwiViYsUAitP1XgNBp2B08Hga8PwSouixBtwN/jEVMHhT pIV9usTedS8KCZ8IsjSJimlC8fONG3ZFzL1aXi07pLL8AwDkrZj1vMgjWYyGNiyYvBZ5 qJryaiBXHoq03nlMt8uLLFB/FzSVDq/1UK6dQfrwDFts1mDAwZAUNvPdpE9HNfMUzvbx pOIw== X-Gm-Message-State: AOJu0YwbmIFNWlsjWtqHPS3hpR02GY35cNN/FDPGgsCKCMFGP7lXwSO0 cQsDQKT+em2eOfG5zjrZd4zvic5bpd20RDuOvV8tBpIZttSm/oWqm3M5lsRPokU1nw5RKaBBTbK vIFZfpopBEEBajuqZ1d/3wSp/IOX4+R/d75VYF6IJTHpXEXXdDfK7BRmeQbeOWXubr5A= X-Gm-Gg: AR+sD13ZMfokwXl+X3OKQlAoHkeKG8cm/k5XePNxHkTtyDROZYgCk28bilNJID7aeLd 2zk0hCBjWVddVBPcJYenJ+usDsSo4dLhkwYLqSrKLjPdnRjLme4xXzVl+PKjl+sk91hxJxAFMS4 ysY+rv3LtcT3POd2rqHL7V3jVTk62q8GfLpqa1uCxNMQBU6EtBXIlTBRWkO2k84gYXzIPuWibIR Fqvuxu4yV5xvdKAll0jbspS1R+sB/Mm8QSp2dEMvw6vsyT1QzjJWpRgxzgZakRq9mq+SyRLx1Yb mVILYK0g3+ZIoj2dizH0ySHpGGmVsYlZlsBlhym/als2KYevpYcvO6UA2IhdqLdN7EpwY+jxFyy 1g7bp38hY+Q8paG4aWZKOOFT5CCZ0+GG3wUeLxf4= X-Received: by 2002:a05:622a:58c4:b0:51c:1ff:2512 with SMTP id d75a77b69052e-52d20a50c50mr36798501cf.33.1786126642913; Fri, 07 Aug 2026 11:17:22 -0700 (PDT) X-Received: by 2002:a05:622a:58c4:b0:51c:1ff:2512 with SMTP id d75a77b69052e-52d20a50c50mr36797611cf.33.1786126642443; Fri, 07 Aug 2026 11:17:22 -0700 (PDT) Received: from localhost (ip-86-49-241-13.bb.vodafone.cz. [86.49.241.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2080ab446bsm79425666b.27.2026.08.07.11.17.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 11:17:21 -0700 (PDT) From: Andrew Jones To: linux-riscv@lists.infradead.org, iommu@lists.linux.dev Cc: linux-kernel@vger.kernel.org, tomasz.jeznach@linux.dev, tjeznach@rivosinc.com, jgg@ziepe.ca, jgg@nvidia.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, pjw@kernel.org, palmer@dabbelt.com, anup@brainfault.org, tglx@kernel.org, kevin.tian@intel.com, fangyu.yu@linux.alibaba.com Subject: [PATCH v3 03/19] iommu/dma: Add iommu_dma_sw_map_msi() Date: Fri, 7 Aug 2026 20:16:57 +0200 Message-ID: <20260807181713.228535-4-andrew.jones@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260807181713.228535-1-andrew.jones@oss.qualcomm.com> References: <20260807181713.228535-1-andrew.jones@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: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA3MDE0MyBTYWx0ZWRfXxrmyh3WLqECM mKR3x+hpw+nw0l9dwPExHEcy6OyrbudbOzpHshnjKWupg3imaENq2jwHGSPFCLY6zrvloCc9kcu 1v00dwTbu5JYnYsJTTCBkESXjAdx+6Ga37JdewCwXWq9g4RsciEKeEnHK7Jypd4C4Vv7oDIK0Ty FEsmg0VngBPntzj0mKu8MQB39js3eCFwHFSxSVLUer6YYpaa/2L2UzLpKWe92Tq6dzaEu3akciZ J3Z+mKyuWZesB6khpK0x66dSmwNYxgpitzSM+9lR9BKt26OfFOOKCL3Zl2huaqSt6KOC73mAK6I SK/bk2pNu4zfhhR27kEus1LWD6elrL6gsr3tc8RDDlc3FSAR5xuFQXeveot9NV7/oXlMGPI5Gew 7AhN45ImMKTjP8gCvgFRlxyFpx/TbbnWSpBCWFhBIboalPyv2xQs9O7zolOvNM3rjKFzbePowIA k+upvR19d8tjvIgZG8Q== X-Authority-Analysis: v=2.4 cv=QsBuG1yd c=1 sm=1 tr=0 ts=6a762133 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=VPysOpcHbS0DNrM1Xqmyow==:17 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=B9hF7e9JpKM1iJhnVVUA:9 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODA3MDE0MyBTYWx0ZWRfX9vEGjNZVfFoG /gPrFhUixYZj/Jgv53siXCbmqnkdjK5JcRzfhWfrhkXbgwhSlf1PhIPHXGzdJtCwvZkxm6h8ypJ XX5b8Rag6fI/D7qop78BvdI0QrRL300= X-Proofpoint-ORIG-GUID: jlfESNxk3S8bgq412mnwsfYXBejXO6qx X-Proofpoint-GUID: jlfESNxk3S8bgq412mnwsfYXBejXO6qx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-07_03,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 malwarescore=0 impostorscore=0 clxscore=1015 priorityscore=1501 adultscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608070143 Add a descriptor-free counterpart to iommu_dma_sw_msi(). The existing function is tied to a struct msi_desc and stores the result in the descriptor. This variant returns the IOVA directly so callers can pre-map MSI targets before any descriptor has been allocated. Callers may pass a required mapping size so MSI doorbells that must not share a larger IOMMU leaf, such as RISC-V IMSIC files, can fail before a mapping is installed. Signed-off-by: Andrew Jones --- drivers/iommu/dma-iommu.c | 48 ++++++++++++++++++++++++++++++++------- drivers/iommu/dma-iommu.h | 12 ++++++++++ 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 9abaec0703ef..56a5072b4dde 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -2234,24 +2234,56 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, return NULL; } -int iommu_dma_sw_msi(struct iommu_domain *domain, struct msi_desc *desc, - phys_addr_t msi_addr) +/* + * Descriptor-free counterpart to iommu_dma_sw_msi(). Maps an MSI physical + * page into the domain and returns the IOVA and mapping granule. Used for + * pre-mapping MSI targets before any MSI descriptor has been set. + * + * The caller must pass a device attached to @domain and hold @dev's IOMMU + * group mutex. If @required_size is non-zero then it must exactly match the + * domain's MSI mapping granule. @msi_iova and @msi_shift must be non-NULL. + */ +int iommu_dma_sw_map_msi(struct iommu_domain *domain, + struct device *dev, phys_addr_t msi_addr, + size_t required_size, dma_addr_t *msi_iova, + unsigned int *msi_shift) { - struct device *dev = msi_desc_to_dev(desc); const struct iommu_dma_msi_page *msi_page; + size_t size; - if (!has_msi_cookie(domain)) { - msi_desc_set_iommu_msi_iova(desc, 0, 0); + *msi_iova = 0; + *msi_shift = 0; + + if (!has_msi_cookie(domain)) return 0; - } + + size = cookie_msi_granule(domain); + if (required_size && size != required_size) + return -EOPNOTSUPP; iommu_group_mutex_assert(dev); msi_page = iommu_dma_get_msi_page(dev, msi_addr, domain); if (!msi_page) return -ENOMEM; - msi_desc_set_iommu_msi_iova(desc, msi_page->iova, - ilog2(cookie_msi_granule(domain))); + *msi_iova = msi_page->iova; + *msi_shift = ilog2(size); + return 0; +} + +int iommu_dma_sw_msi(struct iommu_domain *domain, struct msi_desc *desc, + phys_addr_t msi_addr) +{ + struct device *dev = msi_desc_to_dev(desc); + dma_addr_t msi_iova; + unsigned int msi_shift; + int ret; + + ret = iommu_dma_sw_map_msi(domain, dev, msi_addr, 0, &msi_iova, &msi_shift); + if (ret) + return ret; + + msi_desc_set_iommu_msi_iova(desc, msi_iova, msi_shift); return 0; } diff --git a/drivers/iommu/dma-iommu.h b/drivers/iommu/dma-iommu.h index 040d00252563..3e1adeafdcac 100644 --- a/drivers/iommu/dma-iommu.h +++ b/drivers/iommu/dma-iommu.h @@ -19,6 +19,10 @@ int iommu_dma_init_fq(struct iommu_domain *domain); void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list); +int iommu_dma_sw_map_msi(struct iommu_domain *domain, + struct device *dev, phys_addr_t msi_addr, + size_t required_size, dma_addr_t *msi_iova, + unsigned int *msi_shift); int iommu_dma_sw_msi(struct iommu_domain *domain, struct msi_desc *desc, phys_addr_t msi_addr); @@ -53,6 +57,14 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he { } +static inline int iommu_dma_sw_map_msi(struct iommu_domain *domain, + struct device *dev, phys_addr_t msi_addr, + size_t required_size, dma_addr_t *msi_iova, + unsigned int *msi_shift) +{ + return -ENODEV; +} + static inline int iommu_dma_sw_msi(struct iommu_domain *domain, struct msi_desc *desc, phys_addr_t msi_addr) { -- 2.43.0