From a528a25f4c1956b67d121c99ab3aadbfa0cdf93b Mon Sep 17 00:00:00 2001 From: Mikael Larsson Date: Thu, 16 Sep 2010 13:31:13 +0200 Subject: ITP loading This adds functionality to load and execute ITP in an early stage just after eMMC init. eMMC init was moved to mmc_host.c since it fits better there and is needed in order to access ITP before loading env. Flag for functionality is CONFIG_ITP_LOAD. This functionailty depends on CONFIG_TOC_PARTITION ST-Ericsson ID: ER273744 Change-Id: Ia80f0bf2d67055045c95e47473b9ba2275bbdb83 Signed-off-by: Mikael LARSSON Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/5130 Reviewed-by: Michael BRANDT Reviewed-by: Ulf HANSSON --- board/st/u8500/Makefile | 4 + board/st/u8500/cspsa_fp.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++ board/st/u8500/cspsa_fp.h | 31 ++++++ board/st/u8500/itp.c | 82 ++++++++++++++ board/st/u8500/itp.h | 24 +++++ board/st/u8500/mmc_host.c | 17 +++ 6 files changed, 427 insertions(+) create mode 100644 board/st/u8500/cspsa_fp.c create mode 100644 board/st/u8500/cspsa_fp.h create mode 100644 board/st/u8500/itp.c create mode 100644 board/st/u8500/itp.h (limited to 'board') diff --git a/board/st/u8500/Makefile b/board/st/u8500/Makefile index e0617f471..d57e4bcd2 100644 --- a/board/st/u8500/Makefile +++ b/board/st/u8500/Makefile @@ -27,6 +27,10 @@ LIB = $(obj)lib$(BOARD).a COBJS := u8500.o flash.o gpio.o u8500_i2c.o mmc_host.o mmc_utils.o clock.o prcmu.o mcde_display.o mcde_hw.o ab8500vibra.o cmd_cdump.o SOBJS := mmc_fifo.o +COBJS-$(CONFIG_ITP_LOAD) += itp.o cspsa_fp.o + +COBJS += $(COBJS-y) + SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) diff --git a/board/st/u8500/cspsa_fp.c b/board/st/u8500/cspsa_fp.c new file mode 100644 index 000000000..9517f2762 --- /dev/null +++ b/board/st/u8500/cspsa_fp.c @@ -0,0 +1,269 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * Author: Martin Lundholm for + * ST-Ericsson. + * + * License terms: GNU General Public License (GPL), version 2. + * + * cspsa_fp.c + * + * Implementation of CSPSA Fast Parameters. CSPSA is an acronym for Crash + * Safe Parameter Storage. + * + */ + +#include "cspsa_fp.h" +#include +#include + +/* -------------------------------------------------------------------------- */ + +#define CSPSA_HEADER_MAGIC 0x00415350 +#define CSPSA_HEADER_VERSION 2 + +/* -------------------------------------------------------------------------- */ + +struct cspsa_header { + u32 magic; + u32 version; + u32 index; + u32 flags; + u32 data_size; + u32 crc32_data; + u32 crc32_header; + u32 fast_parameter[CSPSA_NBR_OF_FAST_PARAMETERS]; + u32 reserved[4]; + u32 bbt_size; + u32 bbt[]; +}; + +/* -------------------------------------------------------------------------- */ + +/* + * CRC32 lookup table based on polynom 0x04C11DB7. Must use the same CRC32 + * algorithm as in main CSPSA implementation. + */ +static const u32 crc_table[256] = { + 0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B, + 0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61, + 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD, 0x4C11DB70, 0x48D0C6C7, + 0x4593E01E, 0x4152FDA9, 0x5F15ADAC, 0x5BD4B01B, 0x569796C2, 0x52568B75, + 0x6A1936C8, 0x6ED82B7F, 0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, + 0x709F7B7A, 0x745E66CD, 0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039, + 0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5, 0xBE2B5B58, 0xBAEA46EF, + 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033, 0xA4AD16EA, 0xA06C0B5D, + 0xD4326D90, 0xD0F37027, 0xDDB056FE, 0xD9714B49, 0xC7361B4C, 0xC3F706FB, + 0xCEB42022, 0xCA753D95, 0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1, + 0xE13EF6F4, 0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D, 0x34867077, 0x30476DC0, + 0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5, 0x2AC12072, + 0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16, 0x018AEB13, 0x054BF6A4, + 0x0808D07D, 0x0CC9CDCA, 0x7897AB07, 0x7C56B6B0, 0x71159069, 0x75D48DDE, + 0x6B93DDDB, 0x6F52C06C, 0x6211E6B5, 0x66D0FB02, 0x5E9F46BF, 0x5A5E5B08, + 0x571D7DD1, 0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA, + 0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B, 0xBB60ADFC, + 0xB6238B25, 0xB2E29692, 0x8AAD2B2F, 0x8E6C3698, 0x832F1041, 0x87EE0DF6, + 0x99A95DF3, 0x9D684044, 0x902B669D, 0x94EA7B2A, 0xE0B41DE7, 0xE4750050, + 0xE9362689, 0xEDF73B3E, 0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2, + 0xC6BCF05F, 0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34, + 0xDC3ABDED, 0xD8FBA05A, 0x690CE0EE, 0x6DCDFD59, 0x608EDB80, 0x644FC637, + 0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB, 0x4F040D56, 0x4BC510E1, + 0x46863638, 0x42472B8F, 0x5C007B8A, 0x58C1663D, 0x558240E4, 0x51435D53, + 0x251D3B9E, 0x21DC2629, 0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, + 0x3F9B762C, 0x3B5A6B9B, 0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF, + 0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623, 0xF12F560E, 0xF5EE4BB9, + 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65, 0xEBA91BBC, 0xEF68060B, + 0xD727BBB6, 0xD3E6A601, 0xDEA580D8, 0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, + 0xCDA1F604, 0xC960EBB3, 0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7, + 0xAE3AFBA2, 0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B, 0x9B3660C6, 0x9FF77D71, + 0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74, 0x857130C3, + 0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640, 0x4E8EE645, 0x4A4FFBF2, + 0x470CDD2B, 0x43CDC09C, 0x7B827D21, 0x7F436096, 0x7200464F, 0x76C15BF8, + 0x68860BFD, 0x6C47164A, 0x61043093, 0x65C52D24, 0x119B4BE9, 0x155A565E, + 0x18197087, 0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC, + 0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D, 0x2056CD3A, + 0x2D15EBE3, 0x29D4F654, 0xC5A92679, 0xC1683BCE, 0xCC2B1D17, 0xC8EA00A0, + 0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB, 0xDBEE767C, 0xE3A1CBC1, 0xE760D676, + 0xEA23F0AF, 0xEEE2ED18, 0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4, + 0x89B8FD09, 0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662, + 0x933EB0BB, 0x97FFAD0C, 0xAFB010B1, 0xAB710D06, 0xA6322BDF, 0xA2F33668, + 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4, +}; + +static u32 cspsa_crc32_calc(u32 crc_value, uint8_t *data, u32 data_size) +{ + u32 i; + u32 j; + + crc_value = ~crc_value; + for (j = 0; j < data_size; j++) { + i = ((u32) (crc_value >> 24) ^ *data++) & 0xFF; + crc_value = (crc_value << 8) ^ crc_table[i]; + } + crc_value = ~crc_value; + + return crc_value; +} + +/* -------------------------------------------------------------------------- */ + +static u32 calc_crc32_header(struct cspsa_header *cspsa_header) +{ + u32 crc_value = CSPSA_HEADER_MAGIC; + + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->magic, + sizeof(cspsa_header->magic)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->version, + sizeof(cspsa_header->version)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->index, + sizeof(cspsa_header->index)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->flags, + sizeof(cspsa_header->flags)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->data_size, + sizeof(cspsa_header->data_size)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->crc32_data, + sizeof(cspsa_header->crc32_data)); + /* - Skip crc32_header. */ + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->fast_parameter, + sizeof(cspsa_header->fast_parameter)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->reserved, + sizeof(cspsa_header->reserved)); + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->bbt_size, + sizeof(cspsa_header->bbt_size)); + if (cspsa_header->bbt_size > 0) + crc_value = + cspsa_crc32_calc( + crc_value, + (u8 *) &cspsa_header->bbt, + cspsa_header->bbt_size); + + return crc_value; +} + +/* -------------------------------------------------------------------------- */ + +static int find_cspsa_area(block_dev_desc_t *block_dev, u32 *start_block, + u32 *size_in_blocks) { + u32 offset; + u32 size; + u32 loadaddr; + + if (get_entry_info_toc(block_dev, CSPSA_PARTITION_NAME, &offset, + &size, &loadaddr)) { + printf("find_cspsa_area: get_entry_info_toc failed\n"); + return 1; + } + (void) loadaddr; + + *start_block = offset / block_dev->blksz; + *size_in_blocks = (size / block_dev->blksz); + if ((*size_in_blocks < 2) || (size % block_dev->blksz)) + return 1; + + return 0; +} + +/* -------------------------------------------------------------------------- */ + +int cspsa_fp_read(block_dev_desc_t *block_dev, u32 key, u32 *value) +{ + u32 start_block; + u32 size_in_blocks; + int result = 1; + struct cspsa_header *first_header = NULL; + struct cspsa_header *last_header = NULL; + u32 first_header_valid = 0; + u32 last_header_valid = 0; + u32 n; + + /* Check that the requested item is a valid fast parameter. */ + if (key >= CSPSA_NBR_OF_FAST_PARAMETERS) + goto error_exit; + + if (find_cspsa_area(block_dev, &start_block, &size_in_blocks)) + goto error_exit; + + first_header = (struct cspsa_header *) malloc(block_dev->blksz); + last_header = (struct cspsa_header *) malloc(block_dev->blksz); + + if ((first_header == NULL) || (last_header == NULL)) + goto error_exit; + + /* Read header at start of area and check header CRC32. */ + n = block_dev->block_read(block_dev->dev, + start_block, + 1, + first_header); + if (n != 1) + goto error_exit; + + /* Read header at end of area and check header CRC32. */ + n = block_dev->block_read(block_dev->dev, + start_block + size_in_blocks - 1, + 1, + last_header); + if (n != 1) + goto error_exit; + + first_header_valid = + (first_header->magic == CSPSA_HEADER_MAGIC) && + (first_header->version == CSPSA_HEADER_VERSION) && + (calc_crc32_header(first_header) == first_header->crc32_header); + last_header_valid = + (last_header->magic == CSPSA_HEADER_MAGIC) && + (last_header->version == CSPSA_HEADER_VERSION) && + (calc_crc32_header(last_header) == last_header->crc32_header); + + if (first_header_valid && last_header_valid) { + /* If both headers are valid use the header with lowest index */ + if (first_header->index < last_header->index) + *value = first_header->fast_parameter[key]; + else + *value = last_header->fast_parameter[key]; + } else if (first_header_valid) + *value = first_header->fast_parameter[key]; + else if (last_header_valid) + *value = last_header->fast_parameter[key]; + else + /* No valid header was found */ + goto error_exit; + + result = 0; + +error_exit: + + if (first_header) + free(first_header); + if (last_header) + free(last_header); + return result; +} + +/* -------------------------------------------------------------------------- */ diff --git a/board/st/u8500/cspsa_fp.h b/board/st/u8500/cspsa_fp.h new file mode 100644 index 000000000..13ddd1e69 --- /dev/null +++ b/board/st/u8500/cspsa_fp.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * Author: Martin Lundholm + * + * License terms: GNU General Public License (GPL), version 2. + * + * cspsa_fp.h + * + * API for CSPSA Fast Parameters + * + */ + +#ifndef __CSPSA_FP_H__ +#define __CSPSA_FP_H__ + +/* -------------------------------------------------------------------------- */ + +#include +#include + +/* -------------------------------------------------------------------------- */ + +#define CSPSA_NBR_OF_FAST_PARAMETERS 4 +#define CSPSA_PARTITION_NAME "CSPSA0" + +/* -------------------------------------------------------------------------- */ + +int cspsa_fp_read(block_dev_desc_t *block_dev, u32 key, u32 *value); + +#endif diff --git a/board/st/u8500/itp.c b/board/st/u8500/itp.c new file mode 100644 index 000000000..e7ef4fa7e --- /dev/null +++ b/board/st/u8500/itp.c @@ -0,0 +1,82 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * Author: Mikael Larsson for ST-Ericsson. + * + * License terms: GNU General Public License (GPL), version 2. + */ +#include +#include +#include +#include +#include +#include "itp.h" +#include "cspsa_fp.h" + + +static int itp_load_toc_entry(block_dev_desc_t *block_dev, + const char *partname, + u32 *loadaddress) +{ + u32 n; + u32 offset; + u32 size; + + debug("itp_load_toc_entry: Loading %s\n", partname); + + if (get_entry_info_toc(block_dev, partname, &offset, + &size, loadaddress)) { + printf("itp_load_toc_entry: get_entry_info_toc failed\n"); + return 1; + } + + size = (size / block_dev->blksz) + + ((size % block_dev->blksz) ? 1 : 0); + + n = block_dev->block_read(block_dev->dev, + offset / block_dev->blksz, + size, + loadaddress); + + if (n != size) { + printf("itp_load_toc_entry: Failed to load %s!\n", partname); + return 1; + } + + return 0; +} + +/* + * itp_load_itp - Loads itp depending on config. + * If itp is loaded ok it will be executed and u-boot execution will stop + */ + +int itp_load_itp(block_dev_desc_t *block_dev) +{ + u32 cspsa_key; + void (*loadaddress)(void) = NULL; + + debug("\nitp_load_itp\n"); + + if (cspsa_fp_read(block_dev, + ITP_CSPSA_KEY, + &cspsa_key)) { + printf("itp_load_itp: cspsa_fp_read failed\n"); + return 1; + } + + if (cspsa_key & ITP_LOAD_ITP) { + if (itp_load_toc_entry(block_dev, + ITP_TOC_ITP_NAME, + (u32 *)loadaddress)) { + printf("itp_load_itp: itp_load_partition failed\n"); + return 1; + } + loadaddress(); /* U-boot execution will end here*/ + + printf("itp_load_itp: itp execution failed\n"); + return 1; + } + + return 0; +} diff --git a/board/st/u8500/itp.h b/board/st/u8500/itp.h new file mode 100644 index 000000000..74dc6b65b --- /dev/null +++ b/board/st/u8500/itp.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) ST-Ericsson SA 2010 + * + * Author: Mikael Larsson for ST-Ericsson. + * + * License terms: GNU General Public License (GPL), version 2. + */ +#ifndef __ITP_H__ +#define __ITP_H__ + +#include + +/* These values are reserved and should not be removed or changed */ +#define ITP_LOAD_KERNEL 0x01 +#define ITP_LOAD_MODEM 0x02 +#define ITP_LOAD_ITP 0x04 + +#define ITP_TOC_ITP_NAME "ITP" + +#define ITP_CSPSA_KEY 0 + +int itp_load_itp(block_dev_desc_t *block_dev); + +#endif /* __ITP_H__ */ diff --git a/board/st/u8500/mmc_host.c b/board/st/u8500/mmc_host.c index df46eb02c..92ff6510e 100644 --- a/board/st/u8500/mmc_host.c +++ b/board/st/u8500/mmc_host.c @@ -21,6 +21,8 @@ #include #include #include "mmc_fifo.h" +#include "itp.h" + struct mmc_host { struct sdi_registers *base; @@ -608,6 +610,21 @@ int board_mmc_init(bd_t *bis) debugX(DBG_LVL_VERBOSE, "registered emmc interface number is:%d\n", dev->block_dev.dev); + + mmc_init(dev); + + /* + * In a perfect world itp_load_itp shouldn't be here but we want ITP + * to be loaded as quickly as possible and putting it here will get the + * shortest time to start loading ITP. Time saved by putting it here + * compared to later is somewhere between 0.3-0.7s. That is enough to be + * able to justify putting it here. + */ + +#ifdef CONFIG_ITP_LOAD + itp_load_itp(&dev->block_dev); +#endif + dev = alloc_mmc_struct(); if (!dev) return -1; -- cgit v1.2.3