From patchwork Mon Aug 12 07:21:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 818719 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 F2AA05FBB7; Mon, 12 Aug 2024 07:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723447483; cv=none; b=WLu2EXvnMp3vUgQY4jIyHdJs0ASdk3cG5yP6DjtZca80UDqW1qsIYhSzuHKT8WY3yMEChVmD/H43ZpPGsdnORRxceaKIfvDr6bNBqgrE6UHUctlV/AJ2eq7t0WxOoPpGLCjbv73zQJQ9mtUz/L38f1APXm5HLz4lBFdO1JThzFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723447483; c=relaxed/simple; bh=Nxe5+R4C9sbMphvd/xbGCajCmYTCQpi3ZSS8JEnsuAI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=URfjlvgEay4MMb8ixgrikkOJezlU4pFT9OS9KDIHMQtC2GIp/r2d0YoZOODO/SpvBo3YNmvrxIB2HwcFHDy96a1Ybbe+mIq2FhfBMK7JjBHl2L0xKinP3Y8noLA4j5Rqz6XJlttT6GgGB2jPHs9Lq16sZQJNKOc6j+6Lt7738j4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=gQtN6a5g; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gQtN6a5g" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723447481; x=1754983481; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Nxe5+R4C9sbMphvd/xbGCajCmYTCQpi3ZSS8JEnsuAI=; b=gQtN6a5gcUrvHH7hZV4xMNh2yYLEPzWIvBrWmsmmDWyeQM9CcI4oLNNh EUy1Vx7Ynl4mcGtLt0hcBnq45aAaaI9NOfqAz9ap3DBNk9cmFRnuNFeAT U8/iPWo3Ov43T0EfKHeO2102Ks/vcC42FaUf16ZzDfrMDqL3qq/mLaKtS aMO56TF/hGN9l+Qww8vMHTxfWvhl/q5LGMTYDUvNxb9O6aSbojmfaqOz0 Ki+0WRQU01c4BF/nEBlFDQMijmVgRpOgSzqrFlESvVkwcFTe7lIadeHd8 I8aehE9yCZF1Qi8lcduxkThMCSsUWdQhSJLS/U0YcusO5mdKyhRyUhqXf w==; X-CSE-ConnectionGUID: LN0ynw7LSgqGXUxaMPhq+A== X-CSE-MsgGUID: TcAFAWzeQ6qNo55VMf8sMg== X-IronPort-AV: E=McAfee;i="6700,10204,11161"; a="32691580" X-IronPort-AV: E=Sophos;i="6.09,282,1716274800"; d="scan'208";a="32691580" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2024 00:24:40 -0700 X-CSE-ConnectionGUID: NDAypZJySrCq1DeB69dwKQ== X-CSE-MsgGUID: yqQutkRQTxKtBPosJ8D5Mg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,282,1716274800"; d="scan'208";a="62829617" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmviesa004.fm.intel.com with ESMTP; 12 Aug 2024 00:24:35 -0700 From: Lu Baolu To: Dmitry Osipenko , Mauro Carvalho Chehab , Thierry Reding , Jonathan Hunter , Stanimir Varbanov , Vikash Garodia , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: linux-media@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe Subject: [PATCH 1/2] media: nvidia: tegra: Use iommu_paging_domain_alloc() Date: Mon, 12 Aug 2024 15:21:04 +0800 Message-Id: <20240812072105.9578-1-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 An iommu domain is allocated in tegra_vde_iommu_init() and is attached to vde->dev. Use iommu_paging_domain_alloc() to make it explicit. Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe Link: https://lore.kernel.org/r/20240610085555.88197-9-baolu.lu@linux.intel.com Acked-by: Thierry Reding --- drivers/media/platform/nvidia/tegra-vde/iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/nvidia/tegra-vde/iommu.c b/drivers/media/platform/nvidia/tegra-vde/iommu.c index 5521ed3e465f..b1d9d841d944 100644 --- a/drivers/media/platform/nvidia/tegra-vde/iommu.c +++ b/drivers/media/platform/nvidia/tegra-vde/iommu.c @@ -78,9 +78,10 @@ int tegra_vde_iommu_init(struct tegra_vde *vde) arm_iommu_release_mapping(mapping); } #endif - vde->domain = iommu_domain_alloc(&platform_bus_type); - if (!vde->domain) { - err = -ENOMEM; + vde->domain = iommu_paging_domain_alloc(dev); + if (IS_ERR(vde->domain)) { + err = PTR_ERR(vde->domain); + vde->domain = NULL; goto put_group; } From patchwork Mon Aug 12 07:02:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 818723 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 AD250154C02; Mon, 12 Aug 2024 07:05:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723446346; cv=none; b=q/1WXZoiWtgm+GbqPpP/JD3f1MhSGbRnAun/rOT5sxo9otsr+wf5uicQ1Op6YQNjEBhoVVVP0caS7m9Y2AOdX/NIPBzWmKpAtDWtATKVTmtf547Gd4rb5Wj8wRYKEW2tAiGYbIUNMwSSjqhrjerCxf5ONyMeVQDa7EAGMhQOOkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723446346; c=relaxed/simple; bh=X0ZSpA6pYNtVglGXUJ8Hdn3nA3Sm4FX8yT8TZxIbhck=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AsQBg1ifGEpK/uhqDTMdJ0f+Tbsww8/6ZIqZmoVlDvNtvtEcQGFK6iDspZBciPlQ4rm/nQ1f1xZyXr+G+u4tqDiEdIErvzfg+XRe80v7+efKyVHm1omPKUU7U/odTxg5qnCvFBAWxez1UEgG4TG2EuOtb/46QjL4OzbHi1vyXmw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=diBuGuSf; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="diBuGuSf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723446344; x=1754982344; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X0ZSpA6pYNtVglGXUJ8Hdn3nA3Sm4FX8yT8TZxIbhck=; b=diBuGuSfEQLQfqfskCsLaWuVSmSp/VwNCJJ/BJuDsAsVEdbdOaZBQDo3 Cl1GzXcTCka1QrDgoGxRciEDYUporqSfJyg3BijnEu+gjhIr3e/8rP7NW Uk0LQSIwDfQmEixvF+tqGFWuqeml1xHCdzXSNUBHtsCy855UGDQ3A2fcR sxRfV7oxHWbD04oz4stwge5etKCxGu4S2+9T7nkX/Zd3cWBgFQJJqJGn1 hg/JPMgBeysFz5lLDgDNEsxmvqftDgAAuN/uXAq7CyvByJ6S8lHPk7s18 tHYx9V5Fg/W+ptR1w0rSpReI6bHIhfKs8nN2awZ2ou22lR2WU+CC4n09o w==; X-CSE-ConnectionGUID: Tnra79dfTXy47E52ztLY2Q== X-CSE-MsgGUID: YRUMoY5CSOCygeuVUpqTJA== X-IronPort-AV: E=McAfee;i="6700,10204,11161"; a="21418198" X-IronPort-AV: E=Sophos;i="6.09,282,1716274800"; d="scan'208";a="21418198" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2024 00:05:44 -0700 X-CSE-ConnectionGUID: B1d9f9FpScSKBHKsscuddg== X-CSE-MsgGUID: 4UYjLl2eTyOw7y8yheaagw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,282,1716274800"; d="scan'208";a="58070144" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orviesa010.jf.intel.com with ESMTP; 12 Aug 2024 00:05:39 -0700 From: Lu Baolu To: Russell King , Inki Dae , Seung-Woo Kim , Kyungmin Park , David Airlie , Daniel Vetter , Krzysztof Kozlowski , Alim Akhtar , Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: Yi Liu , iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe Subject: [PATCH 2/2] ARM: dma-mapping: Use iommu_paging_domain_alloc() Date: Mon, 12 Aug 2024 15:02:02 +0800 Message-Id: <20240812070202.9366-2-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812070202.9366-1-baolu.lu@linux.intel.com> References: <20240812070202.9366-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since arm_iommu_create_mapping() now accepts the device, let's replace iommu_domain_alloc() with iommu_paging_domain_alloc() to retire the former. Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe Link: https://lore.kernel.org/r/20240610085555.88197-18-baolu.lu@linux.intel.com --- arch/arm/mm/dma-mapping.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 52f9c56cc3cb..88c2d68a69c9 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1585,9 +1585,11 @@ arm_iommu_create_mapping(struct device *dev, dma_addr_t base, u64 size) spin_lock_init(&mapping->lock); - mapping->domain = iommu_domain_alloc(dev->bus); - if (!mapping->domain) + mapping->domain = iommu_paging_domain_alloc(dev); + if (IS_ERR(mapping->domain)) { + err = PTR_ERR(mapping->domain); goto err4; + } kref_init(&mapping->kref); return mapping;