armv7: remove loop from dcache_mmu_disable()
dcache_mmu_disable() no longer needs to have its own iterative loop to select each cache level of cache since dcache_clean_invalidate_all() does that now. Change-Id: I5ca273f98943981b943c1c1622f4574d7133fb50 Signed-off-by: David Hendricks <dhendrix@chromium.org> Reviewed-on: http://review.coreboot.org/2967 Reviewed-by: Gabe Black <gabe.black@gmail.com> Tested-by: build bot (Jenkins)
This commit is contained in:
		@@ -237,37 +237,9 @@ void dcache_clean_invalidate_by_mva(unsigned long addr, unsigned long len)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void dcache_mmu_disable(void)
 | 
					void dcache_mmu_disable(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	uint32_t sctlr, clidr;
 | 
						uint32_t sctlr;
 | 
				
			||||||
	int level;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	clidr = read_clidr();
 | 
					 | 
				
			||||||
	for (level = 0; level < 7; level++) {
 | 
					 | 
				
			||||||
		unsigned int ctype = (clidr >> (level * 3)) & 0x7;
 | 
					 | 
				
			||||||
		uint32_t csselr;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		switch(ctype) {
 | 
					 | 
				
			||||||
		case 0x0:
 | 
					 | 
				
			||||||
			/* no cache */
 | 
					 | 
				
			||||||
			break;
 | 
					 | 
				
			||||||
		case 0x2:
 | 
					 | 
				
			||||||
		case 0x4:
 | 
					 | 
				
			||||||
			/* dcache only or unified cache */
 | 
					 | 
				
			||||||
			csselr = level << 1;
 | 
					 | 
				
			||||||
			write_csselr(csselr);
 | 
					 | 
				
			||||||
	dcache_clean_invalidate_all();
 | 
						dcache_clean_invalidate_all();
 | 
				
			||||||
			break;
 | 
					 | 
				
			||||||
		case 0x3:
 | 
					 | 
				
			||||||
			/* separate icache and dcache */
 | 
					 | 
				
			||||||
			csselr = level << 1;
 | 
					 | 
				
			||||||
			write_csselr(csselr);
 | 
					 | 
				
			||||||
			dcache_clean_invalidate_all();
 | 
					 | 
				
			||||||
			break;
 | 
					 | 
				
			||||||
		default:
 | 
					 | 
				
			||||||
			/* reserved */
 | 
					 | 
				
			||||||
			break;
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	sctlr = read_sctlr();
 | 
						sctlr = read_sctlr();
 | 
				
			||||||
	sctlr &= ~(SCTLR_C | SCTLR_M);
 | 
						sctlr &= ~(SCTLR_C | SCTLR_M);
 | 
				
			||||||
	write_sctlr(sctlr);
 | 
						write_sctlr(sctlr);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user