OpenBIOS April 2014

openbios@openbios.org

5 participants
12 discussions

[PATCH v2] arch/ppc/qemu: Clean up and add more cpu infos

by BALATON Zoltan

Removed unused clock_frequency member from struct cpudef which is get from FW_CFG and added bus-frequency property to complete the frequency properties. Also added tlb infos to cpudef (with values only for G4 currently as I have no data for other CPUs). Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- v2: Get bus-frequency from FW_CFG similarly to clock-frequency and tb-frequency (corresponding patch submitted to QEMU) --- Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1286) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -44,7 +44,7 @@ int icache_size, dcache_size; int icache_sets, dcache_sets; int icache_block_size, dcache_block_size; - int clock_frequency; + int tlb_sets, tlb_size; void (*initfn)(const struct cpudef *cpu); }; @@ -269,6 +269,18 @@ push_str("i-cache-block-size"); fword("property"); + if(cpu->tlb_size) { + PUSH(cpu->tlb_sets); + fword("encode-int"); + push_str("tlb-sets"); + fword("property"); + + PUSH(cpu->tlb_size); + fword("encode-int"); + push_str("tlb-size"); + fword("property"); + } + PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ)); fword("encode-int"); push_str("timebase-frequency"); @@ -279,6 +291,11 @@ push_str("clock-frequency"); fword("property"); + PUSH(fw_cfg_read_i32(FW_CFG_PPC_BUSFREQ)); + fword("encode-int"); + push_str("bus-frequency"); + fword("property"); + push_str("running"); fword("encode-string"); push_str("state"); @@ -391,7 +408,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_604_init, }, { // XXX find out real values @@ -403,7 +421,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_604_init, }, { // XXX find out real values @@ -415,7 +434,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_604_init, }, { // XXX find out real values @@ -427,7 +447,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { @@ -439,7 +460,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -451,7 +473,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -463,7 +486,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -475,7 +499,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -487,7 +512,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { @@ -499,7 +525,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x1dcd6500, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_g4_init, }, { @@ -511,7 +538,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x5f5e1000, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_970_init, }, { // XXX find out real values @@ -523,7 +551,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x1dcd6500, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_970_init, }, { @@ -535,7 +564,8 @@ .dcache_sets = 0x40, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x629b4940, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_970_init, }, };

6 years, 7 months

[PATCH v3] Updated some device tree properties to match names used by Apple for compatibility with MorphOS

by BALATON Zoltan

The names of some device tree properties are different on old world and new world Mac hardware and the name of the root node is always "device-tree" on Apple's OpenFirmware implementation. MorphOS on Apple hardware expects these names to find these devices. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- v2: improved commit log v3: fixed a typo in the device type of the pmu node (via-pmu instead of via_pmu) --- Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1286) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -702,6 +732,12 @@ push_str("/"); fword("find-device"); + /* Apple calls the root node device-tree */ + if (is_apple()) { + push_str("device-tree"); + fword("device-name"); + } + switch(machine_id) { case ARCH_HEATHROW: /* OldWorld */ Index: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c (revision 1286) +++ openbios-devel/drivers/cuda.c (working copy) @@ -184,32 +184,33 @@ phandle_t ph=get_cur_dev(); int props[2]; - push_str("via-cuda"); + push_str((is_oldworld() ? "via-cuda" : "via-pmu")); fword("device-type"); set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); - set_property(ph, "compatible", "cuda", 5); - props[0] = __cpu_to_be32(IO_CUDA_OFFSET); props[1] = __cpu_to_be32(IO_CUDA_SIZE); set_property(ph, "reg", (char *)&props, sizeof(props)); - /* on newworld machines the cuda is on interrupt 0x19 */ + if (is_oldworld()) { + set_property(ph, "compatible", "cuda", 5); + /* we emulate an oldworld hardware, so we must use + * non-standard oldworld property (needed by linux 2.6.18) + */ + set_int_property(ph, "AAPL,interrupts", 0x12); + } else { + set_property(ph, "compatible", "pmu", 4); + /* on newworld machines the cuda is on interrupt 0x19 */ - props[0] = 0x19; - props[1] = 0; - NEWWORLD(set_property(ph, "interrupts", (char *)props, sizeof(props))); - NEWWORLD(set_int_property(ph, "#interrupt-cells", 2)); + props[0] = 0x19; + props[1] = 0; + set_property(ph, "interrupts", (char *)&props, sizeof(props)); + set_int_property(ph, "#interrupt-cells", 2); + } - /* we emulate an oldworld hardware, so we must use - * non-standard oldworld property (needed by linux 2.6.18) - */ - - OLDWORLD(set_int_property(ph, "AAPL,interrupts", 0x12)); - bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); fword("eval"); @@ -380,7 +381,8 @@ ph = find_dev(buf); set_property(ph, "device_type", "power-mgt", 10); - set_property(ph, "compatible", "power-mgt", 10); + OLDWORLD(set_property(ph, "compatible", "power-mgt", 10)); + NEWWORLD(set_property(ph, "compatible", "via-pmu-99", 11)); } cuda_t *cuda_init (const char *path, phys_addr_t base) @@ -395,11 +397,13 @@ if (cuda == NULL) return NULL; - snprintf(buf, sizeof(buf), "%s/via-cuda", path); + OLDWORLD(snprintf(buf, sizeof(buf), "%s/via-cuda", path)); + NEWWORLD(snprintf(buf, sizeof(buf), "%s/via-pmu", path)); REGISTER_NAMED_NODE(ob_cuda, buf); aliases = find_dev("/aliases"); - set_property(aliases, "via-cuda", buf, strlen(buf) + 1); + OLDWORLD(set_property(aliases, "via-cuda", buf, strlen(buf) + 1)); + NEWWORLD(set_property(aliases, "via-pmu", buf, strlen(buf) + 1)); cuda->base = base; cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP);

6 years, 8 months

[PATCH 0/4] Changes for MorphOS

by BALATON Zoltan

Hello, I'm sending my previous patches split into multiple patches and some more I've done since. This is not including the change of the / node name as it was suggested to preserve the original name on some other property but the name of that new property was not decided so I don't know what to do with it but that's also needed to get further with MorphOS. Regards, BALATON Zoltan

6 years, 9 months

[PATCH v2] Updated some device tree properties to match names used by Apple for compatibility with MorphOS

by BALATON Zoltan

The names of some device tree properties are different on old world and new world Mac hardware and the name of the root node is always "device-tree" on Apple's OpenFirmware implementation. MorphOS on Apple hardware expects these names to find these devices. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- v2: improved commit log --- Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1286) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -702,6 +732,12 @@ push_str("/"); fword("find-device"); + /* Apple calls the root node device-tree */ + if (is_apple()) { + push_str("device-tree"); + fword("device-name"); + } + switch(machine_id) { case ARCH_HEATHROW: /* OldWorld */ Index: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c (revision 1286) +++ openbios-devel/drivers/cuda.c (working copy) @@ -184,32 +184,33 @@ phandle_t ph=get_cur_dev(); int props[2]; - push_str("via-cuda"); + push_str((is_oldworld() ? "via-cuda" : "via_pmu")); fword("device-type"); set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); - set_property(ph, "compatible", "cuda", 5); - props[0] = __cpu_to_be32(IO_CUDA_OFFSET); props[1] = __cpu_to_be32(IO_CUDA_SIZE); set_property(ph, "reg", (char *)&props, sizeof(props)); - /* on newworld machines the cuda is on interrupt 0x19 */ + if (is_oldworld()) { + set_property(ph, "compatible", "cuda", 5); + /* we emulate an oldworld hardware, so we must use + * non-standard oldworld property (needed by linux 2.6.18) + */ + set_int_property(ph, "AAPL,interrupts", 0x12); + } else { + set_property(ph, "compatible", "pmu", 4); + /* on newworld machines the cuda is on interrupt 0x19 */ - props[0] = 0x19; - props[1] = 0; - NEWWORLD(set_property(ph, "interrupts", (char *)props, sizeof(props))); - NEWWORLD(set_int_property(ph, "#interrupt-cells", 2)); + props[0] = 0x19; + props[1] = 0; + set_property(ph, "interrupts", (char *)&props, sizeof(props)); + set_int_property(ph, "#interrupt-cells", 2); + } - /* we emulate an oldworld hardware, so we must use - * non-standard oldworld property (needed by linux 2.6.18) - */ - - OLDWORLD(set_int_property(ph, "AAPL,interrupts", 0x12)); - bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); fword("eval"); @@ -380,7 +381,8 @@ ph = find_dev(buf); set_property(ph, "device_type", "power-mgt", 10); - set_property(ph, "compatible", "power-mgt", 10); + OLDWORLD(set_property(ph, "compatible", "power-mgt", 10)); + NEWWORLD(set_property(ph, "compatible", "via-pmu-99", 11)); } cuda_t *cuda_init (const char *path, phys_addr_t base) @@ -395,11 +397,13 @@ if (cuda == NULL) return NULL; - snprintf(buf, sizeof(buf), "%s/via-cuda", path); + OLDWORLD(snprintf(buf, sizeof(buf), "%s/via-cuda", path)); + NEWWORLD(snprintf(buf, sizeof(buf), "%s/via-pmu", path)); REGISTER_NAMED_NODE(ob_cuda, buf); aliases = find_dev("/aliases"); - set_property(aliases, "via-cuda", buf, strlen(buf) + 1); + OLDWORLD(set_property(aliases, "via-cuda", buf, strlen(buf) + 1)); + NEWWORLD(set_property(aliases, "via-pmu", buf, strlen(buf) + 1)); cuda->base = base; cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP);

6 years, 9 months

[PATCH] arch/ppc/qemu: Move and simplify DSI and ISI exception handler routines

by BALATON Zoltan

The routines are moved to avoid overwriting by the MorphOS boot code which writes to address 0x80 during start up. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S (revision 1286) +++ openbios-devel/arch/ppc/qemu/start.S (working copy) @@ -280,21 +280,6 @@ 1: nop // b 1b -call_dsi_exception: - LOAD_REG_FUNC(r3, dsi_exception) - mtctr r3 - bctrl - b exception_return - -call_isi_exception: - LOAD_REG_FUNC(r3, isi_exception) - mtctr r3 - bctrl - b exception_return - -exception_return: - EXCEPTION_EPILOGUE - trap_error: lis r1, 0x8000 /* r1=0x80000000 */ add. r1,r1,r1 /* r1=r1+r1 (high 32bit !0) */ @@ -371,13 +356,19 @@ #endif +VECTOR( 0x3000, "DSI_ISI" ): real_dsi: EXCEPTION_PREAMBLE - b call_dsi_exception + LOAD_REG_FUNC(r3, dsi_exception) + b call_exception_handler real_isi: EXCEPTION_PREAMBLE - b call_isi_exception + LOAD_REG_FUNC(r3, isi_exception) +call_exception_handler: + mtctr r3 + bctrl + EXCEPTION_EPILOGUE GLOBL(__vectors_end):

6 years, 9 months

[PATCH] Updated some device tree properties to match names used by Apple

by BALATON Zoltan

Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1286) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -702,6 +732,12 @@ push_str("/"); fword("find-device"); + /* Apple calls the root node device-tree */ + if (is_apple()) { + push_str("device-tree"); + fword("device-name"); + } + switch(machine_id) { case ARCH_HEATHROW: /* OldWorld */ Index: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c (revision 1286) +++ openbios-devel/drivers/cuda.c (working copy) @@ -184,32 +184,33 @@ phandle_t ph=get_cur_dev(); int props[2]; - push_str("via-cuda"); + push_str((is_oldworld() ? "via-cuda" : "via_pmu")); fword("device-type"); set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); - set_property(ph, "compatible", "cuda", 5); - props[0] = __cpu_to_be32(IO_CUDA_OFFSET); props[1] = __cpu_to_be32(IO_CUDA_SIZE); set_property(ph, "reg", (char *)&props, sizeof(props)); - /* on newworld machines the cuda is on interrupt 0x19 */ + if (is_oldworld()) { + set_property(ph, "compatible", "cuda", 5); + /* we emulate an oldworld hardware, so we must use + * non-standard oldworld property (needed by linux 2.6.18) + */ + set_int_property(ph, "AAPL,interrupts", 0x12); + } else { + set_property(ph, "compatible", "pmu", 4); + /* on newworld machines the cuda is on interrupt 0x19 */ - props[0] = 0x19; - props[1] = 0; - NEWWORLD(set_property(ph, "interrupts", (char *)props, sizeof(props))); - NEWWORLD(set_int_property(ph, "#interrupt-cells", 2)); + props[0] = 0x19; + props[1] = 0; + set_property(ph, "interrupts", (char *)&props, sizeof(props)); + set_int_property(ph, "#interrupt-cells", 2); + } - /* we emulate an oldworld hardware, so we must use - * non-standard oldworld property (needed by linux 2.6.18) - */ - - OLDWORLD(set_int_property(ph, "AAPL,interrupts", 0x12)); - bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); fword("eval"); @@ -380,7 +381,8 @@ ph = find_dev(buf); set_property(ph, "device_type", "power-mgt", 10); - set_property(ph, "compatible", "power-mgt", 10); + OLDWORLD(set_property(ph, "compatible", "power-mgt", 10)); + NEWWORLD(set_property(ph, "compatible", "via-pmu-99", 11)); } cuda_t *cuda_init (const char *path, phys_addr_t base) @@ -395,11 +397,13 @@ if (cuda == NULL) return NULL; - snprintf(buf, sizeof(buf), "%s/via-cuda", path); + OLDWORLD(snprintf(buf, sizeof(buf), "%s/via-cuda", path)); + NEWWORLD(snprintf(buf, sizeof(buf), "%s/via-pmu", path)); REGISTER_NAMED_NODE(ob_cuda, buf); aliases = find_dev("/aliases"); - set_property(aliases, "via-cuda", buf, strlen(buf) + 1); + OLDWORLD(set_property(aliases, "via-cuda", buf, strlen(buf) + 1)); + NEWWORLD(set_property(aliases, "via-pmu", buf, strlen(buf) + 1)); cuda->base = base; cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP);

