OpenBIOS November 2013

openbios@openbios.org

1 participants
4 discussions

[commit] r1209 - trunk/openbios-devel/arch/sparc32
by repository service 08 Dec '13

08 Dec '13

Author: mcayland Date: Mon Aug 19 09:40:12 2013 New Revision: 1209 URL: http://tracker.coreboot.org/trac/openbios/changeset/1209 Log: SPARC32: fix romvec stdin/stdout field initialisation Previously the romvec stdin/stdout ihandles were configured so that they were set to the current stdin and stdout paths at initialisation time. Unfortunately as stdin/stdout can be changed with the input and output words, they can end up pointing to invalid ihandles causing a crash when trying to output to the console. Fix this by pointing the romvec structure to the address of the stdin/stdout variables so that they are always in sync. Similarly we also resolve the text path stdin/stdout variables at boot time to ensure that they will never be stale. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Mon Aug 19 09:40:10 2013 (r1208) +++ trunk/openbios-devel/arch/sparc32/boot.c Mon Aug 19 09:40:12 2013 (r1209) @@ -23,7 +23,7 @@ void go(void) { ucell address, type, size; - int image_retval = 0, proplen, target, device; + int image_retval = 0, intprop, proplen, target, device; phandle_t chosen; char *prop, *id, *name; static char bootpathbuf[128], bootargsbuf[128], buf[128]; @@ -40,8 +40,19 @@ needs to be set up to pass certain parameters using a C struct. Hence this section extracts the relevant boot information and places it in obp_arg. */ - /* Get the name of the selected boot device, along with the device and unit number */ + /* Get the stdin and stdout paths */ chosen = find_dev("/chosen"); + intprop = get_int_property(chosen, "stdin", &proplen); + PUSH(intprop); + fword("get-instance-path"); + ((struct linux_romvec *)romvec)->pv_stdin = pop_fstr_copy(); + + intprop = get_int_property(chosen, "stdout", &proplen); + PUSH(intprop); + fword("get-instance-path"); + ((struct linux_romvec *)romvec)->pv_stdout = pop_fstr_copy(); + + /* Get the name of the selected boot device, along with the device and unit number */ prop = get_property(chosen, "bootpath", &proplen); strncpy(bootpathbuf, prop, proplen); prop = get_property(chosen, "bootargs", &proplen); Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Mon Aug 19 09:40:10 2013 (r1208) +++ trunk/openbios-devel/arch/sparc32/romvec.c Mon Aug 19 09:40:12 2013 (r1209) @@ -25,7 +25,6 @@ #endif char obp_stdin, obp_stdout; -static int obp_fd_stdin, obp_fd_stdout; const char *obp_stdin_path, *obp_stdout_path; struct linux_arguments_v0 obp_arg; @@ -498,15 +497,12 @@ romvec0.pv_v2bootargs.bootpath = &bootpath; romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1]; - romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin; - romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout; - push_str(obp_stdin_path); - fword("open-dev"); - obp_fd_stdin = POP(); - push_str(obp_stdout_path); - fword("open-dev"); - obp_fd_stdout = POP(); + /* Point fd_stdin/fd_stdout to the Forth stdin/stdout variables */ + fword("stdin"); + romvec0.pv_v2bootargs.fd_stdin = cell2pointer(POP()); + fword("stdout"); + romvec0.pv_v2bootargs.fd_stdout = cell2pointer(POP()); romvec0.v3_memalloc = obp_memalloc_handler;

3 6

[commit] r1235 - in trunk/openbios-devel: arch/ppc/qemu config/examples drivers
by repository service 10 Nov '13

10 Nov '13

Author: mcayland Date: Sun Nov 10 21:14:39 2013 New Revision: 1235 URL: http://tracker.coreboot.org/trac/openbios/changeset/1235 Log: prep: Add PC keyboard to PPC build and enable it The default PPC configuration now includes a PC keyboard driver for PReP machines, and adds it as a device node in the ISA bridge. This provides a working keyboard in graphical mode for PReP machines. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:33 2013 (r1234) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:39 2013 (r1235) @@ -852,8 +852,13 @@ push_str("screen"); fword("property"); } else { - stdin_path = "adb-keyboard"; - stdout_path = "screen"; + if (is_apple()) { + stdin_path = "adb-keyboard"; + stdout_path = "screen"; + } else { + stdin_path = "keyboard"; + stdout_path = "screen"; + } } kvm_of_init(); Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sun Nov 10 21:14:33 2013 (r1234) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Nov 10 21:14:39 2013 (r1235) @@ -9,6 +9,7 @@ <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:33 2013 (r1234) +++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:39 2013 (r1235) @@ -873,6 +873,9 @@ #ifdef CONFIG_DRIVER_PC_SERIAL ob_pc_serial_init(config->path, "serial", arch->io_base, 0x3f8ULL, 0); #endif +#ifdef CONFIG_DRIVER_PC_KBD + ob_pc_kbd_init(config->path, "8042", arch->io_base, 0x60ULL, 0); +#endif return 0; }

