diff options
| author | Angelo Durgehello <angelo.dureghello@timesys.com> | 2020-01-21 10:37:27 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:36 -0500 |
| commit | 1526bcce0f7285087621e16e6720636d01839da8 (patch) | |
| tree | 168d3316c1f9fec098444449d6d9b19304288e0d | |
| parent | 5cde44e12adc180575d5ee35ef251e0470a10598 (diff) | |
common: add blkcache init
On m68k, block_cache list is relocated, but next and prev list
pointers are not adjusted to the relocated struct list_head address,
so the first iteration over the block_cache list hangs.
This patch initializes the block_cache list after relocation.
Signed-off-by: Angelo Durgehello <angelo.dureghello@timesys.com>
Reviewed-by: Eric Nelson <eric@nelint.com>
| -rw-r--r-- | common/board_r.c | 3 | ||||
| -rw-r--r-- | drivers/block/blkcache.c | 9 | ||||
| -rw-r--r-- | include/blk.h | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index 8a0c1114e7..4f56c19fcc 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -865,6 +865,9 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_PRAM) initr_mem, #endif +#ifdef CONFIG_BLOCK_CACHE + blkcache_init, +#endif run_main_loop, }; diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c index 1fa64989d3..f603aa129d 100644 --- a/drivers/block/blkcache.c +++ b/drivers/block/blkcache.c @@ -21,13 +21,20 @@ struct block_cache_node { char *cache; }; -static LIST_HEAD(block_cache); +static struct list_head block_cache; static struct block_cache_stats _stats = { .max_blocks_per_entry = 8, .max_entries = 32 }; +int blkcache_init(void) +{ + INIT_LIST_HEAD(&block_cache); + + return 0; +} + static struct block_cache_node *cache_find(int iftype, int devnum, lbaint_t start, lbaint_t blkcnt, unsigned long blksz) diff --git a/include/blk.h b/include/blk.h index d0c033aece..65db69f5d9 100644 --- a/include/blk.h +++ b/include/blk.h @@ -113,6 +113,12 @@ struct blk_desc { (PAD_SIZE(size, blk_desc->blksz)) #if CONFIG_IS_ENABLED(BLOCK_CACHE) + +/** + * blkcache_init() - initialize the block cache list pointers + */ +int blkcache_init(void); + /** * blkcache_read() - attempt to read a set of blocks from cache * |