x86-64: Calgary - fix calgary=disable=<busnum> for CalIOC2
PATCH 1/2 x86-64: Calgary - fix calgary=disable=<busnum> for CalIOC2
The old check we used based on dev->bus->number is wrong for devices on CalIOC2. Instead look whether we have an IOMMU table for that bus - if not, translation is disabled.
Thanks to Murillo Fernandes Bernardes <[email protected]> for spotting, suggesting a fix and testing.
Signed-off-by Muli Ben-Yehuda <[email protected]>
---
Andi, This is Calgary 2.6.24 material - please apply.
pci-calgary.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
arch/x86_64/kernel/pci-calgary.c +11 -5
@@ -220,6 +220,12 @@ static inline unsigned int num_dma_pagesreturn npages; } +static inline int translation_enabled (struct iommu_table *tbl) +{ +/* only PHBs with translation enabled have an IOMMU table */ +return (tbl !=NULL ); +} +static inline int translate_phb (struct pci_dev * dev) {int disabled = bus_info[dev->bus->number].translation_disabled;
@@ -384,7 +390,7 @@ static void calgary_unmap_sg(struct devi {struct iommu_table *tbl =find_iommu_table (dev); -if (!translate_phb (to_pci_dev (dev))) +if (!translation_enabled (tbl))return ;while (nelems--) {
@@ -424,7 +430,7 @@ static int calgary_map_sg(struct deviceunsigned long entry;int i; -if (!translate_phb (to_pci_dev (dev))) +if (!translation_enabled (tbl))return calgary_nontranslate_map_sg (dev, sg, nelems, direction);for (i =0 ; i < nelems; i++ ) {
@@ -471,7 +477,7 @@ static dma_addr_t calgary_map_single(str uaddr = (unsigned long )vaddr; npages =num_dma_pages (uaddr, size); -if (translate_phb (to_pci_dev (dev))) +if (translation_enabled (tbl)) dma_handle =iommu_alloc (tbl, vaddr, npages, direction);else dma_handle =virt_to_bus (vaddr);
@@ -485,7 +491,7 @@ static void calgary_unmap_single(structstruct iommu_table *tbl =find_iommu_table (dev);unsigned int npages; -if (!translate_phb (to_pci_dev (dev))) +if (!translation_enabled (tbl))return ; npages =num_dma_pages (dma_handle, size);
@@ -510,7 +516,7 @@ static void* calgary_alloc_coherent(stru goto error;memset (ret,0 , size); -if (translate_phb (to_pci_dev (dev))) { +if (translation_enabled (tbl)) {/* set up tces to cover the allocated range */ mapping =iommu_alloc (tbl, ret, npages,DMA_BIDIRECTIONAL );if (mapping == bad_dma_address)
PATCH 2/2 x86-64: Calgary - get rid of translate_phb
Now that we check for translation enabled/disabled based on the presence of the IOMMU translation table, we can get rid of translate_phb.
Signed-off-by Muli Ben-Yehuda <[email protected]>
--- pci-calgary.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-)
arch/x86_64/kernel/pci-calgary.c +15 -16
@@ -226,12 +226,6 @@ static inline int translation_enabled(streturn (tbl !=NULL ); } -static inline int translate_phb (struct pci_dev * dev) -{ -int disabled = bus_info[dev->bus->number].translation_disabled; -return !disabled; -} -static void iommu_range_reserve (struct iommu_table *tbl,unsigned long start_addr,unsigned int npages) {
@@ -1197,7 +1191,7 @@ static int __init calgary_init(void) {int ret;struct pci_dev *dev =NULL ; -void *tce_space; +struct calgary_bus_info *info; ret =calgary_locate_bbars ();if (ret)
@@ -1209,12 +1203,14 @@ static int __init calgary_init(void)break ;if (!is_cal_pci_dev (dev->device))continue ; -if (!translate_phb (dev)) { + + info = &bus_info[dev->bus->number]; +if (info->translation_disabled) {calgary_init_one_nontraslated (dev);continue ; } - tce_space = bus_info[dev->bus->number].tce_space; -if (!tce_space && !translate_empty_slots) + +if (!info->tce_space && !translate_empty_slots)continue ; ret =calgary_init_one (dev);
@@ -1232,11 +1228,13 @@ error:break ;if (!is_cal_pci_dev (dev->device))continue ; -if (!translate_phb (dev)) { + + info = &bus_info[dev->bus->number]; +if (info->translation_disabled) {pci_dev_put (dev);continue ; } -if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots) +if (!info->tce_space && !translate_empty_slots)continue ;calgary_disable_translation (dev);
@@ -1549,7 +1547,7 @@ static int __init calgary_fixup_tce_spacstatic int __init calgary_fixup_tce_spaces (void ) {struct pci_dev *dev =NULL ; -void *tce_space; +struct calgary_bus_info *info;if (no_iommu || swiotlb || !calgary_detected)return -ENODEV ;
@@ -1562,11 +1560,12 @@ static int __init calgary_fixup_tce_spacbreak ;if (!is_cal_pci_dev (dev->device))continue ; -if (!translate_phb (dev)) + + info = &bus_info[dev->bus->number]; +if (info->translation_disabled)continue ; - tce_space = bus_info[dev->bus->number].tce_space; -if (!tce_space) +if (!info->tce_space)continue ;calgary_fixup_one_tce_space (dev);