From: Stephen Boyd Date: Fri, 24 Oct 2014 00:35:07 +0000 (-0700) Subject: ARM: qcom: scm: Clarify boot interface X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=65b4ab65538e0da8e03e05d137001f10c78273d0;p=deliverable%2Flinux.git ARM: qcom: scm: Clarify boot interface The secure world only knows about 32-bit wide physical addresses for the boot API. Clarify the kernel interface by explicitly stating a u32 instead of phys_addr_t which could be 32 or 64 bits depending on LPAE or not. Signed-off-by: Stephen Boyd Signed-off-by: Kumar Gala --- diff --git a/arch/arm/mach-qcom/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c index 45cee3e469a5..f2fa32834631 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/arch/arm/mach-qcom/scm-boot.c @@ -24,11 +24,11 @@ /* * Set the cold/warm boot address for one of the CPU cores. */ -int scm_set_boot_addr(phys_addr_t addr, int flags) +int scm_set_boot_addr(u32 addr, int flags) { struct { unsigned int flags; - phys_addr_t addr; + u32 addr; } cmd; cmd.addr = addr; diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h index 02b445c426ce..3e210fb818bb 100644 --- a/arch/arm/mach-qcom/scm-boot.h +++ b/arch/arm/mach-qcom/scm-boot.h @@ -21,6 +21,6 @@ #define SCM_FLAG_WARMBOOT_CPU2 0x10 #define SCM_FLAG_WARMBOOT_CPU3 0x40 -int scm_set_boot_addr(phys_addr_t addr, int flags); +int scm_set_boot_addr(u32 addr, int flags); #endif