From eb0eeb21be9886f509d51340ca886b450e2ce95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 18 Aug 2019 08:14:11 +0300 Subject: emulation/qemu-x86: Rename memory.c to memmap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I311423cb565485236f89bd6043155aaf6296a031 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34974 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/mainboard/emulation/qemu-i440fx/Makefile.inc | 12 +++-- src/mainboard/emulation/qemu-i440fx/memmap.c | 69 ++++++++++++++++++++++++ src/mainboard/emulation/qemu-i440fx/memory.c | 69 ------------------------ src/mainboard/emulation/qemu-q35/Makefile.inc | 15 +++--- 4 files changed, 84 insertions(+), 81 deletions(-) create mode 100644 src/mainboard/emulation/qemu-i440fx/memmap.c delete mode 100644 src/mainboard/emulation/qemu-i440fx/memory.c diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc index e3ca3002ff..cac74ee435 100644 --- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc +++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc @@ -1,8 +1,10 @@ -ramstage-y += northbridge.c -ramstage-y += fw_cfg.c romstage-y += fw_cfg.c -romstage-y += memory.c -ramstage-y += memory.c -postcar-y += memory.c +romstage-y += memmap.c + postcar-y += fw_cfg.c +postcar-y += memmap.c postcar-y += exit_car.S + +ramstage-y += fw_cfg.c +ramstage-y += memmap.c +ramstage-y += northbridge.c diff --git a/src/mainboard/emulation/qemu-i440fx/memmap.c b/src/mainboard/emulation/qemu-i440fx/memmap.c new file mode 100644 index 0000000000..8209379bef --- /dev/null +++ b/src/mainboard/emulation/qemu-i440fx/memmap.c @@ -0,0 +1,69 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2004 Stefan Reinauer + * + * 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. + */ + +#include +#include +#include +#include "memory.h" +#include "fw_cfg.h" + +#define CMOS_ADDR_PORT 0x70 +#define CMOS_DATA_PORT 0x71 + +#define HIGH_RAM_ADDR 0x35 +#define LOW_RAM_ADDR 0x34 + +#define HIGH_HIGHRAM_ADDR 0x5d +#define MID_HIGHRAM_ADDR 0x5c +#define LOW_HIGHRAM_ADDR 0x5b + +unsigned long qemu_get_high_memory_size(void) +{ + unsigned long high; + outb(HIGH_HIGHRAM_ADDR, CMOS_ADDR_PORT); + high = ((unsigned long) inb(CMOS_DATA_PORT)) << 22; + outb(MID_HIGHRAM_ADDR, CMOS_ADDR_PORT); + high |= ((unsigned long) inb(CMOS_DATA_PORT)) << 14; + outb(LOW_HIGHRAM_ADDR, CMOS_ADDR_PORT); + high |= ((unsigned long) inb(CMOS_DATA_PORT)) << 6; + return high; +} + +unsigned long qemu_get_memory_size(void) +{ + unsigned long tomk; + outb(HIGH_RAM_ADDR, CMOS_ADDR_PORT); + tomk = ((unsigned long) inb(CMOS_DATA_PORT)) << 14; + outb(LOW_RAM_ADDR, CMOS_ADDR_PORT); + tomk |= ((unsigned long) inb(CMOS_DATA_PORT)) << 6; + tomk += 16 * 1024; + return tomk; +} + +void *cbmem_top(void) +{ + uintptr_t top = 0; + + top = fw_cfg_tolud(); + if (!top) + top = (uintptr_t)qemu_get_memory_size() * 1024; + + return (void *)top; +} + +/* Nothing to do, MTRRs are no-op on QEMU. */ +void fill_postcar_frame(struct postcar_frame *pcf) +{ +} diff --git a/src/mainboard/emulation/qemu-i440fx/memory.c b/src/mainboard/emulation/qemu-i440fx/memory.c deleted file mode 100644 index 8209379bef..0000000000 --- a/src/mainboard/emulation/qemu-i440fx/memory.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2004 Stefan Reinauer - * - * 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. - */ - -#include -#include -#include -#include "memory.h" -#include "fw_cfg.h" - -#define CMOS_ADDR_PORT 0x70 -#define CMOS_DATA_PORT 0x71 - -#define HIGH_RAM_ADDR 0x35 -#define LOW_RAM_ADDR 0x34 - -#define HIGH_HIGHRAM_ADDR 0x5d -#define MID_HIGHRAM_ADDR 0x5c -#define LOW_HIGHRAM_ADDR 0x5b - -unsigned long qemu_get_high_memory_size(void) -{ - unsigned long high; - outb(HIGH_HIGHRAM_ADDR, CMOS_ADDR_PORT); - high = ((unsigned long) inb(CMOS_DATA_PORT)) << 22; - outb(MID_HIGHRAM_ADDR, CMOS_ADDR_PORT); - high |= ((unsigned long) inb(CMOS_DATA_PORT)) << 14; - outb(LOW_HIGHRAM_ADDR, CMOS_ADDR_PORT); - high |= ((unsigned long) inb(CMOS_DATA_PORT)) << 6; - return high; -} - -unsigned long qemu_get_memory_size(void) -{ - unsigned long tomk; - outb(HIGH_RAM_ADDR, CMOS_ADDR_PORT); - tomk = ((unsigned long) inb(CMOS_DATA_PORT)) << 14; - outb(LOW_RAM_ADDR, CMOS_ADDR_PORT); - tomk |= ((unsigned long) inb(CMOS_DATA_PORT)) << 6; - tomk += 16 * 1024; - return tomk; -} - -void *cbmem_top(void) -{ - uintptr_t top = 0; - - top = fw_cfg_tolud(); - if (!top) - top = (uintptr_t)qemu_get_memory_size() * 1024; - - return (void *)top; -} - -/* Nothing to do, MTRRs are no-op on QEMU. */ -void fill_postcar_frame(struct postcar_frame *pcf) -{ -} diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc index b18d2e4f97..133a213cc6 100644 --- a/src/mainboard/emulation/qemu-q35/Makefile.inc +++ b/src/mainboard/emulation/qemu-q35/Makefile.inc @@ -1,11 +1,12 @@ -ramstage-y += ../qemu-i440fx/northbridge.c -ramstage-y += ../qemu-i440fx/memory.c -ramstage-y += ../qemu-i440fx/fw_cfg.c -romstage-y += ../qemu-i440fx/memory.c +bootblock-y += bootblock.c + romstage-y += ../qemu-i440fx/fw_cfg.c +romstage-y += ../qemu-i440fx/memmap.c -postcar-y += ../qemu-i440fx/memory.c -postcar-y += ../qemu-i440fx/exit_car.S postcar-y += ../qemu-i440fx/fw_cfg.c +postcar-y += ../qemu-i440fx/memmap.c +postcar-y += ../qemu-i440fx/exit_car.S -bootblock-y += bootblock.c +ramstage-y += ../qemu-i440fx/fw_cfg.c +ramstage-y += ../qemu-i440fx/memmap.c +ramstage-y += ../qemu-i440fx/northbridge.c -- cgit v1.2.3