1 0

[commit] r1234 - in trunk/openbios-devel: arch/ppc/qemu drivers
by repository service 10 Nov '13

10 Nov '13

Author: mcayland Date: Sun Nov 10 21:14:33 2013 New Revision: 1234 URL: http://tracker.coreboot.org/trac/openbios/changeset/1234 Log: prep: Move serial port into the new ISA bridge node This is its real home according to device tree samples that I can find. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:30 2013 (r1233) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:33 2013 (r1234) @@ -662,11 +662,6 @@ ofmem_t *ofmem = ofmem_arch_get_private(); - if (!is_apple()) { - /* Initialise PReP serial port */ - ob_pc_serial_init("", "serial", arch->io_base, 0x3f8ULL, 0); - } - openbios_init(); modules_init(); setup_timers(); @@ -841,8 +836,8 @@ stdout_path = "sccb"; } } else { - stdin_path = "/serial"; - stdout_path = "/serial"; + stdin_path = "ttya"; + stdout_path = "ttya"; } /* Some bootloaders force the output to the screen device, so Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:30 2013 (r1233) +++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:33 2013 (r1234) @@ -870,6 +870,10 @@ int i82378_config_cb(const pci_config_t *config) { +#ifdef CONFIG_DRIVER_PC_SERIAL + ob_pc_serial_init(config->path, "serial", arch->io_base, 0x3f8ULL, 0); +#endif + return 0; }

1 0

[commit] r1233 - in trunk/openbios-devel: drivers include/drivers
by repository service 10 Nov '13

10 Nov '13

Author: mcayland Date: Sun Nov 10 21:14:30 2013 New Revision: 1233 URL: http://tracker.coreboot.org/trac/openbios/changeset/1233 Log: prep: Add support for detection of i82378 ISA bridge Here we simply allow the ISA bridge to be detected during PCI bus enumeration and implement a stub callback so that devices can be added later. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/pci_database.h trunk/openbios-devel/include/drivers/pci.h Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:30 2013 (r1233) @@ -868,6 +868,11 @@ return 0; } +int i82378_config_cb(const pci_config_t *config) +{ + return 0; +} + static void ob_pci_add_properties(phandle_t phandle, pci_addr addr, const pci_dev_t *pci_dev, const pci_config_t *config, int num_bars) Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/drivers/pci_database.c Sun Nov 10 21:14:30 2013 (r1233) @@ -390,6 +390,21 @@ }, }; +static const pci_dev_t isabrg_devices[] = { + { + PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, NULL, + "isa", "isa", "pci8086,484\0", + 1, 1, 1, + i82378_config_cb, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + static const pci_subclass_t bridg_subclass[] = { { PCI_SUBCLASS_BRIDGE_HOST, "PCI host bridge", @@ -398,7 +413,7 @@ }, { PCI_SUBCLASS_BRIDGE_ISA, "ISA bridge", - NULL, NULL, NULL, + "isa", isabrg_devices, NULL, NULL, NULL, }, { Modified: trunk/openbios-devel/drivers/pci_database.h ============================================================================== --- trunk/openbios-devel/drivers/pci_database.h Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/drivers/pci_database.h Sun Nov 10 21:14:30 2013 (r1233) @@ -37,6 +37,7 @@ extern int sabre_config_cb(const pci_config_t *config); extern int bridge_config_cb(const pci_config_t *config); extern int ebus_config_cb(const pci_config_t *config); +extern int i82378_config_cb(const pci_config_t *config); static inline int pci_compat_len(const pci_dev_t *dev) { Modified: trunk/openbios-devel/include/drivers/pci.h ============================================================================== --- trunk/openbios-devel/include/drivers/pci.h Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/include/drivers/pci.h Sun Nov 10 21:14:30 2013 (r1233) @@ -210,6 +210,7 @@ #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_82378 0x0484 #define PCI_DEVICE_ID_INTEL_82441 0x1237 #endif /* _H_PCI */

1 0