powerpc: of_parse_dma_window should take a __be32 *dma_window

We pass dma_window to of_parse_dma_window as a void * and then
run through hoops to cast it back to a u32 array. In the process
we lose endian annotation.

Simplify it by just passing a __be32 * down.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 3bac73ecc349799ba6d7587f2ef363d3df96cc52..e6ec2cffba16a91aa10645d71d105d9aafd44a71 100644 (file)
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -38,8 +38,9 @@ extern unsigned long pci_address_to_pio(phys_addr_t address);
 /* Parse the ibm,dma-window property of an OF node into the busno, phys and
  * size parameters.
  */
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-               unsigned long *busno, unsigned long *phys, unsigned long *size);
+void of_parse_dma_window(struct device_node *dn, const __be32 *dma_window,
+                        unsigned long *busno, unsigned long *phys,
+                        unsigned long *size);
 
 extern void kdump_move_device_tree(void);
 

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 4e1331b8eb33e5c613394e312b2799d365fa07f8..6295e646f78cca6a204d4becdb2ec7d8ccdfde40 100644 (file)
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -7,28 +7,27 @@
 #include <linux/of_address.h>
 #include <asm/prom.h>
 
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-               unsigned long *busno, unsigned long *phys, unsigned long *size)
+void of_parse_dma_window(struct device_node *dn, const __be32 *dma_window,
+                        unsigned long *busno, unsigned long *phys,
+                        unsigned long *size)
 {
-       const u32 *dma_window;
        u32 cells;
-       const unsigned char *prop;
-
-       dma_window = dma_window_prop;
+       const __be32 *prop;
 
        /* busno is always one cell */
-       *busno = *(dma_window++);
+       *busno = of_read_number(dma_window, 1);
+       dma_window++;
 
        prop = of_get_property(dn, "ibm,#dma-address-cells", NULL);
        if (!prop)
                prop = of_get_property(dn, "#address-cells", NULL);
 
-       cells = prop ? *(u32 *)prop : of_n_addr_cells(dn);
+       cells = prop ? of_read_number(prop, 1) : of_n_addr_cells(dn);
        *phys = of_read_number(dma_window, cells);
 
        dma_window += cells;
 
        prop = of_get_property(dn, "ibm,#dma-size-cells", NULL);
-       cells = prop ? *(u32 *)prop : of_n_size_cells(dn);
+       cells = prop ? of_read_number(prop, 1) : of_n_size_cells(dn);
        *size = of_read_number(dma_window, cells);
 }

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 536016d792baf8a8a7208c4cd2f300c1672d49f2..31875a6002b783a199fbb2af1cbb913117d7fc84 100644 (file)
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1153,7 +1153,7 @@ EXPORT_SYMBOL(vio_h_cop_sync);
 
 static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
-       const unsigned char *dma_window;
+       const __be32 *dma_window;
        struct iommu_table *tbl;
        unsigned long offset, size;
 

diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 946306b1bb4ed5e12c24f8df55b97577924af756..b53560660b72e72030a6235d295be8ab1fd9c722 100644 (file)
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -697,7 +697,7 @@ static int __init cell_iommu_get_window(struct device_node *np,
                                         unsigned long *base,
                                         unsigned long *size)
 {
-       const void *dma_window;
+       const __be32 *dma_window;
        unsigned long index;
 
        /* Use ibm,dma-window if available, else, hard code ! */

diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 23fc1dcf44344543a9e3336b61e5f0d9f2bf6201..9087f97687814feb7e3235bcf7b270e25f96049f 100644 (file)
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -530,7 +530,7 @@ static void iommu_table_setparms(struct pci_controller *phb,
 static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                      struct device_node *dn,
                                      struct iommu_table *tbl,
-                                     const void *dma_window)
+                                     const __be32 *dma_window)
 {
        unsigned long offset, size;
 
@@ -630,7 +630,7 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)
        struct iommu_table *tbl;
        struct device_node *dn, *pdn;
        struct pci_dn *ppci;
-       const void *dma_window = NULL;
+       const __be32 *dma_window = NULL;
 
        dn = pci_bus_to_OF_node(bus);
 
@@ -1152,7 +1152,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 {
        struct device_node *pdn, *dn;
        struct iommu_table *tbl;
-       const void *dma_window = NULL;
+       const __be32 *dma_window = NULL;
        struct pci_dn *pci;
 
        pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev));
@@ -1201,7 +1201,7 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
        bool ddw_enabled = false;
        struct device_node *pdn, *dn;
        struct pci_dev *pdev;
-       const void *dma_window = NULL;
+       const __be32 *dma_window = NULL;
        u64 dma_offset;
 
        if (!dev->dma_mask)