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

Commit b89bd1f4 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: shrink cpuinfo by not saving full timer BCR 



Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent d584f0fb

arch/arc/include/asm/arcregs.h

+1 −2
Original line number Diff line number Diff line
@@ -349,14 +349,13 @@ struct cpuinfo_arc { 
	struct cpuinfo_arc_bpu bpu;

	struct bcr_identity core;

	struct bcr_isa isa;

	struct bcr_timer timers;

	unsigned int vec_base;

	struct cpuinfo_arc_ccm iccm, dccm;

	struct {

		unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, pad1:3,

			     fpu_sp:1, fpu_dp:1, pad2:6,

			     debug:1, ap:1, smart:1, rtt:1, pad3:4,

			     pad4:8;

			     timer0:1, timer1:1, rtc:1, gfrc:1, pad4:4;

	} extn;

	struct bcr_mpy extn_mpy;

	struct bcr_extn_xymem extn_xymem;

arch/arc/kernel/setup.c

+12 −7
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct cpuinfo_arc cpuinfo_arc700[NR_CPUS]; 
static void read_arc_build_cfg_regs(void)

{

	struct bcr_perip uncached_space;

	struct bcr_timer timer;

	struct bcr_generic bcr;

	struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];

	unsigned long perip_space;
@@ -53,7 +54,11 @@ static void read_arc_build_cfg_regs(void) 
	READ_BCR(AUX_IDENTITY, cpu->core);

	READ_BCR(ARC_REG_ISA_CFG_BCR, cpu->isa);



	READ_BCR(ARC_REG_TIMERS_BCR, cpu->timers);

	READ_BCR(ARC_REG_TIMERS_BCR, timer);

	cpu->extn.timer0 = timer.t0;

	cpu->extn.timer1 = timer.t1;

	cpu->extn.rtc = timer.rtc;



	cpu->vec_base = read_aux_reg(AUX_INTR_VEC_BASE);



	READ_BCR(ARC_REG_D_UNCACH_BCR, uncached_space);
@@ -208,9 +213,9 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len) 
		       (unsigned int)(arc_get_core_freq() / 10000) % 100);



	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s\nISA Extn\t: ",

		       IS_AVAIL1(cpu->timers.t0, "Timer0 "),

		       IS_AVAIL1(cpu->timers.t1, "Timer1 "),

		       IS_AVAIL2(cpu->timers.rtc, "64-bit RTC ",

		       IS_AVAIL1(cpu->extn.timer0, "Timer0 "),

		       IS_AVAIL1(cpu->extn.timer1, "Timer1 "),

		       IS_AVAIL2(cpu->extn.rtc, "Local-64-bit-Ctr ",

				 CONFIG_ARC_HAS_RTC));



	n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s",
@@ -293,13 +298,13 @@ static void arc_chk_core_config(void) 
	struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];

	int fpu_enabled;



	if (!cpu->timers.t0)

	if (!cpu->extn.timer0)

		panic("Timer0 is not present!\n");



	if (!cpu->timers.t1)

	if (!cpu->extn.timer1)

		panic("Timer1 is not present!\n");



	if (IS_ENABLED(CONFIG_ARC_HAS_RTC) && !cpu->timers.rtc)

	if (IS_ENABLED(CONFIG_ARC_HAS_RTC) && !cpu->extn.rtc)

		panic("RTC is not present\n");



#ifdef CONFIG_ARC_HAS_DCCM