diff mbox series

[5.4,35/43] drm/nouveau/tegra: Stop using iommu_present()

Message ID	20220516193615.754563112@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Robin Murphy <robin.murphy@arm.com>, Lyude Paul <lyude@redhat.com> Subject: [PATCH 5.4 35/43] drm/nouveau/tegra: Stop using iommu_present() Date: Mon, 16 May 2022 21:36:46 +0200 Message-Id: <20220516193615.754563112@linuxfoundation.org> In-Reply-To: <20220516193614.714657361@linuxfoundation.org> References: <20220516193614.714657361@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/43] hwmon: (tmp401) Add OF device ID table [5.4,03/43] mac80211: Reset MBSSID parameters upon connection [5.4,04/43] net: Fix features skip in for_each_netdev_feature() [5.4,05/43] ipv4: drop dst in multicast routing path [5.4,06/43] drm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name() [5.4,07/43] netlink: do not reset transport header in netlink_recvmsg() [5.4,08/43] mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection [5.4,09/43] dim: initialize all struct fields [5.4,10/43] hwmon: (ltq-cputemp) restrict it to SOC_XWAY [5.4,11/43] s390/ctcm: fix variable dereferenced before check [5.4,12/43] s390/ctcm: fix potential memory leak [5.4,13/43] s390/lcs: fix variable dereferenced before check [5.4,14/43] net/sched: act_pedit: really ensure the skb is writable [5.4,15/43] net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending [5.4,16/43] net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe() [5.4,17/43] gfs2: Fix filesystem block deallocation for short writes [5.4,18/43] hwmon: (f71882fg) Fix negative temperature [5.4,19/43] ASoC: max98090: Reject invalid values in custom control put() [5.4,20/43] ASoC: max98090: Generate notifications on changes for custom control [5.4,21/43] ASoC: ops: Validate input values in snd_soc_put_volsw_range() [5.4,22/43] s390: disable -Warray-bounds [5.4,23/43] net: emaclite: Dont advertise 1000BASE-T and do auto negotiation [5.4,24/43] tcp: resalt the secret every 10 seconds [5.4,25/43] tty: n_gsm: fix mux activation issues in gsm_config() [5.4,26/43] usb: cdc-wdm: fix reading stuck on device close [5.4,27/43] usb: typec: tcpci: Dont skip cleanup in .remove() on error [5.4,28/43] USB: serial: pl2303: add device id for HP LM930 Display [5.4,29/43] USB: serial: qcserial: add support for Sierra Wireless EM7590 [5.4,30/43] USB: serial: option: add Fibocom L610 modem [5.4,31/43] USB: serial: option: add Fibocom MA510 modem [5.4,32/43] slimbus: qcom: Fix IRQ check in qcom_slim_probe [5.4,33/43] serial: 8250_mtk: Fix UART_EFR register address [5.4,34/43] serial: 8250_mtk: Fix register address for XON/XOFF character [5.4,35/43] drm/nouveau/tegra: Stop using iommu_present() [5.4,36/43] i40e: i40e_main: fix a missing check on list iterator [5.4,37/43] cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp() [5.4,38/43] drm/vmwgfx: Initialize drm_mode_fb_cmd2 [5.4,39/43] MIPS: fix build with gcc-12 [5.4,40/43] net: phy: Fix race condition on link status change [5.4,41/43] arm[64]/memremap: dont abuse pfn_valid() to ensure presence of linear map [5.4,42/43] ping: fix address binding wrt vrf [5.4,43/43] tty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe()

Commit Message

Greg KH May 16, 2022, 7:36 p.m. UTC

From: Robin Murphy <robin.murphy@arm.com>

commit 87fd2b091fb33871a7f812658a0971e8e26f903f upstream.

Even if some IOMMU has registered itself on the platform "bus", that
doesn't necessarily mean it provides translation for the device we
care about. Replace iommu_present() with a more appropriate check.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
[added cc for stable]
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: stable@vger.kernel.org # v5.0+
Link: https://patchwork.freedesktop.org/patch/msgid/70d40ea441da3663c2824d54102b471e9a621f8a.1649168494.git.robin.murphy@arm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -123,7 +123,7 @@  nvkm_device_tegra_probe_iommu(struct nvk
 
 	mutex_init(&tdev->iommu.mutex);
 
-	if (iommu_present(&platform_bus_type)) {
+	if (device_iommu_mapped(dev)) {
 		tdev->iommu.domain = iommu_domain_alloc(&platform_bus_type);
 		if (!tdev->iommu.domain)
 			goto error;