dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 09:42:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

blkcache: Extend blkcache_init to cover CONFIG_NEEDS_MANUAL_RELOC

Browse Source 
Extend manual relocation of block_cache list pointers to all platforms that
enable CONFIG_NEEDS_MANUAL_RELOC. Remove m68k-specific checks and provide a
single implementation that adds gd->reloc_off to the pre-relocation
pointers.

Acked-by: Angelo Dureghello <angelo.dureghello@timesys.com>
Tested-by: Angelo Dureghello <angelo.dureghello@timesys.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Eric Nelson <eric@nelint.com>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
[trini: Add guard around DECLARE_GLOBAL_DATA_PTR to avoid size growth]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Ovidiu Panait
2020-07-24 14:12:24 +03:00
committed by Tom Rini
parent bf2fb81ad3
commit 365af27f0d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/board_r.c
View File

@@ -848,7 +848,7 @@ static init_fnc_t init_sequence_r[] = {
#if defined(CONFIG_PRAM) #if defined(CONFIG_PRAM)
initr_mem, initr_mem,
#endif #endif
#if defined(CONFIG_M68K) && defined(CONFIG_BLOCK_CACHE) #if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_BLOCK_CACHE)
blkcache_init, blkcache_init,
#endif #endif
run_main_loop, run_main_loop,

15
drivers/block/blkcache.c
View File

@@ -12,6 +12,10 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/list.h> #include <linux/list.h>
#ifdef CONFIG_NEEDS_MANUAL_RELOC
DECLARE_GLOBAL_DATA_PTR;
#endif
struct block_cache_node { struct block_cache_node {
struct list_head lh; struct list_head lh;
int iftype; int iftype;
@@ -22,21 +26,20 @@ struct block_cache_node {
char *cache; char *cache;
}; };
#ifndef CONFIG_M68K
static LIST_HEAD(block_cache); static LIST_HEAD(block_cache);
#else
static struct list_head block_cache;
#endif
static struct block_cache_stats _stats = { static struct block_cache_stats _stats = {
.max_blocks_per_entry = 8, .max_blocks_per_entry = 8,
.max_entries = 32 .max_entries = 32
}; };
#ifdef CONFIG_M68K #ifdef CONFIG_NEEDS_MANUAL_RELOC
int blkcache_init(void) int blkcache_init(void)
{ {
INIT_LIST_HEAD(&block_cache); struct list_head *head = &block_cache;
head->next = (uintptr_t)head->next + gd->reloc_off;
head->prev = (uintptr_t)head->prev + gd->reloc_off;
return 0; return 0;
} }