From 491b95925edb721161000398c3a80c5f2b551fbe Mon Sep 17 00:00:00 2001
From: Marius Vikhammer <marius.vikhammer@espressif.com>
Date: Mon, 7 Feb 2022 11:33:33 +0800
Subject: [PATCH] spi flash: fix cache accessed while disabled issues at -O0

mask_get_id and gpio_hal_iomux_func_sel were called while cache
is disabled, but were not inlined as expected at -0O.
Force these functions to always be inlined.
---
 components/driver/spi_bus_lock.c                  | 2 +-
 components/hal/esp32/include/hal/gpio_ll.h        | 2 +-
 components/hal/esp32c3/include/hal/gpio_ll.h      | 2 +-
 components/hal/esp32s2/include/hal/gpio_ll.h      | 2 +-
 components/hal/esp32s3/include/hal/gpio_ll.h      | 2 +-
 tools/ci/config/target-test.yml                   | 6 ++++++
 tools/unit-test-app/configs/no_optimization_c3    | 3 ---
 tools/unit-test-app/configs/no_optimization_esp32 | 3 ---
 8 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 tools/unit-test-app/configs/no_optimization_c3
 delete mode 100644 tools/unit-test-app/configs/no_optimization_esp32

diff --git a/components/driver/spi_bus_lock.c b/components/driver/spi_bus_lock.c
index 8308aa9b51..299e080184 100644
--- a/components/driver/spi_bus_lock.c
+++ b/components/driver/spi_bus_lock.c
@@ -172,7 +172,7 @@ typedef struct spi_bus_lock_t spi_bus_lock_t;
 #define REQUEST_BIT(mask)   ((mask) << REQ_SHIFT)
 #define PENDING_BIT(mask)   ((mask) << PENDING_SHIFT)
 #define DEV_MASK(id)        (LOCK_BIT(1<<id) | PENDING_BIT(1<<id) | REQUEST_BIT(1<<id))
-#define ID_DEV_MASK(mask)   (ffs(mask) - 1)
+#define ID_DEV_MASK(mask)   (__builtin_ffs(mask) - 1)
 
 #define REQ_MASK            BIT1_MASK(REQ_SHIFT+MAX_DEV_NUM, REQ_SHIFT)
 #define PEND_MASK           BIT1_MASK(PENDING_SHIFT+MAX_DEV_NUM, PENDING_SHIFT)
diff --git a/components/hal/esp32/include/hal/gpio_ll.h b/components/hal/esp32/include/hal/gpio_ll.h
index 2d3cee2763..10f35353d6 100644
--- a/components/hal/esp32/include/hal/gpio_ll.h
+++ b/components/hal/esp32/include/hal/gpio_ll.h
@@ -575,7 +575,7 @@ static inline void gpio_ll_iomux_in(gpio_dev_t *hw, uint32_t gpio, uint32_t sign
  * @param  pin_name Pin name to configure
  * @param  func Function to assign to the pin
  */
-static inline void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
+static inline __attribute__((always_inline)) void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
 {
     PIN_FUNC_SELECT(pin_name, func);
 }
diff --git a/components/hal/esp32c3/include/hal/gpio_ll.h b/components/hal/esp32c3/include/hal/gpio_ll.h
index 3e0cff9af0..2baaf77e70 100644
--- a/components/hal/esp32c3/include/hal/gpio_ll.h
+++ b/components/hal/esp32c3/include/hal/gpio_ll.h
@@ -388,7 +388,7 @@ static inline void gpio_ll_iomux_in(gpio_dev_t *hw, uint32_t gpio, uint32_t sign
  * @param  pin_name Pin name to configure
  * @param  func Function to assign to the pin
  */
-static inline void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
+static inline __attribute__((always_inline)) void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
 {
     // Disable USB Serial JTAG if pins 18 or pins 19 needs to select an IOMUX function
     if (pin_name == IO_MUX_GPIO18_REG || pin_name == IO_MUX_GPIO19_REG) {
diff --git a/components/hal/esp32s2/include/hal/gpio_ll.h b/components/hal/esp32s2/include/hal/gpio_ll.h
index 12fafe6062..4d27786c3e 100644
--- a/components/hal/esp32s2/include/hal/gpio_ll.h
+++ b/components/hal/esp32s2/include/hal/gpio_ll.h
@@ -399,7 +399,7 @@ static inline void gpio_ll_iomux_in(gpio_dev_t *hw, uint32_t gpio, uint32_t sign
  * @param  pin_name Pin name to configure
  * @param  func Function to assign to the pin
  */
-static inline void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
+static inline __attribute__((always_inline)) void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
 {
     PIN_FUNC_SELECT(pin_name, func);
 }
diff --git a/components/hal/esp32s3/include/hal/gpio_ll.h b/components/hal/esp32s3/include/hal/gpio_ll.h
index 3e3c092664..fccbb5764e 100644
--- a/components/hal/esp32s3/include/hal/gpio_ll.h
+++ b/components/hal/esp32s3/include/hal/gpio_ll.h
@@ -401,7 +401,7 @@ static inline void gpio_ll_iomux_in(gpio_dev_t *hw, uint32_t gpio, uint32_t sign
  * @param  pin_name Pin name to configure
  * @param  func Function to assign to the pin
  */
-static inline void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
+static inline __attribute__((always_inline)) void gpio_ll_iomux_func_sel(uint32_t pin_name, uint32_t func)
 {
     PIN_FUNC_SELECT(pin_name, func);
 }
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index f3e8f7dc11..8afcd80416 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -584,6 +584,12 @@ UT_047:
     - ESP32S2_IDF
     - UT_T1_1
 
+UT_048:
+  extends: .unit_test_32_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_1
+
 UT_C3:
   extends: .unit_test_c3_template
   parallel: 31
diff --git a/tools/unit-test-app/configs/no_optimization_c3 b/tools/unit-test-app/configs/no_optimization_c3
deleted file mode 100644
index 00719f8712..0000000000
--- a/tools/unit-test-app/configs/no_optimization_c3
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_IDF_TARGET="esp32c3"
-TEST_COMPONENTS=esp_ipc spi_flash
-CONFIG_COMPILER_OPTIMIZATION_NONE=y
diff --git a/tools/unit-test-app/configs/no_optimization_esp32 b/tools/unit-test-app/configs/no_optimization_esp32
deleted file mode 100644
index 64114b1215..0000000000
--- a/tools/unit-test-app/configs/no_optimization_esp32
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_IDF_TARGET="esp32"
-TEST_COMPONENTS=esp_ipc spi_flash
-CONFIG_COMPILER_OPTIMIZATION_NONE=y