From: Lu Baolu <baolu.lu@linux.intel.com> To: Joerg Roedel <joro@8bytes.org>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, Paolo Bonzini <pbonzini@redhat.com>, David Airlie <airlied@linux.ie>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, Daniel Vetter <daniel@ffwll.ch>, Kevin Tian <kevin.tian@intel.com>, Ashok Raj <ashok.raj@intel.com>, Liu Yi L <yi.l.liu@intel.com>, Jacob Pan <jacob.jun.pan@linux.intel.com>, Ning Sun <ning.sun@intel.com> Cc: Steve Wahl <steve.wahl@hpe.com>, Will Deacon <will@kernel.org>, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Jason Gunthorpe <jgg@nvidia.com>, Robin Murphy <robin.murphy@arm.com>, Christoph Hellwig <hch@lst.de> Subject: [PATCH 2/7] agp/intel: Use per device iommu check Date: Sat, 14 May 2022 09:43:17 +0800 [thread overview] Message-ID: <20220514014322.2927339-3-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220514014322.2927339-1-baolu.lu@linux.intel.com> The IOMMU subsystem has already provided an interface to query whether the IOMMU hardware is enabled for a specific device. This changes the check from Intel specific intel_iommu_gfx_mapped (globally exported by the Intel IOMMU driver) to probing the presence of IOMMU on a specific device using the generic device_iommu_mapped(). This follows commit cca084692394a ("drm/i915: Use per device iommu check") which converted drm/i915 driver to use device_iommu_mapped(). Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/char/agp/intel-gtt.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 79a1b65527c2..cfcb450e9b59 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -20,7 +20,7 @@ #include <linux/kernel.h> #include <linux/pagemap.h> #include <linux/agp_backend.h> -#include <linux/intel-iommu.h> +#include <linux/iommu.h> #include <linux/delay.h> #include <asm/smp.h> #include "agp.h" @@ -573,18 +573,15 @@ static void intel_gtt_cleanup(void) */ static inline int needs_ilk_vtd_wa(void) { -#ifdef CONFIG_INTEL_IOMMU const unsigned short gpu_devid = intel_private.pcidev->device; - /* Query intel_iommu to see if we need the workaround. Presumably that - * was loaded first. + /* + * Query iommu subsystem to see if we need the workaround. Presumably + * that was loaded first. */ - if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG || - gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && - intel_iommu_gfx_mapped) - return 1; -#endif - return 0; + return ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG || + gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && + device_iommu_mapped(&intel_private.pcidev->dev)); } static bool intel_gtt_can_wc(void) -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Lu Baolu <baolu.lu@linux.intel.com> To: Joerg Roedel <joro@8bytes.org>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, Paolo Bonzini <pbonzini@redhat.com>, David Airlie <airlied@linux.ie>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, Daniel Vetter <daniel@ffwll.ch>, Kevin Tian <kevin.tian@intel.com>, Ashok Raj <ashok.raj@intel.com>, Liu Yi L <yi.l.liu@intel.com>, Jacob Pan <jacob.jun.pan@linux.intel.com>, Ning Sun <ning.sun@intel.com> Cc: Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>, Jason Gunthorpe <jgg@nvidia.com>, Christoph Hellwig <hch@lst.de>, Steve Wahl <steve.wahl@hpe.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com> Subject: [PATCH 2/7] agp/intel: Use per device iommu check Date: Sat, 14 May 2022 09:43:17 +0800 [thread overview] Message-ID: <20220514014322.2927339-3-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220514014322.2927339-1-baolu.lu@linux.intel.com> The IOMMU subsystem has already provided an interface to query whether the IOMMU hardware is enabled for a specific device. This changes the check from Intel specific intel_iommu_gfx_mapped (globally exported by the Intel IOMMU driver) to probing the presence of IOMMU on a specific device using the generic device_iommu_mapped(). This follows commit cca084692394a ("drm/i915: Use per device iommu check") which converted drm/i915 driver to use device_iommu_mapped(). Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/char/agp/intel-gtt.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 79a1b65527c2..cfcb450e9b59 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -20,7 +20,7 @@ #include <linux/kernel.h> #include <linux/pagemap.h> #include <linux/agp_backend.h> -#include <linux/intel-iommu.h> +#include <linux/iommu.h> #include <linux/delay.h> #include <asm/smp.h> #include "agp.h" @@ -573,18 +573,15 @@ static void intel_gtt_cleanup(void) */ static inline int needs_ilk_vtd_wa(void) { -#ifdef CONFIG_INTEL_IOMMU const unsigned short gpu_devid = intel_private.pcidev->device; - /* Query intel_iommu to see if we need the workaround. Presumably that - * was loaded first. + /* + * Query iommu subsystem to see if we need the workaround. Presumably + * that was loaded first. */ - if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG || - gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && - intel_iommu_gfx_mapped) - return 1; -#endif - return 0; + return ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG || + gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && + device_iommu_mapped(&intel_private.pcidev->dev)); } static bool intel_gtt_can_wc(void) -- 2.25.1
next prev parent reply other threads:[~2022-05-14 1:46 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-14 1:43 [PATCH 0/7] iommu/vt-d: Make intel-iommu.h private Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-14 1:43 ` [PATCH 1/7] iommu/vt-d: Move trace/events/intel_iommu.h under iommu Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-16 18:04 ` Jason Gunthorpe 2022-05-16 18:04 ` Jason Gunthorpe via iommu 2022-05-14 1:43 ` Lu Baolu [this message] 2022-05-14 1:43 ` [PATCH 2/7] agp/intel: Use per device iommu check Lu Baolu 2022-05-16 18:04 ` Jason Gunthorpe 2022-05-16 18:04 ` Jason Gunthorpe via iommu 2022-05-14 1:43 ` [PATCH 3/7] iommu/vt-d: Remove unnecessary exported symbol Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-16 18:04 ` Jason Gunthorpe 2022-05-16 18:04 ` Jason Gunthorpe via iommu 2022-05-14 1:43 ` [PATCH 4/7] drm/i915: Remove unnecessary include Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-16 7:28 ` Jani Nikula 2022-05-16 7:28 ` Jani Nikula 2022-05-16 18:04 ` Jason Gunthorpe 2022-05-16 18:04 ` Jason Gunthorpe via iommu 2022-05-14 1:43 ` [PATCH 5/7] KVM: x86: " Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-16 18:05 ` Jason Gunthorpe 2022-05-16 18:05 ` Jason Gunthorpe via iommu 2022-05-14 1:43 ` [PATCH 6/7] x86/boot/tboot: Move tboot_force_iommu() to Intel IOMMU Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-16 18:06 ` Jason Gunthorpe 2022-05-16 18:06 ` Jason Gunthorpe via iommu 2022-05-16 22:58 ` Jacob Pan 2022-05-16 22:58 ` Jacob Pan 2022-05-17 2:05 ` Baolu Lu 2022-05-17 2:05 ` Baolu Lu 2022-05-17 11:13 ` Jason Gunthorpe 2022-05-17 11:13 ` Jason Gunthorpe via iommu 2022-05-18 7:38 ` Baolu Lu 2022-05-18 7:38 ` Baolu Lu 2022-05-14 1:43 ` [PATCH 7/7] iommu/vt-d: Move include/linux/intel_iommu.h under iommu Lu Baolu 2022-05-14 1:43 ` Lu Baolu 2022-05-16 18:06 ` Jason Gunthorpe 2022-05-16 18:06 ` Jason Gunthorpe via iommu 2022-05-16 5:54 ` [PATCH 0/7] iommu/vt-d: Make intel-iommu.h private Christoph Hellwig 2022-05-16 5:54 ` Christoph Hellwig 2022-05-18 18:41 ` Steve Wahl 2022-05-18 18:41 ` Steve Wahl
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220514014322.2927339-3-baolu.lu@linux.intel.com \ --to=baolu.lu@linux.intel.com \ --cc=airlied@linux.ie \ --cc=ashok.raj@intel.com \ --cc=bp@alien8.de \ --cc=daniel@ffwll.ch \ --cc=dave.hansen@linux.intel.com \ --cc=hch@lst.de \ --cc=iommu@lists.linux-foundation.org \ --cc=jacob.jun.pan@linux.intel.com \ --cc=jani.nikula@linux.intel.com \ --cc=jgg@nvidia.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=ning.sun@intel.com \ --cc=pbonzini@redhat.com \ --cc=robin.murphy@arm.com \ --cc=rodrigo.vivi@intel.com \ --cc=steve.wahl@hpe.com \ --cc=tglx@linutronix.de \ --cc=tvrtko.ursulin@linux.intel.com \ --cc=will@kernel.org \ --cc=yi.l.liu@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.