[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 9/9] mac_oldworld: Add SPD data to cover RAM
From: |
BALATON Zoltan |
Subject: |
[PATCH v4 9/9] mac_oldworld: Add SPD data to cover RAM |
Date: |
Sun, 14 Jun 2020 20:13:19 +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).
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 53615af6b1..1f85859034 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"
@@ -137,6 +138,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;
linux_boot = (kernel_filename != NULL);
@@ -156,8 +159,16 @@ static void ppc_heathrow_init(MachineState *machine)
"maximum 2047 MB", ram_size / MiB);
exit(1);
}
-
memory_region_add_subregion(sysmem, 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,
@@ -340,6 +351,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_create(adb_bus, TYPE_ADB_KEYBOARD);
qdev_init_nofail(dev);
--
2.21.3
- [PATCH v4 0/9] Mac Old World ROM experiment, BALATON Zoltan, 2020/06/14
- [PATCH v4 6/9] mac_oldworld: Add machine ID register, BALATON Zoltan, 2020/06/14
- [PATCH v4 5/9] mac_oldworld: Map macio to expected address at reset, BALATON Zoltan, 2020/06/14
- [PATCH v4 1/9] mac_oldworld: Allow loading binary ROM image, BALATON Zoltan, 2020/06/14
- [PATCH v4 4/9] mac_oldworld: Rename ppc_heathrow_reset to ppc_heathrow_cpu_reset, BALATON Zoltan, 2020/06/14
- [PATCH v4 2/9] mac_newworld: Allow loading binary ROM image, BALATON Zoltan, 2020/06/14
- [PATCH v4 9/9] mac_oldworld: Add SPD data to cover RAM,
BALATON Zoltan <=
- [PATCH v4 7/9] macio: Add dummy screamer register area, BALATON Zoltan, 2020/06/14
- [PATCH v4 8/9] WIP RFC macio/cuda: Attempt to add i2c support, BALATON Zoltan, 2020/06/14
- [PATCH v4 3/9] grackle: Set revision in PCI config to match hardware, BALATON Zoltan, 2020/06/14