pkarashchenko commented on a change in pull request #4908: URL: https://github.com/apache/incubator-nuttx/pull/4908#discussion_r757882890
########## File path: boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c ########## @@ -0,0 +1,284 @@ +/**************************************************************************** + * apps/examples/mtdpart/stm32_progmem.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <sys/mount.h> + +#include <stdbool.h> +#include <stdlib.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <debug.h> + +#include <nuttx/progmem.h> +#include <nuttx/drivers/drivers.h> +#include <nuttx/fs/ioctl.h> +#include <nuttx/kmalloc.h> +#include <nuttx/mtd/mtd.h> +#ifdef CONFIG_BCH +#include <nuttx/drivers/drivers.h> +#endif + +#include <stm32.h> +#include <nucleo-h743zi.h> +#include <stm32_flash.h> + +#ifdef HAVE_PROGMEM_CHARDEV + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0])) + +/* Configuration ************************************************************/ + +/* Make sure that support for MTD partitions is enabled */ +#ifdef CONFIG_MTD + +#ifndef CONFIG_MTD_PARTITION +# error "CONFIG_MTD_PARTITION is required" +#endif + +#endif +/**************************************************************************** + * Private Types + ****************************************************************************/ + +#if defined(CONFIG_PROGMEM_OTA_PARTITION) + +struct ota_partition_s +{ + uint32_t offset; /* Partition offset from the beginning of MTD */ + uint32_t size; /* Partition size in bytes */ + const char *devpath; /* Partition device path */ +}; + +#endif + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +#if defined(CONFIG_PROGMEM_OTA_PARTITION) +static struct mtd_dev_s *progmem_alloc_mtdpart(uint32_t mtd_offset, + uint32_t mtd_size); +static int init_ota_partitions(void); +#endif + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static FAR struct mtd_dev_s *g_progmem_mtd; + +#if defined(CONFIG_PROGMEM_OTA_PARTITION) +static const struct ota_partition_s g_ota_partition_table[] = +{ + { + .offset = CONFIG_OTA_PRIMARY_SLOT_OFFSET, + .size = CONFIG_OTA_SLOT_SIZE, + .devpath = CONFIG_OTA_PRIMARY_SLOT_DEVPATH + }, + { + .offset = CONFIG_OTA_SECONDARY_SLOT_OFFSET, + .size = CONFIG_OTA_SLOT_SIZE, + .devpath = CONFIG_OTA_SECONDARY_SLOT_DEVPATH + }, + { + .offset = CONFIG_OTA_SCRATCH_OFFSET, + .size = CONFIG_OTA_SCRATCH_SIZE, + .devpath = CONFIG_OTA_SCRATCH_DEVPATH + } +}; +#endif + + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +#if defined(CONFIG_PROGMEM_OTA_PARTITION) + +/**************************************************************************** + * Name: sam_progmem_alloc_mtdpart + * + * Description: + * Allocate an MTD partition from FLASH. + * + * Input Parameters: + * mtd_offset - MTD Partition offset from the base address in FLASH. + * mtd_size - Size for the MTD partition. + * + * Returned Value: + * MTD partition data pointer on success, NULL on failure. + * + ****************************************************************************/ + +static struct mtd_dev_s *progmem_alloc_mtdpart(uint32_t mtd_offset, + uint32_t mtd_size) +{ + uint32_t blocks; + ssize_t startblock; + + //ASSERT((mtd_offset + mtd_size) <= up_progmem_neraseblocks() * + // up_progmem_pagesize(0)); + ASSERT((mtd_offset % up_progmem_pagesize(0)) == 0); + ASSERT((mtd_size % up_progmem_pagesize(0)) == 0); + + finfo("\tMTD offset = 0x%"PRIx32"\n", mtd_offset); + finfo("\tMTD size = 0x%"PRIx32"\n", mtd_size); + + startblock = up_progmem_getpage(mtd_offset + up_progmem_getaddress(0)); + if (startblock < 0) + { + return NULL; + } + + blocks = mtd_size / up_progmem_pagesize(0); + + return mtd_partition(g_progmem_mtd, startblock, blocks); +} + +/**************************************************************************** + * Name: init_ota_partitions + * + * Description: + * Initialize partitions that are dedicated to firmware OTA update. + * + * Input Parameters: + * None. + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +static int init_ota_partitions(void) +{ + FAR struct mtd_dev_s *mtd; +#ifdef CONFIG_BCH + char blockdev[18]; +#endif + int ret = OK; + + for (uint i = 0; i < ARRAYSIZE(g_ota_partition_table); ++i) + { + const struct ota_partition_s *part = &g_ota_partition_table[i]; + mtd = progmem_alloc_mtdpart(part->offset, part->size); + + ret = ftl_initialize(i, mtd); + if (ret < 0) + { + ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret); + return ret; + } + +#ifdef CONFIG_BCH + snprintf(blockdev, 18, "/dev/mtdblock%d", i); + + ret = bchdev_register(blockdev, part->devpath, false); + if (ret < 0) + { + ferr("ERROR: bchdev_register %s failed: %d\n", part->devpath, ret); + return ret; + } +#endif + } + + return ret; +} +#endif + + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_progmem_init + * + * Description: + * Initialize the FLASH and register the MTD device. + ****************************************************************************/ + +int stm32_progmem_init(void) +{ + int ret = OK; + + + stm32h7_flash_unlock(); //TODO: Remove. Is only because cant link if removed. + + /* Create an instance of the SAME70 FLASH program memory device driver */ Review comment: ```suggestion /* Create an instance of the STM32H7 FLASH program memory device driver */ ``` ########## File path: boards/arm/stm32h7/nucleo-h743zi/Kconfig ########## @@ -27,4 +27,66 @@ config STM32_ROMFS_IMAGEFILE depends on STM32_ROMFS default "../../../rom.img" + +config PROGMEM_OTA_PARTITION + bool "Progmem ota partitions" + default y + select MTD + select MTD_BYTE_WRITE + select MTD_PARTITION + select MTD_PROGMEM + select MTD_PROGMEM_ERASESTATE + +menuconfig APP_FORMAT_MCUBOOT + bool "MCUboot-bootable format" + default y Review comment: Please consider if this can be defaulted to `n`. ########## File path: boards/arm/stm32h7/nucleo-h743zi/Kconfig ########## @@ -27,4 +27,66 @@ config STM32_ROMFS_IMAGEFILE depends on STM32_ROMFS default "../../../rom.img" + +config PROGMEM_OTA_PARTITION + bool "Progmem ota partitions" + default y + select MTD + select MTD_BYTE_WRITE + select MTD_PARTITION + select MTD_PROGMEM + select MTD_PROGMEM_ERASESTATE + +menuconfig APP_FORMAT_MCUBOOT + bool "MCUboot-bootable format" + default y + select PROGMEM_OTA_PARTITION + ---help--- + The MCUboot support of loading the firmware images. + +if APP_FORMAT_MCUBOOT + +config MCUBOOT_BOOTLOADER + bool "MCUboot bootloader application" + default y Review comment: Please consider if this can be defaulted to `n`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
