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

Commit 515bbc8a authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Michael Ellerman
Browse files

powerpc/pseries: Use macros for referring to the DTL enable mask 



Introduce macros to encode the DTL enable mask fields and use those
instead of hardcoding numbers.

Acked-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 31afa05b

arch/powerpc/include/asm/lppaca.h

+11 −0
Original line number Diff line number Diff line
@@ -154,6 +154,17 @@ struct dtl_entry { 
#define DISPATCH_LOG_BYTES	4096	/* bytes per cpu */

#define N_DISPATCH_LOG		(DISPATCH_LOG_BYTES / sizeof(struct dtl_entry))



/*

 * Dispatch trace log event enable mask:

 *   0x1: voluntary virtual processor waits

 *   0x2: time-slice preempts

 *   0x4: virtual partition memory page faults

 */

#define DTL_LOG_CEDE		0x1

#define DTL_LOG_PREEMPT		0x2

#define DTL_LOG_FAULT		0x4

#define DTL_LOG_ALL		(DTL_LOG_CEDE | DTL_LOG_PREEMPT | DTL_LOG_FAULT)



extern struct kmem_cache *dtl_cache;



/*

arch/powerpc/platforms/pseries/dtl.c

+1 −7
Original line number Diff line number Diff line
@@ -40,13 +40,7 @@ struct dtl { 
};

static DEFINE_PER_CPU(struct dtl, cpu_dtl);



/*

 * Dispatch trace log event mask:

 * 0x7: 0x1: voluntary virtual processor waits

 *      0x2: time-slice preempts

 *      0x4: virtual partition memory page faults

 */

static u8 dtl_event_mask = 0x7;

static u8 dtl_event_mask = DTL_LOG_ALL;





/*

arch/powerpc/platforms/pseries/lpar.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void vpa_init(int cpu) 
			pr_err("WARNING: DTL registration of cpu %d (hw %d) "

			       "failed with %ld\n", smp_processor_id(),

			       hwcpu, ret);

		lppaca_of(cpu).dtl_enable_mask = 2;

		lppaca_of(cpu).dtl_enable_mask = DTL_LOG_PREEMPT;

	}

}

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int alloc_dispatch_logs(void) 
		pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "

		       "with %d\n", smp_processor_id(),

		       hard_smp_processor_id(), ret);

	get_paca()->lppaca_ptr->dtl_enable_mask = 2;

	get_paca()->lppaca_ptr->dtl_enable_mask = DTL_LOG_PREEMPT;



	return 0;

}