2010-06-29 06:50:43 +04:00
|
|
|
/*
|
2020-04-26 13:16:37 +03:00
|
|
|
* QEMU fuloong 2e mini pc support
|
2010-06-29 06:50:43 +04:00
|
|
|
*
|
|
|
|
* Copyright (c) 2008 yajin (yajin@vm-kernel.org)
|
|
|
|
* Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn)
|
|
|
|
* Copyright (c) 2010 Huacai Chen (zltjiangshi@gmail.com)
|
|
|
|
* This code is licensed under the GNU GPL v2.
|
2012-01-13 20:44:23 +04:00
|
|
|
*
|
|
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
2010-06-29 06:50:43 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2020-04-26 13:16:37 +03:00
|
|
|
* Fuloong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 800MHz)
|
|
|
|
* https://www.linux-mips.org/wiki/Fuloong_2E
|
2010-06-29 06:50:43 +04:00
|
|
|
*
|
2020-12-24 06:17:44 +03:00
|
|
|
* Loongson 2e manuals:
|
|
|
|
* https://github.com/loongson-community/docs/tree/master/2E
|
2010-06-29 06:50:43 +04:00
|
|
|
*/
|
|
|
|
|
2016-01-18 20:35:00 +03:00
|
|
|
#include "qemu/osdep.h"
|
2019-05-23 17:35:08 +03:00
|
|
|
#include "qemu-common.h"
|
2020-10-28 14:36:57 +03:00
|
|
|
#include "qemu/datadir.h"
|
2018-06-25 15:42:22 +03:00
|
|
|
#include "qemu/units.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2019-02-21 15:29:15 +03:00
|
|
|
#include "cpu.h"
|
2020-10-12 12:57:57 +03:00
|
|
|
#include "hw/clock.h"
|
2012-10-24 10:43:34 +04:00
|
|
|
#include "net/net.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/boards.h"
|
2018-11-14 03:31:27 +03:00
|
|
|
#include "hw/i2c/smbus_eeprom.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/block/flash.h"
|
|
|
|
#include "hw/mips/mips.h"
|
2020-12-15 09:45:05 +03:00
|
|
|
#include "hw/mips/bootloader.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/mips/cpudevs.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/pci/pci.h"
|
|
|
|
#include "hw/loader.h"
|
2020-03-13 11:24:39 +03:00
|
|
|
#include "hw/ide/pci.h"
|
2021-01-09 23:16:36 +03:00
|
|
|
#include "hw/qdev-properties.h"
|
2010-06-29 06:50:43 +04:00
|
|
|
#include "elf.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/isa/vt82c686.h"
|
2013-07-29 18:05:30 +04:00
|
|
|
#include "sysemu/qtest.h"
|
2019-08-12 08:23:38 +03:00
|
|
|
#include "sysemu/reset.h"
|
2021-01-09 23:16:36 +03:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-08-03 18:03:18 +04:00
|
|
|
#include "qemu/error-report.h"
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2020-12-15 09:41:55 +03:00
|
|
|
#define ENVP_PADDR 0x2000
|
|
|
|
#define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
|
2019-08-19 15:07:52 +03:00
|
|
|
#define ENVP_NB_ENTRIES 16
|
|
|
|
#define ENVP_ENTRY_SIZE 256
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2020-04-26 13:16:37 +03:00
|
|
|
/* Fuloong 2e has a 512k flash: Winbond W39L040AP70Z */
|
2019-08-19 15:07:52 +03:00
|
|
|
#define BIOS_SIZE (512 * KiB)
|
|
|
|
#define MAX_IDE_BUS 2
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* PMON is not part of qemu and released with BSD license, anyone
|
|
|
|
* who want to build a pmon binary please first git-clone the source
|
|
|
|
* from the git repository at:
|
2020-12-24 06:17:44 +03:00
|
|
|
* https://github.com/loongson-community/pmon
|
2010-06-29 06:50:43 +04:00
|
|
|
*/
|
2020-04-26 13:16:37 +03:00
|
|
|
#define FULOONG_BIOSNAME "pmon_2e.bin"
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2020-04-26 13:16:37 +03:00
|
|
|
/* PCI SLOT in Fuloong 2e */
|
|
|
|
#define FULOONG2E_VIA_SLOT 5
|
|
|
|
#define FULOONG2E_ATI_SLOT 6
|
|
|
|
#define FULOONG2E_RTL8139_SLOT 7
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
static struct _loaderparams {
|
|
|
|
int ram_size;
|
|
|
|
const char *kernel_filename;
|
|
|
|
const char *kernel_cmdline;
|
|
|
|
const char *initrd_filename;
|
|
|
|
} loaderparams;
|
|
|
|
|
2022-02-20 19:39:25 +03:00
|
|
|
static void G_GNUC_PRINTF(3, 4) prom_set(uint32_t *prom_buf, int index,
|
2010-09-23 23:28:05 +04:00
|
|
|
const char *string, ...)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int32_t table_addr;
|
|
|
|
|
2019-08-19 15:07:52 +03:00
|
|
|
if (index >= ENVP_NB_ENTRIES) {
|
2010-06-29 06:50:43 +04:00
|
|
|
return;
|
2019-08-19 15:07:52 +03:00
|
|
|
}
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
if (string == NULL) {
|
|
|
|
prom_buf[index] = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
table_addr = sizeof(int32_t) * ENVP_NB_ENTRIES + index * ENVP_ENTRY_SIZE;
|
2020-12-15 09:41:55 +03:00
|
|
|
prom_buf[index] = tswap32(ENVP_VADDR + table_addr);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
va_start(ap, string);
|
|
|
|
vsnprintf((char *)prom_buf + table_addr, ENVP_ENTRY_SIZE, string, ap);
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
2020-12-24 06:17:48 +03:00
|
|
|
static uint64_t load_kernel(MIPSCPU *cpu)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
2020-12-15 09:41:53 +03:00
|
|
|
uint64_t kernel_entry, kernel_high, initrd_size;
|
2010-06-29 06:50:43 +04:00
|
|
|
int index = 0;
|
2018-09-13 13:07:13 +03:00
|
|
|
long kernel_size;
|
2010-06-29 06:50:43 +04:00
|
|
|
ram_addr_t initrd_offset;
|
|
|
|
uint32_t *prom_buf;
|
|
|
|
long prom_size;
|
|
|
|
|
2019-01-15 15:18:03 +03:00
|
|
|
kernel_size = load_elf(loaderparams.kernel_filename, NULL,
|
|
|
|
cpu_mips_kseg0_to_phys, NULL,
|
2020-12-15 09:41:53 +03:00
|
|
|
&kernel_entry, NULL,
|
|
|
|
&kernel_high, NULL,
|
2020-07-05 20:22:11 +03:00
|
|
|
0, EM_MIPS, 1, 0);
|
2017-07-27 02:56:13 +03:00
|
|
|
if (kernel_size < 0) {
|
hw/mips: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-6-armbru@redhat.com>
2018-02-03 11:43:06 +03:00
|
|
|
error_report("could not load kernel '%s': %s",
|
2017-07-27 02:56:13 +03:00
|
|
|
loaderparams.kernel_filename,
|
|
|
|
load_elf_strerror(kernel_size));
|
2010-06-29 06:50:43 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* load initrd */
|
|
|
|
initrd_size = 0;
|
|
|
|
initrd_offset = 0;
|
|
|
|
if (loaderparams.initrd_filename) {
|
2019-08-19 15:07:52 +03:00
|
|
|
initrd_size = get_image_size(loaderparams.initrd_filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
if (initrd_size > 0) {
|
2020-09-27 14:18:17 +03:00
|
|
|
initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
|
2020-10-28 13:20:52 +03:00
|
|
|
if (initrd_offset + initrd_size > loaderparams.ram_size) {
|
hw/mips: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-6-armbru@redhat.com>
2018-02-03 11:43:06 +03:00
|
|
|
error_report("memory too small for initial ram disk '%s'",
|
|
|
|
loaderparams.initrd_filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
initrd_size = load_image_targphys(loaderparams.initrd_filename,
|
2019-08-19 15:07:52 +03:00
|
|
|
initrd_offset,
|
2020-10-28 13:20:52 +03:00
|
|
|
loaderparams.ram_size - initrd_offset);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
if (initrd_size == (target_ulong) -1) {
|
hw/mips: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@imgtec.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-6-armbru@redhat.com>
2018-02-03 11:43:06 +03:00
|
|
|
error_report("could not load initial ram disk '%s'",
|
|
|
|
loaderparams.initrd_filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Setup prom parameters. */
|
|
|
|
prom_size = ENVP_NB_ENTRIES * (sizeof(int32_t) + ENVP_ENTRY_SIZE);
|
2011-08-21 07:09:37 +04:00
|
|
|
prom_buf = g_malloc(prom_size);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2010-09-21 00:18:00 +04:00
|
|
|
prom_set(prom_buf, index++, "%s", loaderparams.kernel_filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
if (initrd_size > 0) {
|
2019-08-19 15:07:52 +03:00
|
|
|
prom_set(prom_buf, index++,
|
|
|
|
"rd_start=0x%" PRIx64 " rd_size=%" PRId64 " %s",
|
|
|
|
cpu_mips_phys_to_kseg0(NULL, initrd_offset),
|
|
|
|
initrd_size, loaderparams.kernel_cmdline);
|
2010-06-29 06:50:43 +04:00
|
|
|
} else {
|
2010-09-21 00:18:00 +04:00
|
|
|
prom_set(prom_buf, index++, "%s", loaderparams.kernel_cmdline);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Setup minimum environment variables */
|
|
|
|
prom_set(prom_buf, index++, "busclock=33000000");
|
2020-12-24 06:17:48 +03:00
|
|
|
prom_set(prom_buf, index++, "cpuclock=%u", clock_get_hz(cpu->clock));
|
2018-06-25 15:42:22 +03:00
|
|
|
prom_set(prom_buf, index++, "memsize=%"PRIi64, loaderparams.ram_size / MiB);
|
2010-06-29 06:50:43 +04:00
|
|
|
prom_set(prom_buf, index++, NULL);
|
|
|
|
|
2020-12-15 09:41:55 +03:00
|
|
|
rom_add_blob_fixed("prom", prom_buf, prom_size, ENVP_PADDR);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2015-04-28 12:11:02 +03:00
|
|
|
g_free(prom_buf);
|
2010-06-29 06:50:43 +04:00
|
|
|
return kernel_entry;
|
|
|
|
}
|
|
|
|
|
2019-08-19 15:07:52 +03:00
|
|
|
static void write_bootloader(CPUMIPSState *env, uint8_t *base,
|
2020-12-15 09:41:53 +03:00
|
|
|
uint64_t kernel_addr)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
uint32_t *p;
|
|
|
|
|
|
|
|
/* Small bootloader */
|
2019-08-19 15:07:52 +03:00
|
|
|
p = (uint32_t *)base;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2019-08-19 15:07:52 +03:00
|
|
|
/* j 0x1fc00040 */
|
|
|
|
stl_p(p++, 0x0bf00010);
|
|
|
|
/* nop */
|
|
|
|
stl_p(p++, 0x00000000);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* Second part of the bootloader */
|
2019-08-19 15:07:52 +03:00
|
|
|
p = (uint32_t *)(base + 0x040);
|
|
|
|
|
2020-12-15 09:45:05 +03:00
|
|
|
bl_gen_jump_kernel(&p, ENVP_VADDR - 64, 2, ENVP_VADDR, ENVP_VADDR + 8,
|
|
|
|
loaderparams.ram_size, kernel_addr);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void main_cpu_reset(void *opaque)
|
|
|
|
{
|
2012-05-05 15:56:22 +04:00
|
|
|
MIPSCPU *cpu = opaque;
|
|
|
|
CPUMIPSState *env = &cpu->env;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2012-05-05 15:56:22 +04:00
|
|
|
cpu_reset(CPU(cpu));
|
2010-06-29 06:50:43 +04:00
|
|
|
/* TODO: 2E reset stuff */
|
|
|
|
if (loaderparams.kernel_filename) {
|
|
|
|
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-09 01:39:38 +03:00
|
|
|
static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
|
2021-01-09 23:16:36 +03:00
|
|
|
I2CBus **i2c_bus)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
2020-03-13 11:24:39 +03:00
|
|
|
PCIDevice *dev;
|
2018-03-09 01:39:38 +03:00
|
|
|
|
2021-01-02 13:43:35 +03:00
|
|
|
dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true,
|
|
|
|
TYPE_VT82C686B_ISA);
|
2021-01-09 23:16:36 +03:00
|
|
|
qdev_connect_gpio_out(DEVICE(dev), 0, intc);
|
2018-03-09 01:39:38 +03:00
|
|
|
|
2020-03-13 11:24:39 +03:00
|
|
|
dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide");
|
2020-03-17 18:05:37 +03:00
|
|
|
pci_ide_create_devs(dev);
|
2018-03-09 01:39:38 +03:00
|
|
|
|
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
|
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci");
|
|
|
|
|
2021-01-09 23:16:36 +03:00
|
|
|
dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM);
|
2021-01-02 13:43:35 +03:00
|
|
|
*i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
|
2018-03-09 01:39:38 +03:00
|
|
|
|
|
|
|
/* Audio support */
|
2021-01-02 13:43:35 +03:00
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(slot, 5), TYPE_VIA_AC97);
|
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(slot, 6), TYPE_VIA_MC97);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Network support */
|
2019-08-19 15:07:52 +03:00
|
|
|
static void network_init(PCIBus *pci_bus)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2019-08-19 15:07:52 +03:00
|
|
|
for (i = 0; i < nb_nics; i++) {
|
2010-06-29 06:50:43 +04:00
|
|
|
NICInfo *nd = &nd_table[i];
|
|
|
|
const char *default_devaddr = NULL;
|
|
|
|
|
|
|
|
if (i == 0 && (!nd->model || strcmp(nd->model, "rtl8139") == 0)) {
|
2020-04-26 13:16:37 +03:00
|
|
|
/* The Fuloong board has a RTL8139 card using PCI SLOT 7 */
|
2010-06-29 06:50:43 +04:00
|
|
|
default_devaddr = "07";
|
|
|
|
}
|
|
|
|
|
2013-06-06 12:48:51 +04:00
|
|
|
pci_nic_init_nofail(nd, pci_bus, "rtl8139", default_devaddr);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-26 13:16:37 +03:00
|
|
|
static void mips_fuloong2e_init(MachineState *machine)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
2014-05-07 18:42:57 +04:00
|
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
|
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
|
|
|
const char *initrd_filename = machine->initrd_filename;
|
2010-06-29 06:50:43 +04:00
|
|
|
char *filename;
|
2011-08-08 22:46:13 +04:00
|
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
|
|
MemoryRegion *bios = g_new(MemoryRegion, 1);
|
2010-09-18 09:53:14 +04:00
|
|
|
long bios_size;
|
2019-02-21 15:34:07 +03:00
|
|
|
uint8_t *spd_data;
|
2020-12-15 09:41:53 +03:00
|
|
|
uint64_t kernel_entry;
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 08:32:04 +03:00
|
|
|
PCIDevice *pci_dev;
|
2010-06-29 06:50:43 +04:00
|
|
|
PCIBus *pci_bus;
|
2013-08-03 02:18:51 +04:00
|
|
|
I2CBus *smbus;
|
2020-10-12 12:57:57 +03:00
|
|
|
Clock *cpuclk;
|
2012-05-05 15:54:41 +04:00
|
|
|
MIPSCPU *cpu;
|
2012-03-14 04:38:23 +04:00
|
|
|
CPUMIPSState *env;
|
2019-03-09 20:21:40 +03:00
|
|
|
DeviceState *dev;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2020-10-12 12:57:57 +03:00
|
|
|
cpuclk = clock_new(OBJECT(machine), "cpu-refclk");
|
|
|
|
clock_set_hz(cpuclk, 533080000); /* ~533 MHz */
|
|
|
|
|
2010-06-29 06:50:43 +04:00
|
|
|
/* init CPUs */
|
2020-10-12 12:57:57 +03:00
|
|
|
cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk);
|
2012-05-05 15:54:41 +04:00
|
|
|
env = &cpu->env;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2012-05-05 15:56:22 +04:00
|
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2019-02-21 15:34:07 +03:00
|
|
|
/* TODO: support more than 256M RAM as highmem */
|
2020-02-19 19:09:25 +03:00
|
|
|
if (machine->ram_size != 256 * MiB) {
|
|
|
|
error_report("Invalid RAM size, should be 256MB");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2020-04-26 13:19:16 +03:00
|
|
|
memory_region_add_subregion(address_space_mem, 0, machine->ram);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2020-04-26 13:19:16 +03:00
|
|
|
/* Boot ROM */
|
2020-04-26 13:16:37 +03:00
|
|
|
memory_region_init_rom(bios, NULL, "fuloong2e.bios", BIOS_SIZE,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 17:51:43 +03:00
|
|
|
&error_fatal);
|
2011-08-08 22:46:13 +04:00
|
|
|
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2019-08-19 15:07:52 +03:00
|
|
|
/*
|
|
|
|
* We do not support flash operation, just loading pmon.bin as raw BIOS.
|
|
|
|
* Please use -L to set the BIOS path and -bios to set bios name.
|
|
|
|
*/
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
if (kernel_filename) {
|
2020-02-19 19:09:25 +03:00
|
|
|
loaderparams.ram_size = machine->ram_size;
|
2010-06-29 06:50:43 +04:00
|
|
|
loaderparams.kernel_filename = kernel_filename;
|
|
|
|
loaderparams.kernel_cmdline = kernel_cmdline;
|
|
|
|
loaderparams.initrd_filename = initrd_filename;
|
2020-12-24 06:17:48 +03:00
|
|
|
kernel_entry = load_kernel(cpu);
|
2011-08-08 22:46:13 +04:00
|
|
|
write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
|
2010-06-29 06:50:43 +04:00
|
|
|
} else {
|
2020-07-21 09:15:05 +03:00
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS,
|
2020-10-26 17:30:21 +03:00
|
|
|
machine->firmware ?: FULOONG_BIOSNAME);
|
2010-06-29 06:50:43 +04:00
|
|
|
if (filename) {
|
|
|
|
bios_size = load_image_targphys(filename, 0x1fc00000LL,
|
|
|
|
BIOS_SIZE);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
} else {
|
|
|
|
bios_size = -1;
|
|
|
|
}
|
|
|
|
|
2013-07-29 18:05:30 +04:00
|
|
|
if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
|
2020-10-26 17:30:21 +03:00
|
|
|
machine->firmware && !qtest_enabled()) {
|
|
|
|
error_report("Could not load MIPS bios '%s'", machine->firmware);
|
2013-08-03 18:03:18 +04:00
|
|
|
exit(1);
|
2010-06-30 21:39:45 +04:00
|
|
|
}
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Init internal devices */
|
2016-03-15 16:32:19 +03:00
|
|
|
cpu_mips_irq_init_cpu(cpu);
|
|
|
|
cpu_mips_clock_init(cpu);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* North bridge, Bonito --> IP2 */
|
|
|
|
pci_bus = bonito_init((qemu_irq *)&(env->irq[2]));
|
|
|
|
|
2018-03-09 01:39:38 +03:00
|
|
|
/* South bridge -> IP5 */
|
2020-04-26 13:16:37 +03:00
|
|
|
vt82c686b_southbridge_init(pci_bus, FULOONG2E_VIA_SLOT, env->irq[5],
|
2021-01-09 23:16:36 +03:00
|
|
|
&smbus);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2019-03-09 20:21:40 +03:00
|
|
|
/* GPU */
|
2019-03-19 17:37:19 +03:00
|
|
|
if (vga_interface_type != VGA_NONE) {
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 08:32:04 +03:00
|
|
|
pci_dev = pci_new(-1, "ati-vga");
|
|
|
|
dev = DEVICE(pci_dev);
|
2019-03-19 17:37:19 +03:00
|
|
|
qdev_prop_set_uint32(dev, "vgamem_mb", 16);
|
|
|
|
qdev_prop_set_uint16(dev, "x-device-id", 0x5159);
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 08:32:04 +03:00
|
|
|
pci_realize_and_unref(pci_dev, pci_bus, &error_fatal);
|
2019-03-19 17:37:19 +03:00
|
|
|
}
|
2019-03-09 20:21:40 +03:00
|
|
|
|
2019-02-21 15:34:07 +03:00
|
|
|
/* Populate SPD eeprom data */
|
smbus: Fix spd_data_generate() error API violation
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
spd_data_generate() can pass @errp to error_setg() more than once when
it adjusts both memory size and type. Harmless, because no caller
passes anything that needs adjusting. Until the previous commit,
sam460ex passed types that needed adjusting, but not sizes.
spd_data_generate()'s contract is rather awkward:
If everything's fine, return non-null and don't set an error.
Else, if memory size or type need adjusting, return non-null and
set an error describing the adjustment.
Else, return null and set an error reporting why no data can be
generated.
Its callers treat the error as a warning even when null is returned.
They don't create the "smbus-eeprom" device then. Suspicious.
Since the previous commit, only "everything's fine" can actually
happen. Drop the unused code and simplify the callers. This gets rid
of the error API violation.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200422134815.1584-3-armbru@redhat.com>
2020-04-22 16:48:13 +03:00
|
|
|
spd_data = spd_data_generate(DDR, machine->ram_size);
|
|
|
|
smbus_eeprom_init_one(smbus, 0x50, spd_data);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2018-03-09 01:39:38 +03:00
|
|
|
/* Network card: RTL8139D */
|
2013-06-06 12:48:51 +04:00
|
|
|
network_init(pci_bus);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
2020-04-26 13:16:37 +03:00
|
|
|
static void mips_fuloong2e_machine_init(MachineClass *mc)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
2020-04-26 13:16:37 +03:00
|
|
|
mc->desc = "Fuloong 2e mini pc";
|
|
|
|
mc->init = mips_fuloong2e_init;
|
2017-02-15 13:05:40 +03:00
|
|
|
mc->block_default_type = IF_IDE;
|
2017-10-05 16:51:11 +03:00
|
|
|
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E");
|
2019-02-21 15:34:07 +03:00
|
|
|
mc->default_ram_size = 256 * MiB;
|
2020-04-26 13:16:37 +03:00
|
|
|
mc->default_ram_id = "fuloong2e.ram";
|
2020-04-08 12:16:19 +03:00
|
|
|
mc->minimum_page_bits = 14;
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
2020-04-26 13:16:37 +03:00
|
|
|
DEFINE_MACHINE("fuloong2e", mips_fuloong2e_machine_init)
|