public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/1] ARMv8: make master CPU checking logic more clear
@ 2017-09-25  7:28 zijun_hu
  2017-10-09 17:00 ` [U-Boot] [U-Boot, " Tom Rini
  0 siblings, 1 reply; 2+ messages in thread
From: zijun_hu @ 2017-09-25  7:28 UTC (permalink / raw)
  To: u-boot

From: zijun_hu <zijun_hu@htc.com>

macro branch_if_master checks master CPU via (Aff3 & (Aff2:Aff1:Aff0))
it is simple but a little obscure.

fix by checking Affx fields within MPIDR_EL1 directly.

Signed-off-by: zijun_hu <zijun_hu@htc.com>
---
 arch/arm/include/asm/macro.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h
index e1916f7..0c8652a 100644
--- a/arch/arm/include/asm/macro.h
+++ b/arch/arm/include/asm/macro.h
@@ -131,6 +131,7 @@ lr	.req	x30
 	/* NOTE: MPIDR handling will be erroneous on multi-cluster machines */
 	mrs	\xreg1, mpidr_el1
 	lsr	\xreg2, \xreg1, #32
+	lsl	\xreg2, \xreg2, #32
 	lsl	\xreg1, \xreg1, #40
 	lsr	\xreg1, \xreg1, #40
 	orr	\xreg1, \xreg1, \xreg2
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [U-Boot, 1/1] ARMv8: make master CPU checking logic more clear
  2017-09-25  7:28 [U-Boot] [PATCH 1/1] ARMv8: make master CPU checking logic more clear zijun_hu
@ 2017-10-09 17:00 ` Tom Rini
  0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2017-10-09 17:00 UTC (permalink / raw)
  To: u-boot

On Mon, Sep 25, 2017 at 03:28:50PM +0800, zijun_hu wrote:

> From: zijun_hu <zijun_hu@htc.com>
> 
> macro branch_if_master checks master CPU via (Aff3 & (Aff2:Aff1:Aff0))
> it is simple but a little obscure.
> 
> fix by checking Affx fields within MPIDR_EL1 directly.
> 
> Signed-off-by: zijun_hu <zijun_hu@htc.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171009/61cf69d7/attachment.sig>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-10-09 17:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-25  7:28 [U-Boot] [PATCH 1/1] ARMv8: make master CPU checking logic more clear zijun_hu
2017-10-09 17:00 ` [U-Boot] [U-Boot, " Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox