MIPS: Netlogic: Move cores per node out of multi-node.h
Use the current_cpu_data package field to get the node of the current CPU. This allows us to remove xlp_cores_per_node and move nlm_threads_per_node() and nlm_cores_per_node() to netlogic/common.h, which simplifies code. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/8889/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:

committed by
Ralf Baechle

parent
65fecc2725
commit
c273652546
@@ -111,6 +111,25 @@ static inline int nlm_irq_to_xirq(int node, int irq)
|
||||
return node * NR_IRQS / NLM_NR_NODES + irq;
|
||||
}
|
||||
|
||||
extern int nlm_cpu_ready[];
|
||||
#ifdef CONFIG_CPU_XLR
|
||||
#define nlm_cores_per_node() 8
|
||||
#else
|
||||
static inline int nlm_cores_per_node(void)
|
||||
{
|
||||
return ((read_c0_prid() & PRID_IMP_MASK)
|
||||
== PRID_IMP_NETLOGIC_XLP9XX) ? 32 : 8;
|
||||
}
|
||||
#endif
|
||||
static inline int nlm_threads_per_node(void)
|
||||
{
|
||||
return nlm_cores_per_node() * NLM_THREADS_PER_CORE;
|
||||
}
|
||||
|
||||
static inline int nlm_hwtid_to_node(int hwtid)
|
||||
{
|
||||
return hwtid / nlm_threads_per_node();
|
||||
}
|
||||
|
||||
extern int nlm_cpu_ready[];
|
||||
#endif /* __ASSEMBLY__ */
|
||||
#endif /* _NETLOGIC_COMMON_H_ */
|
||||
|
Reference in New Issue
Block a user