stm32l4x: fix incorrect device id mask

[fw/openocd] / src / flash / nor / stm32l4x.c

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 32d5a0ed5524288123676ed5f0988b9d1ebe1542..7a75c523b45d699e33acf71b6b0daecb663390a6 100644 (file)
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -13,8 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.                                        *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -600,6 +599,7 @@ static int stm32l4_probe(struct flash_bank *bank)
        struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
        int i;
        uint16_t flash_size_in_kb = 0xffff;
+       uint16_t max_flash_size_in_kb;
        uint32_t device_id;
        uint32_t options;
        uint32_t base_address = 0x08000000;
@@ -615,6 +615,7 @@ static int stm32l4_probe(struct flash_bank *bank)
        /* set max flash size depending on family */
        switch (device_id & 0xfff) {
        case 0x415:
+               max_flash_size_in_kb = 1024;
                break;
        default:
                LOG_WARNING("Cannot identify target as a STM32L4 family.");
@@ -624,6 +625,19 @@ static int stm32l4_probe(struct flash_bank *bank)
        /* get flash size from target. */
        retval = target_read_u16(target, FLASH_SIZE_REG, &flash_size_in_kb);
 
+       /* failed reading flash size or flash size invalid (early silicon),
+        * default to max target family */
+       if (retval != ERROR_OK || flash_size_in_kb == 0xffff || flash_size_in_kb == 0) {
+               LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming %dk flash",
+                       max_flash_size_in_kb);
+               flash_size_in_kb = max_flash_size_in_kb;
+       }
+
+       LOG_INFO("flash size = %dkbytes", flash_size_in_kb);
+
+       /* did we assign flash size? */
+       assert(flash_size_in_kb != 0xffff);
+
        /* get options to for DUAL BANK. */
        retval = target_read_u32(target, STM32_FLASH_OPTR, &options);
 
@@ -633,8 +647,6 @@ static int stm32l4_probe(struct flash_bank *bank)
        else
                stm32l4_info->option_bytes.bank_b_start = flash_size_in_kb << 9;
 
-       LOG_INFO("flash size = %dkbytes", flash_size_in_kb);
-
        /* did we assign flash size? */
        assert((flash_size_in_kb != 0xffff) && flash_size_in_kb);
 
@@ -686,7 +698,7 @@ static int get_stm32l4_info(struct flash_bank *bank, char *buf, int buf_size)
        if (retval != ERROR_OK)
                return retval;
 
-       uint16_t device_id = dbgmcu_idcode & 0xffff;
+       uint16_t device_id = dbgmcu_idcode & 0xfff;
        uint8_t rev_id = dbgmcu_idcode >> 28;
        uint8_t rev_minor = 0;
        int i;
@@ -701,7 +713,7 @@ static int get_stm32l4_info(struct flash_bank *bank, char *buf, int buf_size)
        const char *device_str;
 
        switch (device_id) {
-       case 0x6415:
+       case 0x415:
                device_str = "STM32L4xx";
                break;