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

Commit fe333321 authored by Ingo Molnar's avatar Ingo Molnar Committed by Benjamin Herrenschmidt
Browse files

powerpc: Change u64/s64 to a long long integer type 



Convert arch/powerpc/ over to long long based u64:

 -#ifdef __powerpc64__
 -# include <asm-generic/int-l64.h>
 -#else
 -# include <asm-generic/int-ll64.h>
 -#endif
 +#include <asm-generic/int-ll64.h>

This will avoid reoccuring spurious warnings in core kernel code that
comes when people test on their own hardware. (i.e. x86 in ~98% of the
cases) This is what x86 uses and it generally helps keep 64-bit code
32-bit clean too.

[Adjusted to not impact user mode (from paulus) - sfr]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 66c721e1

arch/powerpc/include/asm/rtas.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 */



#define RTAS_UNKNOWN_SERVICE (-1)

#define RTAS_INSTANTIATE_MAX (1UL<<30) /* Don't instantiate rtas at/above this value */

#define RTAS_INSTANTIATE_MAX (1ULL<<30) /* Don't instantiate rtas at/above this value */



/* Buffer size for ppc_rtas system call. */

#define RTAS_RMOBUF_MAX (64 * 1024)

arch/powerpc/include/asm/types.h

+6 −1
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_TYPES_H

#define _ASM_POWERPC_TYPES_H



#ifdef __powerpc64__

/*

 * This is here because we used to use l64 for 64bit powerpc

 * and we don't want to impact user mode with our change to ll64

 * in the kernel.

 */

#if defined(__powerpc64__) && !defined(__KERNEL__)

# include <asm-generic/int-l64.h>

#else

# include <asm-generic/int-ll64.h>

arch/powerpc/kernel/dma-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask) 
		       "Warning: IOMMU offset too big for device mask\n");

		if (tbl)

			printk(KERN_INFO

			       "mask: 0x%08lx, table offset: 0x%08lx\n",

			       "mask: 0x%08llx, table offset: 0x%08lx\n",

				mask, tbl->it_offset);

		else

			printk(KERN_INFO "mask: 0x%08lx, table unavailable\n",

			printk(KERN_INFO "mask: 0x%08llx, table unavailable\n",

				mask);

		return 0;

	} else

arch/powerpc/kernel/iommu.c

+6 −6
Original line number Diff line number Diff line
@@ -239,12 +239,12 @@ static void __iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, 
		if (printk_ratelimit()) {

			printk(KERN_INFO "iommu_free: invalid entry\n");

			printk(KERN_INFO "\tentry     = 0x%lx\n", entry); 

			printk(KERN_INFO "\tdma_addr  = 0x%lx\n", (u64)dma_addr);

			printk(KERN_INFO "\tTable     = 0x%lx\n", (u64)tbl);

			printk(KERN_INFO "\tbus#      = 0x%lx\n", (u64)tbl->it_busno);

			printk(KERN_INFO "\tsize      = 0x%lx\n", (u64)tbl->it_size);

			printk(KERN_INFO "\tstartOff  = 0x%lx\n", (u64)tbl->it_offset);

			printk(KERN_INFO "\tindex     = 0x%lx\n", (u64)tbl->it_index);

			printk(KERN_INFO "\tdma_addr  = 0x%llx\n", (u64)dma_addr);

			printk(KERN_INFO "\tTable     = 0x%llx\n", (u64)tbl);

			printk(KERN_INFO "\tbus#      = 0x%llx\n", (u64)tbl->it_busno);

			printk(KERN_INFO "\tsize      = 0x%llx\n", (u64)tbl->it_size);

			printk(KERN_INFO "\tstartOff  = 0x%llx\n", (u64)tbl->it_offset);

			printk(KERN_INFO "\tindex     = 0x%llx\n", (u64)tbl->it_index);

			WARN_ON(1);

		}

		return;

arch/powerpc/kernel/lparcfg.c

+5 −5
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void parse_ppp_data(struct seq_file *m) 
	if (rc)

		return;



	seq_printf(m, "partition_entitled_capacity=%ld\n",

	seq_printf(m, "partition_entitled_capacity=%lld\n",

	           ppp_data.entitlement);

	seq_printf(m, "group=%d\n", ppp_data.group_num);

	seq_printf(m, "system_active_processors=%d\n",
@@ -265,7 +265,7 @@ static void parse_ppp_data(struct seq_file *m) 
		   ppp_data.unallocated_weight);

	seq_printf(m, "capacity_weight=%d\n", ppp_data.weight);

	seq_printf(m, "capped=%d\n", ppp_data.capped);

	seq_printf(m, "unallocated_capacity=%ld\n",

	seq_printf(m, "unallocated_capacity=%lld\n",

		   ppp_data.unallocated_entitlement);

}
@@ -509,10 +509,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight) 
	} else

		return -EINVAL;



	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",

	pr_debug("%s: current_entitled = %llu, current_weight = %u\n",

		 __func__, ppp_data.entitlement, ppp_data.weight);



	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",

	pr_debug("%s: new_entitled = %llu, new_weight = %u\n",

		 __func__, new_entitled, new_weight);



	retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
@@ -558,7 +558,7 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight) 
	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",

	         __func__, mpp_data.entitled_mem, mpp_data.mem_weight);



	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",

	pr_debug("%s: new_entitled = %llu, new_weight = %u\n",

		 __func__, new_entitled, new_weight);



	rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);