| Message ID | 1502183569-7902-5-git-send-email-tien.fong.chee@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
On 08/08/2017 11:12 AM, tien.fong.chee@intel.com wrote: > From: Tien Fong Chee <tien.fong.chee@intel.com> > > Configuration flip-flop driver is mainly used for handling the FPGA program > operation where the FPGA image loading from the flash into FPGA manager. I don't understand what this driver is for , sorry. Coding style issues are present (camel case, wrong comment style, use checkpatch). If this is for some FPGA loading, can this functionality be scripted instead? > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > --- > arch/arm/mach-socfpga/cff.c | 582 +++++++++++++++++++++++++++++++ > arch/arm/mach-socfpga/include/mach/cff.h | 40 +++ > include/configs/socfpga_arria10_socdk.h | 6 + > 3 files changed, 628 insertions(+) > create mode 100644 arch/arm/mach-socfpga/cff.c > create mode 100644 arch/arm/mach-socfpga/include/mach/cff.h > > diff --git a/arch/arm/mach-socfpga/cff.c b/arch/arm/mach-socfpga/cff.c > new file mode 100644 > index 0000000..ccee5e9 > --- /dev/null > +++ b/arch/arm/mach-socfpga/cff.c > @@ -0,0 +1,582 @@ > +/* > + * COPYRIGHT (C) 2017 Intel Corporation <www.intel.com> > + * > + * SPDX-License-Identifier: GPL-2.0 > + */ > + > +#include <altera.h> > +#include <common.h> > +#include <asm/io.h> > +#include <asm/arch/cff.h> > +#include <asm/arch/fpga_manager.h> > +#include <asm/arch/misc.h> > +#include <asm/arch/system_manager.h> > +#include <asm/arch/reset_manager.h> > +#include <errno.h> > +#include <fat.h> > +#include <fs.h> > +#include <fdtdec.h> > +#include <malloc.h> > +#include <mmc.h> > +#include <spi_flash.h> > +#include <spl.h> > +#include <watchdog.h> > + > +#define RBF_UNENCRYPTED 0xa65c > +#define RBF_ENCRYPTED 0xa65d > +#define ARRIA10RBF_PERIPH 0x0001 > +#define ARRIA10RBF_CORE 0x8001 > + > +DECLARE_GLOBAL_DATA_PTR; > + > +static int flash_type = -1; > + > +struct mmc *mmc; > + > +/* Local functions */ > +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, u32 *buffer, > + u32 *buffer_sizebytes); > +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, > + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 *buffer_sizebytes); > +#ifdef CONFIG_CMD_FPGA_LOADFS > +static const char *get_cff_filename(const void *fdt, int *len, u32 core); > +#else > +static int get_cff_offset(const void *fdt, u32 core); > +#endif > + > +static struct mmc *init_mmc_device(int dev, bool force_init) > +{ > + struct mmc *mmc; > + > + mmc = find_mmc_device(dev); > + if (!mmc) { > + printf("no mmc device at slot %x\n", dev); > + return NULL; > + } > + > + if (force_init) > + mmc->has_init = 0; > + if (mmc_init(mmc)) > + return NULL; > + > + return mmc; > +} > + > +static int cff_flash_probe(struct cff_flash_info *cff_flashinfo) > +{ > + int dev = 0; > + > + if(BOOT_DEVICE_MMC1 == flash_type) > + { > + mmc = init_mmc_device(dev, true); > + > + if (!mmc) > + return -ENOTBLK; > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > + /* we are looking at the FAT partition */ > + if (fat_register_device(mmc_get_blk_desc(mmc), > + cff_flashinfo->sdmmc_flashinfo.dev_part)) { > + printf("Failed to set filesystem to FAT.\n"); > + return -EPERM; > + } > +#endif > + } > + > + return flash_type; > +} > + > +static int flash_read(struct cff_flash_info *cff_flashinfo, > + u32 size_read, > + u32 *buffer_ptr) > +{ > + size_t ret = EEXIST; > +#ifdef CONFIG_CMD_FPGA_LOADFS > + loff_t actread; > +#endif > + > + if(BOOT_DEVICE_MMC1 == flash_type) { > +#ifdef CONFIG_CMD_FPGA_LOADFS > + ret = fat_read_file(cff_flashinfo->sdmmc_flashinfo.filename, > + buffer_ptr, cff_flashinfo->flash_offset, > + size_read, &actread); > + > + if (ret || actread != size_read) { > + printf("Failed to read %s from FAT %d ", > + cff_flashinfo->sdmmc_flashinfo.filename, > + ret); > + printf("!= %d.\n", size_read); > + return -EPERM; > + } else > + ret = actread; > +#else > + u32 blk = cff_flashinfo->flash_offset/mmc->read_bl_len; > + u32 cnt = size_read / mmc->read_bl_len; > + > + if (!cnt) > + cnt = 1; > + > + if((size_read % mmc->read_bl_len) && > + (size_read >= mmc->read_bl_len)) > + cnt++; > + > + ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, > + buffer_ptr); > + > + if (cnt != ret) > + return -EPERM; > +#endif > + } > + > + return ret; > +} > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > +const char *get_cff_filename(const void *fdt, int *len, u32 core) > +{ > + const char *cff_filename = NULL; > + const char *cell; > + int nodeoffset; > + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); > + > + if (nodeoffset >= 0) { > + if (core) > + cell = fdt_getprop(fdt, > + nodeoffset, > + "cffcore-file", > + len); > + else > + cell = fdt_getprop(fdt, nodeoffset, "cff-file", len); > + > + if (cell) > + cff_filename = cell; > + } > + > + return cff_filename; > +} > +#else > +static int get_cff_offset(const void *fdt, u32 core) > +{ > + int nodeoffset = 0; > + > + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); > + > + if (nodeoffset >= 0) { > + if (core) > + return fdtdec_get_int(fdt, > + nodeoffset, > + "cffcore-offset", > + -ESPIPE); > + else > + return fdtdec_get_int(fdt, > + nodeoffset, > + "cff-offset", > + -ESPIPE); > + } > + return -ESPIPE; > +} > +#endif > + > +int cff_from_sdmmc_env(u32 core) > +{ > + int rval = -ENOENT; > + fpga_fs_info fpga_fsinfo; > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > + int len = 0; > + const char *cff = NULL; > +#else > + char addrToString[32] = {0}; > + > + int sdmmc_rbf_rawaddr = -ENOENT; > +#endif > + > + flash_type = spl_boot_device(); > + > + fpga_fsinfo.interface = "sdmmc"; > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > + cff = get_cff_filename(gd->fdt_blob, &len, core); > + > + /* FAT periph RBF file reading */ > + if (cff && (len > 0)) { > + mmc_initialize(gd->bd); > + > + fpga_fsinfo.filename = (char *)cff; > + > + fpga_fsinfo.dev_part = getenv("cff_devsel_partition"); > + > + if (NULL == fpga_fsinfo.dev_part) { > + /* FAT partition */ > + fpga_fsinfo.dev_part = "1"; > + > + printf("No SD/MMC partition found in environment. "); > + printf("Assuming partition 1.\n"); > + } > + > + rval = cff_from_flash(&fpga_fsinfo); > + } > +#else > + sdmmc_rbf_rawaddr = get_cff_offset(gd->fdt_blob, core); > + > + /* RAW periph RBF reading */ > + if (sdmmc_rbf_rawaddr >= 0) { > + sprintf(addrToString, "%x", sdmmc_rbf_rawaddr); > + > + fpga_fsinfo.filename = addrToString; > + > + rval = cff_from_flash(&fpga_fsinfo); > + } > +#endif > + return rval; > +} > + > +void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer) > +{ > + /* > + Magic ID starting at: > + -> 1st dword in periph.rbf > + -> 2nd dword in core.rbf > + */ > + u32 word_reading_max = 2; > + u32 i; > + > + for(i = 0; i < word_reading_max; i++) > + { > + if(RBF_UNENCRYPTED == *(buffer + i)) /* PERIPH RBF */ > + rbf->security = unencrypted; > + else if (RBF_ENCRYPTED == *(buffer + i)) > + rbf->security = encrypted; > + else if (RBF_UNENCRYPTED == *(buffer + i + 1)) /* CORE RBF */ > + rbf->security = unencrypted; > + else if (RBF_ENCRYPTED == *(buffer + i + 1)) > + rbf->security = encrypted; > + else { > + rbf->security = invalid; > + continue; > + } > + > + /* PERIPH RBF */ > + if (ARRIA10RBF_PERIPH == *(buffer + i + 1)) { > + rbf->section = periph_section; > + break; > + } > + else if (ARRIA10RBF_CORE == *(buffer + i + 1)) { > + rbf->section = core_section; > + break; > + } /* CORE RBF */ > + else if (ARRIA10RBF_PERIPH == *(buffer + i + 2)) { > + rbf->section = periph_section; > + break; > + } > + else if (ARRIA10RBF_CORE == *(buffer + i + 2)) { > + rbf->section = core_section; > + break; > + } > + else { > + rbf->section = unknown; > + break; > + } > + } > + > + return; > +} > + > +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, > + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 *buffer_sizebytes) > +{ > + u32 *bufferptr_after_header = NULL; > + u32 buffersize_after_header = 0; > + u32 rbf_header_data_size = 0; > + int ret = 0; > + /* To avoid from keeping re-read the contents */ > + struct image_header *header = &(cff_flashinfo->header); > + size_t buffer_size = *buffer_sizebytes; > + u32 *buffer_ptr = (u32 *)*buffer; > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > + cff_flashinfo->sdmmc_flashinfo.filename = fpga_fsinfo->filename; > + cff_flashinfo->flash_offset = 0; > +#else > + cff_flashinfo->flash_offset = > + simple_strtoul(fpga_fsinfo->filename, NULL, 16); > +#endif > + > + /* Load mkimage header into buffer */ > + ret = flash_read(cff_flashinfo, > + sizeof(struct image_header), buffer_ptr); > + > + if (0 >= ret) { > + printf(" Failed to read mkimage header from flash.\n"); > + return -ENOENT; > + } > + > + WATCHDOG_RESET(); > + > + memcpy(header, (u_char *)buffer_ptr, sizeof(*header)); > + > + if (!image_check_magic(header)) { > + printf("FPGA: Bad Magic Number.\n"); > + return -EBADF; > + } > + > + if (!image_check_hcrc(header)) { > + printf("FPGA: Bad Header Checksum.\n"); > + return -EPERM; > + } > + > + /* Getting rbf data size */ > + cff_flashinfo->remaining = > + image_get_data_size(header); > + > + /* Calculate total size of both rbf data with mkimage header */ > + rbf_header_data_size = cff_flashinfo->remaining + > + sizeof(struct image_header); > + > + /* Loading to buffer chunk by chunk, normally for OCRAM buffer */ > + if (rbf_header_data_size > buffer_size) { > + /* Calculate size of rbf data in the buffer */ > + buffersize_after_header = > + buffer_size - sizeof(struct image_header); > + cff_flashinfo->remaining -= buffersize_after_header; > + } else { > + /* Loading whole rbf image into buffer, normally for DDR buffer */ > + buffer_size = rbf_header_data_size; > + /* Calculate size of rbf data in the buffer */ > + buffersize_after_header = > + buffer_size - sizeof(struct image_header); > + cff_flashinfo->remaining = 0; > + } > + > + /* Loading mkimage header and rbf data into buffer */ > + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); > + > + if (0 >= ret) { > + printf(" Failed to read mkimage header and rbf data "); > + printf("from flash.\n"); > + return -ENOENT; > + } > + > + /* Getting pointer of rbf data starting address where is it > + right after mkimage header */ > + bufferptr_after_header = > + (u32 *)((u_char *)buffer_ptr + sizeof(struct image_header)); > + > + /* Update next reading rbf data flash offset */ > + cff_flashinfo->flash_offset += buffer_size; > + > + /* Update the starting addr of rbf data to init FPGA & programming > + into FPGA */ > + *buffer = (u32)bufferptr_after_header; > + > + get_rbf_image_info(&cff_flashinfo->rbfinfo, (u16 *)bufferptr_after_header); > + > + /* Update the size of rbf data to be programmed into FPGA */ > + *buffer_sizebytes = buffersize_after_header; > + > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > + cff_flashinfo->datacrc = > + crc32(cff_flashinfo->datacrc, > + (u_char *)bufferptr_after_header, > + buffersize_after_header); > +#endif > +if (0 == cff_flashinfo->remaining) { > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > + if (cff_flashinfo->datacrc != > + image_get_dcrc(&(cff_flashinfo->header))) { > + printf("FPGA: Bad Data Checksum.\n"); > + return -EPERM; > + } > +#endif > +} > + return 0; > +} > + > + > +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, u32 *buffer, > + u32 *buffer_sizebytes) > +{ > + int ret = 0; > + /* To avoid from keeping re-read the contents */ > + size_t buffer_size = *buffer_sizebytes; > + u32 *buffer_ptr = (u32 *)*buffer; > + u32 flash_addr = cff_flashinfo->flash_offset; > + > + /* Buffer allocated in OCRAM */ > + /* Read the data by small chunk by chunk. */ > + if (cff_flashinfo->remaining > buffer_size) > + cff_flashinfo->remaining -= buffer_size; > + else { > + /* Buffer allocated in DDR, larger than rbf data most > + of the time */ > + buffer_size = cff_flashinfo->remaining; > + cff_flashinfo->remaining = 0; > + } > + > + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); > + > + if (0 >= ret) { > + printf(" Failed to read rbf data from flash.\n"); > + return -ENOENT; > + } > + > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > + cff_flashinfo->datacrc = > + crc32(cff_flashinfo->datacrc, > + (unsigned char *)buffer_ptr, buffer_size); > +#endif > + > +if (0 == cff_flashinfo->remaining) { > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > + if (cff_flashinfo->datacrc != > + image_get_dcrc(&(cff_flashinfo->header))) { > + printf("FPGA: Bad Data Checksum.\n"); > + return -EPERM; > + } > +#endif > +} > + /* Update next reading rbf data flash offset */ > + flash_addr += buffer_size; > + > + cff_flashinfo->flash_offset = flash_addr; > + > + /* Update the size of rbf data to be programmed into FPGA */ > + *buffer_sizebytes = buffer_size; > + > + return 0; > +} > + > +int cff_from_flash(fpga_fs_info *fpga_fsinfo) > +{ > + u32 buffer = 0; > + u32 buffer_ori = 0; > + u32 buffer_sizebytes = 0; > + u32 buffer_sizebytes_ori = 0; > + struct cff_flash_info cff_flashinfo; > + u32 status; > + int ret = 0; > + > + memset(&cff_flashinfo, 0, sizeof(cff_flashinfo)); > + > + if (fpga_fsinfo->filename == NULL) { > + printf("no [periph/core] rbf [filename/offset] specified.\n"); > + return -EINVAL; > + } > + > + WATCHDOG_RESET(); > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > + cff_flashinfo.sdmmc_flashinfo.dev_part = > + simple_strtol(fpga_fsinfo->dev_part, NULL, 10); > +#endif > + > + ret = cff_flash_probe(&cff_flashinfo); > + > + if (0 >= ret) { > + puts("Flash probe failed.\n"); > + return ret; > + } > + > +#ifdef CONFIG_CMD_FPGA_LOADFS > + /* Loading rbf data with DDR, faster than OCRAM, > + only for core rbf */ > + if (gd->ram_size != 0) { > + ret = fat_size(fpga_fsinfo->filename, (loff_t *)&buffer_sizebytes); > + > + if(ret){ > + puts("Failed to read file size.\n"); > + return ret; > + } > + > + buffer_ori = (u32)memalign(ARCH_DMA_MINALIGN, buffer_sizebytes); > + > + if (!buffer_ori) { > + error("RBF calloc failed!\n"); > + return -ENOMEM; > + } > + > + /* Loading mkimage header and rbf data into > + DDR instead of OCRAM */ > + buffer = buffer_ori; > + > + buffer_sizebytes_ori = buffer_sizebytes; > + } else { > + buffer = buffer_ori = (u32)cff_flashinfo.buffer; > + > + buffer_sizebytes = > + buffer_sizebytes_ori = > + sizeof(cff_flashinfo.buffer); > + } > +#else > + /* Adjust to adjacent block */ > + buffer_sizebytes = buffer_sizebytes_ori = > + (sizeof(cff_flashinfo.buffer)/ mmc->read_bl_len) * > + mmc->read_bl_len; > +#endif > + > + /* Note: Both buffer and buffer_sizebytes values can be altered by > + function below. */ > + ret = cff_flash_preinit(&cff_flashinfo, fpga_fsinfo, &buffer, > + &buffer_sizebytes); > + > + if (ret) > + return ret; > + > + if (periph_section == cff_flashinfo.rbfinfo.section) { > + /* initialize the FPGA Manager */ > + status = fpgamgr_program_init((u32 *)buffer, buffer_sizebytes); > + if (status) { > + printf("FPGA: Init with periph rbf failed with error. "); > + printf("code %d\n", status); > + return -EPERM; > + } > + } > + > + WATCHDOG_RESET(); > + > + /* transfer data to FPGA Manager */ > + fpgamgr_program_write((void *)buffer, > + buffer_sizebytes); > + > + WATCHDOG_RESET(); > + > + while (cff_flashinfo.remaining) { > + ret = cff_flash_read(&cff_flashinfo, &buffer_ori, > + &buffer_sizebytes_ori); > + > + if (ret) > + return ret; > + > + /* transfer data to FPGA Manager */ > + fpgamgr_program_write((void *)buffer_ori, > + buffer_sizebytes_ori); > + > + WATCHDOG_RESET(); > + } > + > + if ((periph_section == cff_flashinfo.rbfinfo.section) && > + is_early_release_fpga_config(gd->fdt_blob)) { > + if (-ETIMEDOUT != fpgamgr_wait_early_user_mode()) > + printf("FPGA: Early Release Succeeded.\n"); > + else { > + printf("FPGA: Failed to see Early Release.\n"); > + return -EIO; > + } > + } else if ((core_section == cff_flashinfo.rbfinfo.section) || > + ((periph_section == cff_flashinfo.rbfinfo.section) && > + !is_early_release_fpga_config(gd->fdt_blob))) { > + /* Ensure the FPGA entering config done */ > + status = fpgamgr_program_finish(); > + if (status) > + return status; > + else > + printf("FPGA: Enter user mode.\n"); > + > + } else { > + printf("Config Error: Unsupported FGPA raw binary type.\n"); > + return -ENOEXEC; > + } > + > + WATCHDOG_RESET(); > + return 1; > +} > diff --git a/arch/arm/mach-socfpga/include/mach/cff.h b/arch/arm/mach-socfpga/include/mach/cff.h > new file mode 100644 > index 0000000..7f3f66b > --- /dev/null > +++ b/arch/arm/mach-socfpga/include/mach/cff.h > @@ -0,0 +1,40 @@ > +/* > + * Copyright (C) 2017 Intel Corporation <www.intel.com> > + * > + * SPDX-License-Identifier: GPL-2.0 > + */ > + > +#ifndef _SOCFPGA_CFF_H_ > +#define _SOCFPGA_CFF_H_ > + > +#include <fpga.h> > + > +#ifndef __ASSEMBLY_ > + > +struct flash_info { > + char *filename; > + int dev_part; > +}; > + > +enum rbf_type {unknown, periph_section, core_section}; > +enum rbf_security {invalid, unencrypted, encrypted}; > + > +struct rbf_info { > + enum rbf_type section ; > + enum rbf_security security; > +}; > + > +struct cff_flash_info { > + struct flash_info sdmmc_flashinfo; > + u32 buffer[4096] __aligned(ARCH_DMA_MINALIGN); > + u32 remaining; > + u32 flash_offset; > + struct rbf_info rbfinfo; > + struct image_header header; > +}; > + > +int cff_from_sdmmc_env(unsigned int core); > +int cff_from_flash(fpga_fs_info *fpga_fsinfo); > +#endif /* __ASSEMBLY__ */ > + > +#endif /* _SOCFPGA_CFF_H_ */ > diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h > index 3b59b6a..aa4c54a 100644 > --- a/include/configs/socfpga_arria10_socdk.h > +++ b/include/configs/socfpga_arria10_socdk.h > @@ -58,6 +58,12 @@ > * Flash configurations > */ > #define CONFIG_SYS_MAX_FLASH_BANKS 1 > +/* Default SDMMC physical address for periph.rbf (sector alignment) */ > +#define CONFIG_FS_FAT_MAX_CLUSTSIZE (32 * 1024) > + > +#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_CMD_FPGA_LOADFS) > +#define CONFIG_CMD_FPGA_LOADFS > +#endif > > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> >
On Sel, 2017-08-08 at 11:32 +0200, Marek Vasut wrote: > On 08/08/2017 11:12 AM, tien.fong.chee@intel.com wrote: > > > > From: Tien Fong Chee <tien.fong.chee@intel.com> > > > > Configuration flip-flop driver is mainly used for handling the FPGA > > program > > operation where the FPGA image loading from the flash into FPGA > > manager. > I don't understand what this driver is for , sorry. > this is core driver for handling fpga program operation from flash to fpga manager. I can improve the message. Let me know if you have other comment need to add. > Coding style issues are present (camel case, wrong comment style, use > checkpatch). > Okay, i will run checkpatch. > If this is for some FPGA loading, can this functionality be scripted > instead? > Sorry, i'm not getting you. How functionality be scripted? Could you provide some example or details explanation? Thanks. > > > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > --- > > arch/arm/mach-socfpga/cff.c | 582 > > +++++++++++++++++++++++++++++++ > > arch/arm/mach-socfpga/include/mach/cff.h | 40 +++ > > include/configs/socfpga_arria10_socdk.h | 6 + > > 3 files changed, 628 insertions(+) > > create mode 100644 arch/arm/mach-socfpga/cff.c > > create mode 100644 arch/arm/mach-socfpga/include/mach/cff.h > > > > diff --git a/arch/arm/mach-socfpga/cff.c b/arch/arm/mach- > > socfpga/cff.c > > new file mode 100644 > > index 0000000..ccee5e9 > > --- /dev/null > > +++ b/arch/arm/mach-socfpga/cff.c > > @@ -0,0 +1,582 @@ > > +/* > > + * COPYRIGHT (C) 2017 Intel Corporation <www.intel.com> > > + * > > + * SPDX-License-Identifier: GPL-2.0 > > + */ > > + > > +#include <altera.h> > > +#include <common.h> > > +#include <asm/io.h> > > +#include <asm/arch/cff.h> > > +#include <asm/arch/fpga_manager.h> > > +#include <asm/arch/misc.h> > > +#include <asm/arch/system_manager.h> > > +#include <asm/arch/reset_manager.h> > > +#include <errno.h> > > +#include <fat.h> > > +#include <fs.h> > > +#include <fdtdec.h> > > +#include <malloc.h> > > +#include <mmc.h> > > +#include <spi_flash.h> > > +#include <spl.h> > > +#include <watchdog.h> > > + > > +#define RBF_UNENCRYPTED 0xa65c > > +#define RBF_ENCRYPTED 0xa65d > > +#define ARRIA10RBF_PERIPH 0x0001 > > +#define ARRIA10RBF_CORE 0x8001 > > + > > +DECLARE_GLOBAL_DATA_PTR; > > + > > +static int flash_type = -1; > > + > > +struct mmc *mmc; > > + > > +/* Local functions */ > > +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, > > u32 *buffer, > > + u32 *buffer_sizebytes); > > +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, > > + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 > > *buffer_sizebytes); > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > +static const char *get_cff_filename(const void *fdt, int *len, u32 > > core); > > +#else > > +static int get_cff_offset(const void *fdt, u32 core); > > +#endif > > + > > +static struct mmc *init_mmc_device(int dev, bool force_init) > > +{ > > + struct mmc *mmc; > > + > > + mmc = find_mmc_device(dev); > > + if (!mmc) { > > + printf("no mmc device at slot %x\n", dev); > > + return NULL; > > + } > > + > > + if (force_init) > > + mmc->has_init = 0; > > + if (mmc_init(mmc)) > > + return NULL; > > + > > + return mmc; > > +} > > + > > +static int cff_flash_probe(struct cff_flash_info *cff_flashinfo) > > +{ > > + int dev = 0; > > + > > + if(BOOT_DEVICE_MMC1 == flash_type) > > + { > > + mmc = init_mmc_device(dev, true); > > + > > + if (!mmc) > > + return -ENOTBLK; > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + /* we are looking at the FAT partition */ > > + if (fat_register_device(mmc_get_blk_desc(mmc), > > + cff_flashinfo->sdmmc_flashinfo.dev_part)) > > { > > + printf("Failed to set filesystem to > > FAT.\n"); > > + return -EPERM; > > + } > > +#endif > > + } > > + > > + return flash_type; > > +} > > + > > +static int flash_read(struct cff_flash_info *cff_flashinfo, > > + u32 size_read, > > + u32 *buffer_ptr) > > +{ > > + size_t ret = EEXIST; > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + loff_t actread; > > +#endif > > + > > + if(BOOT_DEVICE_MMC1 == flash_type) { > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + ret = fat_read_file(cff_flashinfo- > > >sdmmc_flashinfo.filename, > > + buffer_ptr, cff_flashinfo- > > >flash_offset, > > + size_read, &actread); > > + > > + if (ret || actread != size_read) { > > + printf("Failed to read %s from FAT %d ", > > + cff_flashinfo- > > >sdmmc_flashinfo.filename, > > + ret); > > + printf("!= %d.\n", size_read); > > + return -EPERM; > > + } else > > + ret = actread; > > +#else > > + u32 blk = cff_flashinfo->flash_offset/mmc- > > >read_bl_len; > > + u32 cnt = size_read / mmc->read_bl_len; > > + > > + if (!cnt) > > + cnt = 1; > > + > > + if((size_read % mmc->read_bl_len) && > > + (size_read >= mmc->read_bl_len)) > > + cnt++; > > + > > + ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, > > + buffer_ptr); > > + > > + if (cnt != ret) > > + return -EPERM; > > +#endif > > + } > > + > > + return ret; > > +} > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > +const char *get_cff_filename(const void *fdt, int *len, u32 core) > > +{ > > + const char *cff_filename = NULL; > > + const char *cell; > > + int nodeoffset; > > + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); > > + > > + if (nodeoffset >= 0) { > > + if (core) > > + cell = fdt_getprop(fdt, > > + nodeoffset, > > + "cffcore-file", > > + len); > > + else > > + cell = fdt_getprop(fdt, nodeoffset, "cff- > > file", len); > > + > > + if (cell) > > + cff_filename = cell; > > + } > > + > > + return cff_filename; > > +} > > +#else > > +static int get_cff_offset(const void *fdt, u32 core) > > +{ > > + int nodeoffset = 0; > > + > > + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); > > + > > + if (nodeoffset >= 0) { > > + if (core) > > + return fdtdec_get_int(fdt, > > + nodeoffset, > > + "cffcore-offset", > > + -ESPIPE); > > + else > > + return fdtdec_get_int(fdt, > > + nodeoffset, > > + "cff-offset", > > + -ESPIPE); > > + } > > + return -ESPIPE; > > +} > > +#endif > > + > > +int cff_from_sdmmc_env(u32 core) > > +{ > > + int rval = -ENOENT; > > + fpga_fs_info fpga_fsinfo; > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + int len = 0; > > + const char *cff = NULL; > > +#else > > + char addrToString[32] = {0}; > > + > > + int sdmmc_rbf_rawaddr = -ENOENT; > > +#endif > > + > > + flash_type = spl_boot_device(); > > + > > + fpga_fsinfo.interface = "sdmmc"; > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + cff = get_cff_filename(gd->fdt_blob, &len, core); > > + > > + /* FAT periph RBF file reading */ > > + if (cff && (len > 0)) { > > + mmc_initialize(gd->bd); > > + > > + fpga_fsinfo.filename = (char *)cff; > > + > > + fpga_fsinfo.dev_part = > > getenv("cff_devsel_partition"); > > + > > + if (NULL == fpga_fsinfo.dev_part) { > > + /* FAT partition */ > > + fpga_fsinfo.dev_part = "1"; > > + > > + printf("No SD/MMC partition found in > > environment. "); > > + printf("Assuming partition 1.\n"); > > + } > > + > > + rval = cff_from_flash(&fpga_fsinfo); > > + } > > +#else > > + sdmmc_rbf_rawaddr = get_cff_offset(gd->fdt_blob, core); > > + > > + /* RAW periph RBF reading */ > > + if (sdmmc_rbf_rawaddr >= 0) { > > + sprintf(addrToString, "%x", sdmmc_rbf_rawaddr); > > + > > + fpga_fsinfo.filename = addrToString; > > + > > + rval = cff_from_flash(&fpga_fsinfo); > > + } > > +#endif > > + return rval; > > +} > > + > > +void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer) > > +{ > > + /* > > + Magic ID starting at: > > + -> 1st dword in periph.rbf > > + -> 2nd dword in core.rbf > > + */ > > + u32 word_reading_max = 2; > > + u32 i; > > + > > + for(i = 0; i < word_reading_max; i++) > > + { > > + if(RBF_UNENCRYPTED == *(buffer + i)) /* PERIPH RBF > > */ > > + rbf->security = unencrypted; > > + else if (RBF_ENCRYPTED == *(buffer + i)) > > + rbf->security = encrypted; > > + else if (RBF_UNENCRYPTED == *(buffer + i + 1)) /* > > CORE RBF */ > > + rbf->security = > > unencrypted; > > + else if (RBF_ENCRYPTED == *(buffer + i + 1)) > > + rbf->security = encrypted; > > + else { > > + rbf->security = invalid; > > + continue; > > + } > > + > > + /* PERIPH RBF */ > > + if (ARRIA10RBF_PERIPH == *(buffer + i + 1)) { > > + rbf->section = periph_section; > > + break; > > + } > > + else if (ARRIA10RBF_CORE == *(buffer + i + 1)) { > > + rbf->section = core_section; > > + break; > > + } /* CORE RBF */ > > + else if (ARRIA10RBF_PERIPH == *(buffer + i + 2)) { > > + rbf->section = periph_section; > > + break; > > + } > > + else if (ARRIA10RBF_CORE == *(buffer + i + 2)) { > > + rbf->section = core_section; > > + break; > > + } > > + else { > > + rbf->section = unknown; > > + break; > > + } > > + } > > + > > + return; > > +} > > + > > +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, > > + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 > > *buffer_sizebytes) > > +{ > > + u32 *bufferptr_after_header = NULL; > > + u32 buffersize_after_header = 0; > > + u32 rbf_header_data_size = 0; > > + int ret = 0; > > + /* To avoid from keeping re-read the contents */ > > + struct image_header *header = &(cff_flashinfo->header); > > + size_t buffer_size = *buffer_sizebytes; > > + u32 *buffer_ptr = (u32 *)*buffer; > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + cff_flashinfo->sdmmc_flashinfo.filename = fpga_fsinfo- > > >filename; > > + cff_flashinfo->flash_offset = 0; > > +#else > > + cff_flashinfo->flash_offset = > > + simple_strtoul(fpga_fsinfo->filename, NULL, 16); > > +#endif > > + > > + /* Load mkimage header into buffer */ > > + ret = flash_read(cff_flashinfo, > > + sizeof(struct image_header), buffer_ptr); > > + > > + if (0 >= ret) { > > + printf(" Failed to read mkimage header from > > flash.\n"); > > + return -ENOENT; > > + } > > + > > + WATCHDOG_RESET(); > > + > > + memcpy(header, (u_char *)buffer_ptr, sizeof(*header)); > > + > > + if (!image_check_magic(header)) { > > + printf("FPGA: Bad Magic Number.\n"); > > + return -EBADF; > > + } > > + > > + if (!image_check_hcrc(header)) { > > + printf("FPGA: Bad Header Checksum.\n"); > > + return -EPERM; > > + } > > + > > + /* Getting rbf data size */ > > + cff_flashinfo->remaining = > > + image_get_data_size(header); > > + > > + /* Calculate total size of both rbf data with mkimage > > header */ > > + rbf_header_data_size = cff_flashinfo->remaining + > > + sizeof(struct image_header); > > + > > + /* Loading to buffer chunk by chunk, normally for OCRAM > > buffer */ > > + if (rbf_header_data_size > buffer_size) { > > + /* Calculate size of rbf data in the buffer */ > > + buffersize_after_header = > > + buffer_size - sizeof(struct image_header); > > + cff_flashinfo->remaining -= > > buffersize_after_header; > > + } else { > > + /* Loading whole rbf image into buffer, normally for DDR > > buffer */ > > + buffer_size = rbf_header_data_size; > > + /* Calculate size of rbf data in the buffer */ > > + buffersize_after_header = > > + buffer_size - sizeof(struct image_header); > > + cff_flashinfo->remaining = 0; > > + } > > + > > + /* Loading mkimage header and rbf data into buffer */ > > + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); > > + > > + if (0 >= ret) { > > + printf(" Failed to read mkimage header and rbf > > data "); > > + printf("from flash.\n"); > > + return -ENOENT; > > + } > > + > > + /* Getting pointer of rbf data starting address where is > > it > > + right after mkimage header */ > > + bufferptr_after_header = > > + (u32 *)((u_char *)buffer_ptr + sizeof(struct > > image_header)); > > + > > + /* Update next reading rbf data flash offset */ > > + cff_flashinfo->flash_offset += buffer_size; > > + > > + /* Update the starting addr of rbf data to init FPGA & > > programming > > + into FPGA */ > > + *buffer = (u32)bufferptr_after_header; > > + > > + get_rbf_image_info(&cff_flashinfo->rbfinfo, (u16 > > *)bufferptr_after_header); > > + > > + /* Update the size of rbf data to be programmed into FPGA > > */ > > + *buffer_sizebytes = buffersize_after_header; > > + > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > + cff_flashinfo->datacrc = > > + crc32(cff_flashinfo->datacrc, > > + (u_char *)bufferptr_after_header, > > + buffersize_after_header); > > +#endif > > +if (0 == cff_flashinfo->remaining) { > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > + if (cff_flashinfo->datacrc != > > + image_get_dcrc(&(cff_flashinfo->header))) { > > + printf("FPGA: Bad Data Checksum.\n"); > > + return -EPERM; > > + } > > +#endif > > +} > > + return 0; > > +} > > + > > + > > +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, > > u32 *buffer, > > + u32 *buffer_sizebytes) > > +{ > > + int ret = 0; > > + /* To avoid from keeping re-read the contents */ > > + size_t buffer_size = *buffer_sizebytes; > > + u32 *buffer_ptr = (u32 *)*buffer; > > + u32 flash_addr = cff_flashinfo->flash_offset; > > + > > + /* Buffer allocated in OCRAM */ > > + /* Read the data by small chunk by chunk. */ > > + if (cff_flashinfo->remaining > buffer_size) > > + cff_flashinfo->remaining -= buffer_size; > > + else { > > + /* Buffer allocated in DDR, larger than rbf data > > most > > + of the time */ > > + buffer_size = cff_flashinfo->remaining; > > + cff_flashinfo->remaining = 0; > > + } > > + > > + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); > > + > > + if (0 >= ret) { > > + printf(" Failed to read rbf data from flash.\n"); > > + return -ENOENT; > > + } > > + > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > + cff_flashinfo->datacrc = > > + crc32(cff_flashinfo->datacrc, > > + (unsigned char *)buffer_ptr, buffer_size); > > +#endif > > + > > +if (0 == cff_flashinfo->remaining) { > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > + if (cff_flashinfo->datacrc != > > + image_get_dcrc(&(cff_flashinfo->header))) { > > + printf("FPGA: Bad Data Checksum.\n"); > > + return -EPERM; > > + } > > +#endif > > +} > > + /* Update next reading rbf data flash offset */ > > + flash_addr += buffer_size; > > + > > + cff_flashinfo->flash_offset = flash_addr; > > + > > + /* Update the size of rbf data to be programmed into FPGA > > */ > > + *buffer_sizebytes = buffer_size; > > + > > + return 0; > > +} > > + > > +int cff_from_flash(fpga_fs_info *fpga_fsinfo) > > +{ > > + u32 buffer = 0; > > + u32 buffer_ori = 0; > > + u32 buffer_sizebytes = 0; > > + u32 buffer_sizebytes_ori = 0; > > + struct cff_flash_info cff_flashinfo; > > + u32 status; > > + int ret = 0; > > + > > + memset(&cff_flashinfo, 0, sizeof(cff_flashinfo)); > > + > > + if (fpga_fsinfo->filename == NULL) { > > + printf("no [periph/core] rbf [filename/offset] > > specified.\n"); > > + return -EINVAL; > > + } > > + > > + WATCHDOG_RESET(); > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + cff_flashinfo.sdmmc_flashinfo.dev_part = > > + simple_strtol(fpga_fsinfo->dev_part, NULL, 10); > > +#endif > > + > > + ret = cff_flash_probe(&cff_flashinfo); > > + > > + if (0 >= ret) { > > + puts("Flash probe failed.\n"); > > + return ret; > > + } > > + > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > + /* Loading rbf data with DDR, faster than OCRAM, > > + only for core rbf */ > > + if (gd->ram_size != 0) { > > + ret = fat_size(fpga_fsinfo->filename, (loff_t > > *)&buffer_sizebytes); > > + > > + if(ret){ > > + puts("Failed to read file size.\n"); > > + return ret; > > + } > > + > > + buffer_ori = (u32)memalign(ARCH_DMA_MINALIGN, > > buffer_sizebytes); > > + > > + if (!buffer_ori) { > > + error("RBF calloc failed!\n"); > > + return -ENOMEM; > > + } > > + > > + /* Loading mkimage header and rbf data into > > + DDR instead of OCRAM */ > > + buffer = buffer_ori; > > + > > + buffer_sizebytes_ori = buffer_sizebytes; > > + } else { > > + buffer = buffer_ori = (u32)cff_flashinfo.buffer; > > + > > + buffer_sizebytes = > > + buffer_sizebytes_ori = > > + sizeof(cff_flashinfo.buffer); > > + } > > +#else > > + /* Adjust to adjacent block */ > > + buffer_sizebytes = buffer_sizebytes_ori = > > + (sizeof(cff_flashinfo.buffer)/ > > mmc->read_bl_len) * > > + mmc->read_bl_len; > > +#endif > > + > > + /* Note: Both buffer and buffer_sizebytes values can be > > altered by > > + function below. */ > > + ret = cff_flash_preinit(&cff_flashinfo, fpga_fsinfo, > > &buffer, > > + &buffer_sizebytes); > > + > > + if (ret) > > + return ret; > > + > > + if (periph_section == cff_flashinfo.rbfinfo.section) { > > + /* initialize the FPGA Manager */ > > + status = fpgamgr_program_init((u32 *)buffer, > > buffer_sizebytes); > > + if (status) { > > + printf("FPGA: Init with periph rbf failed > > with error. "); > > + printf("code %d\n", status); > > + return -EPERM; > > + } > > + } > > + > > + WATCHDOG_RESET(); > > + > > + /* transfer data to FPGA Manager */ > > + fpgamgr_program_write((void *)buffer, > > + buffer_sizebytes); > > + > > + WATCHDOG_RESET(); > > + > > + while (cff_flashinfo.remaining) { > > + ret = cff_flash_read(&cff_flashinfo, &buffer_ori, > > + &buffer_sizebytes_ori); > > + > > + if (ret) > > + return ret; > > + > > + /* transfer data to FPGA Manager */ > > + fpgamgr_program_write((void *)buffer_ori, > > + buffer_sizebytes_ori); > > + > > + WATCHDOG_RESET(); > > + } > > + > > + if ((periph_section == cff_flashinfo.rbfinfo.section) && > > + is_early_release_fpga_config(gd->fdt_blob)) { > > + if (-ETIMEDOUT != fpgamgr_wait_early_user_mode()) > > + printf("FPGA: Early Release > > Succeeded.\n"); > > + else { > > + printf("FPGA: Failed to see Early > > Release.\n"); > > + return -EIO; > > + } > > + } else if ((core_section == cff_flashinfo.rbfinfo.section) > > || > > + ((periph_section == cff_flashinfo.rbfinfo.section) && > > + !is_early_release_fpga_config(gd->fdt_blob))) { > > + /* Ensure the FPGA entering config done */ > > + status = fpgamgr_program_finish(); > > + if (status) > > + return status; > > + else > > + printf("FPGA: Enter user mode.\n"); > > + > > + } else { > > + printf("Config Error: Unsupported FGPA raw binary > > type.\n"); > > + return -ENOEXEC; > > + } > > + > > + WATCHDOG_RESET(); > > + return 1; > > +} > > diff --git a/arch/arm/mach-socfpga/include/mach/cff.h > > b/arch/arm/mach-socfpga/include/mach/cff.h > > new file mode 100644 > > index 0000000..7f3f66b > > --- /dev/null > > +++ b/arch/arm/mach-socfpga/include/mach/cff.h > > @@ -0,0 +1,40 @@ > > +/* > > + * Copyright (C) 2017 Intel Corporation <www.intel.com> > > + * > > + * SPDX-License-Identifier: GPL-2.0 > > + */ > > + > > +#ifndef _SOCFPGA_CFF_H_ > > +#define _SOCFPGA_CFF_H_ > > + > > +#include <fpga.h> > > + > > +#ifndef __ASSEMBLY_ > > + > > +struct flash_info { > > + char *filename; > > + int dev_part; > > +}; > > + > > +enum rbf_type {unknown, periph_section, core_section}; > > +enum rbf_security {invalid, unencrypted, encrypted}; > > + > > +struct rbf_info { > > + enum rbf_type section ; > > + enum rbf_security security; > > +}; > > + > > +struct cff_flash_info { > > + struct flash_info sdmmc_flashinfo; > > + u32 buffer[4096] __aligned(ARCH_DMA_MINALIGN); > > + u32 remaining; > > + u32 flash_offset; > > + struct rbf_info rbfinfo; > > + struct image_header header; > > +}; > > + > > +int cff_from_sdmmc_env(unsigned int core); > > +int cff_from_flash(fpga_fs_info *fpga_fsinfo); > > +#endif /* __ASSEMBLY__ */ > > + > > +#endif /* _SOCFPGA_CFF_H_ */ > > diff --git a/include/configs/socfpga_arria10_socdk.h > > b/include/configs/socfpga_arria10_socdk.h > > index 3b59b6a..aa4c54a 100644 > > --- a/include/configs/socfpga_arria10_socdk.h > > +++ b/include/configs/socfpga_arria10_socdk.h > > @@ -58,6 +58,12 @@ > > * Flash configurations > > */ > > #define CONFIG_SYS_MAX_FLASH_BANKS 1 > > +/* Default SDMMC physical address for periph.rbf (sector > > alignment) */ > > +#define CONFIG_FS_FAT_MAX_CLUSTSIZE (32 * 1024) > > + > > +#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_CMD_FPGA_LOADFS) > > +#define CONFIG_CMD_FPGA_LOADFS > > +#endif > > > > /* The rest of the configuration is shared */ > > #include <configs/socfpga_common.h> > > >
On 08/08/2017 12:06 PM, Chee, Tien Fong wrote: > On Sel, 2017-08-08 at 11:32 +0200, Marek Vasut wrote: >> On 08/08/2017 11:12 AM, tien.fong.chee@intel.com wrote: >>> >>> From: Tien Fong Chee <tien.fong.chee@intel.com> >>> >>> Configuration flip-flop driver is mainly used for handling the FPGA >>> program >>> operation where the FPGA image loading from the flash into FPGA >>> manager. >> I don't understand what this driver is for , sorry. >> > this is core driver for handling fpga program operation from flash to > fpga manager. I can improve the message. Let me know if you have other > comment need to add. Yes, it's not clear what this driver is for. It dabbles into multiple subsystems , but I don't understand how is this useful. >> Coding style issues are present (camel case, wrong comment style, use >> checkpatch). >> > Okay, i will run checkpatch. You should always run checkpatch before submitting patches. >> If this is for some FPGA loading, can this functionality be scripted >> instead? >> > Sorry, i'm not getting you. How functionality be scripted? Could you > provide some example or details explanation? ie. "load" (from fs) + "fpga load" (program FPGA) commands ? I think the fpga command already has some support for loading from FS too. > Thanks. >>> >>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>> --- >>> arch/arm/mach-socfpga/cff.c | 582 >>> +++++++++++++++++++++++++++++++ >>> arch/arm/mach-socfpga/include/mach/cff.h | 40 +++ >>> include/configs/socfpga_arria10_socdk.h | 6 + >>> 3 files changed, 628 insertions(+) >>> create mode 100644 arch/arm/mach-socfpga/cff.c >>> create mode 100644 arch/arm/mach-socfpga/include/mach/cff.h >>> >>> diff --git a/arch/arm/mach-socfpga/cff.c b/arch/arm/mach- >>> socfpga/cff.c >>> new file mode 100644 >>> index 0000000..ccee5e9 >>> --- /dev/null >>> +++ b/arch/arm/mach-socfpga/cff.c >>> @@ -0,0 +1,582 @@ >>> +/* >>> + * COPYRIGHT (C) 2017 Intel Corporation <www.intel.com> >>> + * >>> + * SPDX-License-Identifier: GPL-2.0 >>> + */ >>> + >>> +#include <altera.h> >>> +#include <common.h> >>> +#include <asm/io.h> >>> +#include <asm/arch/cff.h> >>> +#include <asm/arch/fpga_manager.h> >>> +#include <asm/arch/misc.h> >>> +#include <asm/arch/system_manager.h> >>> +#include <asm/arch/reset_manager.h> >>> +#include <errno.h> >>> +#include <fat.h> >>> +#include <fs.h> >>> +#include <fdtdec.h> >>> +#include <malloc.h> >>> +#include <mmc.h> >>> +#include <spi_flash.h> >>> +#include <spl.h> >>> +#include <watchdog.h> >>> + >>> +#define RBF_UNENCRYPTED 0xa65c >>> +#define RBF_ENCRYPTED 0xa65d >>> +#define ARRIA10RBF_PERIPH 0x0001 >>> +#define ARRIA10RBF_CORE 0x8001 >>> + >>> +DECLARE_GLOBAL_DATA_PTR; >>> + >>> +static int flash_type = -1; >>> + >>> +struct mmc *mmc; >>> + >>> +/* Local functions */ >>> +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, >>> u32 *buffer, >>> + u32 *buffer_sizebytes); >>> +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, >>> + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 >>> *buffer_sizebytes); >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> +static const char *get_cff_filename(const void *fdt, int *len, u32 >>> core); >>> +#else >>> +static int get_cff_offset(const void *fdt, u32 core); >>> +#endif >>> + >>> +static struct mmc *init_mmc_device(int dev, bool force_init) >>> +{ >>> + struct mmc *mmc; >>> + >>> + mmc = find_mmc_device(dev); >>> + if (!mmc) { >>> + printf("no mmc device at slot %x\n", dev); >>> + return NULL; >>> + } >>> + >>> + if (force_init) >>> + mmc->has_init = 0; >>> + if (mmc_init(mmc)) >>> + return NULL; >>> + >>> + return mmc; >>> +} >>> + >>> +static int cff_flash_probe(struct cff_flash_info *cff_flashinfo) >>> +{ >>> + int dev = 0; >>> + >>> + if(BOOT_DEVICE_MMC1 == flash_type) >>> + { >>> + mmc = init_mmc_device(dev, true); >>> + >>> + if (!mmc) >>> + return -ENOTBLK; >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + /* we are looking at the FAT partition */ >>> + if (fat_register_device(mmc_get_blk_desc(mmc), >>> + cff_flashinfo->sdmmc_flashinfo.dev_part)) >>> { >>> + printf("Failed to set filesystem to >>> FAT.\n"); >>> + return -EPERM; >>> + } >>> +#endif >>> + } >>> + >>> + return flash_type; >>> +} >>> + >>> +static int flash_read(struct cff_flash_info *cff_flashinfo, >>> + u32 size_read, >>> + u32 *buffer_ptr) >>> +{ >>> + size_t ret = EEXIST; >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + loff_t actread; >>> +#endif >>> + >>> + if(BOOT_DEVICE_MMC1 == flash_type) { >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + ret = fat_read_file(cff_flashinfo- >>>> sdmmc_flashinfo.filename, >>> + buffer_ptr, cff_flashinfo- >>>> flash_offset, >>> + size_read, &actread); >>> + >>> + if (ret || actread != size_read) { >>> + printf("Failed to read %s from FAT %d ", >>> + cff_flashinfo- >>>> sdmmc_flashinfo.filename, >>> + ret); >>> + printf("!= %d.\n", size_read); >>> + return -EPERM; >>> + } else >>> + ret = actread; >>> +#else >>> + u32 blk = cff_flashinfo->flash_offset/mmc- >>>> read_bl_len; >>> + u32 cnt = size_read / mmc->read_bl_len; >>> + >>> + if (!cnt) >>> + cnt = 1; >>> + >>> + if((size_read % mmc->read_bl_len) && >>> + (size_read >= mmc->read_bl_len)) >>> + cnt++; >>> + >>> + ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, >>> + buffer_ptr); >>> + >>> + if (cnt != ret) >>> + return -EPERM; >>> +#endif >>> + } >>> + >>> + return ret; >>> +} >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> +const char *get_cff_filename(const void *fdt, int *len, u32 core) >>> +{ >>> + const char *cff_filename = NULL; >>> + const char *cell; >>> + int nodeoffset; >>> + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); >>> + >>> + if (nodeoffset >= 0) { >>> + if (core) >>> + cell = fdt_getprop(fdt, >>> + nodeoffset, >>> + "cffcore-file", >>> + len); >>> + else >>> + cell = fdt_getprop(fdt, nodeoffset, "cff- >>> file", len); >>> + >>> + if (cell) >>> + cff_filename = cell; >>> + } >>> + >>> + return cff_filename; >>> +} >>> +#else >>> +static int get_cff_offset(const void *fdt, u32 core) >>> +{ >>> + int nodeoffset = 0; >>> + >>> + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); >>> + >>> + if (nodeoffset >= 0) { >>> + if (core) >>> + return fdtdec_get_int(fdt, >>> + nodeoffset, >>> + "cffcore-offset", >>> + -ESPIPE); >>> + else >>> + return fdtdec_get_int(fdt, >>> + nodeoffset, >>> + "cff-offset", >>> + -ESPIPE); >>> + } >>> + return -ESPIPE; >>> +} >>> +#endif >>> + >>> +int cff_from_sdmmc_env(u32 core) >>> +{ >>> + int rval = -ENOENT; >>> + fpga_fs_info fpga_fsinfo; >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + int len = 0; >>> + const char *cff = NULL; >>> +#else >>> + char addrToString[32] = {0}; >>> + >>> + int sdmmc_rbf_rawaddr = -ENOENT; >>> +#endif >>> + >>> + flash_type = spl_boot_device(); >>> + >>> + fpga_fsinfo.interface = "sdmmc"; >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + cff = get_cff_filename(gd->fdt_blob, &len, core); >>> + >>> + /* FAT periph RBF file reading */ >>> + if (cff && (len > 0)) { >>> + mmc_initialize(gd->bd); >>> + >>> + fpga_fsinfo.filename = (char *)cff; >>> + >>> + fpga_fsinfo.dev_part = >>> getenv("cff_devsel_partition"); >>> + >>> + if (NULL == fpga_fsinfo.dev_part) { >>> + /* FAT partition */ >>> + fpga_fsinfo.dev_part = "1"; >>> + >>> + printf("No SD/MMC partition found in >>> environment. "); >>> + printf("Assuming partition 1.\n"); >>> + } >>> + >>> + rval = cff_from_flash(&fpga_fsinfo); >>> + } >>> +#else >>> + sdmmc_rbf_rawaddr = get_cff_offset(gd->fdt_blob, core); >>> + >>> + /* RAW periph RBF reading */ >>> + if (sdmmc_rbf_rawaddr >= 0) { >>> + sprintf(addrToString, "%x", sdmmc_rbf_rawaddr); >>> + >>> + fpga_fsinfo.filename = addrToString; >>> + >>> + rval = cff_from_flash(&fpga_fsinfo); >>> + } >>> +#endif >>> + return rval; >>> +} >>> + >>> +void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer) >>> +{ >>> + /* >>> + Magic ID starting at: >>> + -> 1st dword in periph.rbf >>> + -> 2nd dword in core.rbf >>> + */ >>> + u32 word_reading_max = 2; >>> + u32 i; >>> + >>> + for(i = 0; i < word_reading_max; i++) >>> + { >>> + if(RBF_UNENCRYPTED == *(buffer + i)) /* PERIPH RBF >>> */ >>> + rbf->security = unencrypted; >>> + else if (RBF_ENCRYPTED == *(buffer + i)) >>> + rbf->security = encrypted; >>> + else if (RBF_UNENCRYPTED == *(buffer + i + 1)) /* >>> CORE RBF */ >>> + rbf->security = >>> unencrypted; >>> + else if (RBF_ENCRYPTED == *(buffer + i + 1)) >>> + rbf->security = encrypted; >>> + else { >>> + rbf->security = invalid; >>> + continue; >>> + } >>> + >>> + /* PERIPH RBF */ >>> + if (ARRIA10RBF_PERIPH == *(buffer + i + 1)) { >>> + rbf->section = periph_section; >>> + break; >>> + } >>> + else if (ARRIA10RBF_CORE == *(buffer + i + 1)) { >>> + rbf->section = core_section; >>> + break; >>> + } /* CORE RBF */ >>> + else if (ARRIA10RBF_PERIPH == *(buffer + i + 2)) { >>> + rbf->section = periph_section; >>> + break; >>> + } >>> + else if (ARRIA10RBF_CORE == *(buffer + i + 2)) { >>> + rbf->section = core_section; >>> + break; >>> + } >>> + else { >>> + rbf->section = unknown; >>> + break; >>> + } >>> + } >>> + >>> + return; >>> +} >>> + >>> +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, >>> + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 >>> *buffer_sizebytes) >>> +{ >>> + u32 *bufferptr_after_header = NULL; >>> + u32 buffersize_after_header = 0; >>> + u32 rbf_header_data_size = 0; >>> + int ret = 0; >>> + /* To avoid from keeping re-read the contents */ >>> + struct image_header *header = &(cff_flashinfo->header); >>> + size_t buffer_size = *buffer_sizebytes; >>> + u32 *buffer_ptr = (u32 *)*buffer; >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + cff_flashinfo->sdmmc_flashinfo.filename = fpga_fsinfo- >>>> filename; >>> + cff_flashinfo->flash_offset = 0; >>> +#else >>> + cff_flashinfo->flash_offset = >>> + simple_strtoul(fpga_fsinfo->filename, NULL, 16); >>> +#endif >>> + >>> + /* Load mkimage header into buffer */ >>> + ret = flash_read(cff_flashinfo, >>> + sizeof(struct image_header), buffer_ptr); >>> + >>> + if (0 >= ret) { >>> + printf(" Failed to read mkimage header from >>> flash.\n"); >>> + return -ENOENT; >>> + } >>> + >>> + WATCHDOG_RESET(); >>> + >>> + memcpy(header, (u_char *)buffer_ptr, sizeof(*header)); >>> + >>> + if (!image_check_magic(header)) { >>> + printf("FPGA: Bad Magic Number.\n"); >>> + return -EBADF; >>> + } >>> + >>> + if (!image_check_hcrc(header)) { >>> + printf("FPGA: Bad Header Checksum.\n"); >>> + return -EPERM; >>> + } >>> + >>> + /* Getting rbf data size */ >>> + cff_flashinfo->remaining = >>> + image_get_data_size(header); >>> + >>> + /* Calculate total size of both rbf data with mkimage >>> header */ >>> + rbf_header_data_size = cff_flashinfo->remaining + >>> + sizeof(struct image_header); >>> + >>> + /* Loading to buffer chunk by chunk, normally for OCRAM >>> buffer */ >>> + if (rbf_header_data_size > buffer_size) { >>> + /* Calculate size of rbf data in the buffer */ >>> + buffersize_after_header = >>> + buffer_size - sizeof(struct image_header); >>> + cff_flashinfo->remaining -= >>> buffersize_after_header; >>> + } else { >>> + /* Loading whole rbf image into buffer, normally for DDR >>> buffer */ >>> + buffer_size = rbf_header_data_size; >>> + /* Calculate size of rbf data in the buffer */ >>> + buffersize_after_header = >>> + buffer_size - sizeof(struct image_header); >>> + cff_flashinfo->remaining = 0; >>> + } >>> + >>> + /* Loading mkimage header and rbf data into buffer */ >>> + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); >>> + >>> + if (0 >= ret) { >>> + printf(" Failed to read mkimage header and rbf >>> data "); >>> + printf("from flash.\n"); >>> + return -ENOENT; >>> + } >>> + >>> + /* Getting pointer of rbf data starting address where is >>> it >>> + right after mkimage header */ >>> + bufferptr_after_header = >>> + (u32 *)((u_char *)buffer_ptr + sizeof(struct >>> image_header)); >>> + >>> + /* Update next reading rbf data flash offset */ >>> + cff_flashinfo->flash_offset += buffer_size; >>> + >>> + /* Update the starting addr of rbf data to init FPGA & >>> programming >>> + into FPGA */ >>> + *buffer = (u32)bufferptr_after_header; >>> + >>> + get_rbf_image_info(&cff_flashinfo->rbfinfo, (u16 >>> *)bufferptr_after_header); >>> + >>> + /* Update the size of rbf data to be programmed into FPGA >>> */ >>> + *buffer_sizebytes = buffersize_after_header; >>> + >>> +#ifdef CONFIG_CHECK_FPGA_DATA_CRC >>> + cff_flashinfo->datacrc = >>> + crc32(cff_flashinfo->datacrc, >>> + (u_char *)bufferptr_after_header, >>> + buffersize_after_header); >>> +#endif >>> +if (0 == cff_flashinfo->remaining) { >>> +#ifdef CONFIG_CHECK_FPGA_DATA_CRC >>> + if (cff_flashinfo->datacrc != >>> + image_get_dcrc(&(cff_flashinfo->header))) { >>> + printf("FPGA: Bad Data Checksum.\n"); >>> + return -EPERM; >>> + } >>> +#endif >>> +} >>> + return 0; >>> +} >>> + >>> + >>> +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, >>> u32 *buffer, >>> + u32 *buffer_sizebytes) >>> +{ >>> + int ret = 0; >>> + /* To avoid from keeping re-read the contents */ >>> + size_t buffer_size = *buffer_sizebytes; >>> + u32 *buffer_ptr = (u32 *)*buffer; >>> + u32 flash_addr = cff_flashinfo->flash_offset; >>> + >>> + /* Buffer allocated in OCRAM */ >>> + /* Read the data by small chunk by chunk. */ >>> + if (cff_flashinfo->remaining > buffer_size) >>> + cff_flashinfo->remaining -= buffer_size; >>> + else { >>> + /* Buffer allocated in DDR, larger than rbf data >>> most >>> + of the time */ >>> + buffer_size = cff_flashinfo->remaining; >>> + cff_flashinfo->remaining = 0; >>> + } >>> + >>> + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); >>> + >>> + if (0 >= ret) { >>> + printf(" Failed to read rbf data from flash.\n"); >>> + return -ENOENT; >>> + } >>> + >>> +#ifdef CONFIG_CHECK_FPGA_DATA_CRC >>> + cff_flashinfo->datacrc = >>> + crc32(cff_flashinfo->datacrc, >>> + (unsigned char *)buffer_ptr, buffer_size); >>> +#endif >>> + >>> +if (0 == cff_flashinfo->remaining) { >>> +#ifdef CONFIG_CHECK_FPGA_DATA_CRC >>> + if (cff_flashinfo->datacrc != >>> + image_get_dcrc(&(cff_flashinfo->header))) { >>> + printf("FPGA: Bad Data Checksum.\n"); >>> + return -EPERM; >>> + } >>> +#endif >>> +} >>> + /* Update next reading rbf data flash offset */ >>> + flash_addr += buffer_size; >>> + >>> + cff_flashinfo->flash_offset = flash_addr; >>> + >>> + /* Update the size of rbf data to be programmed into FPGA >>> */ >>> + *buffer_sizebytes = buffer_size; >>> + >>> + return 0; >>> +} >>> + >>> +int cff_from_flash(fpga_fs_info *fpga_fsinfo) >>> +{ >>> + u32 buffer = 0; >>> + u32 buffer_ori = 0; >>> + u32 buffer_sizebytes = 0; >>> + u32 buffer_sizebytes_ori = 0; >>> + struct cff_flash_info cff_flashinfo; >>> + u32 status; >>> + int ret = 0; >>> + >>> + memset(&cff_flashinfo, 0, sizeof(cff_flashinfo)); >>> + >>> + if (fpga_fsinfo->filename == NULL) { >>> + printf("no [periph/core] rbf [filename/offset] >>> specified.\n"); >>> + return -EINVAL; >>> + } >>> + >>> + WATCHDOG_RESET(); >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + cff_flashinfo.sdmmc_flashinfo.dev_part = >>> + simple_strtol(fpga_fsinfo->dev_part, NULL, 10); >>> +#endif >>> + >>> + ret = cff_flash_probe(&cff_flashinfo); >>> + >>> + if (0 >= ret) { >>> + puts("Flash probe failed.\n"); >>> + return ret; >>> + } >>> + >>> +#ifdef CONFIG_CMD_FPGA_LOADFS >>> + /* Loading rbf data with DDR, faster than OCRAM, >>> + only for core rbf */ >>> + if (gd->ram_size != 0) { >>> + ret = fat_size(fpga_fsinfo->filename, (loff_t >>> *)&buffer_sizebytes); >>> + >>> + if(ret){ >>> + puts("Failed to read file size.\n"); >>> + return ret; >>> + } >>> + >>> + buffer_ori = (u32)memalign(ARCH_DMA_MINALIGN, >>> buffer_sizebytes); >>> + >>> + if (!buffer_ori) { >>> + error("RBF calloc failed!\n"); >>> + return -ENOMEM; >>> + } >>> + >>> + /* Loading mkimage header and rbf data into >>> + DDR instead of OCRAM */ >>> + buffer = buffer_ori; >>> + >>> + buffer_sizebytes_ori = buffer_sizebytes; >>> + } else { >>> + buffer = buffer_ori = (u32)cff_flashinfo.buffer; >>> + >>> + buffer_sizebytes = >>> + buffer_sizebytes_ori = >>> + sizeof(cff_flashinfo.buffer); >>> + } >>> +#else >>> + /* Adjust to adjacent block */ >>> + buffer_sizebytes = buffer_sizebytes_ori = >>> + (sizeof(cff_flashinfo.buffer)/ >>> mmc->read_bl_len) * >>> + mmc->read_bl_len; >>> +#endif >>> + >>> + /* Note: Both buffer and buffer_sizebytes values can be >>> altered by >>> + function below. */ >>> + ret = cff_flash_preinit(&cff_flashinfo, fpga_fsinfo, >>> &buffer, >>> + &buffer_sizebytes); >>> + >>> + if (ret) >>> + return ret; >>> + >>> + if (periph_section == cff_flashinfo.rbfinfo.section) { >>> + /* initialize the FPGA Manager */ >>> + status = fpgamgr_program_init((u32 *)buffer, >>> buffer_sizebytes); >>> + if (status) { >>> + printf("FPGA: Init with periph rbf failed >>> with error. "); >>> + printf("code %d\n", status); >>> + return -EPERM; >>> + } >>> + } >>> + >>> + WATCHDOG_RESET(); >>> + >>> + /* transfer data to FPGA Manager */ >>> + fpgamgr_program_write((void *)buffer, >>> + buffer_sizebytes); >>> + >>> + WATCHDOG_RESET(); >>> + >>> + while (cff_flashinfo.remaining) { >>> + ret = cff_flash_read(&cff_flashinfo, &buffer_ori, >>> + &buffer_sizebytes_ori); >>> + >>> + if (ret) >>> + return ret; >>> + >>> + /* transfer data to FPGA Manager */ >>> + fpgamgr_program_write((void *)buffer_ori, >>> + buffer_sizebytes_ori); >>> + >>> + WATCHDOG_RESET(); >>> + } >>> + >>> + if ((periph_section == cff_flashinfo.rbfinfo.section) && >>> + is_early_release_fpga_config(gd->fdt_blob)) { >>> + if (-ETIMEDOUT != fpgamgr_wait_early_user_mode()) >>> + printf("FPGA: Early Release >>> Succeeded.\n"); >>> + else { >>> + printf("FPGA: Failed to see Early >>> Release.\n"); >>> + return -EIO; >>> + } >>> + } else if ((core_section == cff_flashinfo.rbfinfo.section) >>> || >>> + ((periph_section == cff_flashinfo.rbfinfo.section) && >>> + !is_early_release_fpga_config(gd->fdt_blob))) { >>> + /* Ensure the FPGA entering config done */ >>> + status = fpgamgr_program_finish(); >>> + if (status) >>> + return status; >>> + else >>> + printf("FPGA: Enter user mode.\n"); >>> + >>> + } else { >>> + printf("Config Error: Unsupported FGPA raw binary >>> type.\n"); >>> + return -ENOEXEC; >>> + } >>> + >>> + WATCHDOG_RESET(); >>> + return 1; >>> +} >>> diff --git a/arch/arm/mach-socfpga/include/mach/cff.h >>> b/arch/arm/mach-socfpga/include/mach/cff.h >>> new file mode 100644 >>> index 0000000..7f3f66b >>> --- /dev/null >>> +++ b/arch/arm/mach-socfpga/include/mach/cff.h >>> @@ -0,0 +1,40 @@ >>> +/* >>> + * Copyright (C) 2017 Intel Corporation <www.intel.com> >>> + * >>> + * SPDX-License-Identifier: GPL-2.0 >>> + */ >>> + >>> +#ifndef _SOCFPGA_CFF_H_ >>> +#define _SOCFPGA_CFF_H_ >>> + >>> +#include <fpga.h> >>> + >>> +#ifndef __ASSEMBLY_ >>> + >>> +struct flash_info { >>> + char *filename; >>> + int dev_part; >>> +}; >>> + >>> +enum rbf_type {unknown, periph_section, core_section}; >>> +enum rbf_security {invalid, unencrypted, encrypted}; >>> + >>> +struct rbf_info { >>> + enum rbf_type section ; >>> + enum rbf_security security; >>> +}; >>> + >>> +struct cff_flash_info { >>> + struct flash_info sdmmc_flashinfo; >>> + u32 buffer[4096] __aligned(ARCH_DMA_MINALIGN); >>> + u32 remaining; >>> + u32 flash_offset; >>> + struct rbf_info rbfinfo; >>> + struct image_header header; >>> +}; >>> + >>> +int cff_from_sdmmc_env(unsigned int core); >>> +int cff_from_flash(fpga_fs_info *fpga_fsinfo); >>> +#endif /* __ASSEMBLY__ */ >>> + >>> +#endif /* _SOCFPGA_CFF_H_ */ >>> diff --git a/include/configs/socfpga_arria10_socdk.h >>> b/include/configs/socfpga_arria10_socdk.h >>> index 3b59b6a..aa4c54a 100644 >>> --- a/include/configs/socfpga_arria10_socdk.h >>> +++ b/include/configs/socfpga_arria10_socdk.h >>> @@ -58,6 +58,12 @@ >>> * Flash configurations >>> */ >>> #define CONFIG_SYS_MAX_FLASH_BANKS 1 >>> +/* Default SDMMC physical address for periph.rbf (sector >>> alignment) */ >>> +#define CONFIG_FS_FAT_MAX_CLUSTSIZE (32 * 1024) >>> + >>> +#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_CMD_FPGA_LOADFS) >>> +#define CONFIG_CMD_FPGA_LOADFS >>> +#endif >>> >>> /* The rest of the configuration is shared */ >>> #include <configs/socfpga_common.h> >>>
On Sel, 2017-08-08 at 12:11 +0200, Marek Vasut wrote: > On 08/08/2017 12:06 PM, Chee, Tien Fong wrote: > > > > On Sel, 2017-08-08 at 11:32 +0200, Marek Vasut wrote: > > > > > > On 08/08/2017 11:12 AM, tien.fong.chee@intel.com wrote: > > > > > > > > > > > > From: Tien Fong Chee <tien.fong.chee@intel.com> > > > > > > > > Configuration flip-flop driver is mainly used for handling the > > > > FPGA > > > > program > > > > operation where the FPGA image loading from the flash into FPGA > > > > manager. > > > I don't understand what this driver is for , sorry. > > > > > this is core driver for handling fpga program operation from flash > > to > > fpga manager. I can improve the message. Let me know if you have > > other > > comment need to add. > Yes, it's not clear what this driver is for. It dabbles into multiple > subsystems , but I don't understand how is this useful. > > > > > > > > > Coding style issues are present (camel case, wrong comment style, > > > use > > > checkpatch). > > > > > Okay, i will run checkpatch. > You should always run checkpatch before submitting patches. > > > > > > > > > If this is for some FPGA loading, can this functionality be > > > scripted > > > instead? > > > > > Sorry, i'm not getting you. How functionality be scripted? Could > > you > > provide some example or details explanation? > ie. "load" (from fs) + "fpga load" (program FPGA) commands ? > I think the fpga command already has some support for loading from FS > too. > Currently, we already have fpga load commands in fpga driver, fpga rbf is loaded to memory, and programmed to fpga from memory, where memory location would be decided by user, it could be OCRAM or SDRAM. for fpga loadfs command, i plan to implement it after having complete boot to U-boot console, since this is quite complex and involving some hardware workaround issue, and some use case scenarios need to be considerd. For example reconfiguring fpga with periperal rbf can corrupt the sdram since sdram IOs is part of the fpga periph rbf. I need console to run a lot different scenarios testing. We still need cff.c, because most functionality in cff.c are required by fpga loadfs command. > > > > Thanks. > > > > > > > > > > > > > > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > > > --- > > > > arch/arm/mach-socfpga/cff.c | 582 > > > > +++++++++++++++++++++++++++++++ > > > > arch/arm/mach-socfpga/include/mach/cff.h | 40 +++ > > > > include/configs/socfpga_arria10_socdk.h | 6 + > > > > 3 files changed, 628 insertions(+) > > > > create mode 100644 arch/arm/mach-socfpga/cff.c > > > > create mode 100644 arch/arm/mach-socfpga/include/mach/cff.h > > > > > > > > diff --git a/arch/arm/mach-socfpga/cff.c b/arch/arm/mach- > > > > socfpga/cff.c > > > > new file mode 100644 > > > > index 0000000..ccee5e9 > > > > --- /dev/null > > > > +++ b/arch/arm/mach-socfpga/cff.c > > > > @@ -0,0 +1,582 @@ > > > > +/* > > > > + * COPYRIGHT (C) 2017 Intel Corporation <www.intel.com> > > > > + * > > > > + * SPDX-License-Identifier: GPL-2.0 > > > > + */ > > > > + > > > > +#include <altera.h> > > > > +#include <common.h> > > > > +#include <asm/io.h> > > > > +#include <asm/arch/cff.h> > > > > +#include <asm/arch/fpga_manager.h> > > > > +#include <asm/arch/misc.h> > > > > +#include <asm/arch/system_manager.h> > > > > +#include <asm/arch/reset_manager.h> > > > > +#include <errno.h> > > > > +#include <fat.h> > > > > +#include <fs.h> > > > > +#include <fdtdec.h> > > > > +#include <malloc.h> > > > > +#include <mmc.h> > > > > +#include <spi_flash.h> > > > > +#include <spl.h> > > > > +#include <watchdog.h> > > > > + > > > > +#define RBF_UNENCRYPTED 0xa65c > > > > +#define RBF_ENCRYPTED 0xa65d > > > > +#define ARRIA10RBF_PERIPH 0x0001 > > > > +#define ARRIA10RBF_CORE 0x8001 > > > > + > > > > +DECLARE_GLOBAL_DATA_PTR; > > > > + > > > > +static int flash_type = -1; > > > > + > > > > +struct mmc *mmc; > > > > + > > > > +/* Local functions */ > > > > +static int cff_flash_read(struct cff_flash_info > > > > *cff_flashinfo, > > > > u32 *buffer, > > > > + u32 *buffer_sizebytes); > > > > +static int cff_flash_preinit(struct cff_flash_info > > > > *cff_flashinfo, > > > > + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 > > > > *buffer_sizebytes); > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > +static const char *get_cff_filename(const void *fdt, int *len, > > > > u32 > > > > core); > > > > +#else > > > > +static int get_cff_offset(const void *fdt, u32 core); > > > > +#endif > > > > + > > > > +static struct mmc *init_mmc_device(int dev, bool force_init) > > > > +{ > > > > + struct mmc *mmc; > > > > + > > > > + mmc = find_mmc_device(dev); > > > > + if (!mmc) { > > > > + printf("no mmc device at slot %x\n", dev); > > > > + return NULL; > > > > + } > > > > + > > > > + if (force_init) > > > > + mmc->has_init = 0; > > > > + if (mmc_init(mmc)) > > > > + return NULL; > > > > + > > > > + return mmc; > > > > +} > > > > + > > > > +static int cff_flash_probe(struct cff_flash_info > > > > *cff_flashinfo) > > > > +{ > > > > + int dev = 0; > > > > + > > > > + if(BOOT_DEVICE_MMC1 == flash_type) > > > > + { > > > > + mmc = init_mmc_device(dev, true); > > > > + > > > > + if (!mmc) > > > > + return -ENOTBLK; > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + /* we are looking at the FAT partition */ > > > > + if (fat_register_device(mmc_get_blk_desc(mmc), > > > > + cff_flashinfo- > > > > >sdmmc_flashinfo.dev_part)) > > > > { > > > > + printf("Failed to set filesystem to > > > > FAT.\n"); > > > > + return -EPERM; > > > > + } > > > > +#endif > > > > + } > > > > + > > > > + return flash_type; > > > > +} > > > > + > > > > +static int flash_read(struct cff_flash_info *cff_flashinfo, > > > > + u32 size_read, > > > > + u32 *buffer_ptr) > > > > +{ > > > > + size_t ret = EEXIST; > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + loff_t actread; > > > > +#endif > > > > + > > > > + if(BOOT_DEVICE_MMC1 == flash_type) { > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + ret = fat_read_file(cff_flashinfo- > > > > > > > > > > sdmmc_flashinfo.filename, > > > > + buffer_ptr, cff_flashinfo- > > > > > > > > > > flash_offset, > > > > + size_read, &actread); > > > > + > > > > + if (ret || actread != size_read) { > > > > + printf("Failed to read %s from FAT %d > > > > ", > > > > + cff_flashinfo- > > > > > > > > > > sdmmc_flashinfo.filename, > > > > + ret); > > > > + printf("!= %d.\n", size_read); > > > > + return -EPERM; > > > > + } else > > > > + ret = actread; > > > > +#else > > > > + u32 blk = cff_flashinfo->flash_offset/mmc- > > > > > > > > > > read_bl_len; > > > > + u32 cnt = size_read / mmc->read_bl_len; > > > > + > > > > + if (!cnt) > > > > + cnt = 1; > > > > + > > > > + if((size_read % mmc->read_bl_len) && > > > > + (size_read >= mmc- > > > > >read_bl_len)) > > > > + cnt++; > > > > + > > > > + ret = blk_dread(mmc_get_blk_desc(mmc), blk, > > > > cnt, > > > > + buffer_ptr); > > > > + > > > > + if (cnt != ret) > > > > + return -EPERM; > > > > +#endif > > > > + } > > > > + > > > > + return ret; > > > > +} > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > +const char *get_cff_filename(const void *fdt, int *len, u32 > > > > core) > > > > +{ > > > > + const char *cff_filename = NULL; > > > > + const char *cell; > > > > + int nodeoffset; > > > > + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); > > > > + > > > > + if (nodeoffset >= 0) { > > > > + if (core) > > > > + cell = fdt_getprop(fdt, > > > > + nodeoffset, > > > > + "cffcore-file", > > > > + len); > > > > + else > > > > + cell = fdt_getprop(fdt, nodeoffset, > > > > "cff- > > > > file", len); > > > > + > > > > + if (cell) > > > > + cff_filename = cell; > > > > + } > > > > + > > > > + return cff_filename; > > > > +} > > > > +#else > > > > +static int get_cff_offset(const void *fdt, u32 core) > > > > +{ > > > > + int nodeoffset = 0; > > > > + > > > > + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); > > > > + > > > > + if (nodeoffset >= 0) { > > > > + if (core) > > > > + return fdtdec_get_int(fdt, > > > > + nodeoffset, > > > > + "cffcore-offset", > > > > + -ESPIPE); > > > > + else > > > > + return fdtdec_get_int(fdt, > > > > + nodeoffset, > > > > + "cff-offset", > > > > + -ESPIPE); > > > > + } > > > > + return -ESPIPE; > > > > +} > > > > +#endif > > > > + > > > > +int cff_from_sdmmc_env(u32 core) > > > > +{ > > > > + int rval = -ENOENT; > > > > + fpga_fs_info fpga_fsinfo; > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + int len = 0; > > > > + const char *cff = NULL; > > > > +#else > > > > + char addrToString[32] = {0}; > > > > + > > > > + int sdmmc_rbf_rawaddr = -ENOENT; > > > > +#endif > > > > + > > > > + flash_type = spl_boot_device(); > > > > + > > > > + fpga_fsinfo.interface = "sdmmc"; > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + cff = get_cff_filename(gd->fdt_blob, &len, core); > > > > + > > > > + /* FAT periph RBF file reading */ > > > > + if (cff && (len > 0)) { > > > > + mmc_initialize(gd->bd); > > > > + > > > > + fpga_fsinfo.filename = (char *)cff; > > > > + > > > > + fpga_fsinfo.dev_part = > > > > getenv("cff_devsel_partition"); > > > > + > > > > + if (NULL == fpga_fsinfo.dev_part) { > > > > + /* FAT partition */ > > > > + fpga_fsinfo.dev_part = "1"; > > > > + > > > > + printf("No SD/MMC partition found in > > > > environment. "); > > > > + printf("Assuming partition 1.\n"); > > > > + } > > > > + > > > > + rval = cff_from_flash(&fpga_fsinfo); > > > > + } > > > > +#else > > > > + sdmmc_rbf_rawaddr = get_cff_offset(gd->fdt_blob, > > > > core); > > > > + > > > > + /* RAW periph RBF reading */ > > > > + if (sdmmc_rbf_rawaddr >= 0) { > > > > + sprintf(addrToString, "%x", > > > > sdmmc_rbf_rawaddr); > > > > + > > > > + fpga_fsinfo.filename = addrToString; > > > > + > > > > + rval = cff_from_flash(&fpga_fsinfo); > > > > + } > > > > +#endif > > > > + return rval; > > > > +} > > > > + > > > > +void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer) > > > > +{ > > > > + /* > > > > + Magic ID starting at: > > > > + -> 1st dword in periph.rbf > > > > + -> 2nd dword in core.rbf > > > > + */ > > > > + u32 word_reading_max = 2; > > > > + u32 i; > > > > + > > > > + for(i = 0; i < word_reading_max; i++) > > > > + { > > > > + if(RBF_UNENCRYPTED == *(buffer + i)) /* PERIPH > > > > RBF > > > > */ > > > > + rbf->security = unencrypted; > > > > + else if (RBF_ENCRYPTED == *(buffer + i)) > > > > + rbf->security = encrypted; > > > > + else if (RBF_UNENCRYPTED == *(buffer + i + 1)) > > > > /* > > > > CORE RBF */ > > > > + rbf->security = > > > > unencrypted; > > > > + else if (RBF_ENCRYPTED == *(buffer + i + 1)) > > > > + rbf->security = > > > > encrypted; > > > > + else { > > > > + rbf->security = invalid; > > > > + continue; > > > > + } > > > > + > > > > + /* PERIPH RBF */ > > > > + if (ARRIA10RBF_PERIPH == *(buffer + i + 1)) { > > > > + rbf->section = periph_section; > > > > + break; > > > > + } > > > > + else if (ARRIA10RBF_CORE == *(buffer + i + 1)) > > > > { > > > > + rbf->section = core_section; > > > > + break; > > > > + } /* CORE RBF */ > > > > + else if (ARRIA10RBF_PERIPH == *(buffer + i + > > > > 2)) { > > > > + rbf->section = periph_section; > > > > + break; > > > > + } > > > > + else if (ARRIA10RBF_CORE == *(buffer + i + 2)) > > > > { > > > > + rbf->section = core_section; > > > > + break; > > > > + } > > > > + else { > > > > + rbf->section = unknown; > > > > + break; > > > > + } > > > > + } > > > > + > > > > + return; > > > > +} > > > > + > > > > +static int cff_flash_preinit(struct cff_flash_info > > > > *cff_flashinfo, > > > > + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 > > > > *buffer_sizebytes) > > > > +{ > > > > + u32 *bufferptr_after_header = NULL; > > > > + u32 buffersize_after_header = 0; > > > > + u32 rbf_header_data_size = 0; > > > > + int ret = 0; > > > > + /* To avoid from keeping re-read the contents */ > > > > + struct image_header *header = &(cff_flashinfo- > > > > >header); > > > > + size_t buffer_size = *buffer_sizebytes; > > > > + u32 *buffer_ptr = (u32 *)*buffer; > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + cff_flashinfo->sdmmc_flashinfo.filename = fpga_fsinfo- > > > > > > > > > > filename; > > > > + cff_flashinfo->flash_offset = 0; > > > > +#else > > > > + cff_flashinfo->flash_offset = > > > > + simple_strtoul(fpga_fsinfo->filename, NULL, > > > > 16); > > > > +#endif > > > > + > > > > + /* Load mkimage header into buffer */ > > > > + ret = flash_read(cff_flashinfo, > > > > + sizeof(struct image_header), > > > > buffer_ptr); > > > > + > > > > + if (0 >= ret) { > > > > + printf(" Failed to read mkimage header from > > > > flash.\n"); > > > > + return -ENOENT; > > > > + } > > > > + > > > > + WATCHDOG_RESET(); > > > > + > > > > + memcpy(header, (u_char *)buffer_ptr, sizeof(*header)); > > > > + > > > > + if (!image_check_magic(header)) { > > > > + printf("FPGA: Bad Magic Number.\n"); > > > > + return -EBADF; > > > > + } > > > > + > > > > + if (!image_check_hcrc(header)) { > > > > + printf("FPGA: Bad Header Checksum.\n"); > > > > + return -EPERM; > > > > + } > > > > + > > > > + /* Getting rbf data size */ > > > > + cff_flashinfo->remaining = > > > > + image_get_data_size(header); > > > > + > > > > + /* Calculate total size of both rbf data with mkimage > > > > header */ > > > > + rbf_header_data_size = cff_flashinfo->remaining + > > > > + sizeof(struct image_header); > > > > + > > > > + /* Loading to buffer chunk by chunk, normally for > > > > OCRAM > > > > buffer */ > > > > + if (rbf_header_data_size > buffer_size) { > > > > + /* Calculate size of rbf data in the buffer */ > > > > + buffersize_after_header = > > > > + buffer_size - sizeof(struct > > > > image_header); > > > > + cff_flashinfo->remaining -= > > > > buffersize_after_header; > > > > + } else { > > > > + /* Loading whole rbf image into buffer, normally for > > > > DDR > > > > buffer */ > > > > + buffer_size = rbf_header_data_size; > > > > + /* Calculate size of rbf data in the buffer */ > > > > + buffersize_after_header = > > > > + buffer_size - sizeof(struct > > > > image_header); > > > > + cff_flashinfo->remaining = 0; > > > > + } > > > > + > > > > + /* Loading mkimage header and rbf data into buffer */ > > > > + ret = flash_read(cff_flashinfo, buffer_size, > > > > buffer_ptr); > > > > + > > > > + if (0 >= ret) { > > > > + printf(" Failed to read mkimage header and rbf > > > > data "); > > > > + printf("from flash.\n"); > > > > + return -ENOENT; > > > > + } > > > > + > > > > + /* Getting pointer of rbf data starting address where > > > > is > > > > it > > > > + right after mkimage header */ > > > > + bufferptr_after_header = > > > > + (u32 *)((u_char *)buffer_ptr + sizeof(struct > > > > image_header)); > > > > + > > > > + /* Update next reading rbf data flash offset */ > > > > + cff_flashinfo->flash_offset += buffer_size; > > > > + > > > > + /* Update the starting addr of rbf data to init FPGA & > > > > programming > > > > + into FPGA */ > > > > + *buffer = (u32)bufferptr_after_header; > > > > + > > > > + get_rbf_image_info(&cff_flashinfo->rbfinfo, (u16 > > > > *)bufferptr_after_header); > > > > + > > > > + /* Update the size of rbf data to be programmed into > > > > FPGA > > > > */ > > > > + *buffer_sizebytes = buffersize_after_header; > > > > + > > > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > > > + cff_flashinfo->datacrc = > > > > + crc32(cff_flashinfo->datacrc, > > > > + (u_char *)bufferptr_after_header, > > > > + buffersize_after_header); > > > > +#endif > > > > +if (0 == cff_flashinfo->remaining) { > > > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > > > + if (cff_flashinfo->datacrc != > > > > + image_get_dcrc(&(cff_flashinfo->header))) { > > > > + printf("FPGA: Bad Data Checksum.\n"); > > > > + return -EPERM; > > > > + } > > > > +#endif > > > > +} > > > > + return 0; > > > > +} > > > > + > > > > + > > > > +static int cff_flash_read(struct cff_flash_info > > > > *cff_flashinfo, > > > > u32 *buffer, > > > > + u32 *buffer_sizebytes) > > > > +{ > > > > + int ret = 0; > > > > + /* To avoid from keeping re-read the contents */ > > > > + size_t buffer_size = *buffer_sizebytes; > > > > + u32 *buffer_ptr = (u32 *)*buffer; > > > > + u32 flash_addr = cff_flashinfo->flash_offset; > > > > + > > > > + /* Buffer allocated in OCRAM */ > > > > + /* Read the data by small chunk by chunk. */ > > > > + if (cff_flashinfo->remaining > buffer_size) > > > > + cff_flashinfo->remaining -= buffer_size; > > > > + else { > > > > + /* Buffer allocated in DDR, larger than rbf > > > > data > > > > most > > > > + of the time */ > > > > + buffer_size = cff_flashinfo->remaining; > > > > + cff_flashinfo->remaining = 0; > > > > + } > > > > + > > > > + ret = flash_read(cff_flashinfo, buffer_size, > > > > buffer_ptr); > > > > + > > > > + if (0 >= ret) { > > > > + printf(" Failed to read rbf data from > > > > flash.\n"); > > > > + return -ENOENT; > > > > + } > > > > + > > > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > > > + cff_flashinfo->datacrc = > > > > + crc32(cff_flashinfo->datacrc, > > > > + (unsigned char *)buffer_ptr, > > > > buffer_size); > > > > +#endif > > > > + > > > > +if (0 == cff_flashinfo->remaining) { > > > > +#ifdef CONFIG_CHECK_FPGA_DATA_CRC > > > > + if (cff_flashinfo->datacrc != > > > > + image_get_dcrc(&(cff_flashinfo->header))) { > > > > + printf("FPGA: Bad Data Checksum.\n"); > > > > + return -EPERM; > > > > + } > > > > +#endif > > > > +} > > > > + /* Update next reading rbf data flash offset */ > > > > + flash_addr += buffer_size; > > > > + > > > > + cff_flashinfo->flash_offset = flash_addr; > > > > + > > > > + /* Update the size of rbf data to be programmed into > > > > FPGA > > > > */ > > > > + *buffer_sizebytes = buffer_size; > > > > + > > > > + return 0; > > > > +} > > > > + > > > > +int cff_from_flash(fpga_fs_info *fpga_fsinfo) > > > > +{ > > > > + u32 buffer = 0; > > > > + u32 buffer_ori = 0; > > > > + u32 buffer_sizebytes = 0; > > > > + u32 buffer_sizebytes_ori = 0; > > > > + struct cff_flash_info cff_flashinfo; > > > > + u32 status; > > > > + int ret = 0; > > > > + > > > > + memset(&cff_flashinfo, 0, sizeof(cff_flashinfo)); > > > > + > > > > + if (fpga_fsinfo->filename == NULL) { > > > > + printf("no [periph/core] rbf [filename/offset] > > > > specified.\n"); > > > > + return -EINVAL; > > > > + } > > > > + > > > > + WATCHDOG_RESET(); > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + cff_flashinfo.sdmmc_flashinfo.dev_part = > > > > + simple_strtol(fpga_fsinfo->dev_part, NULL, > > > > 10); > > > > +#endif > > > > + > > > > + ret = cff_flash_probe(&cff_flashinfo); > > > > + > > > > + if (0 >= ret) { > > > > + puts("Flash probe failed.\n"); > > > > + return ret; > > > > + } > > > > + > > > > +#ifdef CONFIG_CMD_FPGA_LOADFS > > > > + /* Loading rbf data with DDR, faster than OCRAM, > > > > + only for core rbf */ > > > > + if (gd->ram_size != 0) { > > > > + ret = fat_size(fpga_fsinfo->filename, (loff_t > > > > *)&buffer_sizebytes); > > > > + > > > > + if(ret){ > > > > + puts("Failed to read file size.\n"); > > > > + return ret; > > > > + } > > > > + > > > > + buffer_ori = (u32)memalign(ARCH_DMA_MINALIGN, > > > > buffer_sizebytes); > > > > + > > > > + if (!buffer_ori) { > > > > + error("RBF calloc failed!\n"); > > > > + return -ENOMEM; > > > > + } > > > > + > > > > + /* Loading mkimage header and rbf data into > > > > + DDR instead of OCRAM */ > > > > + buffer = buffer_ori; > > > > + > > > > + buffer_sizebytes_ori = buffer_sizebytes; > > > > + } else { > > > > + buffer = buffer_ori = > > > > (u32)cff_flashinfo.buffer; > > > > + > > > > + buffer_sizebytes = > > > > + buffer_sizebytes_ori = > > > > + sizeof(cff_flashinfo.buffer); > > > > + } > > > > +#else > > > > + /* Adjust to adjacent block */ > > > > + buffer_sizebytes = buffer_sizebytes_ori = > > > > + (sizeof(cff_flashinfo.buffer)/ > > > > mmc->read_bl_len) * > > > > + mmc->read_bl_len; > > > > +#endif > > > > + > > > > + /* Note: Both buffer and buffer_sizebytes values can > > > > be > > > > altered by > > > > + function below. */ > > > > + ret = cff_flash_preinit(&cff_flashinfo, fpga_fsinfo, > > > > &buffer, > > > > + &buffer_sizebytes); > > > > + > > > > + if (ret) > > > > + return ret; > > > > + > > > > + if (periph_section == cff_flashinfo.rbfinfo.section) { > > > > + /* initialize the FPGA Manager */ > > > > + status = fpgamgr_program_init((u32 *)buffer, > > > > buffer_sizebytes); > > > > + if (status) { > > > > + printf("FPGA: Init with periph rbf > > > > failed > > > > with error. "); > > > > + printf("code %d\n", status); > > > > + return -EPERM; > > > > + } > > > > + } > > > > + > > > > + WATCHDOG_RESET(); > > > > + > > > > + /* transfer data to FPGA Manager */ > > > > + fpgamgr_program_write((void *)buffer, > > > > + buffer_sizebytes); > > > > + > > > > + WATCHDOG_RESET(); > > > > + > > > > + while (cff_flashinfo.remaining) { > > > > + ret = cff_flash_read(&cff_flashinfo, > > > > &buffer_ori, > > > > + &buffer_sizebytes_ori); > > > > + > > > > + if (ret) > > > > + return ret; > > > > + > > > > + /* transfer data to FPGA Manager */ > > > > + fpgamgr_program_write((void *)buffer_ori, > > > > + buffer_sizebytes_ori); > > > > + > > > > + WATCHDOG_RESET(); > > > > + } > > > > + > > > > + if ((periph_section == cff_flashinfo.rbfinfo.section) > > > > && > > > > + is_early_release_fpga_config(gd->fdt_blob)) { > > > > + if (-ETIMEDOUT != > > > > fpgamgr_wait_early_user_mode()) > > > > + printf("FPGA: Early Release > > > > Succeeded.\n"); > > > > + else { > > > > + printf("FPGA: Failed to see Early > > > > Release.\n"); > > > > + return -EIO; > > > > + } > > > > + } else if ((core_section == > > > > cff_flashinfo.rbfinfo.section) > > > > > > > > > > > > > > > > > > > > > + ((periph_section == cff_flashinfo.rbfinfo.section) && > > > > + !is_early_release_fpga_config(gd->fdt_blob))) { > > > > + /* Ensure the FPGA entering config done */ > > > > + status = fpgamgr_program_finish(); > > > > + if (status) > > > > + return status; > > > > + else > > > > + printf("FPGA: Enter user mode.\n"); > > > > + > > > > + } else { > > > > + printf("Config Error: Unsupported FGPA raw > > > > binary > > > > type.\n"); > > > > + return -ENOEXEC; > > > > + } > > > > + > > > > + WATCHDOG_RESET(); > > > > + return 1; > > > > +} > > > > diff --git a/arch/arm/mach-socfpga/include/mach/cff.h > > > > b/arch/arm/mach-socfpga/include/mach/cff.h > > > > new file mode 100644 > > > > index 0000000..7f3f66b > > > > --- /dev/null > > > > +++ b/arch/arm/mach-socfpga/include/mach/cff.h > > > > @@ -0,0 +1,40 @@ > > > > +/* > > > > + * Copyright (C) 2017 Intel Corporation <www.intel.com> > > > > + * > > > > + * SPDX-License-Identifier: GPL-2.0 > > > > + */ > > > > + > > > > +#ifndef _SOCFPGA_CFF_H_ > > > > +#define _SOCFPGA_CFF_H_ > > > > + > > > > +#include <fpga.h> > > > > + > > > > +#ifndef __ASSEMBLY_ > > > > + > > > > +struct flash_info { > > > > + char *filename; > > > > + int dev_part; > > > > +}; > > > > + > > > > +enum rbf_type {unknown, periph_section, core_section}; > > > > +enum rbf_security {invalid, unencrypted, encrypted}; > > > > + > > > > +struct rbf_info { > > > > + enum rbf_type section ; > > > > + enum rbf_security security; > > > > +}; > > > > + > > > > +struct cff_flash_info { > > > > + struct flash_info sdmmc_flashinfo; > > > > + u32 buffer[4096] __aligned(ARCH_DMA_MINALIGN); > > > > + u32 remaining; > > > > + u32 flash_offset; > > > > + struct rbf_info rbfinfo; > > > > + struct image_header header; > > > > +}; > > > > + > > > > +int cff_from_sdmmc_env(unsigned int core); > > > > +int cff_from_flash(fpga_fs_info *fpga_fsinfo); > > > > +#endif /* __ASSEMBLY__ */ > > > > + > > > > +#endif /* _SOCFPGA_CFF_H_ */ > > > > diff --git a/include/configs/socfpga_arria10_socdk.h > > > > b/include/configs/socfpga_arria10_socdk.h > > > > index 3b59b6a..aa4c54a 100644 > > > > --- a/include/configs/socfpga_arria10_socdk.h > > > > +++ b/include/configs/socfpga_arria10_socdk.h > > > > @@ -58,6 +58,12 @@ > > > > * Flash configurations > > > > */ > > > > #define CONFIG_SYS_MAX_FLASH_BANKS 1 > > > > +/* Default SDMMC physical address for periph.rbf (sector > > > > alignment) */ > > > > +#define CONFIG_FS_FAT_MAX_CLUSTSIZE (32 * 1024) > > > > + > > > > +#if !defined(CONFIG_SPL_BUILD) && > > > > !defined(CONFIG_CMD_FPGA_LOADFS) > > > > +#define CONFIG_CMD_FPGA_LOADFS > > > > +#endif > > > > > > > > /* The rest of the configuration is shared */ > > > > #include <configs/socfpga_common.h> > > > > >
On 08/09/2017 06:50 AM, Chee, Tien Fong wrote: [...] >>>> If this is for some FPGA loading, can this functionality be >>>> scripted >>>> instead? >>>> >>> Sorry, i'm not getting you. How functionality be scripted? Could >>> you >>> provide some example or details explanation? >> ie. "load" (from fs) + "fpga load" (program FPGA) commands ? >> I think the fpga command already has some support for loading from FS >> too. >> > Currently, we already have fpga load commands in fpga driver, fpga rbf > is loaded to memory, and programmed to fpga from memory, where memory > location would be decided by user, it could be OCRAM or SDRAM. > > for fpga loadfs command, i plan to implement it after having complete > boot to U-boot console, since this is quite complex and involving some > hardware workaround issue, and some use case scenarios need to be > considerd. So the arria10 u-boot port is still unable to boot to console ? > For example reconfiguring fpga with periperal rbf can > corrupt the sdram since sdram IOs is part of the fpga periph rbf. I > need console to run a lot different scenarios testing. OK > We still need cff.c, because most functionality in cff.c are required > by fpga loadfs command. It seems a lot of stuff from this is common code, so why does it have to be in this driver again ? Also, the ifdeffery is awful and the explicit depedence on VFAT when loading from FS is real bad. [...]
On Rab, 2017-08-09 at 10:29 +0200, Marek Vasut wrote: > On 08/09/2017 06:50 AM, Chee, Tien Fong wrote: > [...] > > > > > > > > > > > > > > > > > > > > If this is for some FPGA loading, can this functionality be > > > > > scripted > > > > > instead? > > > > > > > > > Sorry, i'm not getting you. How functionality be scripted? > > > > Could > > > > you > > > > provide some example or details explanation? > > > ie. "load" (from fs) + "fpga load" (program FPGA) commands ? > > > I think the fpga command already has some support for loading > > > from FS > > > too. > > > > > Currently, we already have fpga load commands in fpga driver, fpga > > rbf > > is loaded to memory, and programmed to fpga from memory, where > > memory > > location would be decided by user, it could be OCRAM or SDRAM. > > > > for fpga loadfs command, i plan to implement it after having > > complete > > boot to U-boot console, since this is quite complex and involving > > some > > hardware workaround issue, and some use case scenarios need to be > > considerd. > So the arria10 u-boot port is still unable to boot to console ? > Still need 2 to 3 more patchsets to get it boot to console. > > > > For example reconfiguring fpga with periperal rbf can > > corrupt the sdram since sdram IOs is part of the fpga periph rbf. I > > need console to run a lot different scenarios testing. > OK > > > > > We still need cff.c, because most functionality in cff.c are > > required > > by fpga loadfs command. > It seems a lot of stuff from this is common code, so why does it have > to > be in this driver again ? This driver contains a lot "smart" functionality such as: 1: It having ability to the right memory(OCRAM or SDRAM) to achieve the best FPGA programing performance. 2: It can determine the right size buffer for the fpga rbf without info of buffer size defined by user. 3: It has ability to know what kind of fpga rbf type, and security type, such as peripheral, core, combined rbf, encryption and unencryption based on any fpga file user pass in . 4: It supports the checksum. 5: support raw flash without fs. 6: support the file name defined in DTS and U-boot environment variable. > Also, the ifdeffery is awful and the explicit > depedence on VFAT when loading from FS is real bad. > It is because a lot functions is common to sdmmc, nand and qspi in different fs such as vfat, ubi and raw. It is unavoidable to have some ifdeffery if we want to keep the function common to all flashes and fs. > [...]
On 08/10/2017 06:43 AM, Chee, Tien Fong wrote: > On Rab, 2017-08-09 at 10:29 +0200, Marek Vasut wrote: >> On 08/09/2017 06:50 AM, Chee, Tien Fong wrote: >> [...] >> >>> >>>> >>>>> >>>>>> >>>>>> If this is for some FPGA loading, can this functionality be >>>>>> scripted >>>>>> instead? >>>>>> >>>>> Sorry, i'm not getting you. How functionality be scripted? >>>>> Could >>>>> you >>>>> provide some example or details explanation? >>>> ie. "load" (from fs) + "fpga load" (program FPGA) commands ? >>>> I think the fpga command already has some support for loading >>>> from FS >>>> too. >>>> >>> Currently, we already have fpga load commands in fpga driver, fpga >>> rbf >>> is loaded to memory, and programmed to fpga from memory, where >>> memory >>> location would be decided by user, it could be OCRAM or SDRAM. >>> >>> for fpga loadfs command, i plan to implement it after having >>> complete >>> boot to U-boot console, since this is quite complex and involving >>> some >>> hardware workaround issue, and some use case scenarios need to be >>> considerd. >> So the arria10 u-boot port is still unable to boot to console ? >> > Still need 2 to 3 more patchsets to get it boot to console. >>> >>> For example reconfiguring fpga with periperal rbf can >>> corrupt the sdram since sdram IOs is part of the fpga periph rbf. I >>> need console to run a lot different scenarios testing. >> OK >> >>> >>> We still need cff.c, because most functionality in cff.c are >>> required >>> by fpga loadfs command. >> It seems a lot of stuff from this is common code, so why does it have >> to >> be in this driver again ? > This driver contains a lot "smart" functionality such as: I start to cringe when I read "smart functionality". > 1: It having ability to the right memory(OCRAM or SDRAM) to achieve the > best FPGA programing performance. Did you find significant throughput difference ? > 2: It can determine the right size buffer for the fpga rbf without info > of buffer size defined by user. You mean like $filesize variable in the command prompt ? > 3: It has ability to know what kind of fpga rbf type, and security > type, such as peripheral, core, combined rbf, encryption and > unencryption based on any fpga file user pass in . Is this information used for anything ? I was under the impression that the user just needs to load in the correct RBF file into the FPGA. > 4: It supports the checksum. What checksum ? Can we have a generic hook into the FPGA framework ? > 5: support raw flash without fs. This should go into common code. > 6: support the file name defined in DTS and U-boot environment > variable. I think you should extend the FPGA LOADFS here instead. >> Also, the ifdeffery is awful and the explicit >> depedence on VFAT when loading from FS is real bad. >> > It is because a lot functions is common to sdmmc, nand and qspi in > different fs such as vfat, ubi and raw. It is unavoidable to have some > ifdeffery if we want to keep the function common to all flashes and > fs. Can the FPGA LOADFS be extended generically ? >> [...]
On Jum, 2017-08-11 at 17:09 +0200, Marek Vasut wrote: > On 08/10/2017 06:43 AM, Chee, Tien Fong wrote: > > > > On Rab, 2017-08-09 at 10:29 +0200, Marek Vasut wrote: > > > > > > On 08/09/2017 06:50 AM, Chee, Tien Fong wrote: > > > [...] > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > If this is for some FPGA loading, can this functionality > > > > > > > be > > > > > > > scripted > > > > > > > instead? > > > > > > > > > > > > > Sorry, i'm not getting you. How functionality be scripted? > > > > > > Could > > > > > > you > > > > > > provide some example or details explanation? > > > > > ie. "load" (from fs) + "fpga load" (program FPGA) commands ? > > > > > I think the fpga command already has some support for loading > > > > > from FS > > > > > too. > > > > > > > > > Currently, we already have fpga load commands in fpga driver, > > > > fpga > > > > rbf > > > > is loaded to memory, and programmed to fpga from memory, where > > > > memory > > > > location would be decided by user, it could be OCRAM or SDRAM. > > > > > > > > for fpga loadfs command, i plan to implement it after having > > > > complete > > > > boot to U-boot console, since this is quite complex and > > > > involving > > > > some > > > > hardware workaround issue, and some use case scenarios need to > > > > be > > > > considerd. > > > So the arria10 u-boot port is still unable to boot to console ? > > > > > Still need 2 to 3 more patchsets to get it boot to console. > > > > > > > > > > > > > > > For example reconfiguring fpga with periperal rbf can > > > > corrupt the sdram since sdram IOs is part of the fpga periph > > > > rbf. I > > > > need console to run a lot different scenarios testing. > > > OK > > > > > > > > > > > > > > > We still need cff.c, because most functionality in cff.c are > > > > required > > > > by fpga loadfs command. > > > It seems a lot of stuff from this is common code, so why does it > > > have > > > to > > > be in this driver again ? > > This driver contains a lot "smart" functionality such as: > I start to cringe when I read "smart functionality". > > > > > 1: It having ability to the right memory(OCRAM or SDRAM) to achieve > > the > > best FPGA programing performance. > Did you find significant throughput difference ? > 80% performance improvement with SDRAM. > > > > 2: It can determine the right size buffer for the fpga rbf without > > info > > of buffer size defined by user. > You mean like $filesize variable in the command prompt ? > Yeah. No filesize is required. > > > > 3: It has ability to know what kind of fpga rbf type, and security > > type, such as peripheral, core, combined rbf, encryption and > > unencryption based on any fpga file user pass in . > Is this information used for anything ? I was under the impression > that > the user just needs to load in the correct RBF file into the FPGA. > Yeah, the driver would decode the RBF image to know what type of RBF user loading, and applying correct method(buffer allocation, which memory to use and configuration on FPGA manager) to program FPGA. > > > > 4: It supports the checksum. > What checksum ? Can we have a generic hook into the FPGA framework ? > This checksum is to ensure integrity of RBF file after loading from flash into SDRAM. This can help to prevent possibility system instability caused by programming corrupt rbf into FPGA. So, this should be implemented in cff.c . > > > > 5: support raw flash without fs. > This should go into common code. > raw flash is part of common codes in cff.c because it is part of mechanism like fs to determine how loading rbf from flash and program into fpga. > > > > 6: support the file name defined in DTS and U-boot environment > > variable. > I think you should extend the FPGA LOADFS here instead. > The peripheral rbf filename and DTS are generated from our bsp tool. But user can run fpga loadfs to reconfigure FPGA in U-boot console after i have supported it. > > > > > > > > Also, the ifdeffery is awful and the explicit > > > depedence on VFAT when loading from FS is real bad. > > > > > It is because a lot functions is common to sdmmc, nand and qspi in > > different fs such as vfat, ubi and raw. It is unavoidable to have > > some > > ifdeffery if we want to keep the function common to all flashes and > > fs. > Can the FPGA LOADFS be extended generically ? > Yeah, FPGA loadfs is considered when design cff.c. But, i plan to to support FPGA loadfs after having complete boot to U-boot console. > > > > > > > > [...] >
On 08/12/2017 10:03 AM, Chee, Tien Fong wrote: [...] >>> 1: It having ability to the right memory(OCRAM or SDRAM) to achieve >>> the >>> best FPGA programing performance. >> Did you find significant throughput difference ? >> > 80% performance improvement with SDRAM. This looks more like caches are not enabled ... sort of problem ? >>> 2: It can determine the right size buffer for the fpga rbf without >>> info >>> of buffer size defined by user. >> You mean like $filesize variable in the command prompt ? >> > Yeah. No filesize is required. You can use $filesize instead of reimplementing this functionality yourself though ? >>> 3: It has ability to know what kind of fpga rbf type, and security >>> type, such as peripheral, core, combined rbf, encryption and >>> unencryption based on any fpga file user pass in . >> Is this information used for anything ? I was under the impression >> that >> the user just needs to load in the correct RBF file into the FPGA. >> > Yeah, the driver would decode the RBF image to know what type of RBF > user loading, and applying correct method(buffer allocation, which > memory to use and configuration on FPGA manager) to program FPGA. If the code needs to extract some information from the RBF to correctly configure something in the FPGA manager, then that's where this should go then. >>> 4: It supports the checksum. >> What checksum ? Can we have a generic hook into the FPGA framework ? >> > This checksum is to ensure integrity of RBF file after loading from > flash into SDRAM. This can help to prevent possibility system > instability caused by programming corrupt rbf into FPGA. So, this > should be implemented in cff.c . Or the FPGA manager driver . >>> 5: support raw flash without fs. >> This should go into common code. >> > raw flash is part of common codes in cff.c because it is part of > mechanism like fs to determine how loading rbf from flash and program > into fpga. By common code I mean the stuff around FPGA LOADFS , so other FPGAs can also benefit from that. >>> 6: support the file name defined in DTS and U-boot environment >>> variable. >> I think you should extend the FPGA LOADFS here instead. >> > The peripheral rbf filename and DTS are generated from our bsp tool. > But user can run fpga loadfs to reconfigure FPGA in U-boot console > after i have supported it. And why don't you rather apply some FPGA LOADFS if this property is detected in the DT instead of reimplementing it ? >>> >>>> >>>> Also, the ifdeffery is awful and the explicit >>>> depedence on VFAT when loading from FS is real bad. >>>> >>> It is because a lot functions is common to sdmmc, nand and qspi in >>> different fs such as vfat, ubi and raw. It is unavoidable to have >>> some >>> ifdeffery if we want to keep the function common to all flashes and >>> fs. >> Can the FPGA LOADFS be extended generically ? >> > Yeah, FPGA loadfs is considered when design cff.c. But, i plan to to > support FPGA loadfs after having complete boot to U-boot console. Does that mean the Arria10 is still not even capable of booting into U-Boot console ? cff.c is unlikely to hit mainline unless there's compelling argument that it is needed . Thus far, I see most of the functionality should be added elsewhere or is already there (fpga loadfs).
On Sab, 2017-08-12 at 18:49 +0200, Marek Vasut wrote: > On 08/12/2017 10:03 AM, Chee, Tien Fong wrote: > [...] > > > > > > > > > > > > > 1: It having ability to the right memory(OCRAM or SDRAM) to > > > > achieve > > > > the > > > > best FPGA programing performance. > > > Did you find significant throughput difference ? > > > > > 80% performance improvement with SDRAM. > This looks more like caches are not enabled ... sort of problem ? > It is because SDRAM size large enough to store whole rbf file and reduce significantly of the repetitive block transfer. It requires one time block transfer from SDRAM to FPGA compare to OCRAM which require more than that. > > > > > > > > > > > > > 2: It can determine the right size buffer for the fpga rbf > > > > without > > > > info > > > > of buffer size defined by user. > > > You mean like $filesize variable in the command prompt ? > > > > > Yeah. No filesize is required. > You can use $filesize instead of reimplementing this functionality > yourself though ? > I'am sorry to have confused you. What i trying to say is user no longer require to specify the file size and location when calling fpga loadfs. So, this would keep the thing simple. The driver in cff.c would handle all these troublesome things and deciding the best route for good performance. > > > > > > > > > > > > > 3: It has ability to know what kind of fpga rbf type, and > > > > security > > > > type, such as peripheral, core, combined rbf, encryption and > > > > unencryption based on any fpga file user pass in . > > > Is this information used for anything ? I was under the > > > impression > > > that > > > the user just needs to load in the correct RBF file into the > > > FPGA. > > > > > Yeah, the driver would decode the RBF image to know what type of > > RBF > > user loading, and applying correct method(buffer allocation, which > > memory to use and configuration on FPGA manager) to program FPGA. > If the code needs to extract some information from the RBF to > correctly > configure something in the FPGA manager, then that's where this > should > go then. > Those functions for extracting info from RBF and configuring the FPGA are actually come from fpga driver which i have submited as in previous patchset. The actualy implementation is in cff.c, as i try to explain cff.c drivers are mainly to handle all activities of loading rbf from flashes to program FPGA. > > > > > > > > > > > > > 4: It supports the checksum. > > > What checksum ? Can we have a generic hook into the FPGA > > > framework ? > > > > > This checksum is to ensure integrity of RBF file after loading from > > flash into SDRAM. This can help to prevent possibility system > > instability caused by programming corrupt rbf into FPGA. So, this > > should be implemented in cff.c . > Or the FPGA manager driver . > This integrity checking is implemented during RBF loading from flash to SDRAM before calling the functions from fpga driver to program FPGA. So cff.c which is designed for handling these operation and it should be appropriate place for checksum. > > > > > > > > > > > > > 5: support raw flash without fs. > > > This should go into common code. > > > > > raw flash is part of common codes in cff.c because it is part of > > mechanism like fs to determine how loading rbf from flash and > > program > > into fpga. > By common code I mean the stuff around FPGA LOADFS , so other FPGAs > can > also benefit from that. > But the raw flash to FPGA implementation is designed fully tied to common codes in cff.c. FPGA loadfs would be acted like a wrapper to it, so i am not sure it can be shared by other FPGA. > > > > > > > > > > > > > 6: support the file name defined in DTS and U-boot environment > > > > variable. > > > I think you should extend the FPGA LOADFS here instead. > > > > > The peripheral rbf filename and DTS are generated from our bsp > > tool. > > But user can run fpga loadfs to reconfigure FPGA in U-boot console > > after i have supported it. > And why don't you rather apply some FPGA LOADFS if this property is > detected in the DT instead of reimplementing it ? > We need to program the FPGA IO ring buffer from very early phase in SPL before SDRAM can be initialized. So we need the peripheral rbf file name from DTS, which is defined by user in our BSP tool. I don't think FPGA loadfs would be available in SPL by that time. So, i think FPGA loadfs is suitable for reprogramming FPGA in U-boot console, and filename is passed as parameter to fpga loadfs command. > > > > > > > > > > > > > > > > > > > > > > > > > > > > Also, the ifdeffery is awful and the explicit > > > > > depedence on VFAT when loading from FS is real bad. > > > > > > > > > It is because a lot functions is common to sdmmc, nand and qspi > > > > in > > > > different fs such as vfat, ubi and raw. It is unavoidable to > > > > have > > > > some > > > > ifdeffery if we want to keep the function common to all flashes > > > > and > > > > fs. > > > Can the FPGA LOADFS be extended generically ? > > > > > Yeah, FPGA loadfs is considered when design cff.c. But, i plan to > > to > > support FPGA loadfs after having complete boot to U-boot console. > Does that mean the Arria10 is still not even capable of booting into > U-Boot console ? > > cff.c is unlikely to hit mainline unless there's compelling argument > that it is needed . Thus far, I see most of the functionality should > be > added elsewhere or is already there (fpga loadfs). > Please consider it, as i think that implementation of loading rbf from any flashes to memory before programming PFGA should not be part of FPGA driver. FPGA driver should contains only functionality of init fpga and programming FPGA. cff.c is designed so the fpga loadfs can be acted wrapper on it.
On 08/14/2017 05:58 AM, Chee, Tien Fong wrote: > On Sab, 2017-08-12 at 18:49 +0200, Marek Vasut wrote: >> On 08/12/2017 10:03 AM, Chee, Tien Fong wrote: >> [...] >>> >>>> >>>>> >>>>> 1: It having ability to the right memory(OCRAM or SDRAM) to >>>>> achieve >>>>> the >>>>> best FPGA programing performance. >>>> Did you find significant throughput difference ? >>>> >>> 80% performance improvement with SDRAM. >> This looks more like caches are not enabled ... sort of problem ? >> > It is because SDRAM size large enough to store whole rbf file and > reduce significantly of the repetitive block transfer. It requires one > time block transfer from SDRAM to FPGA compare to OCRAM which require > more than that. OK, do that as a subsequent optimization. >>> >>>> >>>>> >>>>> 2: It can determine the right size buffer for the fpga rbf >>>>> without >>>>> info >>>>> of buffer size defined by user. >>>> You mean like $filesize variable in the command prompt ? >>>> >>> Yeah. No filesize is required. >> You can use $filesize instead of reimplementing this functionality >> yourself though ? >> > I'am sorry to have confused you. What i trying to say is user no longer > require to specify the file size and location when calling fpga loadfs. > So, this would keep the thing simple. The driver in cff.c would handle > all these troublesome things and deciding the best route for good > performance. OK, separate patch >>> >>>> >>>>> >>>>> 3: It has ability to know what kind of fpga rbf type, and >>>>> security >>>>> type, such as peripheral, core, combined rbf, encryption and >>>>> unencryption based on any fpga file user pass in . >>>> Is this information used for anything ? I was under the >>>> impression >>>> that >>>> the user just needs to load in the correct RBF file into the >>>> FPGA. >>>> >>> Yeah, the driver would decode the RBF image to know what type of >>> RBF >>> user loading, and applying correct method(buffer allocation, which >>> memory to use and configuration on FPGA manager) to program FPGA. >> If the code needs to extract some information from the RBF to >> correctly >> configure something in the FPGA manager, then that's where this >> should >> go then. >> > Those functions for extracting info from RBF and configuring the FPGA > are actually come from fpga driver which i have submited as in previous > patchset. The actualy implementation is in cff.c, as i try to explain > cff.c drivers are mainly to handle all activities of loading rbf from > flashes to program FPGA. Such functionality should be generic and split between fpga loadfs and the driver. >>> >>>> >>>>> >>>>> 4: It supports the checksum. >>>> What checksum ? Can we have a generic hook into the FPGA >>>> framework ? >>>> >>> This checksum is to ensure integrity of RBF file after loading from >>> flash into SDRAM. This can help to prevent possibility system >>> instability caused by programming corrupt rbf into FPGA. So, this >>> should be implemented in cff.c . >> Or the FPGA manager driver . >> > This integrity checking is implemented during RBF loading from flash to > SDRAM before calling the functions from fpga driver to program FPGA. So > cff.c which is designed for handling these operation and it should > be appropriate place for checksum. Add a checksum hook into the FPGA framework ? >>> >>>> >>>>> >>>>> 5: support raw flash without fs. >>>> This should go into common code. >>>> >>> raw flash is part of common codes in cff.c because it is part of >>> mechanism like fs to determine how loading rbf from flash and >>> program >>> into fpga. >> By common code I mean the stuff around FPGA LOADFS , so other FPGAs >> can >> also benefit from that. >> > But the raw flash to FPGA implementation is designed fully tied to > common codes in cff.c. FPGA loadfs would be acted like a wrapper to it, > so i am not sure it can be shared by other FPGA. I do not want any ad-hoc wrapper, implement it properly be extending fpga loadfs or the fpga framework. >>> >>>> >>>>> >>>>> 6: support the file name defined in DTS and U-boot environment >>>>> variable. >>>> I think you should extend the FPGA LOADFS here instead. >>>> >>> The peripheral rbf filename and DTS are generated from our bsp >>> tool. >>> But user can run fpga loadfs to reconfigure FPGA in U-boot console >>> after i have supported it. >> And why don't you rather apply some FPGA LOADFS if this property is >> detected in the DT instead of reimplementing it ? >> > We need to program the FPGA IO ring buffer from very early phase in SPL > before SDRAM can be initialized. So we need the peripheral rbf file > name from DTS, which is defined by user in our BSP tool. I don't think > FPGA loadfs would be available in SPL by that time. So, i think FPGA > loadfs is suitable for reprogramming FPGA in U-boot console, and > filename is passed as parameter to fpga loadfs command. Then just call the required bits from fpga loadfs during SPL . Extract them into some fpga-loadfs-common and make both fpga loadfs and your SPL code call those functions. >>> >>>> >>>>> >>>>> >>>>>> >>>>>> >>>>>> Also, the ifdeffery is awful and the explicit >>>>>> depedence on VFAT when loading from FS is real bad. >>>>>> >>>>> It is because a lot functions is common to sdmmc, nand and qspi >>>>> in >>>>> different fs such as vfat, ubi and raw. It is unavoidable to >>>>> have >>>>> some >>>>> ifdeffery if we want to keep the function common to all flashes >>>>> and >>>>> fs. >>>> Can the FPGA LOADFS be extended generically ? >>>> >>> Yeah, FPGA loadfs is considered when design cff.c. But, i plan to >>> to >>> support FPGA loadfs after having complete boot to U-boot console. >> Does that mean the Arria10 is still not even capable of booting into >> U-Boot console ? >> >> cff.c is unlikely to hit mainline unless there's compelling argument >> that it is needed . Thus far, I see most of the functionality should >> be >> added elsewhere or is already there (fpga loadfs). >> > Please consider it, as i think that implementation of loading rbf from > any flashes to memory before programming PFGA should not be part of > FPGA driver. That's correct. > FPGA driver should contains only functionality of init > fpga and programming FPGA. cff.c is designed so the fpga loadfs can be > acted wrapper on it. And that is the part I have real problem with. Extend the common code and then use it to load whatever stuff into the FPGA instead of making common code a wrapper around ad-hoc stuff.
diff --git a/arch/arm/mach-socfpga/cff.c b/arch/arm/mach-socfpga/cff.c new file mode 100644 index 0000000..ccee5e9 --- /dev/null +++ b/arch/arm/mach-socfpga/cff.c @@ -0,0 +1,582 @@ +/* + * COPYRIGHT (C) 2017 Intel Corporation <www.intel.com> + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include <altera.h> +#include <common.h> +#include <asm/io.h> +#include <asm/arch/cff.h> +#include <asm/arch/fpga_manager.h> +#include <asm/arch/misc.h> +#include <asm/arch/system_manager.h> +#include <asm/arch/reset_manager.h> +#include <errno.h> +#include <fat.h> +#include <fs.h> +#include <fdtdec.h> +#include <malloc.h> +#include <mmc.h> +#include <spi_flash.h> +#include <spl.h> +#include <watchdog.h> + +#define RBF_UNENCRYPTED 0xa65c +#define RBF_ENCRYPTED 0xa65d +#define ARRIA10RBF_PERIPH 0x0001 +#define ARRIA10RBF_CORE 0x8001 + +DECLARE_GLOBAL_DATA_PTR; + +static int flash_type = -1; + +struct mmc *mmc; + +/* Local functions */ +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, u32 *buffer, + u32 *buffer_sizebytes); +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 *buffer_sizebytes); +#ifdef CONFIG_CMD_FPGA_LOADFS +static const char *get_cff_filename(const void *fdt, int *len, u32 core); +#else +static int get_cff_offset(const void *fdt, u32 core); +#endif + +static struct mmc *init_mmc_device(int dev, bool force_init) +{ + struct mmc *mmc; + + mmc = find_mmc_device(dev); + if (!mmc) { + printf("no mmc device at slot %x\n", dev); + return NULL; + } + + if (force_init) + mmc->has_init = 0; + if (mmc_init(mmc)) + return NULL; + + return mmc; +} + +static int cff_flash_probe(struct cff_flash_info *cff_flashinfo) +{ + int dev = 0; + + if(BOOT_DEVICE_MMC1 == flash_type) + { + mmc = init_mmc_device(dev, true); + + if (!mmc) + return -ENOTBLK; + +#ifdef CONFIG_CMD_FPGA_LOADFS + /* we are looking at the FAT partition */ + if (fat_register_device(mmc_get_blk_desc(mmc), + cff_flashinfo->sdmmc_flashinfo.dev_part)) { + printf("Failed to set filesystem to FAT.\n"); + return -EPERM; + } +#endif + } + + return flash_type; +} + +static int flash_read(struct cff_flash_info *cff_flashinfo, + u32 size_read, + u32 *buffer_ptr) +{ + size_t ret = EEXIST; +#ifdef CONFIG_CMD_FPGA_LOADFS + loff_t actread; +#endif + + if(BOOT_DEVICE_MMC1 == flash_type) { +#ifdef CONFIG_CMD_FPGA_LOADFS + ret = fat_read_file(cff_flashinfo->sdmmc_flashinfo.filename, + buffer_ptr, cff_flashinfo->flash_offset, + size_read, &actread); + + if (ret || actread != size_read) { + printf("Failed to read %s from FAT %d ", + cff_flashinfo->sdmmc_flashinfo.filename, + ret); + printf("!= %d.\n", size_read); + return -EPERM; + } else + ret = actread; +#else + u32 blk = cff_flashinfo->flash_offset/mmc->read_bl_len; + u32 cnt = size_read / mmc->read_bl_len; + + if (!cnt) + cnt = 1; + + if((size_read % mmc->read_bl_len) && + (size_read >= mmc->read_bl_len)) + cnt++; + + ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, + buffer_ptr); + + if (cnt != ret) + return -EPERM; +#endif + } + + return ret; +} + +#ifdef CONFIG_CMD_FPGA_LOADFS +const char *get_cff_filename(const void *fdt, int *len, u32 core) +{ + const char *cff_filename = NULL; + const char *cell; + int nodeoffset; + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); + + if (nodeoffset >= 0) { + if (core) + cell = fdt_getprop(fdt, + nodeoffset, + "cffcore-file", + len); + else + cell = fdt_getprop(fdt, nodeoffset, "cff-file", len); + + if (cell) + cff_filename = cell; + } + + return cff_filename; +} +#else +static int get_cff_offset(const void *fdt, u32 core) +{ + int nodeoffset = 0; + + nodeoffset = fdt_subnode_offset(fdt, 0, "chosen"); + + if (nodeoffset >= 0) { + if (core) + return fdtdec_get_int(fdt, + nodeoffset, + "cffcore-offset", + -ESPIPE); + else + return fdtdec_get_int(fdt, + nodeoffset, + "cff-offset", + -ESPIPE); + } + return -ESPIPE; +} +#endif + +int cff_from_sdmmc_env(u32 core) +{ + int rval = -ENOENT; + fpga_fs_info fpga_fsinfo; + +#ifdef CONFIG_CMD_FPGA_LOADFS + int len = 0; + const char *cff = NULL; +#else + char addrToString[32] = {0}; + + int sdmmc_rbf_rawaddr = -ENOENT; +#endif + + flash_type = spl_boot_device(); + + fpga_fsinfo.interface = "sdmmc"; + +#ifdef CONFIG_CMD_FPGA_LOADFS + cff = get_cff_filename(gd->fdt_blob, &len, core); + + /* FAT periph RBF file reading */ + if (cff && (len > 0)) { + mmc_initialize(gd->bd); + + fpga_fsinfo.filename = (char *)cff; + + fpga_fsinfo.dev_part = getenv("cff_devsel_partition"); + + if (NULL == fpga_fsinfo.dev_part) { + /* FAT partition */ + fpga_fsinfo.dev_part = "1"; + + printf("No SD/MMC partition found in environment. "); + printf("Assuming partition 1.\n"); + } + + rval = cff_from_flash(&fpga_fsinfo); + } +#else + sdmmc_rbf_rawaddr = get_cff_offset(gd->fdt_blob, core); + + /* RAW periph RBF reading */ + if (sdmmc_rbf_rawaddr >= 0) { + sprintf(addrToString, "%x", sdmmc_rbf_rawaddr); + + fpga_fsinfo.filename = addrToString; + + rval = cff_from_flash(&fpga_fsinfo); + } +#endif + return rval; +} + +void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer) +{ + /* + Magic ID starting at: + -> 1st dword in periph.rbf + -> 2nd dword in core.rbf + */ + u32 word_reading_max = 2; + u32 i; + + for(i = 0; i < word_reading_max; i++) + { + if(RBF_UNENCRYPTED == *(buffer + i)) /* PERIPH RBF */ + rbf->security = unencrypted; + else if (RBF_ENCRYPTED == *(buffer + i)) + rbf->security = encrypted; + else if (RBF_UNENCRYPTED == *(buffer + i + 1)) /* CORE RBF */ + rbf->security = unencrypted; + else if (RBF_ENCRYPTED == *(buffer + i + 1)) + rbf->security = encrypted; + else { + rbf->security = invalid; + continue; + } + + /* PERIPH RBF */ + if (ARRIA10RBF_PERIPH == *(buffer + i + 1)) { + rbf->section = periph_section; + break; + } + else if (ARRIA10RBF_CORE == *(buffer + i + 1)) { + rbf->section = core_section; + break; + } /* CORE RBF */ + else if (ARRIA10RBF_PERIPH == *(buffer + i + 2)) { + rbf->section = periph_section; + break; + } + else if (ARRIA10RBF_CORE == *(buffer + i + 2)) { + rbf->section = core_section; + break; + } + else { + rbf->section = unknown; + break; + } + } + + return; +} + +static int cff_flash_preinit(struct cff_flash_info *cff_flashinfo, + fpga_fs_info *fpga_fsinfo, u32 *buffer, u32 *buffer_sizebytes) +{ + u32 *bufferptr_after_header = NULL; + u32 buffersize_after_header = 0; + u32 rbf_header_data_size = 0; + int ret = 0; + /* To avoid from keeping re-read the contents */ + struct image_header *header = &(cff_flashinfo->header); + size_t buffer_size = *buffer_sizebytes; + u32 *buffer_ptr = (u32 *)*buffer; + +#ifdef CONFIG_CMD_FPGA_LOADFS + cff_flashinfo->sdmmc_flashinfo.filename = fpga_fsinfo->filename; + cff_flashinfo->flash_offset = 0; +#else + cff_flashinfo->flash_offset = + simple_strtoul(fpga_fsinfo->filename, NULL, 16); +#endif + + /* Load mkimage header into buffer */ + ret = flash_read(cff_flashinfo, + sizeof(struct image_header), buffer_ptr); + + if (0 >= ret) { + printf(" Failed to read mkimage header from flash.\n"); + return -ENOENT; + } + + WATCHDOG_RESET(); + + memcpy(header, (u_char *)buffer_ptr, sizeof(*header)); + + if (!image_check_magic(header)) { + printf("FPGA: Bad Magic Number.\n"); + return -EBADF; + } + + if (!image_check_hcrc(header)) { + printf("FPGA: Bad Header Checksum.\n"); + return -EPERM; + } + + /* Getting rbf data size */ + cff_flashinfo->remaining = + image_get_data_size(header); + + /* Calculate total size of both rbf data with mkimage header */ + rbf_header_data_size = cff_flashinfo->remaining + + sizeof(struct image_header); + + /* Loading to buffer chunk by chunk, normally for OCRAM buffer */ + if (rbf_header_data_size > buffer_size) { + /* Calculate size of rbf data in the buffer */ + buffersize_after_header = + buffer_size - sizeof(struct image_header); + cff_flashinfo->remaining -= buffersize_after_header; + } else { + /* Loading whole rbf image into buffer, normally for DDR buffer */ + buffer_size = rbf_header_data_size; + /* Calculate size of rbf data in the buffer */ + buffersize_after_header = + buffer_size - sizeof(struct image_header); + cff_flashinfo->remaining = 0; + } + + /* Loading mkimage header and rbf data into buffer */ + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); + + if (0 >= ret) { + printf(" Failed to read mkimage header and rbf data "); + printf("from flash.\n"); + return -ENOENT; + } + + /* Getting pointer of rbf data starting address where is it + right after mkimage header */ + bufferptr_after_header = + (u32 *)((u_char *)buffer_ptr + sizeof(struct image_header)); + + /* Update next reading rbf data flash offset */ + cff_flashinfo->flash_offset += buffer_size; + + /* Update the starting addr of rbf data to init FPGA & programming + into FPGA */ + *buffer = (u32)bufferptr_after_header; + + get_rbf_image_info(&cff_flashinfo->rbfinfo, (u16 *)bufferptr_after_header); + + /* Update the size of rbf data to be programmed into FPGA */ + *buffer_sizebytes = buffersize_after_header; + +#ifdef CONFIG_CHECK_FPGA_DATA_CRC + cff_flashinfo->datacrc = + crc32(cff_flashinfo->datacrc, + (u_char *)bufferptr_after_header, + buffersize_after_header); +#endif +if (0 == cff_flashinfo->remaining) { +#ifdef CONFIG_CHECK_FPGA_DATA_CRC + if (cff_flashinfo->datacrc != + image_get_dcrc(&(cff_flashinfo->header))) { + printf("FPGA: Bad Data Checksum.\n"); + return -EPERM; + } +#endif +} + return 0; +} + + +static int cff_flash_read(struct cff_flash_info *cff_flashinfo, u32 *buffer, + u32 *buffer_sizebytes) +{ + int ret = 0; + /* To avoid from keeping re-read the contents */ + size_t buffer_size = *buffer_sizebytes; + u32 *buffer_ptr = (u32 *)*buffer; + u32 flash_addr = cff_flashinfo->flash_offset; + + /* Buffer allocated in OCRAM */ + /* Read the data by small chunk by chunk. */ + if (cff_flashinfo->remaining > buffer_size) + cff_flashinfo->remaining -= buffer_size; + else { + /* Buffer allocated in DDR, larger than rbf data most + of the time */ + buffer_size = cff_flashinfo->remaining; + cff_flashinfo->remaining = 0; + } + + ret = flash_read(cff_flashinfo, buffer_size, buffer_ptr); + + if (0 >= ret) { + printf(" Failed to read rbf data from flash.\n"); + return -ENOENT; + } + +#ifdef CONFIG_CHECK_FPGA_DATA_CRC + cff_flashinfo->datacrc = + crc32(cff_flashinfo->datacrc, + (unsigned char *)buffer_ptr, buffer_size); +#endif + +if (0 == cff_flashinfo->remaining) { +#ifdef CONFIG_CHECK_FPGA_DATA_CRC + if (cff_flashinfo->datacrc != + image_get_dcrc(&(cff_flashinfo->header))) { + printf("FPGA: Bad Data Checksum.\n"); + return -EPERM; + } +#endif +} + /* Update next reading rbf data flash offset */ + flash_addr += buffer_size; + + cff_flashinfo->flash_offset = flash_addr; + + /* Update the size of rbf data to be programmed into FPGA */ + *buffer_sizebytes = buffer_size; + + return 0; +} + +int cff_from_flash(fpga_fs_info *fpga_fsinfo) +{ + u32 buffer = 0; + u32 buffer_ori = 0; + u32 buffer_sizebytes = 0; + u32 buffer_sizebytes_ori = 0; + struct cff_flash_info cff_flashinfo; + u32 status; + int ret = 0; + + memset(&cff_flashinfo, 0, sizeof(cff_flashinfo)); + + if (fpga_fsinfo->filename == NULL) { + printf("no [periph/core] rbf [filename/offset] specified.\n"); + return -EINVAL; + } + + WATCHDOG_RESET(); + +#ifdef CONFIG_CMD_FPGA_LOADFS + cff_flashinfo.sdmmc_flashinfo.dev_part = + simple_strtol(fpga_fsinfo->dev_part, NULL, 10); +#endif + + ret = cff_flash_probe(&cff_flashinfo); + + if (0 >= ret) { + puts("Flash probe failed.\n"); + return ret; + } + +#ifdef CONFIG_CMD_FPGA_LOADFS + /* Loading rbf data with DDR, faster than OCRAM, + only for core rbf */ + if (gd->ram_size != 0) { + ret = fat_size(fpga_fsinfo->filename, (loff_t *)&buffer_sizebytes); + + if(ret){ + puts("Failed to read file size.\n"); + return ret; + } + + buffer_ori = (u32)memalign(ARCH_DMA_MINALIGN, buffer_sizebytes); + + if (!buffer_ori) { + error("RBF calloc failed!\n"); + return -ENOMEM; + } + + /* Loading mkimage header and rbf data into + DDR instead of OCRAM */ + buffer = buffer_ori; + + buffer_sizebytes_ori = buffer_sizebytes; + } else { + buffer = buffer_ori = (u32)cff_flashinfo.buffer; + + buffer_sizebytes = + buffer_sizebytes_ori = + sizeof(cff_flashinfo.buffer); + } +#else + /* Adjust to adjacent block */ + buffer_sizebytes = buffer_sizebytes_ori = + (sizeof(cff_flashinfo.buffer)/ mmc->read_bl_len) * + mmc->read_bl_len; +#endif + + /* Note: Both buffer and buffer_sizebytes values can be altered by + function below. */ + ret = cff_flash_preinit(&cff_flashinfo, fpga_fsinfo, &buffer, + &buffer_sizebytes); + + if (ret) + return ret; + + if (periph_section == cff_flashinfo.rbfinfo.section) { + /* initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)buffer, buffer_sizebytes); + if (status) { + printf("FPGA: Init with periph rbf failed with error. "); + printf("code %d\n", status); + return -EPERM; + } + } + + WATCHDOG_RESET(); + + /* transfer data to FPGA Manager */ + fpgamgr_program_write((void *)buffer, + buffer_sizebytes); + + WATCHDOG_RESET(); + + while (cff_flashinfo.remaining) { + ret = cff_flash_read(&cff_flashinfo, &buffer_ori, + &buffer_sizebytes_ori); + + if (ret) + return ret; + + /* transfer data to FPGA Manager */ + fpgamgr_program_write((void *)buffer_ori, + buffer_sizebytes_ori); + + WATCHDOG_RESET(); + } + + if ((periph_section == cff_flashinfo.rbfinfo.section) && + is_early_release_fpga_config(gd->fdt_blob)) { + if (-ETIMEDOUT != fpgamgr_wait_early_user_mode()) + printf("FPGA: Early Release Succeeded.\n"); + else { + printf("FPGA: Failed to see Early Release.\n"); + return -EIO; + } + } else if ((core_section == cff_flashinfo.rbfinfo.section) || + ((periph_section == cff_flashinfo.rbfinfo.section) && + !is_early_release_fpga_config(gd->fdt_blob))) { + /* Ensure the FPGA entering config done */ + status = fpgamgr_program_finish(); + if (status) + return status; + else + printf("FPGA: Enter user mode.\n"); + + } else { + printf("Config Error: Unsupported FGPA raw binary type.\n"); + return -ENOEXEC; + } + + WATCHDOG_RESET(); + return 1; +} diff --git a/arch/arm/mach-socfpga/include/mach/cff.h b/arch/arm/mach-socfpga/include/mach/cff.h new file mode 100644 index 0000000..7f3f66b --- /dev/null +++ b/arch/arm/mach-socfpga/include/mach/cff.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2017 Intel Corporation <www.intel.com> + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef _SOCFPGA_CFF_H_ +#define _SOCFPGA_CFF_H_ + +#include <fpga.h> + +#ifndef __ASSEMBLY_ + +struct flash_info { + char *filename; + int dev_part; +}; + +enum rbf_type {unknown, periph_section, core_section}; +enum rbf_security {invalid, unencrypted, encrypted}; + +struct rbf_info { + enum rbf_type section ; + enum rbf_security security; +}; + +struct cff_flash_info { + struct flash_info sdmmc_flashinfo; + u32 buffer[4096] __aligned(ARCH_DMA_MINALIGN); + u32 remaining; + u32 flash_offset; + struct rbf_info rbfinfo; + struct image_header header; +}; + +int cff_from_sdmmc_env(unsigned int core); +int cff_from_flash(fpga_fs_info *fpga_fsinfo); +#endif /* __ASSEMBLY__ */ + +#endif /* _SOCFPGA_CFF_H_ */ diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 3b59b6a..aa4c54a 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -58,6 +58,12 @@ * Flash configurations */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* Default SDMMC physical address for periph.rbf (sector alignment) */ +#define CONFIG_FS_FAT_MAX_CLUSTSIZE (32 * 1024) + +#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_CMD_FPGA_LOADFS) +#define CONFIG_CMD_FPGA_LOADFS +#endif /* The rest of the configuration is shared */ #include <configs/socfpga_common.h>