diff options
| author |   Jayachandran C <jchandra@broadcom.com> | 2013-12-21 16:52:26 +0530 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2014-01-24 22:39:49 +0100 |
| commit | 98d4884ca55883e8b16180bd969a8bccaa885c80 (patch) | |
| tree | ca7424268b4ef49d1472895bf2bb50d57b38d4fe /arch/mips/include/asm/netlogic | |
| parent | MIPS: Netlogic: XLP9XX bridge and DRAM code (diff) | |
| download | linux-dev-98d4884ca55883e8b16180bd969a8bccaa885c80.tar.xz linux-dev-98d4884ca55883e8b16180bd969a8bccaa885c80.zip | |
MIPS: Netlogic: Add cpu to node mapping for XLP9XX
XLP9XX has 20 cores per node, opposed to 8 on earlier XLP8XX.
Update code that calculates node id from cpu id to handle this.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6283/
Diffstat (limited to 'arch/mips/include/asm/netlogic')
| -rw-r--r-- | arch/mips/include/asm/netlogic/mips-extns.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/mips/include/asm/netlogic/mips-extns.h b/arch/mips/include/asm/netlogic/mips-extns.h index f299d31d7c1a..de9aada6f4c1 100644 --- a/arch/mips/include/asm/netlogic/mips-extns.h +++ b/arch/mips/include/asm/netlogic/mips-extns.h @@ -146,7 +146,12 @@ static inline int hard_smp_processor_id(void) static inline int nlm_nodeid(void) { - return (__read_32bit_c0_register($15, 1) >> 5) & 0x3; + uint32_t prid = read_c0_prid(); + + if ((prid & 0xff00) == PRID_IMP_NETLOGIC_XLP9XX) + return (__read_32bit_c0_register($15, 1) >> 7) & 0x7; + else + return (__read_32bit_c0_register($15, 1) >> 5) & 0x3; } static inline unsigned int nlm_core_id(void) |