Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43b4f406 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[POWERPC] cell: fix bugs found by sparse 



- Some long constants should be marked 'ul'.
- When using desc->handler_data to pass an __iomem
  register area, we need to add casts to and from
  __iomem.

Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f7e2ce78

arch/powerpc/platforms/cell/interrupt.c

+7 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void iic_ioexc_eoi(unsigned int irq) 
static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc,

			    struct pt_regs *regs)

{

	struct cbe_iic_regs *node_iic = desc->handler_data;

	struct cbe_iic_regs __iomem *node_iic = (void __iomem *)desc->handler_data;

	unsigned int base = (irq & 0xffffff00) | IIC_IRQ_TYPE_IOEXC;

	unsigned long bits, ack;

	int cascade;
@@ -320,7 +320,7 @@ static int __init setup_iic(void) 
	struct device_node *dn;

	struct resource r0, r1;

	unsigned int node, cascade, found = 0;

	struct cbe_iic_regs *node_iic;

	struct cbe_iic_regs __iomem *node_iic;

	const u32 *np;



	for (dn = NULL;
@@ -357,7 +357,11 @@ static int __init setup_iic(void) 
		cascade = irq_create_mapping(iic_host, cascade);

		if (cascade == NO_IRQ)

			continue;

		set_irq_data(cascade, node_iic);

		/*

		 * irq_data is a generic pointer that gets passed back

		 * to us later, so the forced cast is fine.

		 */

		set_irq_data(cascade, (void __force *)node_iic);

		set_irq_chained_handler(cascade , iic_ioexc_cascade);

		out_be64(&node_iic->iic_ir,

			 (1 << 12)		/* priority */ |

arch/powerpc/platforms/cell/iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -345,8 +345,8 @@ static int cell_map_iommu_hardcoded(int num_nodes) 


	/* node 0 */

	iommu = &cell_iommus[0];

	iommu->mapped_base = ioremap(0x20000511000, 0x1000);

	iommu->mapped_mmio_base = ioremap(0x20000510000, 0x1000);

	iommu->mapped_base = ioremap(0x20000511000ul, 0x1000);

	iommu->mapped_mmio_base = ioremap(0x20000510000ul, 0x1000);



	enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
@@ -358,8 +358,8 @@ static int cell_map_iommu_hardcoded(int num_nodes) 


	/* node 1 */

	iommu = &cell_iommus[1];

	iommu->mapped_base = ioremap(0x30000511000, 0x1000);

	iommu->mapped_mmio_base = ioremap(0x30000510000, 0x1000);

	iommu->mapped_base = ioremap(0x30000511000ul, 0x1000);

	iommu->mapped_mmio_base = ioremap(0x30000510000ul, 0x1000);



	enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);

arch/powerpc/platforms/cell/spider-pic.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ void __init spider_init_IRQ(void) 
		} else if (device_is_compatible(dn, "sti,platform-spider-pic")

			   && (chip < 2)) {

			static long hard_coded_pics[] =

				{ 0x24000008000, 0x34000008000 };

				{ 0x24000008000ul, 0x34000008000ul};

			r.start = hard_coded_pics[chip];

		} else

			continue;