6 years, 9 months

[PATCH] Make naming of ata devices match what is found on Apple hardware

by BALATON Zoltan

Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c (revision 1286) +++ openbios-devel/drivers/ide.c (working copy) @@ -1574,7 +1574,8 @@ dnode = find_dev(nodebuff); - set_property(dnode, "compatible", "heathrow-ata", 13); + set_property(dnode, "compatible", (is_oldworld() ? + "heathrow-ata" : "keylargo-ata"), 13); props[0] = 0x00000526; props[1] = 0x00000085; Index: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c (revision 1286) +++ openbios-devel/drivers/macio.c (working copy) @@ -130,7 +130,7 @@ else it_shift = NW_IO_NVRAM_SHIFT; - for (i=0; i< arch_nvram_size() ; i++) + for (i=0; i < arch_nvram_size(); i++) nvram[i << it_shift] = buf[i]; #ifdef DUMP_NVRAM printk("new nvram:\n"); @@ -202,18 +202,19 @@ target_node = find_dev("/pci/mac-io/escc/ch-b"); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-1"); + /* QEMU only emulates 2 of the 3 ata buses currently */ + /* On a Mac these are strangely named as ata-3, ata-3, ata-4 */ + target_node = find_dev("/pci/mac-io/ata-3"); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-2"); + target_node = find_dev("/pci/mac-io/ata-4"); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-3"); + target_node = find_dev((is_oldworld() ? + "/pci/mac-io/via-cuda" : + "/pci/mac-io/via-pmu")); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/via-cuda"); - set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci"); set_int_property(target_node, "interrupt-parent", dnode); Index: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml (revision 1286) +++ openbios-devel/config/examples/ppc_config.xml (working copy) @@ -70,7 +70,7 @@ <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> - <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/> + <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="3"/> <option name="CONFIG_IDE_DEV_NAME" type="string" value="ata-%d"/> <option name="CONFIG_IDE_DEV_TYPE" type="string" value="ata"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/>

