[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 11/11] mac_oldworld: Add SPD data to cover RAM
From: |
BALATON Zoltan |
Subject: |
[PATCH v6 11/11] mac_oldworld: Add SPD data to cover RAM |
Date: |
Sun, 28 Jun 2020 20:03:36 +0200 |
OpenBIOS gets RAM size via fw_cfg but rhe original board firmware
detects RAM using SPD data so generate and add SDP eeproms to cover as
much RAM as possible to describe with SPD (this may be less than the
actual ram_size due to SDRAM size constraints).
This patch is more complex as it should be which I intend to fix once
agreement can be made on how to get back the necessary functionality
removed by previous patches. See in this thread:
https://lists.nongnu.org/archive/html/qemu-devel/2020-06/msg08710.html
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/ppc/mac_oldworld.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 8fbddba4eb..5ad54370d0 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -34,6 +34,7 @@
#include "hw/input/adb.h"
#include "sysemu/sysemu.h"
#include "net/net.h"
+#include "hw/i2c/smbus_eeprom.h"
#include "hw/isa/isa.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
@@ -133,6 +134,8 @@ static void ppc_heathrow_init(MachineState *machine)
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
void *fw_cfg;
uint64_t tbfreq;
+ uint8_t *spd_data[3] = {};
+ I2CBus *i2c_bus;
/* init CPUs */
for (i = 0; i < smp_cpus; i++) {
@@ -150,8 +153,16 @@ static void ppc_heathrow_init(MachineState *machine)
"maximum 2047 MB", ram_size / MiB);
exit(1);
}
-
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
+ for (i = 0; i < 3; i++) {
+ int size_left = ram_size - i * 512 * MiB;
+ if (size_left > 0) {
+ uint32_t s = size_left / MiB;
+ s = (s > 512 ? 512 : s);
+ s = 1U << (31 - clz32(s));
+ spd_data[i] = spd_data_generate(SDR, s * MiB);
+ }
+ }
/* allocate and load firmware ROM */
memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE,
@@ -337,6 +348,12 @@ static void ppc_heathrow_init(MachineState *machine)
macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]);
dev = DEVICE(object_resolve_path_component(OBJECT(macio), "cuda"));
+ i2c_bus = I2C_BUS(qdev_get_child_bus(dev, "i2c"));
+ for (i = 0; i < 3; i++) {
+ if (spd_data[i]) {
+ smbus_eeprom_init_one(i2c_bus, 0x50 + i, spd_data[i]);
+ }
+ }
adb_bus = qdev_get_child_bus(dev, "adb.0");
dev = qdev_new(TYPE_ADB_KEYBOARD);
qdev_realize_and_unref(dev, adb_bus, &error_fatal);
--
2.21.3
- [PATCH v6 00/11] Mac Old World ROM experiment, BALATON Zoltan, 2020/06/28
- [PATCH v6 01/11] mac_oldworld: Allow loading binary ROM image, BALATON Zoltan, 2020/06/28
- [PATCH v6 02/11] mac_newworld: Allow loading binary ROM image, BALATON Zoltan, 2020/06/28
- [PATCH v6 03/11] mac_oldworld: Drop a variable, use get_system_memory() directly, BALATON Zoltan, 2020/06/28
- [PATCH v6 04/11] mac_oldworld: Drop some variables, BALATON Zoltan, 2020/06/28
- [PATCH v6 06/11] mac_oldworld: Rename ppc_heathrow_reset to ppc_heathrow_cpu_reset, BALATON Zoltan, 2020/06/28
- [PATCH v6 05/11] grackle: Set revision in PCI config to match hardware, BALATON Zoltan, 2020/06/28
- [PATCH v6 08/11] mac_oldworld: Add machine ID register, BALATON Zoltan, 2020/06/28
- [PATCH v6 07/11] mac_oldworld: Map macio to expected address at reset, BALATON Zoltan, 2020/06/28
- [RFC PATCH v6 10/11] WIP macio/cuda: Attempt to add i2c support, BALATON Zoltan, 2020/06/28
- [PATCH v6 11/11] mac_oldworld: Add SPD data to cover RAM,
BALATON Zoltan <=
- [PATCH v6 09/11] i2c: Match parameters of i2c_start_transfer and i2c_send_recv, BALATON Zoltan, 2020/06/28