Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix args to sun4v_ldc_revoke().
  [SPARC64]: Really fix parport.
  [SPARC64]: Fix IO/MEM space sizing for PCI.
  [SPARC64]: Wire up cookie based sun4v interrupt registry.

4 files changed, 23 insertions, 33 deletions

diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
index 4e21c2f3065c..c58ec1661df8 100644
--- a/include/asm-sparc64/dma-mapping.h
+++ b/include/asm-sparc64/dma-mapping.h
@@ -15,8 +15,7 @@
 static inline int
 dma_supported(struct device *dev, u64 mask)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_dma_supported(to_pci_dev(dev), mask);
 }
@@ -24,8 +23,7 @@ dma_supported(struct device *dev, u64 mask)
 static inline int
 dma_set_mask(struct device *dev, u64 dma_mask)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
 }
@@ -34,8 +32,7 @@ static inline void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
                    gfp_t flag)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag);
 }
@@ -44,8 +41,7 @@ static inline void
 dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
                     dma_addr_t dma_handle)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
 }
@@ -54,8 +50,7 @@ static inline dma_addr_t
 dma_map_single(struct device *dev, void *cpu_addr, size_t size,
                enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
 }
@@ -64,8 +59,7 @@ static inline void
 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                  enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
 }
@@ -75,8 +69,7 @@ dma_map_page(struct device *dev, struct page *page,
              unsigned long offset, size_t size,
              enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
 }
@@ -85,8 +78,7 @@ static inline void
 dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
                enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
 }
@@ -95,8 +87,7 @@ static inline int
 dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
            enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
 }
@@ -105,8 +96,7 @@ static inline void
 dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
              enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
 }
@@ -115,8 +105,7 @@ static inline void
 dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
                         enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,
                                     size, (int)direction);
@@ -126,8 +115,7 @@ static inline void
 dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
                            enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,
                                        size, (int)direction);
@@ -137,8 +125,7 @@ static inline void
 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
                     enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);
 }
@@ -147,8 +134,7 @@ static inline void
 dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
                        enum dma_data_direction direction)
 {
-        BUG_ON(dev->bus != &pci_bus_type &&
-               dev->bus != &ebus_bus_type);
+        BUG_ON(dev->bus != &pci_bus_type);
 
         pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);
 }
diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
index 5c2f9d4b9f06..db2130a95d68 100644
--- a/include/asm-sparc64/hypervisor.h
+++ b/include/asm-sparc64/hypervisor.h
@@ -2615,8 +2615,9 @@ struct ldc_mtable_entry {
 /* ldc_revoke()
  * TRAP:        HV_FAST_TRAP
  * FUNCTION:    HV_FAST_LDC_REVOKE
- * ARG0:        cookie
- * ARG1:        ldc_mtable_entry cookie
+ * ARG0:        channel ID
+ * ARG1:        cookie
+ * ARG2:        ldc_mtable_entry cookie
  * RET0:        status
  */
 #define HV_FAST_LDC_REVOKE              0xef
@@ -2663,7 +2664,8 @@ extern unsigned long sun4v_ldc_mapin(unsigned long channel,
                                      unsigned long *ra,
                                      unsigned long *perm);
 extern unsigned long sun4v_ldc_unmap(unsigned long ra);
-extern unsigned long sun4v_ldc_revoke(unsigned long cookie,
+extern unsigned long sun4v_ldc_revoke(unsigned long channel,
+                                      unsigned long cookie,
                                       unsigned long mte_cookie);
 #endif
 
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index 5d233b42fe13..90781e34a95c 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -46,6 +46,7 @@ extern void irq_install_pre_handler(int virt_irq,
 #define irq_canonicalize(irq)   (irq)
 extern unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap);
 extern unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino);
+extern unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino);
 extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
                                     unsigned int msi_devino_start,
                                     unsigned int msi_devino_end);
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index 6340a5253a34..23cc63f049a8 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -145,7 +145,7 @@ static int parport_isa_probe(int count)
                          */
                         if (parport_pc_probe_port(base, base + 0x400,
                                                   child->irq, PARPORT_DMA_NOFIFO,
-                                                  child->bus->self))
+                                                  &child->bus->self->dev))
                                 count++;
                 }
         }
@@ -199,7 +199,8 @@ static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
 
                                 if (parport_pc_probe_port(base, base + 0x400,
                                                           edev->irqs[0],
-                                                          count, ebus->self))
+                                                          count,
+                                                          &ebus->self->dev))
                                         count++;
                         }
                 }