Commit a50d3d3c authored by John David Anglin's avatar John David Anglin Committed by Helge Deller
Browse files

parisc: Rewrite tlb flush threshold calculation 



Signed-off-by: default avatarJohn David Anglin <dave.anglin@bell.net>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 53a42b63

arch/parisc/kernel/cache.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -383,12 +383,12 @@ EXPORT_SYMBOL(flush_kernel_icache_range_asm); 
static unsigned long parisc_cache_flush_threshold __ro_after_init = FLUSH_THRESHOLD;

static unsigned long parisc_cache_flush_threshold __ro_after_init = FLUSH_THRESHOLD;





#define FLUSH_TLB_THRESHOLD (16*1024) /* 16 KiB minimum TLB threshold */

#define FLUSH_TLB_THRESHOLD (16*1024) /* 16 KiB minimum TLB threshold */

static unsigned long parisc_tlb_flush_threshold __ro_after_init = FLUSH_TLB_THRESHOLD;

static unsigned long parisc_tlb_flush_threshold __ro_after_init = ~0UL;





void __init parisc_setup_cache_timing(void)

void __init parisc_setup_cache_timing(void)

{

{

	unsigned long rangetime, alltime;

	unsigned long rangetime, alltime;

	unsigned long size, start;

	unsigned long size;

	unsigned long threshold;

	unsigned long threshold;





	alltime = mfctl(16);

	alltime = mfctl(16);
@@ -422,14 +422,9 @@ void __init parisc_setup_cache_timing(void) 
		goto set_tlb_threshold;

		goto set_tlb_threshold;

	}

	}





	size = 0;

	size = (unsigned long)_end - (unsigned long)_text;

	start = (unsigned long) _text;

	rangetime = mfctl(16);

	rangetime = mfctl(16);

	while (start < (unsigned long) _end) {

	flush_tlb_kernel_range((unsigned long)_text, (unsigned long)_end);

		flush_tlb_kernel_range(start, start + PAGE_SIZE);

		start += PAGE_SIZE;

		size += PAGE_SIZE;

	}

	rangetime = mfctl(16) - rangetime;

	rangetime = mfctl(16) - rangetime;





	alltime = mfctl(16);

	alltime = mfctl(16);
@@ -444,8 +439,11 @@ void __init parisc_setup_cache_timing(void) 
		threshold/1024);

		threshold/1024);





set_tlb_threshold:

set_tlb_threshold:

	if (threshold > parisc_tlb_flush_threshold)

	if (threshold > FLUSH_TLB_THRESHOLD)

		parisc_tlb_flush_threshold = threshold;

		parisc_tlb_flush_threshold = threshold;

	else

		parisc_tlb_flush_threshold = FLUSH_TLB_THRESHOLD;



	printk(KERN_INFO "TLB flush threshold set to %lu KiB\n",

	printk(KERN_INFO "TLB flush threshold set to %lu KiB\n",

		parisc_tlb_flush_threshold/1024);

		parisc_tlb_flush_threshold/1024);

}

}