Exynos 5250: Enable dynamic CBMEM

...  In order to do this, the graphics memory has to move into
the resource allocator and out of CBMEM.

Change-Id: I7396da4a7068404b0d2e4d308becab4dd6ea59bb
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/59326
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/4390
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Stefan Reinauer 2013-06-19 15:54:19 -07:00 committed by Patrick Georgi
parent d9a98581ce
commit 662874446a
7 changed files with 63 additions and 22 deletions

View File

@ -3,6 +3,7 @@ config CPU_SAMSUNG_EXYNOS5250
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select EARLY_CONSOLE
select DYNAMIC_CBMEM
bool
default n

View File

@ -33,6 +33,7 @@ romstage-y += gpio.c
romstage-y += timer.c
romstage-y += i2c.c
#romstage-y += wdt.c
romstage-y += cbmem.c
ramstage-y += spi.c
ramstage-y += clock.c
@ -50,6 +51,7 @@ ramstage-y += i2c.c
ramstage-y += dp-reg.c
ramstage-y += fb.c
ramstage-y += usb.c
ramstage-y += cbmem.c
exynos5250_add_bl1: $(obj)/coreboot.pre
printf " DD Adding Samsung Exynos5250 BL1\n"

View File

@ -0,0 +1,28 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2013 Google Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stddef.h>
#include <cbmem.h>
#include "cpu.h"
void *cbmem_top(void)
{
return (void *)(get_fb_base_kb() * KiB);
}

View File

@ -32,9 +32,6 @@
#include "usb.h"
#include "chip.h"
#define RAM_BASE_KB (CONFIG_SYS_SDRAM_BASE >> 10)
#define RAM_SIZE_KB (CONFIG_DRAM_SIZE_MB << 10UL)
static unsigned int cpu_id;
static unsigned int cpu_rev;
@ -62,7 +59,8 @@ static void set_cpu_id(void)
* involving lots of machine and callbacks, is hard to debug and
* verify.
*/
static void exynos_displayport_init(device_t dev)
static void exynos_displayport_init(device_t dev, u32 lcdbase,
unsigned long fb_size)
{
int ret;
struct cpu_samsung_exynos5250_config *conf = dev->chip_info;
@ -70,9 +68,6 @@ static void exynos_displayport_init(device_t dev)
* this code to a pre-ram stage, it will be much easier.
*/
struct exynos5_fimd_panel panel;
unsigned long int fb_size;
u32 lcdbase;
memset(&panel, 0, sizeof(panel));
panel.is_dp = 1; /* Display I/F is eDP */
@ -93,11 +88,7 @@ static void exynos_displayport_init(device_t dev)
panel.xres = conf->xres;
panel.yres = conf->yres;
/* The size is a magic number from hardware. */
fb_size = conf->xres * conf->yres * (conf->bpp / 8);
lcdbase = (uintptr_t)cbmem_add(CBMEM_ID_CONSOLE, fb_size);
printk(BIOS_SPEW, "LCD framebuffer base is %p\n", (void *)(lcdbase));
printk(BIOS_SPEW, "LCD framebuffer @%p\n", (void *)(lcdbase));
memset((void *)lcdbase, 0, fb_size); /* clear the framebuffer */
/*
@ -111,23 +102,26 @@ static void exynos_displayport_init(device_t dev)
*/
uint32_t lower = ALIGN_DOWN(lcdbase, MiB);
uint32_t upper = ALIGN_UP(lcdbase + fb_size, MiB);
dcache_clean_invalidate_by_mva(lower, upper - lower);
mmu_config_range(lower/MiB, (upper - lower)/MiB, DCACHE_OFF);
mmio_resource(dev, 1, lcdbase/KiB, (fb_size + KiB - 1)/KiB);
printk(BIOS_DEBUG,
"Initializing Exynos VGA, base %p\n", (void *)lcdbase);
dcache_clean_invalidate_by_mva(lower, upper - lower);
mmu_config_range(lower / MiB, (upper - lower) / MiB, DCACHE_OFF);
printk(BIOS_DEBUG, "Initializing Exynos LCD.\n");
ret = lcd_ctrl_init(fb_size, &panel, (void *)lcdbase);
}
static void cpu_enable(device_t dev)
{
exynos_displayport_init(dev);
unsigned long fb_size = FB_SIZE_KB * KiB;
u32 lcdbase = get_fb_base_kb() * KiB;
ram_resource(dev, 0, RAM_BASE_KB, RAM_SIZE_KB);
ram_resource(dev, 0, RAM_BASE_KB, RAM_SIZE_KB - FB_SIZE_KB);
mmio_resource(dev, 1, lcdbase / KiB, (fb_size + KiB - 1) / KiB);
exynos_displayport_init(dev, lcdbase, fb_size);
set_cpu_id();
}
static void cpu_init(device_t dev)

View File

@ -125,4 +125,14 @@ void exynos5250_config_l2_cache(void);
extern struct tmu_info exynos5250_tmu_info;
/* TODO clean up defines. */
#define FB_SIZE_KB 4096
#define RAM_BASE_KB (CONFIG_SYS_SDRAM_BASE >> 10)
#define RAM_SIZE_KB (CONFIG_DRAM_SIZE_MB << 10UL)
static inline u32 get_fb_base_kb(void)
{
return RAM_BASE_KB + RAM_SIZE_KB - FB_SIZE_KB;
}
#endif /* _EXYNOS5250_CPU_H */

View File

@ -213,7 +213,7 @@ static void mainboard_init(device_t dev)
.base = (struct exynos5_dp *)EXYNOS5250_DP1_BASE,
.video_info = &dp_video_info,
};
void *fb_addr;
void *fb_addr = (void *)(get_fb_base_kb() * KiB);
gpio_init();
@ -228,7 +228,6 @@ static void mainboard_init(device_t dev)
/* Disable USB3.0 PLL to save 250mW of power */
disable_usb30_pll();
fb_addr = cbmem_find(CBMEM_ID_CONSOLE);
set_vbe_mode_info_valid(&edid, (uintptr_t)fb_addr);
lcd_vdd();
@ -265,6 +264,7 @@ static void mainboard_init(device_t dev)
// gpio_info();
}
#if !CONFIG_DYNAMIC_CBMEM
void get_cbmem_table(uint64_t *base, uint64_t *size)
{
*size = CONFIG_COREBOOT_TABLES_SIZE;
@ -272,13 +272,16 @@ void get_cbmem_table(uint64_t *base, uint64_t *size)
((unsigned)CONFIG_DRAM_SIZE_MB << 20ULL) -
CONFIG_COREBOOT_TABLES_SIZE;
}
#endif
static void mainboard_enable(device_t dev)
{
dev->ops->init = &mainboard_init;
#if !CONFIG_DYNAMIC_CBMEM
/* set up coreboot tables */
cbmem_initialize();
#endif
/* set up dcache and MMU */
/* FIXME: this should happen via resource allocator */

View File

@ -21,6 +21,7 @@
#include <armv7.h>
#include <cbfs.h>
#include <cbmem.h>
#include <arch/cache.h>
#include <cpu/samsung/exynos5250/i2c.h>
@ -189,6 +190,8 @@ void main(void)
/* Set SPI (primary CBFS media) clock to 50MHz. */
clock_set_rate(PERIPH_ID_SPI1, 50000000);
cbmem_initialize_empty();
entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/coreboot_ram");
stage_exit(entry);
}