Solaris kmdb support for OpenBIOS SPARC64
by Mark Cave-Ayland
Hi all,
I've been looking at how to enable kmdb support for Solaris OpenBIOS
SPARC64 and it seems that OpenBIOS needs some additional routines in
order for the kernel to load the debugger.
AIUI the kernel makes use of 2 traps for kmdb, for which some searching
on the internet gives the following:
0x17d : kadb enter
0x17e : kadb breakpoint
Indeed if I start Milax with "boot cdrom:a -kdv" then current SVN trunk
will halt because the 0x17d trap currently jumps straight to the bug()
routine. Sadly what OpenBIOS should do is a little more hazy, especially
as I don't think the relevant sun4u parts are in Sun's open-sourced
OpenBOOT.
Currently booting Milax will emit the following error on the console
during boot:
interpret : kmdb_callback %pc f000.0000 ffff.ffff between if exit then
%pc h# 18e9058 x! %npc h# 18e9060 x! %g1 h# 18e8f58 x! %g2 h#
18e8f60 x! %g3 h# 18e8f68 x! %g4 h# 18e8f70 x! %g5 h# 18e8f78 x!
%g6 h# 18e8f80 x! %g7 h# 18e8f88 x! 1 %tstate h# 18e9220 x! 1
%tt h# 18e90e8 x! %tba h# 18e90a8 x! h# 12f6098 set-pc go ;
failed with error ffffffffffffffed
kmdb_callback:interpret: exception -13 caught
interpret ['] kmdb_callback init-debugger-hook failed with error
ffffffffffffffed
Based upon this, my best guess would be that both traps above execute
the init-debugger-hook word which simply copies the current register
sets above on PROM entry somewhere accessible to kmdb, then points the
PC to the debugger entry point and resumes execution causing a jump
straight into kmdb. Does this sound about right?
ATB,
Mark.
4 years, 8 months
- 1
- 0
QEMU OpenBIOS update
by Mark Cave-Ayland
Hi all,
I've just pushed my outstanding patches for OpenBIOS to SVN trunk and
will probably send a QEMU pull request tomorrow as I'm interested to get
both the OFMEM and TCX patches tested as soon as possible (I should add
that it seems to pass all my tests here, but I know Alex has a more
comprehensive build-bot).
The other patch I have on my immediate radar is Zoltan's bus mastering
patch here:
http://www.openfirmware.info/pipermail/openbios/2014-June/008448.html.
Would anyone have any further objections to applying this after the next
QEMU pull request? It seems reasonable, but I can't say I'm overly
familiar enough with PCI to say this won't break anything. Will a
successful test under SPARC64 be good enough? Thoughts?
ATB,
Mark.
4 years, 8 months
- 1
- 0
[commit] r1320 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Wed Sep 24 20:03:55 2014
New Revision: 1320
URL: http://tracker.coreboot.org/trac/openbios/changeset/1320
Log:
tcx.fs: add support for hardware acceleration
This is a tidied version of the patch originally posted to the mailing list by
Olivier DANET <odanet(a)caramail.com>.
- Change a few addresses to match actual hardware
- Remove the "address" property from TCX, because of some almost-bug in NetBSD
when detecting framebuffers (actual TCX has no address property, so it works
by chance on real hardware)
- Add the hardware cursor properties
With this and the corresponding QEMU TCX hardware acceleration patch, the
hardware-assisted NetBSD TCX driver will function under QEMU.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/drivers/tcx.fs
Modified: trunk/openbios-devel/drivers/tcx.fs
==============================================================================
--- trunk/openbios-devel/drivers/tcx.fs Wed Sep 24 20:03:53 2014 (r1319)
+++ trunk/openbios-devel/drivers/tcx.fs Wed Sep 24 20:03:55 2014 (r1320)
@@ -92,7 +92,7 @@
h# 1000 constant /tcx-off-thc-24
h# 81c constant /tcx-off-thc-8
-h# 700000 constant tcx-off-tec
+h# 701000 constant tcx-off-tec
h# 1000 constant /tcx-off-tec
h# 800000 constant tcx-off-dfb8
@@ -103,7 +103,7 @@
h# 1 constant /tcx-off-dfb24-8
h# 4000000 constant tcx-off-stip
-h# 400000 constant /tcx-off-stip-24
+h# 800000 constant /tcx-off-stip-24
h# 1 constant /tcx-off-stip-8
h# 6000000 constant tcx-off-blit
@@ -228,7 +228,11 @@
fb-addr to frame-buffer-adr
default-font set-font
- frame-buffer-adr encode-int " address" property
+ \ Sun TCX adapters don't have an address property, but it is useful for
+ \ OpenBIOS developers. Unfortunately NetBSD SPARC32 has a bug that causes
+ \ it to fail initialising TCX if the address property is present; so work
+ \ around this by adding an underscore prefix
+ frame-buffer-adr encode-int " _address" property
openbios-video-width openbios-video-height over char-width / over char-height /
fb8-install
@@ -266,7 +270,7 @@
openbios-video-width encode-int " width" property
line-bytes encode-int " linebytes" property
- 5 encode-int 0 encode-int encode+ " intr" property
+ h# 39 encode-int 0 encode-int encode+ " intr" property
5 encode-int " interrupts" property
['] qemu-tcx-driver-install is-install
4 years, 8 months
- 1
- 0
[commit] r1319 - trunk/openbios-devel/drivers
by repository service
Author: mcayland
Date: Wed Sep 24 20:03:53 2014
New Revision: 1319
URL: http://tracker.coreboot.org/trac/openbios/changeset/1319
Log:
tcx.fs: update reg offsets to use proper register names
Rather than use numerical offsets, use the proper register names as used in
the QEMU TCX hardware acceleration patch.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/drivers/tcx.fs
Modified: trunk/openbios-devel/drivers/tcx.fs
==============================================================================
--- trunk/openbios-devel/drivers/tcx.fs Wed Sep 24 20:03:51 2014 (r1318)
+++ trunk/openbios-devel/drivers/tcx.fs Wed Sep 24 20:03:53 2014 (r1319)
@@ -72,54 +72,54 @@
\ Registers
\
-h# 0 constant tcx-off1
-h# 10000 constant /tcx-off1
+h# 0 constant tcx-off-rom
+h# 10000 constant /tcx-off-rom
-h# 200000 constant tcx-off-dac
-h# 4000 constant /tcx-off-dac-24
-h# 4 constant /tcx-off-dac-8
-
-h# 240000 constant tcx-off3
-h# 4000 constant /tcx-off3-24
-h# 4 constant /tcx-off3-8
-
-h# 280000 constant tcx-off4
-h# 8000 constant /tcx-off4-24
-h# 1 constant /tcx-off4-8
-
-h# 301000 constant tcx-off5-24
-h# 300000 constant tcx-off5-8
-h# 1000 constant /tcx-off5-24
-h# 81c constant /tcx-off5-8
-
-h# 700000 constant tcx-off6
-h# 1000 constant /tcx-off6
-
-h# 800000 constant tcx-off-fb
-h# 100000 constant /tcx-off-fb
-
-h# 2000000 constant tcx-off8
-h# 400000 constant /tcx-off8-24
-h# 1 constant /tcx-off8-8
-
-h# 4000000 constant tcx-off9
-h# 400000 constant /tcx-off9-24
-h# 1 constant /tcx-off9-8
-
-h# 6000000 constant tcx-off10
-h# 800000 constant /tcx-off10
-
-h# a000000 constant tcx-off11
-h# 400000 constant /tcx-off11-24
-h# 1 constant /tcx-off11-8
-
-h# c000000 constant tcx-off12
-h# 800000 constant /tcx-off12-24
-h# 1 constant /tcx-off12-8
-
-h# e000000 constant tcx-off13
-h# 800000 constant /tcx-off13-24
-h# 1 constant /tcx-off13-8
+h# 200000 constant tcx-off-cmap
+h# 4000 constant /tcx-off-cmap-24
+h# 4 constant /tcx-off-cmap-8
+
+h# 240000 constant tcx-off-dhc
+h# 4000 constant /tcx-off-dhc-24
+h# 4 constant /tcx-off-dhc-8
+
+h# 280000 constant tcx-off-alt
+h# 8000 constant /tcx-off-alt-24
+h# 1 constant /tcx-off-alt-8
+
+h# 301000 constant tcx-off-thc-24
+h# 300000 constant tcx-off-thc-8
+h# 1000 constant /tcx-off-thc-24
+h# 81c constant /tcx-off-thc-8
+
+h# 700000 constant tcx-off-tec
+h# 1000 constant /tcx-off-tec
+
+h# 800000 constant tcx-off-dfb8
+h# 100000 constant /tcx-off-dfb8
+
+h# 2000000 constant tcx-off-dfb24
+h# 400000 constant /tcx-off-dfb24-24
+h# 1 constant /tcx-off-dfb24-8
+
+h# 4000000 constant tcx-off-stip
+h# 400000 constant /tcx-off-stip-24
+h# 1 constant /tcx-off-stip-8
+
+h# 6000000 constant tcx-off-blit
+h# 800000 constant /tcx-off-blit
+
+h# a000000 constant tcx-off-rdfb32
+h# 400000 constant /tcx-off-rdfb32-24
+h# 1 constant /tcx-off-rdfb32-8
+
+h# c000000 constant tcx-off-rstip
+h# 800000 constant /tcx-off-rstip-24
+h# 1 constant /tcx-off-rstip-8
+
+h# e000000 constant tcx-off-rblit
+h# 800000 constant /tcx-off-rblit-24
+h# 1 constant /tcx-off-rblit-8
: >tcx-reg-spec ( offset size -- encoded-reg )
>r 0 my-address d+ my-space encode-phys r> encode-int encode+
@@ -127,37 +127,37 @@
: tcx-8bit-reg
\ WARNING: order is important (at least to Solaris)
- tcx-off-fb /tcx-off-fb >tcx-reg-spec
- tcx-off8 /tcx-off8-8 >tcx-reg-spec encode+
- tcx-off9 /tcx-off9-8 >tcx-reg-spec encode+
- tcx-off10 /tcx-off10 >tcx-reg-spec encode+
- tcx-off11 /tcx-off11-8 >tcx-reg-spec encode+
- tcx-off12 /tcx-off12-8 >tcx-reg-spec encode+
- tcx-off13 /tcx-off13-8 >tcx-reg-spec encode+
- tcx-off6 /tcx-off6 >tcx-reg-spec encode+
- tcx-off-dac /tcx-off-dac-8 >tcx-reg-spec encode+
- tcx-off5-8 /tcx-off5-8 >tcx-reg-spec encode+
- tcx-off1 /tcx-off1 >tcx-reg-spec encode+
- tcx-off3 /tcx-off3-8 >tcx-reg-spec encode+
- tcx-off4 /tcx-off4-8 >tcx-reg-spec encode+
+ tcx-off-dfb8 /tcx-off-dfb8 >tcx-reg-spec
+ tcx-off-dfb24 /tcx-off-dfb24-8 >tcx-reg-spec encode+
+ tcx-off-stip /tcx-off-stip-8 >tcx-reg-spec encode+
+ tcx-off-blit /tcx-off-blit >tcx-reg-spec encode+
+ tcx-off-rdfb32 /tcx-off-rdfb32-8 >tcx-reg-spec encode+
+ tcx-off-rstip /tcx-off-rstip-8 >tcx-reg-spec encode+
+ tcx-off-rblit /tcx-off-rblit-8 >tcx-reg-spec encode+
+ tcx-off-tec /tcx-off-tec >tcx-reg-spec encode+
+ tcx-off-cmap /tcx-off-cmap-8 >tcx-reg-spec encode+
+ tcx-off-thc-8 /tcx-off-thc-8 >tcx-reg-spec encode+
+ tcx-off-rom /tcx-off-rom >tcx-reg-spec encode+
+ tcx-off-dhc /tcx-off-dhc-8 >tcx-reg-spec encode+
+ tcx-off-alt /tcx-off-alt-8 >tcx-reg-spec encode+
" reg" property
;
: tcx-24bit-reg
\ WARNING: order is important (at least to Solaris)
- tcx-off-fb /tcx-off-fb >tcx-reg-spec
- tcx-off8 /tcx-off8-24 >tcx-reg-spec encode+
- tcx-off9 /tcx-off9-24 >tcx-reg-spec encode+
- tcx-off10 /tcx-off10 >tcx-reg-spec encode+
- tcx-off11 /tcx-off11-24 >tcx-reg-spec encode+
- tcx-off12 /tcx-off12-24 >tcx-reg-spec encode+
- tcx-off13 /tcx-off13-24 >tcx-reg-spec encode+
- tcx-off6 /tcx-off6 >tcx-reg-spec encode+
- tcx-off-dac /tcx-off-dac-24 >tcx-reg-spec encode+
- tcx-off5-24 /tcx-off5-24 >tcx-reg-spec encode+
- tcx-off1 /tcx-off1 >tcx-reg-spec encode+
- tcx-off3 /tcx-off3-24 >tcx-reg-spec encode+
- tcx-off4 /tcx-off4-24 >tcx-reg-spec encode+
+ tcx-off-dfb8 /tcx-off-dfb8 >tcx-reg-spec
+ tcx-off-dfb24 /tcx-off-dfb24-24 >tcx-reg-spec encode+
+ tcx-off-stip /tcx-off-stip-24 >tcx-reg-spec encode+
+ tcx-off-blit /tcx-off-blit >tcx-reg-spec encode+
+ tcx-off-rdfb32 /tcx-off-rdfb32-24 >tcx-reg-spec encode+
+ tcx-off-rstip /tcx-off-rstip-24 >tcx-reg-spec encode+
+ tcx-off-rblit /tcx-off-rblit-24 >tcx-reg-spec encode+
+ tcx-off-tec /tcx-off-tec >tcx-reg-spec encode+
+ tcx-off-cmap /tcx-off-cmap-24 >tcx-reg-spec encode+
+ tcx-off-thc-24 /tcx-off-thc-24 >tcx-reg-spec encode+
+ tcx-off-rom /tcx-off-rom >tcx-reg-spec encode+
+ tcx-off-dhc /tcx-off-dhc-24 >tcx-reg-spec encode+
+ tcx-off-alt /tcx-off-alt-24 >tcx-reg-spec encode+
" reg" property
;
@@ -198,11 +198,11 @@
\
: dac-map
- tcx-off-dac /tcx-dac do-map-in to tcx-dac
+ tcx-off-cmap /tcx-dac do-map-in to tcx-dac
;
: fb-map
- tcx-off-fb h# c0000 do-map-in to fb-addr
+ tcx-off-dfb8 h# c0000 do-map-in to fb-addr
;
: map-regs
@@ -240,11 +240,11 @@
\ Handle differences between 8-bit/24-bit mode
depth-bits 8 = if
tcx-8bit-reg
- /tcx-off-dac-8 to /tcx-dac
+ /tcx-off-cmap-8 to /tcx-dac
" true" encode-string " tcx-8-bit" property
else
tcx-24bit-reg
- /tcx-off-dac-24 to /tcx-dac
+ /tcx-off-cmap-24 to /tcx-dac
\ Even with a 24-bit enabled TCX card, the control plane is
\ used in 8-bit mode. So force the video subsystem into 8-bit
4 years, 8 months
- 1
- 0
[commit] r1318 - trunk/openbios-devel/libopenbios
by repository service
Author: mcayland
Date: Wed Sep 24 20:03:51 2014
New Revision: 1318
URL: http://tracker.coreboot.org/trac/openbios/changeset/1318
Log:
OFMEM: change ofmem_claim() to always allocate addresses where phys == virt
The wording of the IEEE1275 specification for the CIF claim and release words
contains the following:
claim
IN: [address] virt, size, align
OUT: [address] baseaddr
Allocates size bytes of memory. If align is zero, the allocated range begins
at the virtual address virt.... The range of physical memory and virtual addresses
affected by this operation will be unavailable for subsequent mapping or allocation
operations until freed by release.
release
IN: [address] virt, size
OUT: none
Frees size bytes of physical memory starting at virtual address virt, making that
physical memory and the corresponding range of virtual address space available for
later use. That memory must have been previously allocated by claim.
Even though the claim word mentions virtual addresses, the implication from the
release word mentioning physical memory is that allocations made by claim must
have phys == virt. So change ofmem_claim() to ensure that addresses allocated via
the CIF claim word always have phys == virt.
This fixes a bug in MorphOS boot where different physical and virtual addresses
cause mixed accesses by the bootloader to fail.
Reported-by: BALATON Zoltan <balaton(a)eik.bme.hu>
Tested-by: BALATON Zoltan <balaton(a)eik.bme.hu>
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 Wed Sep 24 20:03:48 2014 (r1317)
+++ trunk/openbios-devel/libopenbios/ofmem_common.c Wed Sep 24 20:03:51 2014 (r1318)
@@ -634,8 +634,8 @@
} else {
if( align < PAGE_SIZE )
align = PAGE_SIZE;
- phys = ofmem_claim_phys_( addr, size, align, 0, ofmem_arch_get_phys_top(), 1 /* reverse */ );
- virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ );
+ phys = ofmem_claim_phys_( -1, size, align, 0, ofmem_arch_get_phys_top(), 1 /* reverse */ );
+ virt = ofmem_claim_virt_( phys, size, 0, 0, 0, 0 );
if( phys == -1 || virt == -1 ) {
OFMEM_TRACE("ofmem_claim failed\n");
return -1;
4 years, 8 months
- 1
- 0
[commit] r1317 - trunk/openbios-devel/arch/sparc64
by repository service
Author: mcayland
Date: Wed Sep 24 20:03:48 2014
New Revision: 1317
URL: http://tracker.coreboot.org/trac/openbios/changeset/1317
Log:
SPARC64: configure the Sabre PCI TAS register
Make sure that we declare the same range available as set by the virtual-dma
properties hardcoded in sabre_configure().
This register is checked by FreeBSD during boot which panics if it finds a
default (zero) value.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/sparc64/openbios.c
Modified: trunk/openbios-devel/arch/sparc64/openbios.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/openbios.c Mon Aug 25 15:08:08 2014 (r1316)
+++ trunk/openbios-devel/arch/sparc64/openbios.c Wed Sep 24 20:03:48 2014 (r1317)
@@ -116,6 +116,20 @@
: : "r" (val), "r" (addr) : "memory");
}
+/* PCI Target Address Space Register (see UltraSPARC IIi User's Manual
+ section 19.3.0.4) */
+#define PBM_PCI_TARGET_AS 0x2028
+#define PBM_PCI_TARGET_AS_CD_ENABLE 0x40
+
+static void
+sparc64_set_tas_register(unsigned long val)
+{
+ unsigned long addr = APB_SPECIAL_BASE + PBM_PCI_TARGET_AS;
+
+ asm("stxa %0, [%1] 0x15\n\t"
+ : : "r" (val), "r" (addr) : "memory");
+}
+
static void cpu_generic_init(const struct cpudef *cpu, uint32_t clock_frequency)
{
unsigned long iu_version;
@@ -574,6 +588,10 @@
modules_init();
#ifdef CONFIG_DRIVER_PCI
ob_pci_init();
+
+ /* Set TAS register to match the virtual-dma properties
+ set during sabre configure */
+ sparc64_set_tas_register(PBM_PCI_TARGET_AS_CD_ENABLE);
#endif
nvconf_init();
device_end();
4 years, 8 months
- 1
- 0
Re: [OpenBIOS] [PATCH] SPARC64: configure the Sabre PCI TAS register
by Peter Firmstone
There's a lot of cheap sparc hardware based on sunv T2 coming onto the market, I'd like to use AMD cards that are known to work well with the free radeon driver, but none of them have open firmware support.
I've read that IBM's OpenFirmware did include vga bios emulation.
I think the openBoot firmware at the link is for the T1, Sun also released a later version for the T2 sparc processor, which is still available.
They released their hypervisor code too, I don't know it's portable to other architectures, but it's pretty cool technology.
Thanks,
Peter.
----- Original message -----
> On 13/09/14 12:45, Peter Firmstone wrote:
>
> > Anyone know if OpenBios works with Sun's Hypervisor (also free
> > software) on it's Niagara servers?
> >
> > Wondering if it's feasible to use this for vga bios emulation for 3d
> > graphics support with Gentoo linux?
>
> Sadly not, but Sun did open source their OpenBOOT implementation which
> has sun4v support which you can get a copy of here:
> http://www.openfirmware.info/OpenBOOT.
>
> Can you explain further why you need vga bios support for 3d graphics
> support? Which drivers/hardware are you looking to support?
>
>
> ATB,
>
> Mark.
>
4 years, 8 months
- 1
- 0
[PATCH] SPARC64: configure the Sabre PCI TAS register
by Mark Cave-Ayland
Make sure that we declare the same range available as set by the virtual-dma
properties hardcoded in sabre_configure().
This register is checked by FreeBSD during boot which panics if it finds a
default (zero) value.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
openbios-devel/arch/sparc64/openbios.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/openbios-devel/arch/sparc64/openbios.c b/openbios-devel/arch/sparc64/openbios.c
index 9cc1ac2..3a36146 100644
--- a/openbios-devel/arch/sparc64/openbios.c
+++ b/openbios-devel/arch/sparc64/openbios.c
@@ -116,6 +116,20 @@ sparc64_reset_all(void)
: : "r" (val), "r" (addr) : "memory");
}
+/* PCI Target Address Space Register (see UltraSPARC IIi User's Manual
+ section 19.3.0.4) */
+#define PBM_PCI_TARGET_AS 0x2028
+#define PBM_PCI_TARGET_AS_CD_ENABLE 0x40
+
+static void
+sparc64_set_tas_register(unsigned long val)
+{
+ unsigned long addr = APB_SPECIAL_BASE + PBM_PCI_TARGET_AS;
+
+ asm("stxa %0, [%1] 0x15\n\t"
+ : : "r" (val), "r" (addr) : "memory");
+}
+
static void cpu_generic_init(const struct cpudef *cpu, uint32_t clock_frequency)
{
unsigned long iu_version;
@@ -574,6 +588,10 @@ arch_init( void )
modules_init();
#ifdef CONFIG_DRIVER_PCI
ob_pci_init();
+
+ /* Set TAS register to match the virtual-dma properties
+ set during sabre configure */
+ sparc64_set_tas_register(PBM_PCI_TARGET_AS_CD_ENABLE);
#endif
nvconf_init();
device_end();
--
1.7.10.4
4 years, 8 months
- 3
- 2
[PATCH] OFMEM: change ofmem_claim() to always allocate addresses where phys == virt
by Mark Cave-Ayland
The wording of the IEEE1275 specification for the CIF claim and release words
contains the following:
claim
IN: [address] virt, size, align
OUT: [address] baseaddr
Allocates size bytes of memory. If align is zero, the allocated range begins
at the virtual address virt.... The range of physical memory and virtual addresses
affected by this operation will be unavailable for subsequent mapping or allocation
operations until freed by release.
release
IN: [address] virt, size
OUT: none
Frees size bytes of physical memory starting at virtual address virt, making that
physical memory and the corresponding range of virtual address space available for
later use. That memory must have been previously allocated by claim.
Even though the claim word mentions virtual addresses, the implication from the
release word mentioning physical memory is that allocations made by claim must
have phys == virt. So change ofmem_claim() to ensure that addresses allocated via
the CIF claim word always have phys == virt.
This fixes a bug in MorphOS boot where different physical and virtual addresses
cause mixed accesses by the bootloader to fail.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
openbios-devel/libopenbios/ofmem_common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c
index 157ca87..3b8ca15 100644
--- a/openbios-devel/libopenbios/ofmem_common.c
+++ b/openbios-devel/libopenbios/ofmem_common.c
@@ -634,8 +634,8 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align )
} else {
if( align < PAGE_SIZE )
align = PAGE_SIZE;
- phys = ofmem_claim_phys_( addr, size, align, 0, ofmem_arch_get_phys_top(), 1 /* reverse */ );
- virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ );
+ phys = ofmem_claim_phys_( -1, size, align, 0, ofmem_arch_get_phys_top(), 1 /* reverse */ );
+ virt = ofmem_claim_virt_( phys, size, 0, 0, 0, 0 );
if( phys == -1 || virt == -1 ) {
OFMEM_TRACE("ofmem_claim failed\n");
return -1;
--
1.7.10.4
4 years, 8 months
- 2
- 1
[PATCH 1/2] tcx.fs: update reg offsets to use proper register names
by Mark Cave-Ayland
Rather than use numerical offsets, use the proper register names as used in
the QEMU TCX hardware acceleration patch.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
---
openbios-devel/drivers/tcx.fs | 132 ++++++++++++++++++++---------------------
1 file changed, 66 insertions(+), 66 deletions(-)
diff --git a/openbios-devel/drivers/tcx.fs b/openbios-devel/drivers/tcx.fs
index e1ec5ad..d682e35 100644
--- a/openbios-devel/drivers/tcx.fs
+++ b/openbios-devel/drivers/tcx.fs
@@ -72,54 +72,54 @@ fcode-version3
\ Registers
\
-h# 0 constant tcx-off1
-h# 10000 constant /tcx-off1
+h# 0 constant tcx-off-rom
+h# 10000 constant /tcx-off-rom
-h# 200000 constant tcx-off-dac
-h# 4000 constant /tcx-off-dac-24
-h# 4 constant /tcx-off-dac-8
+h# 200000 constant tcx-off-cmap
+h# 4000 constant /tcx-off-cmap-24
+h# 4 constant /tcx-off-cmap-8
-h# 240000 constant tcx-off3
-h# 4000 constant /tcx-off3-24
-h# 4 constant /tcx-off3-8
+h# 240000 constant tcx-off-dhc
+h# 4000 constant /tcx-off-dhc-24
+h# 4 constant /tcx-off-dhc-8
-h# 280000 constant tcx-off4
-h# 8000 constant /tcx-off4-24
-h# 1 constant /tcx-off4-8
+h# 280000 constant tcx-off-alt
+h# 8000 constant /tcx-off-alt-24
+h# 1 constant /tcx-off-alt-8
-h# 301000 constant tcx-off5-24
-h# 300000 constant tcx-off5-8
-h# 1000 constant /tcx-off5-24
-h# 81c constant /tcx-off5-8
+h# 301000 constant tcx-off-thc-24
+h# 300000 constant tcx-off-thc-8
+h# 1000 constant /tcx-off-thc-24
+h# 81c constant /tcx-off-thc-8
-h# 700000 constant tcx-off6
-h# 1000 constant /tcx-off6
+h# 700000 constant tcx-off-tec
+h# 1000 constant /tcx-off-tec
-h# 800000 constant tcx-off-fb
-h# 100000 constant /tcx-off-fb
+h# 800000 constant tcx-off-dfb8
+h# 100000 constant /tcx-off-dfb8
-h# 2000000 constant tcx-off8
-h# 400000 constant /tcx-off8-24
-h# 1 constant /tcx-off8-8
+h# 2000000 constant tcx-off-dfb24
+h# 400000 constant /tcx-off-dfb24-24
+h# 1 constant /tcx-off-dfb24-8
-h# 4000000 constant tcx-off9
-h# 400000 constant /tcx-off9-24
-h# 1 constant /tcx-off9-8
+h# 4000000 constant tcx-off-stip
+h# 400000 constant /tcx-off-stip-24
+h# 1 constant /tcx-off-stip-8
-h# 6000000 constant tcx-off10
-h# 800000 constant /tcx-off10
+h# 6000000 constant tcx-off-blit
+h# 800000 constant /tcx-off-blit
-h# a000000 constant tcx-off11
-h# 400000 constant /tcx-off11-24
-h# 1 constant /tcx-off11-8
+h# a000000 constant tcx-off-rdfb32
+h# 400000 constant /tcx-off-rdfb32-24
+h# 1 constant /tcx-off-rdfb32-8
-h# c000000 constant tcx-off12
-h# 800000 constant /tcx-off12-24
-h# 1 constant /tcx-off12-8
+h# c000000 constant tcx-off-rstip
+h# 800000 constant /tcx-off-rstip-24
+h# 1 constant /tcx-off-rstip-8
-h# e000000 constant tcx-off13
-h# 800000 constant /tcx-off13-24
-h# 1 constant /tcx-off13-8
+h# e000000 constant tcx-off-rblit
+h# 800000 constant /tcx-off-rblit-24
+h# 1 constant /tcx-off-rblit-8
: >tcx-reg-spec ( offset size -- encoded-reg )
>r 0 my-address d+ my-space encode-phys r> encode-int encode+
@@ -127,37 +127,37 @@ h# 1 constant /tcx-off13-8
: tcx-8bit-reg
\ WARNING: order is important (at least to Solaris)
- tcx-off-fb /tcx-off-fb >tcx-reg-spec
- tcx-off8 /tcx-off8-8 >tcx-reg-spec encode+
- tcx-off9 /tcx-off9-8 >tcx-reg-spec encode+
- tcx-off10 /tcx-off10 >tcx-reg-spec encode+
- tcx-off11 /tcx-off11-8 >tcx-reg-spec encode+
- tcx-off12 /tcx-off12-8 >tcx-reg-spec encode+
- tcx-off13 /tcx-off13-8 >tcx-reg-spec encode+
- tcx-off6 /tcx-off6 >tcx-reg-spec encode+
- tcx-off-dac /tcx-off-dac-8 >tcx-reg-spec encode+
- tcx-off5-8 /tcx-off5-8 >tcx-reg-spec encode+
- tcx-off1 /tcx-off1 >tcx-reg-spec encode+
- tcx-off3 /tcx-off3-8 >tcx-reg-spec encode+
- tcx-off4 /tcx-off4-8 >tcx-reg-spec encode+
+ tcx-off-dfb8 /tcx-off-dfb8 >tcx-reg-spec
+ tcx-off-dfb24 /tcx-off-dfb24-8 >tcx-reg-spec encode+
+ tcx-off-stip /tcx-off-stip-8 >tcx-reg-spec encode+
+ tcx-off-blit /tcx-off-blit >tcx-reg-spec encode+
+ tcx-off-rdfb32 /tcx-off-rdfb32-8 >tcx-reg-spec encode+
+ tcx-off-rstip /tcx-off-rstip-8 >tcx-reg-spec encode+
+ tcx-off-rblit /tcx-off-rblit-8 >tcx-reg-spec encode+
+ tcx-off-tec /tcx-off-tec >tcx-reg-spec encode+
+ tcx-off-cmap /tcx-off-cmap-8 >tcx-reg-spec encode+
+ tcx-off-thc-8 /tcx-off-thc-8 >tcx-reg-spec encode+
+ tcx-off-rom /tcx-off-rom >tcx-reg-spec encode+
+ tcx-off-dhc /tcx-off-dhc-8 >tcx-reg-spec encode+
+ tcx-off-alt /tcx-off-alt-8 >tcx-reg-spec encode+
" reg" property
;
: tcx-24bit-reg
\ WARNING: order is important (at least to Solaris)
- tcx-off-fb /tcx-off-fb >tcx-reg-spec
- tcx-off8 /tcx-off8-24 >tcx-reg-spec encode+
- tcx-off9 /tcx-off9-24 >tcx-reg-spec encode+
- tcx-off10 /tcx-off10 >tcx-reg-spec encode+
- tcx-off11 /tcx-off11-24 >tcx-reg-spec encode+
- tcx-off12 /tcx-off12-24 >tcx-reg-spec encode+
- tcx-off13 /tcx-off13-24 >tcx-reg-spec encode+
- tcx-off6 /tcx-off6 >tcx-reg-spec encode+
- tcx-off-dac /tcx-off-dac-24 >tcx-reg-spec encode+
- tcx-off5-24 /tcx-off5-24 >tcx-reg-spec encode+
- tcx-off1 /tcx-off1 >tcx-reg-spec encode+
- tcx-off3 /tcx-off3-24 >tcx-reg-spec encode+
- tcx-off4 /tcx-off4-24 >tcx-reg-spec encode+
+ tcx-off-dfb8 /tcx-off-dfb8 >tcx-reg-spec
+ tcx-off-dfb24 /tcx-off-dfb24-24 >tcx-reg-spec encode+
+ tcx-off-stip /tcx-off-stip-24 >tcx-reg-spec encode+
+ tcx-off-blit /tcx-off-blit >tcx-reg-spec encode+
+ tcx-off-rdfb32 /tcx-off-rdfb32-24 >tcx-reg-spec encode+
+ tcx-off-rstip /tcx-off-rstip-24 >tcx-reg-spec encode+
+ tcx-off-rblit /tcx-off-rblit-24 >tcx-reg-spec encode+
+ tcx-off-tec /tcx-off-tec >tcx-reg-spec encode+
+ tcx-off-cmap /tcx-off-cmap-24 >tcx-reg-spec encode+
+ tcx-off-thc-24 /tcx-off-thc-24 >tcx-reg-spec encode+
+ tcx-off-rom /tcx-off-rom >tcx-reg-spec encode+
+ tcx-off-dhc /tcx-off-dhc-24 >tcx-reg-spec encode+
+ tcx-off-alt /tcx-off-alt-24 >tcx-reg-spec encode+
" reg" property
;
@@ -198,11 +198,11 @@ headerless
\
: dac-map
- tcx-off-dac /tcx-dac do-map-in to tcx-dac
+ tcx-off-cmap /tcx-dac do-map-in to tcx-dac
;
: fb-map
- tcx-off-fb h# c0000 do-map-in to fb-addr
+ tcx-off-dfb8 h# c0000 do-map-in to fb-addr
;
: map-regs
@@ -240,11 +240,11 @@ headerless
\ Handle differences between 8-bit/24-bit mode
depth-bits 8 = if
tcx-8bit-reg
- /tcx-off-dac-8 to /tcx-dac
+ /tcx-off-cmap-8 to /tcx-dac
" true" encode-string " tcx-8-bit" property
else
tcx-24bit-reg
- /tcx-off-dac-24 to /tcx-dac
+ /tcx-off-cmap-24 to /tcx-dac
\ Even with a 24-bit enabled TCX card, the control plane is
\ used in 8-bit mode. So force the video subsystem into 8-bit
--
1.7.10.4
4 years, 8 months
- 1
- 1