Created
July 4, 2024 07:37
-
-
Save shivaprasadbhat/3f33f50555388290c24d547dd78c370e to your computer and use it in GitHub Desktop.
ubsan tot patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit a4a062a0c923a90a332f42d49015c7c29eb0800c | |
| Author: Shivaprasad G Bhat <sbhat@linux.ibm.com> | |
| Date: Tue Jul 2 01:14:15 2024 -0500 | |
| powerpc/pseries/iommu: Define spapr_tce_table_group_ops only with CONFIG_IOMMU_API | |
| The patch fixes the below warning, | |
| arch/powerpc/platforms/pseries/iommu.c:1824:37: warning: 'spapr_tce_table_group_ops' defined but not used [-Wunused-variable] | |
| The other error reported by the test robot no longer exists on the top | |
| of the tree due to later changes on the file. | |
| Reported-by: kernel test robot <lkp@intel.com> | |
| Closes: https://lore.kernel.org/oe-kbuild-all/202407020357.Hz8kQkKf-lkp@intel.com/ | |
| Fixes: b09c031d9433 ("powerpc/iommu: Move pSeries specific functions to pseries/iommu.c") | |
| Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com> | |
| diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c | |
| index 672199ba7400..534cd159e9ab 100644 | |
| --- a/arch/powerpc/platforms/pseries/iommu.c | |
| +++ b/arch/powerpc/platforms/pseries/iommu.c | |
| @@ -68,7 +68,9 @@ static struct iommu_table *iommu_pseries_alloc_table(int node) | |
| return tbl; | |
| } | |
| +#ifdef CONFIG_IOMMU_API | |
| static struct iommu_table_group_ops spapr_tce_table_group_ops; | |
| +#endif | |
| static struct iommu_table_group *iommu_pseries_alloc_group(int node) | |
| { | |
| @@ -165,6 +167,7 @@ static unsigned long tce_get_pseries(struct iommu_table *tbl, long index) | |
| return be64_to_cpu(*tcep); | |
| } | |
| +#ifdef CONFIG_IOMMU_API | |
| static long pseries_tce_iommu_userspace_view_alloc(struct iommu_table *tbl) | |
| { | |
| unsigned long cb = ALIGN(sizeof(tbl->it_userspace[0]) * tbl->it_size, PAGE_SIZE); | |
| @@ -183,6 +186,7 @@ static long pseries_tce_iommu_userspace_view_alloc(struct iommu_table *tbl) | |
| return 0; | |
| } | |
| +#endif | |
| static void tce_iommu_userspace_view_free(struct iommu_table *tbl) | |
| { | |
| @@ -738,6 +742,7 @@ struct iommu_table_ops iommu_table_lpar_multi_ops = { | |
| .free = tce_free_pSeries | |
| }; | |
| +#ifdef CONFIG_IOMMU_API | |
| /* | |
| * When the DMA window properties might have been removed, | |
| * the parent node has the table_group setup on it. | |
| @@ -757,6 +762,7 @@ static struct device_node *pci_dma_find_parent_node(struct pci_dev *dev, | |
| return NULL; | |
| } | |
| +#endif | |
| /* | |
| * Find nearest ibm,dma-window (default DMA window) or direct DMA window or | |
| @@ -1845,6 +1851,7 @@ static bool iommu_bypass_supported_pSeriesLP(struct pci_dev *pdev, u64 dma_mask) | |
| return false; | |
| } | |
| +#ifdef CONFIG_IOMMU_API | |
| /* | |
| * A simple iommu_table_group_ops which only allows reusing the existing | |
| * iommu_table. This handles VFIO for POWER7 or the nested KVM. | |
| @@ -2327,6 +2334,7 @@ static struct iommu_table_group_ops spapr_tce_table_group_ops = { | |
| .take_ownership = spapr_tce_take_ownership, | |
| .release_ownership = spapr_tce_release_ownership, | |
| }; | |
| +#endif | |
| static int iommu_mem_notifier(struct notifier_block *nb, unsigned long action, | |
| void *data) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment