| Message ID | 20200828161212.71294-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] iommu/vt-d: Move intel_iommu_gfx_mapped to Intel IOMMU header | expand |
Hi Andy, On 8/29/20 12:12 AM, Andy Shevchenko wrote: > Static analyzer is not happy about intel_iommu_gfx_mapped declaration: > > .../drivers/iommu/intel/iommu.c:364:5: warning: symbol 'intel_iommu_gfx_mapped' was not declared. Should it be static? > > Move its declaration to Intel IOMMU header file. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > include/drm/intel-gtt.h | 5 +---- > include/linux/intel-iommu.h | 1 + > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h > index 71d81923e6b0..abfefaaf897a 100644 > --- a/include/drm/intel-gtt.h > +++ b/include/drm/intel-gtt.h > @@ -5,6 +5,7 @@ > #define _DRM_INTEL_GTT_H > > #include <linux/agp_backend.h> > +#include <linux/intel-iommu.h> > #include <linux/kernel.h> > > void intel_gtt_get(u64 *gtt_total, > @@ -33,8 +34,4 @@ void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries); > /* flag for GFDT type */ > #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3) > > -#ifdef CONFIG_INTEL_IOMMU > -extern int intel_iommu_gfx_mapped; > -#endif > - > #endif > diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h > index 64fa5c56c825..fbd3bb64649b 100644 > --- a/include/linux/intel-iommu.h > +++ b/include/linux/intel-iommu.h > @@ -794,6 +794,7 @@ extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu); > extern int dmar_disabled; > extern int intel_iommu_enabled; > extern int intel_iommu_tboot_noforce; > +extern int intel_iommu_gfx_mapped; > #else > static inline int iommu_calculate_agaw(struct intel_iommu *iommu) > { > Looks good to me. Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com> Best regards, baolu
On Fri, Aug 28, 2020 at 07:12:11PM +0300, Andy Shevchenko wrote: > Static analyzer is not happy about intel_iommu_gfx_mapped declaration: > > .../drivers/iommu/intel/iommu.c:364:5: warning: symbol 'intel_iommu_gfx_mapped' was not declared. Should it be static? > > Move its declaration to Intel IOMMU header file. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > include/drm/intel-gtt.h | 5 +---- > include/linux/intel-iommu.h | 1 + > 2 files changed, 2 insertions(+), 4 deletions(-) Applied, thanks.
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 71d81923e6b0..abfefaaf897a 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -5,6 +5,7 @@ #define _DRM_INTEL_GTT_H #include <linux/agp_backend.h> +#include <linux/intel-iommu.h> #include <linux/kernel.h> void intel_gtt_get(u64 *gtt_total, @@ -33,8 +34,4 @@ void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries); /* flag for GFDT type */ #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3) -#ifdef CONFIG_INTEL_IOMMU -extern int intel_iommu_gfx_mapped; -#endif - #endif diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 64fa5c56c825..fbd3bb64649b 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -794,6 +794,7 @@ extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu); extern int dmar_disabled; extern int intel_iommu_enabled; extern int intel_iommu_tboot_noforce; +extern int intel_iommu_gfx_mapped; #else static inline int iommu_calculate_agaw(struct intel_iommu *iommu) {
Static analyzer is not happy about intel_iommu_gfx_mapped declaration: .../drivers/iommu/intel/iommu.c:364:5: warning: symbol 'intel_iommu_gfx_mapped' was not declared. Should it be static? Move its declaration to Intel IOMMU header file. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- include/drm/intel-gtt.h | 5 +---- include/linux/intel-iommu.h | 1 + 2 files changed, 2 insertions(+), 4 deletions(-)