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 1/7] iommu/vt-d: Move trace/events/intel_iommu.h under iommu Date: Sat, 14 May 2022 09:43:16 +0800 [thread overview] Message-ID: <20220514014322.2927339-2-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220514014322.2927339-1-baolu.lu@linux.intel.com> This header file is private to the Intel IOMMU driver. Move it to the driver folder. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- .../trace/events/intel_iommu.h => drivers/iommu/intel/trace.h | 4 ++++ drivers/iommu/intel/dmar.c | 2 +- drivers/iommu/intel/svm.c | 2 +- drivers/iommu/intel/trace.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) rename include/trace/events/intel_iommu.h => drivers/iommu/intel/trace.h (94%) diff --git a/include/trace/events/intel_iommu.h b/drivers/iommu/intel/trace.h similarity index 94% rename from include/trace/events/intel_iommu.h rename to drivers/iommu/intel/trace.h index e5c1ca6d16ee..25cb7f88e1a2 100644 --- a/include/trace/events/intel_iommu.h +++ b/drivers/iommu/intel/trace.h @@ -91,4 +91,8 @@ TRACE_EVENT(prq_report, #endif /* _TRACE_INTEL_IOMMU_H */ /* This part must be outside protection */ +#undef TRACE_INCLUDE_PATH +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_PATH ../../drivers/iommu/intel/ +#define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h> diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index 4de960834a1b..b02d72097a8c 100644 --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -31,10 +31,10 @@ #include <linux/limits.h> #include <asm/irq_remapping.h> #include <asm/iommu_table.h> -#include <trace/events/intel_iommu.h> #include "../irq_remapping.h" #include "perf.h" +#include "trace.h" typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *); struct dmar_res_callback { diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index 7ee37d996e15..70b40d007a52 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -21,11 +21,11 @@ #include <linux/ioasid.h> #include <asm/page.h> #include <asm/fpu/api.h> -#include <trace/events/intel_iommu.h> #include "pasid.h" #include "perf.h" #include "../iommu-sva-lib.h" +#include "trace.h" static irqreturn_t prq_event_thread(int irq, void *d); static void intel_svm_drain_prq(struct device *dev, u32 pasid); diff --git a/drivers/iommu/intel/trace.c b/drivers/iommu/intel/trace.c index bfb6a6e37a88..117e626e3ea9 100644 --- a/drivers/iommu/intel/trace.c +++ b/drivers/iommu/intel/trace.c @@ -11,4 +11,4 @@ #include <linux/types.h> #define CREATE_TRACE_POINTS -#include <trace/events/intel_iommu.h> +#include "trace.h" -- 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 1/7] iommu/vt-d: Move trace/events/intel_iommu.h under iommu Date: Sat, 14 May 2022 09:43:16 +0800 [thread overview] Message-ID: <20220514014322.2927339-2-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220514014322.2927339-1-baolu.lu@linux.intel.com> This header file is private to the Intel IOMMU driver. Move it to the driver folder. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- .../trace/events/intel_iommu.h => drivers/iommu/intel/trace.h | 4 ++++ drivers/iommu/intel/dmar.c | 2 +- drivers/iommu/intel/svm.c | 2 +- drivers/iommu/intel/trace.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) rename include/trace/events/intel_iommu.h => drivers/iommu/intel/trace.h (94%) diff --git a/include/trace/events/intel_iommu.h b/drivers/iommu/intel/trace.h similarity index 94% rename from include/trace/events/intel_iommu.h rename to drivers/iommu/intel/trace.h index e5c1ca6d16ee..25cb7f88e1a2 100644 --- a/include/trace/events/intel_iommu.h +++ b/drivers/iommu/intel/trace.h @@ -91,4 +91,8 @@ TRACE_EVENT(prq_report, #endif /* _TRACE_INTEL_IOMMU_H */ /* This part must be outside protection */ +#undef TRACE_INCLUDE_PATH +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_PATH ../../drivers/iommu/intel/ +#define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h> diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index 4de960834a1b..b02d72097a8c 100644 --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -31,10 +31,10 @@ #include <linux/limits.h> #include <asm/irq_remapping.h> #include <asm/iommu_table.h> -#include <trace/events/intel_iommu.h> #include "../irq_remapping.h" #include "perf.h" +#include "trace.h" typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *); struct dmar_res_callback { diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index 7ee37d996e15..70b40d007a52 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -21,11 +21,11 @@ #include <linux/ioasid.h> #include <asm/page.h> #include <asm/fpu/api.h> -#include <trace/events/intel_iommu.h> #include "pasid.h" #include "perf.h" #include "../iommu-sva-lib.h" +#include "trace.h" static irqreturn_t prq_event_thread(int irq, void *d); static void intel_svm_drain_prq(struct device *dev, u32 pasid); diff --git a/drivers/iommu/intel/trace.c b/drivers/iommu/intel/trace.c index bfb6a6e37a88..117e626e3ea9 100644 --- a/drivers/iommu/intel/trace.c +++ b/drivers/iommu/intel/trace.c @@ -11,4 +11,4 @@ #include <linux/types.h> #define CREATE_TRACE_POINTS -#include <trace/events/intel_iommu.h> +#include "trace.h" -- 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 ` Lu Baolu [this message] 2022-05-14 1:43 ` [PATCH 1/7] iommu/vt-d: Move trace/events/intel_iommu.h under iommu Lu Baolu 2022-05-16 18:04 ` Jason Gunthorpe 2022-05-16 18:04 ` Jason Gunthorpe via iommu 2022-05-14 1:43 ` [PATCH 2/7] agp/intel: Use per device iommu check 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 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-2-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.