Don't build virtual IO drivers for PowerMac
Andrew, please apply:
Only compile vio.c on iSeries and pSeries, since other PPC64 platforms (PowerMac) don't use virtual IO. The resulting #ifdefs in dma.c are kind of ugly, but at least contained, and I can't see a nicer way of doing it for the time being.
Signed-off-by David Gibson <[email protected]>
arch/ppc64/kernel/Makefile +2 -1
@@ -11,7 +11,7 @@ udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ ptrace32.o signal32.o rtc.o init_task.o \ lmb.o cputable.o cpu_setup_power4.o idle_power4.o \ - iommu.o sysfs.o vio.o + iommu.o sysfs.o obj-$(CONFIG_PPC_OF) += of_device.o
@@ -45,6 +45,7 @@ obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_HVCS) += hvcserver.o +obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \ pmac_time.o pmac_nvram.o pmac_low_i2c.o \
arch/ppc64/Kconfig +5 -0
@@ -110,6 +110,11 @@ processors, that is, which share physical processors between two or more partitions. +config IBMVIO + depends on PPC_PSERIES || PPC_ISERIES + bool + default y + config U3_DART bool depends on PPC_MULTIPLATFORM
arch/ppc64/kernel/dma.c +20 -0
@@ -17,8 +17,10 @@ {if (dev->bus == &pci_bus_type)return pci_dma_supported (to_pci_dev (dev), mask); +#ifdef CONFIG_IBMVIO if (dev->bus == &vio_bus_type)return vio_dma_supported (to_vio_dev (dev), mask); +#endif /* CONFIG_IBMVIO */ BUG ();return 0 ; }
@@ -28,8 +30,10 @@ {if (dev->bus == &pci_bus_type)return pci_set_dma_mask (to_pci_dev (dev), dma_mask); +#ifdef CONFIG_IBMVIO if (dev->bus == &vio_bus_type)return vio_set_dma_mask (to_vio_dev (dev), dma_mask); +#endif /* CONFIG_IBMVIO */ BUG ();return 0 ; }
@@ -40,8 +44,10 @@ {if (dev->bus == &pci_bus_type)return pci_alloc_consistent (to_pci_dev (dev), size, dma_handle); +#ifdef CONFIG_IBMVIO if (dev->bus == &vio_bus_type)return vio_alloc_consistent (to_vio_dev (dev), size, dma_handle); +#endif /* CONFIG_IBMVIO */ BUG ();return NULL ; }
@@ -52,8 +58,10 @@ {if (dev->bus == &pci_bus_type)pci_free_consistent (to_pci_dev (dev), size, cpu_addr, dma_handle); +#ifdef CONFIG_IBMVIO else if (dev->bus == &vio_bus_type) vio_free_consistent(to_vio_dev(dev), size, cpu_addr, dma_handle); +#endif /* CONFIG_IBMVIO */ elseBUG (); }
@@ -64,8 +72,10 @@ {if (dev->bus == &pci_bus_type)return pci_map_single (to_pci_dev (dev), cpu_addr, size, (int )direction); +#ifdef CONFIG_IBMVIO if (dev->bus == &vio_bus_type)return vio_map_single (to_vio_dev (dev), cpu_addr, size, direction); +#endif /* CONFIG_IBMVIO */ BUG ();return (dma_addr_t )0 ; }
@@ -76,8 +86,10 @@ {if (dev->bus == &pci_bus_type)pci_unmap_single (to_pci_dev (dev), dma_addr, size, (int )direction); +#ifdef CONFIG_IBMVIO else if (dev->bus == &vio_bus_type) vio_unmap_single(to_vio_dev(dev), dma_addr, size, direction); +#endif /* CONFIG_IBMVIO */ elseBUG (); }
@@ -89,8 +101,10 @@ {if (dev->bus == &pci_bus_type)return pci_map_page (to_pci_dev (dev), page, offset, size, (int )direction); +#ifdef CONFIG_IBMVIO if (dev->bus == &vio_bus_type)return vio_map_page (to_vio_dev (dev), page, offset, size, direction); +#endif /* CONFIG_IBMVIO */ BUG ();return (dma_addr_t )0 ; }
@@ -101,8 +115,10 @@ {if (dev->bus == &pci_bus_type)pci_unmap_page (to_pci_dev (dev), dma_address, size, (int )direction); +#ifdef CONFIG_IBMVIO else if (dev->bus == &vio_bus_type) vio_unmap_page(to_vio_dev(dev), dma_address, size, direction); +#endif /* CONFIG_IBMVIO */ elseBUG (); }
@@ -113,8 +129,10 @@ {if (dev->bus == &pci_bus_type)return pci_map_sg (to_pci_dev (dev), sg, nents, (int )direction); +#ifdef CONFIG_IBMVIO if (dev->bus == &vio_bus_type)return vio_map_sg (to_vio_dev (dev), sg, nents, direction); +#endif /* CONFIG_IBMVIO */ BUG ();return 0 ; }
@@ -125,8 +143,10 @@ {if (dev->bus == &pci_bus_type)pci_unmap_sg (to_pci_dev (dev), sg, nhwentries, (int )direction); +#ifdef CONFIG_IBMVIO else if (dev->bus == &vio_bus_type) vio_unmap_sg(to_vio_dev(dev), sg, nhwentries, direction); +#endif /* CONFIG_IBMVIO */ elseBUG (); }
Signature · 4 lines
David Gibson | For every complex problem there is a david AT gibson.dropbear.id.au | solution which is simple, neat and | wrong. http://www.ozlabs.org/people/dgibson