Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aa54b20 authored by Jayachandran C's avatar Jayachandran C Committed by Ralf Baechle
Browse files

MIPS: Netlogic: Add support for XLP 3XX cores 



Add new processor ID to asm/cpu.h and kernel/cpu-probe.c.
Update to new CPU frequency detection code which works on XLP 3XX
and 8XX.

Signed-off-by: default avatarJayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2971/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 66d29985

arch/mips/include/asm/cpu.h

+3 −1
Original line number Diff line number Diff line
@@ -170,7 +170,9 @@ 
#define PRID_IMP_NETLOGIC_XLS408B	0x4e00

#define PRID_IMP_NETLOGIC_XLS404B	0x4f00



#define PRID_IMP_NETLOGIC_XLP832	0x1000

#define PRID_IMP_NETLOGIC_XLP8XX	0x1000

#define PRID_IMP_NETLOGIC_XLP3XX	0x1100



/*

 * Definitions for 7:0 on legacy processors

 */

arch/mips/kernel/cpu-probe.c

+2 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,8 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu) 
			MIPS_CPU_LLSC);



	switch (c->processor_id & 0xff00) {

	case PRID_IMP_NETLOGIC_XLP832:

	case PRID_IMP_NETLOGIC_XLP8XX:

	case PRID_IMP_NETLOGIC_XLP3XX:

		c->cputype = CPU_XLP;

		__cpu_name[cpu] = "Netlogic XLP";

		break;

arch/mips/netlogic/xlp/nlm_hal.c

+16 −10
Original line number Diff line number Diff line
@@ -86,20 +86,26 @@ int nlm_irt_to_irq(int irt) 
	}

}



unsigned int nlm_get_cpu_frequency(void)

unsigned int nlm_get_core_frequency(int core)

{

	unsigned int pll_divf, pll_divr, dfs_div, denom;

	unsigned int val;

	unsigned int pll_divf, pll_divr, dfs_div, ext_div;

	unsigned int rstval, dfsval, denom;

	uint64_t num;



	val = nlm_read_sys_reg(nlm_sys_base, SYS_POWER_ON_RESET_CFG);

	pll_divf = (val >> 10) & 0x7f;

	pll_divr = (val >> 8)  & 0x3;

	dfs_div  = (val >> 17) & 0x3;

	rstval = nlm_read_sys_reg(nlm_sys_base, SYS_POWER_ON_RESET_CFG);

	dfsval = nlm_read_sys_reg(nlm_sys_base, SYS_CORE_DFS_DIV_VALUE);

	pll_divf = ((rstval >> 10) & 0x7f) + 1;

	pll_divr = ((rstval >> 8)  & 0x3) + 1;

	ext_div  = ((rstval >> 30) & 0x3) + 1;

	dfs_div  = ((dfsval >> (core * 4)) & 0xf) + 1;



	num = pll_divf + 1;

	denom = 3 * (pll_divr + 1) * (1 << (dfs_div + 1));

	num = num * 800000000ULL;

	num = 800000000ULL * pll_divf;

	denom = 3 * pll_divr * ext_div * dfs_div;

	do_div(num, denom);

	return (unsigned int)num;

}



unsigned int nlm_get_cpu_frequency(void)

{

	return nlm_get_core_frequency(0);

}