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

Commit 964cf28f authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: boot log: move helper macros to header for reuse 



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

arch/arc/include/asm/setup.h

+7 −0
Original line number Diff line number Diff line
@@ -33,4 +33,11 @@ extern int root_mountflags, end_mem; 
void setup_processor(void);

void __init setup_arch_memory(void);



/* Helpers used in arc_*_mumbojumbo routines */

#define IS_AVAIL1(v, s)		((v) ? s : "")

#define IS_DISABLED_RUN(v)	((v) ? "" : "(disabled) ")

#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))



#endif /* __ASMARC_SETUP_H */

arch/arc/kernel/mcip.c

+1 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/irq.h>

#include <linux/spinlock.h>

#include <asm/mcip.h>

#include <asm/setup.h>



static char smp_cpuinfo_buf[128];

static int idu_detected;
@@ -122,8 +123,6 @@ struct plat_smp_ops plat_smp_ops = { 


void mcip_init_early_smp(void)

{

#define IS_AVAIL1(var, str)    ((var) ? str : "")



	struct mcip_bcr {

#ifdef CONFIG_CPU_BIG_ENDIAN

		unsigned int pad3:8,

arch/arc/kernel/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -160,10 +160,6 @@ static const struct cpuinfo_data arc_cpu_tbl[] = { 
	{ {0x00, NULL		} }

};



#define IS_AVAIL1(v, s)		((v) ? s : "")

#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))



static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)

{

arch/arc/mm/cache.c

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len) 
	int n = 0;

	struct cpuinfo_arc_cache *p;



#define IS_USED_RUN(v)		((v) ? "" : "(disabled) ")

#define PR_CACHE(p, cfg, str)						\

	if (!(p)->ver)							\

		n += scnprintf(buf + n, len - n, str"\t\t: N/A\n");	\
@@ -47,7 +46,7 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len) 
			(p)->sz_k, (p)->assoc, (p)->line_len,		\

			(p)->vipt ? "VIPT" : "PIPT",			\

			(p)->alias ? " aliasing" : "",			\

			IS_ENABLED(cfg) ? "" : " (not used)");

			IS_USED_CFG(cfg));



	PR_CACHE(&cpuinfo_arc700[c].icache, CONFIG_ARC_HAS_ICACHE, "I-Cache");

	PR_CACHE(&cpuinfo_arc700[c].dcache, CONFIG_ARC_HAS_DCACHE, "D-Cache");
@@ -63,7 +62,7 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len) 


	if (ioc_exists)

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

				IS_USED_RUN(ioc_enable));

				IS_DISABLED_RUN(ioc_enable));



	return buf;

}

arch/arc/mm/tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len) 
	if (p_mmu->s_pg_sz_m)

		scnprintf(super_pg, 64, "%dM Super Page%s, ",

			  p_mmu->s_pg_sz_m,

			  IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) ? "" : " (not used)");

			  IS_USED_CFG(CONFIG_TRANSPARENT_HUGEPAGE));



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

		      "MMU [v%x]\t: %dk PAGE, %sJTLB %d (%dx%d), uDTLB %d, uITLB %d %s\n",