6 years, 9 months

[PATCH] arch/ppc/qemu: Clean up and add more cpu infos

by BALATON Zoltan

Removed unused clock_frequency member from struct cpudef which is get from FW_CFG and added tlb infos instead (with values only for G4 currently as I have no data for other CPUs). Also added a bus-frequency property. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1286) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -44,7 +44,7 @@ int icache_size, dcache_size; int icache_sets, dcache_sets; int icache_block_size, dcache_block_size; - int clock_frequency; + int tlb_sets, tlb_size; void (*initfn)(const struct cpudef *cpu); }; @@ -269,6 +269,18 @@ push_str("i-cache-block-size"); fword("property"); + if(cpu->tlb_size) { + PUSH(cpu->tlb_sets); + fword("encode-int"); + push_str("tlb-sets"); + fword("property"); + + PUSH(cpu->tlb_size); + fword("encode-int"); + push_str("tlb-size"); + fword("property"); + } + PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ)); fword("encode-int"); push_str("timebase-frequency"); @@ -279,6 +291,11 @@ push_str("clock-frequency"); fword("property"); + PUSH(100 * 1000 * 1000); + fword("encode-int"); + push_str("bus-frequency"); + fword("property"); + push_str("running"); fword("encode-string"); push_str("state"); @@ -391,7 +408,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_604_init, }, { // XXX find out real values @@ -403,7 +421,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_604_init, }, { // XXX find out real values @@ -415,7 +434,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_604_init, }, { // XXX find out real values @@ -427,7 +447,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { @@ -439,7 +460,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -451,7 +473,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -463,7 +486,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -475,7 +499,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { // XXX find out real values @@ -487,7 +512,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_750_init, }, { @@ -499,7 +525,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x1dcd6500, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_g4_init, }, { @@ -511,7 +538,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x5f5e1000, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_970_init, }, { // XXX find out real values @@ -523,7 +551,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x1dcd6500, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_970_init, }, { @@ -535,7 +564,8 @@ .dcache_sets = 0x40, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x629b4940, + .tlb_sets = 0x00, + .tlb_size = 0x00, .initfn = cpu_970_init, }, };

6 years, 9 months

How to pass CIF chain arguments on SPARC64?

by Mark Cave-Ayland

Hi all, I'm working on implementing a version of the CIF chain service for SPARC64 and am trying to understand what to do with the arguments parameters. From the specification: "chain: Frees size bytes of memory starting at virtual address virt, then executes another client program beginning at address entry. The argument buffer args, len is copied into the Open Firmware memory and passed to the other program. The address of the arguments in the Open Firmware memory is the client program’s second argument, and their length is its third argument. chain is used to free any remaining memory for a secondary boot program and begin executing the booted program." How are the arguments passed to the next client program? A quick peek at the OpenBOOT source shows that (init-program) only sets up %o4 (CIF) and %o6 (stack) registers. Does that mean that the arguments should be copied onto the stack or somehow via the registers? Unfortunately I can't seem to find a suitable 64-bit SPARC IEEE1275 ISA document anywhere :( ATB, Mark.

6 years, 9 months

[commit] r1286 - trunk/openbios-devel/libopenbios

by repository service

Author: mcayland Date: Fri Apr 4 11:46:24 2014 New Revision: 1286 URL: http://tracker.coreboot.org/trac/openbios/changeset/1286 Log: OFMEM: remove redundant minimum alignment check from find_area() This is now handled by the section of code preceding it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Fri Apr 4 11:46:21 2014 (r1285) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Fri Apr 4 11:46:24 2014 (r1286) @@ -442,15 +442,11 @@ if( (align & (align-1)) ) { /* As per IEEE1275 specification, round up to the nearest power of 2 */ - if (old_align <= PAGE_SIZE) { - align = PAGE_SIZE; - } else { - align--; - for (i = 1; i < sizeof(ucell) * 8; i<<=1) { - align |= align >> i; - } - align++; + align--; + for (i = 1; i < sizeof(ucell) * 8; i<<=1) { + align |= align >> i; } + align++; OFMEM_TRACE("warning: bad alignment " FMT_ucellx " rounded up to " FMT_ucellx "\n", old_align, align); }

6 years, 9 months