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

Commit 3c68da79 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Use __ffs() instead of ffs() for waybit calculation. 


    
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9200c0b2

arch/mips/mm/c-r4k.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -750,12 +750,12 @@ static void __init probe_pcache(void) 
		icache_size = 1 << (12 + ((config & CONF_IC) >> 9));

		icache_size = 1 << (12 + ((config & CONF_IC) >> 9));

		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

		c->icache.ways = 2;

		c->icache.ways = 2;

		c->icache.waybit = ffs(icache_size/2) - 1;

		c->icache.waybit = __ffs(icache_size/2);





		dcache_size = 1 << (12 + ((config & CONF_DC) >> 6));

		dcache_size = 1 << (12 + ((config & CONF_DC) >> 6));

		c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);

		c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);

		c->dcache.ways = 2;

		c->dcache.ways = 2;

		c->dcache.waybit= ffs(dcache_size/2) - 1;

		c->dcache.waybit= __ffs(dcache_size/2);





		c->options |= MIPS_CPU_CACHE_CDEX_P;

		c->options |= MIPS_CPU_CACHE_CDEX_P;

		break;

		break;
@@ -838,12 +838,12 @@ static void __init probe_pcache(void) 
		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));

		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));

		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

		c->icache.ways = 2;

		c->icache.ways = 2;

		c->icache.waybit = ffs(icache_size/2) - 1;

		c->icache.waybit = __ffs(icache_size/2);





		dcache_size = 1 << (10 + ((config & CONF_DC) >> 6));

		dcache_size = 1 << (10 + ((config & CONF_DC) >> 6));

		c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);

		c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);

		c->dcache.ways = 2;

		c->dcache.ways = 2;

		c->dcache.waybit = ffs(dcache_size/2) - 1;

		c->dcache.waybit = __ffs(dcache_size/2);





		c->options |= MIPS_CPU_CACHE_CDEX_P;

		c->options |= MIPS_CPU_CACHE_CDEX_P;

		break;

		break;
@@ -874,12 +874,12 @@ static void __init probe_pcache(void) 
		icache_size = 1 << (12 + ((config & CONF_IC) >> 9));

		icache_size = 1 << (12 + ((config & CONF_IC) >> 9));

		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

		c->icache.ways = 4;

		c->icache.ways = 4;

		c->icache.waybit = ffs(icache_size / c->icache.ways) - 1;

		c->icache.waybit = __ffs(icache_size / c->icache.ways);





		dcache_size = 1 << (12 + ((config & CONF_DC) >> 6));

		dcache_size = 1 << (12 + ((config & CONF_DC) >> 6));

		c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);

		c->dcache.linesz = 16 << ((config & CONF_DB) >> 4);

		c->dcache.ways = 4;

		c->dcache.ways = 4;

		c->dcache.waybit = ffs(dcache_size / c->dcache.ways) - 1;

		c->dcache.waybit = __ffs(dcache_size / c->dcache.ways);





#if !defined(CONFIG_SMP) || !defined(RM9000_CDEX_SMP_WAR)

#if !defined(CONFIG_SMP) || !defined(RM9000_CDEX_SMP_WAR)

		c->options |= MIPS_CPU_CACHE_CDEX_P;

		c->options |= MIPS_CPU_CACHE_CDEX_P;
@@ -907,7 +907,7 @@ static void __init probe_pcache(void) 
		icache_size = c->icache.sets *

		icache_size = c->icache.sets *

		              c->icache.ways *

		              c->icache.ways *

		              c->icache.linesz;

		              c->icache.linesz;

		c->icache.waybit = ffs(icache_size/c->icache.ways) - 1;

		c->icache.waybit = __ffs(icache_size/c->icache.ways);





		if (config & 0x8)		/* VI bit */

		if (config & 0x8)		/* VI bit */

			c->icache.flags |= MIPS_CACHE_VTAG;

			c->icache.flags |= MIPS_CACHE_VTAG;
@@ -927,7 +927,7 @@ static void __init probe_pcache(void) 
		dcache_size = c->dcache.sets *

		dcache_size = c->dcache.sets *

		              c->dcache.ways *

		              c->dcache.ways *

		              c->dcache.linesz;

		              c->dcache.linesz;

		c->dcache.waybit = ffs(dcache_size/c->dcache.ways) - 1;

		c->dcache.waybit = __ffs(dcache_size/c->dcache.ways);





		c->options |= MIPS_CPU_PREFETCH;

		c->options |= MIPS_CPU_PREFETCH;

		break;

		break;

arch/mips/mm/sc-rm7k.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ void __init rm7k_sc_init(void) 




	c->scache.linesz = sc_lsize;

	c->scache.linesz = sc_lsize;

	c->scache.ways = 4;

	c->scache.ways = 4;

	c->scache.waybit= ffs(scache_size / c->scache.ways) - 1;

	c->scache.waybit= __ffs(scache_size / c->scache.ways);

	c->scache.waysize = scache_size / c->scache.ways;

	c->scache.waysize = scache_size / c->scache.ways;

	c->scache.sets = scache_size / (c->scache.linesz * c->scache.ways);

	c->scache.sets = scache_size / (c->scache.linesz * c->scache.ways);

	printk(KERN_INFO "Secondary cache size %dK, linesize %d bytes.\n",

	printk(KERN_INFO "Secondary cache size %dK, linesize %d bytes.\n",