We had mixed virtual and physical pointers in struct sysinfo_t. Some
being virtual by accident which led to problems when we tried to
reinitialize lib_sysinfo after relocating FILO (to get intentionally
virtual pointers valid again). I guess this didn't cause much trouble
before, as lib_get_sysinfo() was always called with physical addresses
being equal to their virtual counterparts.
For FILO, two possibilities seem practical: Either, have all pointers in
struct sysinfo_t physical, so relocation doesn't hurt. Or, have all
pointers virtual and call lib_get_sysinfo() again after relocation.
This patch goes the latter way, changing the following pointers for
situations where virtual pointers differ from physical:
  .extra_version
  .build
  .compile_time
  .compile_by
  .compile_host
  .compile_domain
  .compiler
  .linker
  .assembler
  .cb_version
  .vdat_addr
  .tstamp_table
  .cbmem_cons
  .mrc_cache
We could also just correct the accidentally virtual pointers. But, IMO,
this would lower the risk of future confusion.
Note 1: Looks like .version gets never set.
Note 2: .option_table and .framebuffer were virtual pointers but treated
        like physical ones. Even in FILO, this led to no problems as
        they were set before relocation.
Change-Id: I4c456f56f049d9f8fc40e62520b1d8ec3dad48f8
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: http://review.coreboot.org/1855
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
		
	
		
			
				
	
	
		
			269 lines
		
	
	
		
			8.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			269 lines
		
	
	
		
			8.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * This file is part of the libpayload project.
 | 
						|
 *
 | 
						|
 * Copyright (C) 2008 Advanced Micro Devices, Inc.
 | 
						|
 * Copyright (C) 2010 coresystems GmbH
 | 
						|
 *
 | 
						|
 * Redistribution and use in source and binary forms, with or without
 | 
						|
 * modification, are permitted provided that the following conditions
 | 
						|
 * are met:
 | 
						|
 * 1. Redistributions of source code must retain the above copyright
 | 
						|
 *    notice, this list of conditions and the following disclaimer.
 | 
						|
 * 2. Redistributions in binary form must reproduce the above copyright
 | 
						|
 *    notice, this list of conditions and the following disclaimer in the
 | 
						|
 *    documentation and/or other materials provided with the distribution.
 | 
						|
 * 3. The name of the author may not be used to endorse or promote products
 | 
						|
 *    derived from this software without specific prior written permission.
 | 
						|
 *
 | 
						|
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 | 
						|
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
						|
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 | 
						|
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 | 
						|
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | 
						|
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 | 
						|
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | 
						|
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 | 
						|
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 | 
						|
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 | 
						|
 * SUCH DAMAGE.
 | 
						|
 */
 | 
						|
 | 
						|
#include <libpayload.h>
 | 
						|
#include <coreboot_tables.h>
 | 
						|
#include <pci.h>
 | 
						|
#include <video_console.h>
 | 
						|
#include <arch/msr.h>
 | 
						|
#include "font8x16.h"
 | 
						|
 | 
						|
struct video_console coreboot_video_console;
 | 
						|
 | 
						|
static unsigned int cursor_x = 0, cursor_y = 0, cursor_en = 0;
 | 
						|
 | 
						|
/* color definitions for the 16 standard colors */
 | 
						|
 | 
						|
#define VGA_COLOR_DEFAULT 7
 | 
						|
static const u32 vga_colors[] = {
 | 
						|
	// BLUE      | GREEN       | RED
 | 
						|
	(0x00 << 16) | (0x00 << 8) | 0x00,
 | 
						|
	(0xAA << 16) | (0x00 << 8) | 0x00,
 | 
						|
	(0x00 << 16) | (0xAA << 8) | 0x00,
 | 
						|
	(0xAA << 16) | (0x55 << 8) | 0x00,
 | 
						|
	(0x00 << 16) | (0x00 << 8) | 0xAA,
 | 
						|
	(0xAA << 16) | (0x00 << 8) | 0xAA,
 | 
						|
	(0x00 << 16) | (0xAA << 8) | 0xAA,
 | 
						|
	(0xAA << 16) | (0xAA << 8) | 0xAA,
 | 
						|
	(0x55 << 16) | (0x55 << 8) | 0x55,
 | 
						|
	(0xFF << 16) | (0x55 << 8) | 0x55,
 | 
						|
	(0x55 << 16) | (0xFF << 8) | 0x55,
 | 
						|
	(0xFF << 16) | (0xFF << 8) | 0x55,
 | 
						|
	(0x55 << 16) | (0x55 << 8) | 0xFF,
 | 
						|
	(0xFF << 16) | (0x55 << 8) | 0xFF,
 | 
						|
	(0x55 << 16) | (0xFF << 8) | 0xFF,
 | 
						|
	(0xFF << 16) | (0xFF << 8) | 0xFF,
 | 
						|
};
 | 
						|
 | 
						|
/* Addresses for the various components */
 | 
						|
static struct cb_framebuffer *fbinfo;
 | 
						|
static unsigned long fbaddr;
 | 
						|
static unsigned long chars;
 | 
						|
 | 
						|
#define FI (fbinfo)
 | 
						|
