Re: [U-Boot] [PATCH v4 2/6] ARMv8: Enable SMC instruction
On 11/30/2016 01:47 AM, Hongbo Zhang wrote: > OK. > > And currently this series are against the community tree, and if this > should go to your tree, I should rebase to yours, right? > No. Please use upstream master branch. I trye to keep my repo in sync but mostly it is behind by several merges. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 2/6] ARMv8: Enable SMC instruction
OK. And currently this series are against the community tree, and if this should go to your tree, I should rebase to yours, right? On Wed, Nov 30, 2016 at 4:49 AM, york sunwrote: > On 11/25/2016 02:47 AM, Hongbo Zhang wrote: >> PSCI implementation needs the SMC instruction to be enabled. >> Following the legacy codes pattern, no bit macro definition and bit operation >> are used, only the immediate data used in line is changed. >> >> Signed-off-by: Hongbo Zhang >> Reviewed-by: Tom Rini >> --- >> arch/arm/include/asm/macro.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h >> index 9bb0efa..35ea002 100644 >> --- a/arch/arm/include/asm/macro.h >> +++ b/arch/arm/include/asm/macro.h >> @@ -137,7 +137,7 @@ lr.reqx30 >> >> .macro armv8_switch_to_el2_m, xreg1 >> /* 64bit EL2 | HCE | SMD | RES1 (Bits[5:4]) | Non-secure EL0/EL1 */ >> - mov \xreg1, #0x5b1 >> + mov \xreg1, #0x531 >> msr scr_el3, \xreg1 >> msr cptr_el3, xzr /* Disable coprocessor traps to EL3 */ >> mov \xreg1, #0x33ff >> > > Hongbo, > > This has a conflict. Please work with Alison Wang to figure out the SMD > bit as she has changed the code to deal with both 64- and 32-bit. I can > guess a fix to this conflict, but rather to have her onboard. > > York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 2/6] ARMv8: Enable SMC instruction
On 11/25/2016 02:47 AM, Hongbo Zhang wrote: > PSCI implementation needs the SMC instruction to be enabled. > Following the legacy codes pattern, no bit macro definition and bit operation > are used, only the immediate data used in line is changed. > > Signed-off-by: Hongbo Zhang> Reviewed-by: Tom Rini > --- > arch/arm/include/asm/macro.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h > index 9bb0efa..35ea002 100644 > --- a/arch/arm/include/asm/macro.h > +++ b/arch/arm/include/asm/macro.h > @@ -137,7 +137,7 @@ lr.reqx30 > > .macro armv8_switch_to_el2_m, xreg1 > /* 64bit EL2 | HCE | SMD | RES1 (Bits[5:4]) | Non-secure EL0/EL1 */ > - mov \xreg1, #0x5b1 > + mov \xreg1, #0x531 > msr scr_el3, \xreg1 > msr cptr_el3, xzr /* Disable coprocessor traps to EL3 */ > mov \xreg1, #0x33ff > Hongbo, This has a conflict. Please work with Alison Wang to figure out the SMD bit as she has changed the code to deal with both 64- and 32-bit. I can guess a fix to this conflict, but rather to have her onboard. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 2/6] ARMv8: Enable SMC instruction
PSCI implementation needs the SMC instruction to be enabled. Following the legacy codes pattern, no bit macro definition and bit operation are used, only the immediate data used in line is changed. Signed-off-by: Hongbo ZhangReviewed-by: Tom Rini --- arch/arm/include/asm/macro.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 9bb0efa..35ea002 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -137,7 +137,7 @@ lr .reqx30 .macro armv8_switch_to_el2_m, xreg1 /* 64bit EL2 | HCE | SMD | RES1 (Bits[5:4]) | Non-secure EL0/EL1 */ - mov \xreg1, #0x5b1 + mov \xreg1, #0x531 msr scr_el3, \xreg1 msr cptr_el3, xzr /* Disable coprocessor traps to EL3 */ mov \xreg1, #0x33ff -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot