OpenBIOS August 2013

openbios@openbios.org

8 participants
34 discussions

[commit] r1210 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers forth/admin forth/device
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:16 2013 New Revision: 1210 URL: http://tracker.coreboot.org/trac/openbios/changeset/1210 Log: display: move creation of "display" and "screen" properties to Forth This means we can remove this code from vga_vbe_init() and move it in to the generic display system. As part of this, we alter the "input" and "output" words so that they update the stdin/stdout handles under /chosen. While we are here, fix up the various architectures so that they don't call "input" and "output" themselves - this is now handled by the Forth console. 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/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/admin/iocontrol.fs trunk/openbios-devel/forth/device/display.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Aug 19 09:40:16 2013 (r1210) @@ -870,18 +870,6 @@ fword("find-device"); push_str(stdin_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); - - push_str(stdout_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); - - push_str(stdin_path); fword("pathres-resolve-aliases"); push_str("input-device"); fword("$setenv"); @@ -891,12 +879,6 @@ push_str("output-device"); fword("$setenv"); - push_str(stdin_path); - fword("input"); - - push_str(stdout_path); - fword("output"); - #if 0 if(getbool("tty-interface?") == 1) #endif Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 19 09:40:16 2013 (r1210) @@ -748,7 +748,6 @@ { char nographic; const char *stdin, *stdout; - phandle_t chosen; fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); if (nographic) { @@ -763,31 +762,6 @@ stdout = "screen"; } - push_str("/"); - fword("find-device"); - - push_str(stdin); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("stdin-path"); - fword("property"); - - push_str(stdout); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("stdout-path"); - fword("property"); - - chosen = find_dev("/chosen"); - push_str(stdin); - fword("open-dev"); - set_int_property(chosen, "stdin", POP()); - - chosen = find_dev("/chosen"); - push_str(stdout); - fword("open-dev"); - set_int_property(chosen, "stdout", POP()); - push_str(stdin); push_str("input-device"); fword("$setenv"); @@ -796,9 +770,6 @@ push_str("output-device"); fword("$setenv"); - push_str(stdin); - fword("input"); - obp_stdin_path = stdin; obp_stdout_path = stdout; } Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Aug 19 09:40:16 2013 (r1210) @@ -505,30 +505,12 @@ } push_str(stdin_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); - - push_str(stdout_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); - - push_str(stdin_path); push_str("input-device"); fword("$setenv"); push_str(stdout_path); push_str("output-device"); fword("$setenv"); - - push_str(stdin_path); - fword("input"); - - push_str(stdout_path); - fword("output"); } void arch_nvram_put(char *data) Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:16 2013 (r1210) @@ -55,7 +55,7 @@ unsigned long rom, uint32_t rom_size) { phys_addr_t phys; - phandle_t ph, chosen, aliases; + phandle_t ph; int size; phys = fb; @@ -73,14 +73,6 @@ ph = get_cur_dev(); #endif - chosen = find_dev("/chosen"); - push_str(path); - fword("open-dev"); - set_int_property(chosen, "display", POP()); - - aliases = find_dev("/aliases"); - set_property(aliases, "screen", path, strlen(path) + 1); - if (rom_size >= 8) { const char *p; Modified: trunk/openbios-devel/forth/admin/iocontrol.fs ============================================================================== --- trunk/openbios-devel/forth/admin/iocontrol.fs Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/forth/admin/iocontrol.fs Mon Aug 19 09:40:16 2013 (r1210) @@ -36,6 +36,19 @@ close-dev then stdin ! + + \ update /chosen + " /chosen" find-package if + >r stdin @ encode-int " stdin" r> (property) + then + +[IFDEF] CONFIG_SPARC32 + \ update stdin-path properties + \ (this isn't part of the IEEE1275 spec but needed by older Solaris) + " /" find-package if + >r stdin @ get-instance-path encode-string " stdin-path" r> (property) + then +[THEN] ; : output ( dev-str dev-len -- ) @@ -57,6 +70,19 @@ \ close old stdout stdout @ ?dup if close-dev then stdout ! + + \ update /chosen + " /chosen" find-package if + >r stdout @ encode-int " stdout" r> (property) + then + +[IFDEF] CONFIG_SPARC32 + \ update stdout-path properties + \ (this isn't part of the IEEE1275 spec but needed by older Solaris) + " /" find-package if + >r stdout @ get-instance-path encode-string " stdout-path" r> (property) + then +[THEN] ; : io ( dev-str dev-len -- ) Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:16 2013 (r1210) @@ -356,6 +356,14 @@ my-self to display-ih + \ set /chosen display property + my-self active-package 0 to my-self + " /chosen" (find-dev) 0<> if + active-package! + display-ih encode-int " display" property + then + active-package! to my-self + \ set defer functions to 8bit versions ['] fb8-draw-character to draw-character

1 0

[commit] r1208 - in trunk/openbios-devel: drivers libopenbios
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:10 2013 New Revision: 1208 URL: http://tracker.coreboot.org/trac/openbios/changeset/1208 Log: vga: move initialisation of screen-#columns/screen-#rows to setup_video() Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:07 2013 (r1207) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:10 2013 (r1208) @@ -55,8 +55,7 @@ unsigned long rom, uint32_t rom_size) { phys_addr_t phys; - phandle_t ph, chosen, aliases, options; - char buf[6]; + phandle_t ph, chosen, aliases; int size; phys = fb; @@ -82,12 +81,6 @@ aliases = find_dev("/aliases"); set_property(aliases, "screen", path, strlen(path) + 1); - options = find_dev("/options"); - snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.w) / FONT_WIDTH); - set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.h) / FONT_HEIGHT); - set_property(options, "screen-#rows", buf, strlen(buf) + 1); - if (rom_size >= 8) { const char *p; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:07 2013 (r1207) +++ trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:10 2013 (r1208) @@ -15,6 +15,7 @@ */ #include "config.h" +#include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" #include "libopenbios/ofmem.h" @@ -218,6 +219,8 @@ /* Make everything inside the video_info structure point to the values in the Forth dictionary. Hence everything is always in sync. */ + phandle_t options; + char buf[6]; video.mphys = phys; @@ -277,4 +280,11 @@ VIDEO_DICT_VALUE(video.rb) = (w * ((d + 7) / 8)); } #endif + + /* Setup screen-#rows/screen-#columns */ + options = find_dev("/options"); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.w) / FONT_WIDTH); + set_property(options, "screen-#columns", buf, strlen(buf) + 1); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.h) / FONT_HEIGHT); + set_property(options, "screen-#rows", buf, strlen(buf) + 1); }

1 0

[commit] r1207 - trunk/openbios-devel/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:07 2013 New Revision: 1207 URL: http://tracker.coreboot.org/trac/openbios/changeset/1207 Log: pci/vga: move PCI framebuffer map functions info Forth Here we move the code to map the PCI framebuffer into Forth. This is done by introducing a "pci-map-in" word on the /pci node to enable Forth code to perform memory-mapping as required. This is a slight departure from the specification which requires a "map-in" word, but this is because the OpenBIOS PCI bus enumerator *always* configures BARs regardless of whether or not an FCode payload is detected. In order to avoid having to rewrite the bus enumeration code in Forth, we instead create a "pci-bar>pci-region" word which takes the BAR register as a parameter and returns the configured BAR bus address and size. This can then be passed to the "pci-map-in" word in order to do the work. Finally with this in place, we can remove the mapping that takes place in vga_vbe_init(). 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.fs trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:07 2013 (r1207) @@ -17,6 +17,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #include "kernel/kernel.h" #include "drivers/pci.h" #include "libc/byteorder.h" @@ -25,6 +26,7 @@ #include "drivers/drivers.h" #include "drivers/vga.h" #include "packages/video.h" +#include "libopenbios/video.h" #include "timer.h" #include "pci.h" #include "pci_database.h" @@ -139,6 +141,15 @@ } #endif +static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) +{ +#ifdef CONFIG_SPARC64 + return arch->cfg_data + (unsigned long)ba; +#else + return (unsigned long)ba; +#endif +} + static void ob_pci_open(int *idx) { @@ -330,12 +341,50 @@ ss, dev, fn, buf); } +/* ( pci-addr.lo pci-addr.hi size -- virt ) */ + +static void +ob_pci_map_in(int *idx) +{ + phys_addr_t phys; + uint32_t ba; + ucell size, virt; + + PCI_DPRINTF("ob_pci_bar_map_in idx=%p\n", idx); + + size = POP(); + POP(); + ba = POP(); + + phys = pci_bus_addr_to_host_addr(ba); + +#if defined(CONFIG_OFMEM) + ofmem_claim_phys(phys, size, 0); + +#if defined(CONFIG_SPARC64) + /* Fix virtual address on SPARC64 somewhere else */ + virt = ofmem_claim_virt(0xfe000000ULL, size, 0); +#else + virt = ofmem_claim_virt(phys, size, 0); +#endif + + ofmem_map(phys, virt, size, ofmem_arch_io_translation_mode(phys)); + +#else + virt = size; /* Keep compiler quiet */ + virt = phys; +#endif + + PUSH(virt); +} + NODE_METHODS(ob_pci_bus_node) = { { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, { "decode-unit", ob_pci_decode_unit }, { "encode-unit", ob_pci_encode_unit }, + { "pci-map-in", ob_pci_map_in }, }; NODE_METHODS(ob_pci_simple_node) = { @@ -485,15 +534,6 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } -static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) -{ -#ifdef CONFIG_SPARC64 - return arch->cfg_data + (unsigned long)ba; -#else - return (unsigned long)ba; -#endif -} - int host_config_cb(const pci_config_t *config) { //XXX this overrides "reg" property Modified: trunk/openbios-devel/drivers/pci.fs ============================================================================== --- trunk/openbios-devel/drivers/pci.fs Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/pci.fs Mon Aug 19 09:40:07 2013 (r1207) @@ -12,4 +12,81 @@ rot encode-int encode+ ; +\ Get region offset for BAR reg +: pci-bar-offset@ ( bar-reg -- off.lo off.hi -1 | 0 ) + " reg" active-package get-package-property 0= if + begin + decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) + ff and 5 pick = if + >r >r 3drop r> r> + -1 exit + else + 2drop + then + \ Drop the size as we don't need it + decode-int drop decode-int drop + dup 0= + until + 3drop + 0 exit + else + 0 + then + ; + +\ Get region size for BAR reg +: pci-bar-size@ ( bar-reg -- size ) + " reg" active-package get-package-property 0= if + begin + decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) + ff and 5 pick = if + 2drop decode-int drop + decode-int + >r 3drop r> + exit + else + 2drop decode-int drop + decode-int drop + then + dup 0= + until + 3drop + 0 \ default size of 0 if BAR not found + then + ; + +\ Get base address for configured BAR reg +: pci-bar-base@ ( bar-reg -- addr.lo addr.hi -1 | 0 ) + " assigned-addresses" active-package get-package-property 0= if + begin + decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) + ff and 5 pick = if + >r >r 3drop r> r> + -1 exit + else + 2drop + then + \ Drop the size as we don't need it + decode-int drop decode-int drop + dup 0= + until + 3drop + 0 exit + else + 0 + then + ; + +\ Get PCI bus address and size for configured BAR reg +: pci-bar>pci-region ( bar-reg -- addr.lo addr.hi size ) + dup + >r pci-bar-offset@ if + swap r@ pci-bar-base@ if + swap d+ + then + swap r@ pci-bar-size@ + then + r> drop + ; + [THEN] Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:07 2013 (r1207) @@ -108,6 +108,22 @@ ; \ +\ PCI +\ + +" pci-bar>pci-region" (find-xt) value pci-bar>pci-region-xt +: pci-bar>pci-region pci-bar>pci-region-xt execute ; + +h# 10 constant cfg-bar0 \ Framebuffer BAR +-1 value fb-addr + +: map-fb ( -- ) + cfg-bar0 pci-bar>pci-region \ ( pci-addr.lo pci-addr.hi size ) + " pci-map-in" $call-parent + to fb-addr +; + +\ \ Publically visible words \ @@ -167,23 +183,27 @@ \ : qemu-vga-driver-install ( -- ) - openbios-video-addr to frame-buffer-adr - default-font set-font + fb-addr -1 = if + map-fb fb-addr to frame-buffer-adr + default-font set-font + + frame-buffer-adr encode-int " address" property + + openbios-video-width openbios-video-height over char-width / over char-height / + fb8-install + then +; - frame-buffer-adr encode-int " address" property +: qemu-vga-driver-init + + vbe-init openbios-video-width encode-int " width" property openbios-video-height encode-int " height" property depth-bits encode-int " depth" property line-bytes encode-int " linebytes" property - openbios-video-width openbios-video-height over char-width / over char-height / - fb8-install -; - -: qemu-vga-driver-init - vbe-init ['] qemu-vga-driver-install is-install - ; +; qemu-vga-driver-init Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:07 2013 (r1207) @@ -98,12 +98,4 @@ p + 8, size); } } - -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; - - ofmem_claim_phys( video.mphys, size, 0 ); - ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); - ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); -#endif }

1 0

[commit] r1206 - in trunk/openbios-devel: drivers forth/device packages
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:04 2013 New Revision: 1206 URL: http://tracker.coreboot.org/trac/openbios/changeset/1206 Log: video: move all non MOL-specific code from molvideo.c to vga.fs This now leaves just the MOL code in packages/molvideo.c and so now we no longer have a mixture of MOL and non-MOL methods in this packages. As a result of this, we can now conditionally build molvideo.c only if CONFIG_MOL is defined. (Note: I have no way of testing this as I gather that OpenBIOS was pulled from MOL due to compatibility issues at some point in the past. Perhaps one day someone will try and update and see what happens?) Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/packages/build.xml trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:04 2013 (r1206) @@ -24,6 +24,7 @@ #include "drivers/drivers.h" #include "drivers/vga.h" +#include "packages/video.h" #include "timer.h" #include "pci.h" #include "pci_database.h" @@ -773,6 +774,12 @@ /* Currently we don't read FCode from the hardware but execute it directly */ feval("['] vga-driver-fcode 2 cells + 1 byte-load"); + +#ifdef CONFIG_MOL + /* Install special words for Mac On Linux */ + molvideo_init(); +#endif + } return 0; Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:04 2013 (r1206) @@ -33,6 +33,9 @@ : depth-bits depth-bits-xt @ ; : line-bytes line-bytes-xt @ ; +" fb8-fillrect" (find-xt) value fb8-fillrect-xt +: fb8-fillrect fb8-fillrect-xt execute ; + \ \ IO port words \ @@ -114,6 +117,9 @@ defer mol-color! \ Hook for MOL (see packages/molvideo.c) +\ +\ Perhaps for neatness this there should be a separate molvga.fs +\ but let's leave it here for now. : hw-set-color ( r g b index -- ) mol-color! @@ -129,6 +135,31 @@ [THEN] +: color! ( r g b index -- ) + hw-set-color +; + +: fill-rectangle ( color_ind x y width height -- ) + fb8-fillrect +; + +: dimensions ( -- width height ) + openbios-video-width + openbios-video-height +; + +: set-colors ( table start count -- ) + 0 do + over dup \ ( table start table table ) + c@ swap 1+ \ ( table start r table-g ) + dup c@ swap 1+ \ ( table start r g table-b ) + c@ 3 pick \ ( table start r g b index ) + hw-set-color \ ( table start ) + 1+ + swap 3 + swap \ ( table+3 start+1 ) + loop +; + headerless \ Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:04 2013 (r1206) @@ -27,7 +27,6 @@ #include "drivers/vga.h" #include "libopenbios/video.h" #include "libopenbios/ofmem.h" -#include "packages/video.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -75,8 +74,6 @@ ph = get_cur_dev(); #endif - molvideo_init(); - chosen = find_dev("/chosen"); push_str(path); fword("open-dev"); Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:04 2013 (r1206) @@ -408,7 +408,7 @@ \ If we have a startup splash then display it [IFDEF] CONFIG_MOL - startup-splash 2000 ms + mol-startup-splash 2000 ms fb8-erase-screen [THEN] ; Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/packages/build.xml Mon Aug 19 09:40:04 2013 (r1206) @@ -11,7 +11,7 @@ <object source="nvram.c"/> <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> - <object source="molvideo.c"/> + <object source="molvideo.c" condition="MOL"/> <object source="xcoff-loader.c" condition="LOADER_XCOFF"/> </library> Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/packages/molvideo.c Mon Aug 19 09:40:04 2013 (r1206) @@ -2,7 +2,7 @@ * Creation Date: <2002/10/23 20:26:40 samuel> * Time-stamp: <2004/01/07 19:39:15 samuel> * - * <video.c> + * <molvideo.c> * * Mac-on-Linux display node * @@ -30,47 +30,6 @@ DECLARE_NODE( video, 0, 0, "Tdisplay" ); -#ifdef CONFIG_MOL -static void -molvideo_refresh_palette( void ) -{ - - if( VIDEO_DICT_VALUE(video.depth) == 8 ) - OSI_RefreshPalette(); -} - -static void -molvideo_hw_set_color( void ) -{ - - if( VIDEO_DICT_VALUE(video.depth) == 8 ) - OSI_SetColor( ind, color ); -} -#endif - -/* ( -- width height ) (?) */ -static void -molvideo_dimensions( void ) -{ - fword("screen-width"); - fword("screen-height"); -} - -/* ( table start count -- ) (?) */ -static void -molvideo_set_colors( void ) -{ - int count = POP(); - int start = POP(); - unsigned char *p = (unsigned char*)cell2pointer(POP()); - int i; - - for( i=0; i<count; i++, p+=3 ) { - unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; - video_set_color( i + start, col ); - } -} - /* ( r g b index -- ) */ static void molvideo_color_bang( void ) @@ -81,31 +40,26 @@ int r = POP(); unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ - video_set_color( index, col ); -} -/* ( color_ind x y width height -- ) (?) */ -static void -molvideo_fill_rect ( void ) -{ - video_fill_rect(); + if( VIDEO_DICT_VALUE(video.depth) == 8 ) { + OSI_SetColor( index, col ); + OSI_RefreshPalette(); + } } /* ( -- ) - really should be reworked as draw-logo */ static void molvideo_startup_splash( void ) { -#ifdef CONFIG_MOL int fd, s, i, y, x, dx, dy; int width, height; char *pp, *p; char buf[64]; -#endif /* only draw logo in 24-bit mode (for now) */ if( VIDEO_DICT_VALUE(video.depth) < 15 ) return; -#ifdef CONFIG_MOL + for( i=0; i<2; i++ ) { if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) return; @@ -141,23 +95,14 @@ } free( p ); } -#else + /* No bootlogo support yet on other platforms */ return; -#endif } NODE_METHODS( video ) = { -#ifdef CONFIG_MOL - {"hw-set-color", molvideo_hw_set_color }, - {"hw-refresh-palette", molvideo_refresh_palette}, -#endif - {"dimensions", molvideo_dimensions }, - {"set-colors", molvideo_set_colors }, - {"fill-rectangle", molvideo_fill_rect }, - {"color!", molvideo_color_bang }, - {"startup-splash", molvideo_startup_splash }, + {"mol-startup-splash", molvideo_startup_splash }, }; @@ -168,5 +113,12 @@ void molvideo_init(void) { + xt_t color_bang; + REGISTER_NODE( video ); + + /* Bind the MOL graphic routines to the mol-color! defer */ + color_bang = bind_noname_func(molvideo_color_bang); + PUSH(color_bang); + feval(" to mol-color!"); }

1 0

[commit] r1205 - trunk/openbios-devel/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:01 2013 New Revision: 1205 URL: http://tracker.coreboot.org/trac/openbios/changeset/1205 Log: vga: move VGA initialisation from C to Forth This includes the low-level VGA register accesses and also the package properties. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:39:58 2013 (r1204) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:01 2013 (r1205) @@ -4,40 +4,153 @@ \ This is the Forth source for an Fcode payload to initialise \ the QEMU VGA graphics card. \ +\ (C) Copyright 2013 Mark Cave-Ayland +\ fcode-version3 \ -\ Instead of using fixed values for the framebuffer address and the width -\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ Dictionary lookups for words that don't have an FCode \ -: openbios-video-addr - " openbios-video-addr" $find if - cell+ @ +: (find-xt) \ ( str len -- xt | -1 ) + $find if + exit + else + -1 then ; -: openbios-video-width - " openbios-video-width" $find if - cell+ @ - then +" openbios-video-addr" (find-xt) cell+ value openbios-video-addr-xt +" openbios-video-width" (find-xt) cell+ value openbios-video-width-xt +" openbios-video-height" (find-xt) cell+ value openbios-video-height-xt +" depth-bits" (find-xt) cell+ value depth-bits-xt +" line-bytes" (find-xt) cell+ value line-bytes-xt + +: openbios-video-addr openbios-video-addr-xt @ ; +: openbios-video-width openbios-video-width-xt @ ; +: openbios-video-height openbios-video-height-xt @ ; +: depth-bits depth-bits-xt @ ; +: line-bytes line-bytes-xt @ ; + +\ +\ IO port words +\ + +" ioc!" (find-xt) value ioc!-xt +" iow!" (find-xt) value iow!-xt + +: ioc! ioc!-xt execute ; +: iow! iow!-xt execute ; + +\ +\ VGA registers +\ + +h# 3c0 constant vga-addr +h# 3c8 constant dac-write-addr +h# 3c9 constant dac-data-addr + +: vga-color! ( r g b index -- ) + \ Set the VGA colour registers + dac-write-addr ioc! rot + 2 >> dac-data-addr ioc! swap + 2 >> dac-data-addr ioc! + 2 >> dac-data-addr ioc! ; -: openbios-video-height - " openbios-video-height" $find if - cell+ @ - then +\ +\ VBE registers +\ + +h# 0 constant VBE_DISPI_INDEX_ID +h# 1 constant VBE_DISPI_INDEX_XRES +h# 2 constant VBE_DISPI_INDEX_YRES +h# 3 constant VBE_DISPI_INDEX_BPP +h# 4 constant VBE_DISPI_INDEX_ENABLE +h# 5 constant VBE_DISPI_INDEX_BANK +h# 6 constant VBE_DISPI_INDEX_VIRT_WIDTH +h# 7 constant VBE_DISPI_INDEX_VIRT_HEIGHT +h# 8 constant VBE_DISPI_INDEX_X_OFFSET +h# 9 constant VBE_DISPI_INDEX_Y_OFFSET +h# a constant VBE_DISPI_INDEX_NB + +h# 0 constant VBE_DISPI_DISABLED +h# 1 constant VBE_DISPI_ENABLED + +\ +\ Bochs VBE register writes +\ + +: vbe-iow! ( val addr -- ) + h# 1ce iow! + h# 1d0 iow! +; + +\ +\ Initialise Bochs VBE mode +\ + +: vbe-init ( -- ) + h# 0 vga-addr ioc! \ Enable blanking + VBE_DISPI_DISABLED VBE_DISPI_INDEX_ENABLE vbe-iow! + h# 0 VBE_DISPI_INDEX_X_OFFSET vbe-iow! + h# 0 VBE_DISPI_INDEX_Y_OFFSET vbe-iow! + openbios-video-width VBE_DISPI_INDEX_XRES vbe-iow! + openbios-video-height VBE_DISPI_INDEX_YRES vbe-iow! + depth-bits VBE_DISPI_INDEX_BPP vbe-iow! + VBE_DISPI_ENABLED VBE_DISPI_INDEX_ENABLE vbe-iow! + h# 0 vga-addr ioc! + h# 20 vga-addr ioc! \ Disable blanking +; + +\ +\ Publically visible words +\ + +external + +[IFDEF] CONFIG_MOL +defer mol-color! + +\ Hook for MOL (see packages/molvideo.c) + +: hw-set-color ( r g b index -- ) + mol-color! ; +[ELSE] + +\ Standard VGA + +: hw-set-color ( r g b index -- ) + vga-color! +; + +[THEN] + +headerless + +\ +\ Installation +\ + : qemu-vga-driver-install ( -- ) openbios-video-addr to frame-buffer-adr default-font set-font + + frame-buffer-adr encode-int " address" property + openbios-video-width encode-int " width" property + openbios-video-height encode-int " height" property + depth-bits encode-int " depth" property + line-bytes encode-int " linebytes" property + openbios-video-width openbios-video-height over char-width / over char-height / fb8-install ; : qemu-vga-driver-init + vbe-init ['] qemu-vga-driver-install is-install ; Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:39:58 2013 (r1204) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:01 2013 (r1205) @@ -51,74 +51,6 @@ #define VBE_DISPI_LFB_ENABLED 0x40 #define VBE_DISPI_NOCLEARMEM 0x80 -static void vbe_outw(int index, int val) -{ - outw(index, 0x1ce); - outw(val, 0x1d0); -} - -/* for depth = 8 mode, set a hardware palette entry */ -void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b) -{ - r &= 0xff; - g &= 0xff; - b &= 0xff; - outb(i, 0x3c8); - outb(r >> 2, 0x3c9); - outb(g >> 2, 0x3c9); - outb(b >> 2, 0x3c9); -} - -/* build standard RGB palette */ -static void vga_build_rgb_palette(void) -{ - static const uint8_t pal_value[6] = { 0x00, 0x33, 0x66, 0x99, 0xcc, 0xff }; - int i, r, g, b; - - i = 0; - for(r = 0; r < 6; r++) { - for(g = 0; g < 6; g++) { - for(b = 0; b < 6; b++) { - vga_set_color(i, pal_value[r], pal_value[g], pal_value[b]); - i++; - } - } - } -} - -/* depth = 8, 15, 16 or 32 */ -void vga_vbe_set_mode(int width, int height, int depth) -{ - outb(0x00, 0x3c0); /* enable blanking */ - vbe_outw(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); - vbe_outw(VBE_DISPI_INDEX_X_OFFSET, 0); - vbe_outw(VBE_DISPI_INDEX_Y_OFFSET, 0); - vbe_outw(VBE_DISPI_INDEX_XRES, width); - vbe_outw(VBE_DISPI_INDEX_YRES, height); - vbe_outw(VBE_DISPI_INDEX_BPP, depth); - vbe_outw(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED); - outb(0x00, 0x3c0); - outb(0x20, 0x3c0); /* disable blanking */ - - if (depth == 8) - vga_build_rgb_palette(); -} - -/* Low-level Forth accessor to update VGA color registers */ - -/* ( r g b index -- ) */ -static -void vga_hw_set_color(void) -{ - int index = POP(); - int b = POP(); - int g = POP(); - int r = POP(); - - vga_set_color(index, (r & 0xff), - (g & 0xff), - (b & 0xff)); -} void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) @@ -136,9 +68,6 @@ #endif setup_video(phys, fb); - vga_vbe_set_mode(VIDEO_DICT_VALUE(video.w), - VIDEO_DICT_VALUE(video.h), - VIDEO_DICT_VALUE(video.depth)); #if 0 ph = find_dev(path); @@ -146,14 +75,6 @@ ph = get_cur_dev(); #endif - bind_func("hw-set-color", vga_hw_set_color); - - set_int_property(ph, "width", VIDEO_DICT_VALUE(video.w)); - set_int_property(ph, "height", VIDEO_DICT_VALUE(video.h)); - set_int_property(ph, "depth", VIDEO_DICT_VALUE(video.depth)); - set_int_property(ph, "linebytes", VIDEO_DICT_VALUE(video.rb)); - set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); - molvideo_init(); chosen = find_dev("/chosen");

1 0

[commit] r1204 - trunk/openbios-devel/kernel
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:39:58 2013 New Revision: 1204 URL: http://tracker.coreboot.org/trac/openbios/changeset/1204 Log: forth.c: fix ioc!, iow! and iol! words The kernel implementation for the above words is incorrect because the value/reg parameters are the wrong way around. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/kernel/forth.c Modified: trunk/openbios-devel/kernel/forth.c ============================================================================== --- trunk/openbios-devel/kernel/forth.c Sun Aug 11 09:24:36 2013 (r1203) +++ trunk/openbios-devel/kernel/forth.c Mon Aug 19 09:39:58 2013 (r1204) @@ -1787,7 +1787,7 @@ cell reg = POP(); cell val = POP(); - outb(reg, val); + outb(val, reg); #else (void)POP(); (void)POP(); @@ -1805,7 +1805,7 @@ cell reg = POP(); cell val = POP(); - outw(reg, val); + outw(val, reg); #else (void)POP(); (void)POP(); @@ -1823,7 +1823,7 @@ ucell reg = POP(); ucell val = POP(); - outl(reg, val); + outl(val, reg); #else (void)POP(); (void)POP();

1 0

[PATCHv2 00/14] Display driver rework and Forth conversion series
by Mark Cave-Ayland 11 Aug '13

11 Aug '13

This should be the final in the display rework patch series which completes the conversion of the VGA/TCX drivers from C to Forth. The series also includes several other improvements: - Fixes for SPARC32 romvec stdin/stdout initialisation - Fixes for ioc!/iow!/iol! words - Implementation of SBus and PCI map functions (see comments for PCI) - Isolation of all remaining MOL code into molvideo.h - Simple implementation of TCX "probe" function (will morph into probe-self with very little work) - Removal of remaining hacks required to support a mixed C/Forth display environment Once this patchset is applied, it only remains to implement cpeek and augment the SBus probe-self function to provide the ability to execute FCode ROMs supplied by QEMU. Updates for v2: - Fix typo in cover letter - x86/amd64 build fixes - Add copyrights to tcx.fs and vga.fs - Fix generation of stdin-path/stdout-path properties - Simplify out-of-package property assignments using (property) - Fix typo in map-out-sbus - Use new ofmem_release_io() function - Rebase onto SVN trunk Mark Cave-Ayland (14): forth.c: fix ioc!, iow! and iol! words vga: move VGA initialisation from C to Forth video: move all non MOL-specific code from molvideo.c to vga.fs pci/vga: move PCI framebuffer map functions info Forth vga: move initialisation of screen-#columns/screen-#rows to setup_video() SPARC32: fix romvec stdin/stdout field initialisation display: move creation of "display" and "screen" properties to Forth sbus: implement map-in and map-out words sbus/tcx: implement probe_self() wrapper tcx.fs: tidy-up lookups using (find-xt) and use openbios-* vars where appropriate tcx.fs: move DAC programming from C to tcx.fs tcx.fs: move framebuffer mapping over from C to tcx.fs video: remove video_set_color() vga: remove vga_vbe_init() and vga_vbe.c openbios-devel/arch/ppc/qemu/init.c | 18 --- openbios-devel/arch/sparc32/boot.c | 15 +- openbios-devel/arch/sparc32/console.c | 38 ----- openbios-devel/arch/sparc32/openbios.c | 32 +--- openbios-devel/arch/sparc32/romvec.c | 14 +- openbios-devel/arch/sparc32/tree.fs | 21 +-- openbios-devel/arch/sparc64/openbios.c | 18 --- openbios-devel/arch/x86/openbios.c | 2 +- openbios-devel/drivers/build.xml | 1 - openbios-devel/drivers/iommu.c | 32 ++++ openbios-devel/drivers/pci.c | 98 +++++++++--- openbios-devel/drivers/pci.fs | 77 +++++++++ openbios-devel/drivers/sbus.c | 238 ++++------------------------ openbios-devel/drivers/sbus.fs | 60 +++++++ openbios-devel/drivers/tcx.fs | 219 +++++++++++++++++++++++-- openbios-devel/drivers/vga.fs | 194 ++++++++++++++++++++--- openbios-devel/drivers/vga_vbe.c | 191 ---------------------- openbios-devel/forth/admin/iocontrol.fs | 26 +++ openbios-devel/forth/device/display.fs | 13 +- openbios-devel/include/drivers/drivers.h | 2 - openbios-devel/include/libopenbios/video.h | 4 +- openbios-devel/kernel/forth.c | 6 +- openbios-devel/libopenbios/video_common.c | 46 ++---- openbios-devel/packages/build.xml | 2 +- openbios-devel/packages/molvideo.c | 78 ++------- 25 files changed, 746 insertions(+), 699 deletions(-) delete mode 100644 openbios-devel/drivers/vga_vbe.c -- 1.7.10.4

