evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] ppc64: Fix build with iommu debug enabled

Browse source 
Fix build when iommu debug is enabled.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Anton Blanchard 2005-09-22 21:44:05 -07:00 • committed by Linus Torvalds
parent 586a90eb4c
commit f951da3757
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/ppc64/kernel/pSeries_iommu.c
View file

@ -364,7 +364,8 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
while (pci->phb->dma_window_size * children > 0x80000000ul) while (pci->phb->dma_window_size * children > 0x80000000ul)
pci->phb->dma_window_size >>= 1; pci->phb->dma_window_size >>= 1;
DBG("No ISA/IDE, window size is %x\n", pci->phb->dma_window_size); DBG("No ISA/IDE, window size is 0x%lx\n",
pci->phb->dma_window_size);
pci->phb->dma_window_base_cur = 0; pci->phb->dma_window_base_cur = 0;
return; return;
@ -388,7 +389,7 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
while (pci->phb->dma_window_size * children > 0x70000000ul) while (pci->phb->dma_window_size * children > 0x70000000ul)
pci->phb->dma_window_size >>= 1; pci->phb->dma_window_size >>= 1;
DBG("ISA/IDE, window size is %x\n", pci->phb->dma_window_size); DBG("ISA/IDE, window size is 0x%lx\n", pci->phb->dma_window_size);
} }
@ -442,7 +443,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
struct device_node *dn, *mydn; struct device_node *dn, *mydn;
struct iommu_table *tbl; struct iommu_table *tbl;
DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, dev->pretty_name); DBG("iommu_dev_setup_pSeries, dev %p (%s)\n", dev, pci_name(dev));
mydn = dn = pci_device_to_OF_node(dev); mydn = dn = pci_device_to_OF_node(dev);
@ -469,7 +470,7 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
if (dn && dn->data) { if (dn && dn->data) {
PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table; PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table;
} else { } else {
DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, dev->pretty_name); DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, pci_name(dev));
} }
} }
@ -503,7 +504,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
int *dma_window = NULL; int *dma_window = NULL;
struct pci_dn *pci; struct pci_dn *pci;
DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, dev->pretty_name); DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev));
/* dev setup for LPAR is a little tricky, since the device tree might /* dev setup for LPAR is a little tricky, since the device tree might
* contain the dma-window properties per-device and not neccesarily * contain the dma-window properties per-device and not neccesarily