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

Commit 711c1f26 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARCv2: boot log: print IOC exists as well as enabled status 



Previously we would not print the case when IOC existed but was not
enabled.

And while at it, reduce one line off boot printing by consolidating
the Peripheral address space and IO-Coherency which in a way
applies to them

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

arch/arc/include/asm/setup.h

+1 −0
Original line number Diff line number Diff line
@@ -43,5 +43,6 @@ void __init setup_arch_memory(void); 
#define IS_USED_RUN(v)		((v) ? "" : "(not used) ")

#define IS_USED_CFG(cfg)	IS_USED_RUN(IS_ENABLED(cfg))

#define IS_AVAIL2(v, s, cfg)	IS_AVAIL1(v, s), IS_AVAIL1(v, IS_USED_CFG(cfg))

#define IS_AVAIL3(v, v2, s)	IS_AVAIL1(v, s), IS_AVAIL1(v, IS_DISABLED_RUN(v2))



#endif /* __ASMARC_SETUP_H */

arch/arc/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -272,9 +272,7 @@ static char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len) 


	FIX_PTR(cpu);



	n += scnprintf(buf + n, len - n,

		       "Vector Table\t: %#x\nPeripherals\t: %#lx:%#lx\n",

		       cpu->vec_base, perip_base, perip_end);

	n += scnprintf(buf + n, len - n, "Vector Table\t: %#x\n", cpu->vec_base);



	if (cpu->extn.fpu_sp || cpu->extn.fpu_dp)

		n += scnprintf(buf + n, len - n, "FPU\t\t: %s%s\n",

arch/arc/mm/cache.c

+3 −6
Original line number Diff line number Diff line
@@ -53,18 +53,15 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len) 
	PR_CACHE(&cpuinfo_arc700[c].icache, CONFIG_ARC_HAS_ICACHE, "I-Cache");

	PR_CACHE(&cpuinfo_arc700[c].dcache, CONFIG_ARC_HAS_DCACHE, "D-Cache");



	if (!is_isa_arcv2())

                return buf;



	p = &cpuinfo_arc700[c].slc;

	if (p->ver)

		n += scnprintf(buf + n, len - n,

			       "SLC\t\t: %uK, %uB Line%s\n",

			       p->sz_k, p->line_len, IS_USED_RUN(slc_enable));



	if (ioc_exists)

		n += scnprintf(buf + n, len - n, "IOC\t\t:%s\n",

				IS_DISABLED_RUN(ioc_enable));

	n += scnprintf(buf + n, len - n, "Peripherals\t: %#lx%s%s\n",

		       perip_base,

		       IS_AVAIL3(ioc_exists, ioc_enable, ", IO-Coherency "));



	return buf;

}