#define FB ((unsigned char *) phys_to_virt(fbaddr))
 | 
						|
#define CHARS ((unsigned short *) phys_to_virt(chars))
 | 
						|
 | 
						|
static void corebootfb_scroll_up(void)
 | 
						|
{
 | 
						|
	unsigned char *dst = FB;
 | 
						|
	unsigned char *src = FB + (FI->bytes_per_line * FONT_HEIGHT);
 | 
						|
	int y;
 | 
						|
 | 
						|
	/* Scroll all lines up */
 | 
						|
	for(y = 0; y < FI->y_resolution - FONT_HEIGHT; y++) {
 | 
						|
		memcpy(dst, src, FI->x_resolution * (FI->bits_per_pixel >> 3));
 | 
						|
 | 
						|
		dst += FI->bytes_per_line;
 | 
						|
		src += FI->bytes_per_line;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Erase last line */
 | 
						|
	dst = FB + (FI->y_resolution - FONT_HEIGHT) * FI->bytes_per_line;
 | 
						|
 | 
						|
	for(; y < FI->y_resolution; y++) {
 | 
						|
		memset(dst, 0, FI->x_resolution * (FI->bits_per_pixel >> 3));
 | 
						|
		dst += FI->bytes_per_line;
 | 
						|
	}
 | 
						|
 | 
						|
	/* And update the char buffer */
 | 
						|
	dst = (unsigned char *) CHARS;
 | 
						|
	src = (unsigned char *) (CHARS + coreboot_video_console.columns);
 | 
						|
	memcpy(dst, src, coreboot_video_console.columns *
 | 
						|
			(coreboot_video_console.rows - 1) * 2);
 | 
						|
	int column;
 | 
						|
	for (column = 0; column < coreboot_video_console.columns; column++)
 | 
						|
		CHARS[(coreboot_video_console.rows - 1) * coreboot_video_console.columns + column] = (VGA_COLOR_DEFAULT << 8);
 | 
						|
 | 
						|
	cursor_y--;
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_clear(void)
 | 
						|
{
 | 
						|
	int row, column;
 | 
						|
	unsigned char *ptr = FB;
 | 
						|
 | 
						|
	/* Clear the screen */
 | 
						|
	for(row = 0; row < FI->y_resolution; row++) {
 | 
						|
		memset(ptr, 0, FI->x_resolution * (FI->bits_per_pixel >> 3));
 | 
						|
		ptr += FI->bytes_per_line;
 | 
						|
	}
 | 
						|
 | 
						|
	/* And update the char buffer */
 | 
						|
	for(row = 0; row < coreboot_video_console.rows; row++)
 | 
						|
		for (column = 0; column < coreboot_video_console.columns; column++)
 | 
						|
			CHARS[row * coreboot_video_console.columns + column] = (VGA_COLOR_DEFAULT << 8);
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_putchar(u8 row, u8 col, unsigned int ch)
 | 
						|
{
 | 
						|
	unsigned char *dst;
 | 
						|
	unsigned char *glyph = font8x16 + ((ch & 0xFF) * FONT_HEIGHT);
 | 
						|
 | 
						|
	unsigned char bg = (ch >> 12) & 0xF;
 | 
						|
	unsigned char fg = (ch >> 8) & 0xF;
 | 
						|
	u32 fgval = 0, bgval = 0;
 | 
						|
	u16 *dst16;
 | 
						|
	u32 *dst32;
 | 
						|
 | 
						|
	int x, y;
 | 
						|
 | 
						|
	if (FI->bits_per_pixel > 8) {
 | 
						|
		bgval = ((((vga_colors[bg] >> 0) & 0xff) >> (8 - FI->blue_mask_size)) << FI->blue_mask_pos) |
 | 
						|
			((((vga_colors[bg] >> 8) & 0xff) >> (8 - FI->green_mask_size)) << FI->green_mask_pos) |
 | 
						|
			((((vga_colors[bg] >> 16) & 0xff) >> (8 - FI->red_mask_size)) << FI->red_mask_pos);
 | 
						|
		fgval = ((((vga_colors[fg] >> 0) & 0xff) >> (8 - FI->blue_mask_size)) << FI->blue_mask_pos) |
 | 
						|
			((((vga_colors[fg] >> 8) & 0xff) >> (8 - FI->green_mask_size)) << FI->green_mask_pos) |
 | 
						|
			((((vga_colors[fg] >> 16) & 0xff) >> (8 - FI->red_mask_size)) << FI->red_mask_pos);
 | 
						|
	}
 | 
						|
 | 
						|
 | 
						|
	dst = FB + ((row * FONT_HEIGHT) * FI->bytes_per_line);
 | 
						|
	dst += (col * FONT_WIDTH * (FI->bits_per_pixel >> 3));
 | 
						|
 | 
						|
	for(y = 0; y < FONT_HEIGHT; y++) {
 | 
						|
		for(x = FONT_WIDTH - 1; x >= 0; x--) {
 | 
						|
 | 
						|
			switch (FI->bits_per_pixel) {
 | 
						|
			case 8: /* Indexed */
 | 
						|
				dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3)] = (*glyph & (1 << x)) ?  fg : bg;
 | 
						|
				break;
 | 
						|
			case 16: /* 16 bpp */
 | 
						|
				dst16 = (u16 *)(dst + (FONT_WIDTH - x) * (FI->bits_per_pixel >> 3));
 | 
						|
				*dst16 = (*glyph & (1 << x)) ? fgval : bgval;
 | 
						|
				break;
 | 
						|
			case 24: /* 24 bpp */
 | 
						|
				if (*glyph & (1 << x)) {
 | 
						|
					dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 0] = fgval & 0xff;
 | 
						|
					dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 1] = (fgval >> 8) & 0xff;
 | 
						|
					dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 2] = (fgval >> 16) & 0xff;
 | 
						|
				} else {
 | 
						|
					dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 0] = bgval & 0xff;
 | 
						|
					dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 1] = (bgval >> 8) & 0xff;
 | 
						|
					dst[(FONT_WIDTH - x) * (FI->bits_per_pixel >> 3) + 2] = (bgval >> 16) & 0xff;
 | 
						|
				}
 | 
						|
				break;
 | 
						|
			case 32: /* 32 bpp */
 | 
						|
				dst32 = (u32 *)(dst + (FONT_WIDTH - x) * (FI->bits_per_pixel >> 3));
 | 
						|
				*dst32 = (*glyph & (1 << x)) ? fgval : bgval;
 | 
						|
				break;
 | 
						|
			}
 | 
						|
		}
 | 
						|
 | 
						|
		dst += FI->bytes_per_line;
 | 
						|
		glyph++;
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_putc(u8 row, u8 col, unsigned int ch)
 | 
						|
{
 | 
						|
	CHARS[row * coreboot_video_console.columns + col] = ch;
 | 
						|
	corebootfb_putchar(row, col, ch);
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_update_cursor(void)
 | 
						|
{
 | 
						|
	int ch, paint;
 | 
						|
	if(cursor_en) {
 | 
						|
		ch = CHARS[cursor_y * coreboot_video_console.columns + cursor_x];
 | 
						|
		paint = (ch & 0xff) | ((ch<<4) & 0xf000) | ((ch >> 4) & 0x0f00);
 | 
						|
	} else {
 | 
						|
		paint = CHARS[cursor_y * coreboot_video_console.columns + cursor_x];
 | 
						|
	}
 | 
						|
 | 
						|
	if (cursor_y >= 0 && cursor_y < coreboot_video_console.rows)
 | 
						|
		corebootfb_putchar(cursor_y, cursor_x, paint);
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_enable_cursor(int state)
 | 
						|
{
 | 
						|
	cursor_en = state;
 | 
						|
	corebootfb_update_cursor();
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_get_cursor(unsigned int *x, unsigned int *y, unsigned int *en)
 | 
						|
{
 | 
						|
	*x = cursor_x;
 | 
						|
	*y = cursor_y;
 | 
						|
	*en = cursor_en;
 | 
						|
}
 | 
						|
 | 
						|
static void corebootfb_set_cursor(unsigned int x, unsigned int y)
 | 
						|
{
 | 
						|
	int cursor_remember = cursor_en;
 | 
						|
	if (cursor_remember)
 | 
						|
		corebootfb_enable_cursor(0);
 | 
						|
 | 
						|
	cursor_x = x;
 | 
						|
	cursor_y = y;
 | 
						|
 | 
						|
	if (cursor_remember)
 | 
						|
		corebootfb_enable_cursor(1);
 | 
						|
}
 | 
						|
 | 
						|
static int corebootfb_init(void)
 | 
						|
{
 | 
						|
	if (lib_sysinfo.framebuffer == NULL)
 | 
						|
		return -1;
 | 
						|
 | 
						|
	fbinfo = lib_sysinfo.framebuffer;
 | 
						|
 | 
						|
	fbaddr = FI->physical_address;
 | 
						|
 | 
						|
	coreboot_video_console.columns = FI->x_resolution / FONT_WIDTH;
 | 
						|
	coreboot_video_console.rows = FI->y_resolution / FONT_HEIGHT;
 | 
						|
 | 
						|
	chars = (unsigned long) malloc(coreboot_video_console.rows *
 | 
						|
			coreboot_video_console.columns * 2);
 | 
						|
 | 
						|
	// clear boot splash screen if there is one.
 | 
						|
	corebootfb_clear();
 | 
						|
 | 
						|
	corebootfb_set_cursor(0, 0);
 | 
						|
	corebootfb_enable_cursor(1);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
struct video_console coreboot_video_console = {
 | 
						|
	.init = corebootfb_init,
 | 
						|
	.putc = corebootfb_putc,
 | 
						|
	.clear = corebootfb_clear,
 | 
						|
	.scroll_up = corebootfb_scroll_up,
 | 
						|
 | 
						|
	.get_cursor = corebootfb_get_cursor,
 | 
						|
	.set_cursor = corebootfb_set_cursor,
 | 
						|
	.enable_cursor = corebootfb_enable_cursor,
 | 
						|
 | 
						|
	.columns = 80,
 | 
						|
	.rows    = 25
 | 
						|
};
 | 
						|
 |