1 14

[commit] r1203 - trunk/openbios-devel/include/arch/amd64
by repository service 11 Aug '13

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:36 2013 New Revision: 1203 URL: http://tracker.coreboot.org/trac/openbios/changeset/1203 Log: amd64: add mising FMT_* definitions required for the next display patchset Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/arch/amd64/types.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Aug 11 09:24:33 2013 (r1202) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Aug 11 09:24:36 2013 (r1203) @@ -29,7 +29,9 @@ typedef __int128_t dcell; typedef __uint128_t ducell; +#define FMT_cell "%" PRId64 #define FMT_ucellx "%016" PRIx64 +#define FMT_ucell "%" PRIu64 typedef int64_t prom_arg_t; typedef uint64_t prom_uarg_t;

1 0

[commit] r1202 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 11 Aug '13

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:33 2013 New Revision: 1202 URL: http://tracker.coreboot.org/trac/openbios/changeset/1202 Log: OFMEM: add ofmem_release_io() function Similar to ofmem_release_phys() and ofmem_release_virt(), create a new function to release memory claimed with ofmem_claim_io(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Aug 11 09:24:30 2013 (r1201) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Aug 11 09:24:33 2013 (r1202) @@ -120,6 +120,7 @@ extern void ofmem_release( ucell virt, ucell size ); extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); +extern void ofmem_release_io( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); /* memory and virtual-memory nodes */ Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:30 2013 (r1201) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:33 2013 (r1202) @@ -929,6 +929,16 @@ remove_range(virt, size, &ofmem->virt_range); } +/* release memory allocated by ofmem_claim_io */ +void ofmem_release_io( ucell virt, ucell size ) +{ + OFMEM_TRACE("ofmem_release_io addr=" FMT_ucellx " size=" FMT_ucellx "\n", + virt, size); + + ofmem_t *ofmem = ofmem_arch_get_private(); + remove_range(virt, size, &ofmem->io_range); +} + /* release memory allocated by ofmem_claim - 6.3.2.4 */ void ofmem_release( ucell virt, ucell size ) {

1 0

[commit] r1201 - trunk/openbios-devel/libopenbios
by repository service 11 Aug '13

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:30 2013 New Revision: 1201 URL: http://tracker.coreboot.org/trac/openbios/changeset/1201 Log: OFMEM: implement missing remove_range() function This means that when we call the OFMEM release functions, we actually return the memory range back to the pool for re-use rather than constantly allocating a new range every time. 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 Sun Aug 11 09:24:27 2013 (r1200) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:30 2013 (r1201) @@ -878,9 +878,35 @@ return -1; } -static void remove_range( ucell ea, ucell size, range_t **r ) +static void remove_range_( phys_addr_t ea, ucell size, range_t **r ) { - OFMEM_TRACE("%s: not implemented\n", __func__); + range_t *cr; + + /* Handle special case if we're removing the first entry */ + if ((**r).start >= ea) { + cr = *r; + *r = (**r).next; + free(cr); + + return; + } + + for( ; *r && ((**r).next)->start < ea; r=&(**r).next ) { + } + + cr = (**r).next; + (**r).next = cr->next; + free(cr); +} + +static int remove_range( phys_addr_t ea, ucell size, range_t **r ) +{ + if( is_free( ea, size, *r ) ) { + OFMEM_TRACE("remove_range: range isn't occupied\n"); + return -1; + } + remove_range_( ea, size, r ); + return 0; } /* release memory allocated by ofmem_claim_phys */

1 0