瀏覽代碼

ARC: Cache: Move PAE exists check into slc_upper_region_init()

Move check for PAE existence into slc_upper_region_init()
instead of its caller as more appropriate place.

Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Eugeniy Paltsev 7 年之前
父節點
當前提交
246ba284ec
共有 1 個文件被更改,包括 9 次插入6 次删除
  1. 9 6
      arch/arc/lib/cache.c

+ 9 - 6
arch/arc/lib/cache.c

@@ -192,6 +192,14 @@ static void __slc_entire_op(const int op)
 
 static void slc_upper_region_init(void)
 {
+	/*
+	 * ARC_AUX_SLC_RGN_START1 and ARC_AUX_SLC_RGN_END1 register exist
+	 * only if PAE exists in current HW. So we had to check pae_exist
+	 * before using them.
+	 */
+	if (!pae_exists())
+		return;
+
 	/*
 	 * ARC_AUX_SLC_RGN_END1 and ARC_AUX_SLC_RGN_START1 are always == 0
 	 * as we don't use PAE40.
@@ -334,12 +342,7 @@ void cache_init(void)
 	if (is_isa_arcv2() && ioc_exists)
 		arc_ioc_setup();
 
-	/*
-	 * ARC_AUX_SLC_RGN_START1 and ARC_AUX_SLC_RGN_END1 register exist
-	 * only if PAE exists in current HW. So we had to check pae_exist
-	 * before using them.
-	 */
-	if (is_isa_arcv2() && slc_exists() && pae_exists())
+	if (is_isa_arcv2() && slc_exists())
 		slc_upper_region_init();
 }