]> granicus.if.org Git - esp-idf/commitdiff
spi_flash_cache_enabled: report correct result in single core mode
authorIvan Grokhotkov <ivan@espressif.com>
Mon, 18 Sep 2017 09:26:59 +0000 (17:26 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Thu, 19 Oct 2017 13:35:21 +0000 (21:35 +0800)
components/spi_flash/cache_utils.c

index 6da7b47e1bac43b8d9c0039068a95fdc9616f9ae..53a0caf8ee82005d648ee970e66e2ff91730feaa 100644 (file)
@@ -287,6 +287,9 @@ static void IRAM_ATTR spi_flash_restore_cache(uint32_t cpuid, uint32_t saved_sta
 
 IRAM_ATTR bool spi_flash_cache_enabled()
 {
-    return DPORT_REG_GET_BIT(DPORT_PRO_CACHE_CTRL_REG, DPORT_PRO_CACHE_ENABLE)
-        && DPORT_REG_GET_BIT(DPORT_APP_CACHE_CTRL_REG, DPORT_APP_CACHE_ENABLE);
+    bool result = (DPORT_REG_GET_BIT(DPORT_PRO_CACHE_CTRL_REG, DPORT_PRO_CACHE_ENABLE) != 0);
+#if portNUM_PROCESSORS == 2
+    result = result && (DPORT_REG_GET_BIT(DPORT_APP_CACHE_CTRL_REG, DPORT_APP_CACHE_ENABLE) != 0);
+#endif
+    return result;
 }