flash: stm32: fix g0 error flags and move ifdef-ery to header

In STM32G0 HAL FLASH_FLAG_xxx defines don't follow the pattern of
other Series to simply redefine the FLASH_SR_xxx Msk.
Instead an ID for the SR reg and the position of the Error flag
are defined.

As a result error checking in flash_stm32_check_status was not working
until this fix on stm32g0 series.

In order to avoid complexity in the driver, the ifdef-ery of the flags
was moved to the header file.
Other series except g0 use FLASH_FLAG_xxx defines, because those
are valid for both cores in dual core(wl) and in secure/non-secure
targets(l5,u5).
FLASH_STM32_SR_ERRORS mask is introduced to check for any active error
in the SR.

The flags for SIZERR, MISERR, FASTERR are newly introduced.
the latter two are only required once fast programming is used,
which is not yet the case for any series.

The FLASH_SR_OPTVERR flag (option validity flag) is also present
in the SR, but is not added.
Also ecc errors are generally not checked, but these are in a different
register.

Signed-off-by: Thomas Stranger <[email protected]>

Author: str4t0m

drivers/flash/flash_stm32.c

@@ -78,33 +78,11 @@ static inline void _flash_stm32_sem_give(const struct device *dev)
 #if !defined(CONFIG_SOC_SERIES_STM32WBX)
 static int flash_stm32_check_status(const struct device *dev)
 {
-	uint32_t const error =
-#if defined(FLASH_FLAG_PGAERR)
-		FLASH_FLAG_PGAERR |
-#endif
-#if defined(FLASH_FLAG_RDERR)
-		FLASH_FLAG_RDERR  |
-#endif
-#if defined(FLASH_FLAG_PGPERR)
-		FLASH_FLAG_PGPERR |
-#endif
-#if defined(FLASH_FLAG_PGSERR)
-		FLASH_FLAG_PGSERR |
-#endif
-#if defined(FLASH_FLAG_OPERR)
-		FLASH_FLAG_OPERR |
-#endif
-#if defined(FLASH_FLAG_PROGERR)
-		FLASH_FLAG_PROGERR |
-#endif
-#if defined(FLASH_FLAG_PGERR)
-		FLASH_FLAG_PGERR |
-#endif
-		FLASH_FLAG_WRPERR;
 
-	if (FLASH_STM32_REGS(dev)->FLASH_STM32_SR & error) {
-		LOG_DBG("Status: 0x%08x",
-			FLASH_STM32_REGS(dev)->FLASH_STM32_SR & error);
+	if (FLASH_STM32_REGS(dev)->FLASH_STM32_SR & FLASH_STM32_SR_ERRORS) {
+		LOG_DBG("Status: 0x%08lx",
+			FLASH_STM32_REGS(dev)->FLASH_STM32_SR &
+							FLASH_STM32_SR_ERRORS);
 		return -EIO;
 	}
 

drivers/flash/flash_stm32.h

@@ -59,6 +59,105 @@ struct flash_stm32_priv {
 #define FLASH_STM32_SR_BUSY	(FLASH_FLAG_BSY)
 #endif
 
+#if defined(CONFIG_SOC_SERIES_STM32G0X)
+/* STM32G0 HAL FLASH_FLAG_x don't represent bit-masks, need FLASH_SR_x instead */
+#define FLASH_STM32_SR_OPERR	FLASH_SR_OPERR
+#define FLASH_STM32_SR_PGERR	0
+#define FLASH_STM32_SR_PROGERR	FLASH_SR_PROGERR
+#define FLASH_STM32_SR_WRPERR	FLASH_SR_WRPERR
+#define FLASH_STM32_SR_PGAERR	FLASH_SR_PGAERR
+#define FLASH_STM32_SR_SIZERR	FLASH_SR_SIZERR
+#define FLASH_STM32_SR_PGSERR	FLASH_SR_PGSERR
+#define FLASH_STM32_SR_MISERR	FLASH_SR_MISERR
+#define FLASH_STM32_SR_FASTERR	FLASH_SR_FASTERR
+#if defined(FLASH_SR_RDERR)
+#define FLASH_STM32_SR_RDERR	FLASH_SR_RDERR
+#else
+#define FLASH_STM32_SR_RDERR	0
+#endif
+#define FLASH_STM32_SR_PGPERR	0
+
+#else /* !defined(CONFIG_SOC_SERIES_STM32G0X) */
+#if defined(FLASH_FLAG_OPERR)
+#define FLASH_STM32_SR_OPERR	FLASH_FLAG_OPERR
+#else
+#define FLASH_STM32_SR_OPERR	0
+#endif
+
+#if defined(FLASH_FLAG_PGERR)
+#define FLASH_STM32_SR_PGERR	FLASH_FLAG_PGERR
+#else
+#define FLASH_STM32_SR_PGERR	0
+#endif
+
+#if defined(FLASH_FLAG_PROGERR)
+#define FLASH_STM32_SR_PROGERR	FLASH_FLAG_PROGERR
+#else
+#define FLASH_STM32_SR_PROGERR	0
+#endif
+
+#if defined(FLASH_FLAG_WRPERR)
+#define FLASH_STM32_SR_WRPERR	FLASH_FLAG_WRPERR
+#else
+#define FLASH_STM32_SR_WRPERR	0
+#endif
+
+#if defined(FLASH_FLAG_PGAERR)
+#define FLASH_STM32_SR_PGAERR	FLASH_FLAG_PGAERR
+#else
+#define FLASH_STM32_SR_PGAERR	0
+#endif
+
+#if defined(FLASH_FLAG_SIZERR)
+#define FLASH_STM32_SR_SIZERR	FLASH_FLAG_SIZERR
+#else
+#define FLASH_STM32_SR_SIZERR	0
+#endif
+
+#if defined(FLASH_FLAG_PGSERR)
+#define FLASH_STM32_SR_PGSERR	FLASH_FLAG_PGSERR
+#else
+#define FLASH_STM32_SR_PGSERR	0
+#endif
+
+#if defined(FLASH_FLAG_MISERR)
+#define FLASH_STM32_SR_MISERR	FLASH_FLAG_MISERR
+#else
+#define FLASH_STM32_SR_MISERR	0
+#endif
+
+#if defined(FLASH_FLAG_FASTERR)
+#define FLASH_STM32_SR_FASTERR	FLASH_FLAG_FASTERR
+#else
+#define FLASH_STM32_SR_FASTERR	0
+#endif
+
+#if defined(FLASH_FLAG_RDERR)
+#define FLASH_STM32_SR_RDERR	FLASH_FLAG_RDERR
+#else
+#define FLASH_STM32_SR_RDERR	0
+#endif
+
+#if defined(FLASH_FLAG_PGPERR)
+#define FLASH_STM32_SR_PGPERR	FLASH_FLAG_PGPERR
+#else
+#define FLASH_STM32_SR_PGPERR	0
+#endif
+
+#endif /* !defined(CONFIG_SOC_SERIES_STM32G0X) */
+
+#define FLASH_STM32_SR_ERRORS  (FLASH_STM32_SR_OPERR |			\
+				FLASH_STM32_SR_PGERR |			\
+				FLASH_STM32_SR_PROGERR |		\
+				FLASH_STM32_SR_WRPERR |			\
+				FLASH_STM32_SR_PGAERR |			\
+				FLASH_STM32_SR_SIZERR |			\
+				FLASH_STM32_SR_PGSERR |			\
+				FLASH_STM32_SR_MISERR |			\
+				FLASH_STM32_SR_FASTERR |		\
+				FLASH_STM32_SR_RDERR |			\
+				FLASH_STM32_SR_PGPERR)
+
 
 #ifdef CONFIG_FLASH_PAGE_LAYOUT
 static inline bool flash_stm32_range_exists(const struct device *dev,