[commit] r1244 - trunk/openbios-devel/arch/sparc64
by repository service
Author: mcayland
Date: Mon Dec 16 19:06:24 2013
New Revision: 1244
URL: http://tracker.coreboot.org/trac/openbios/changeset/1244
Log:
SPARC64: move retained area from top of physical RAM to static variable
Currently the low-level SPARC entry routine reserves the top of physical RAM
which is also where we happen to store our retained memory structure; because
of the way this memory is mapped, a fault is generated when trying to access
the retained memory area outside of OpenBIOS.
Move the retained area into a static variable for the moment; the existing
routine is unlikely to survive a reboot anyhow but at least we can store the
requested information for analysis later.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon Dec 16 19:06:22 2013 (r1243)
+++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon Dec 16 19:06:24 2013 (r1244)
@@ -29,6 +29,7 @@
#define OFMEM (&s_ofmem_data.ofmem)
#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE)
+static retain_t s_retained;
translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans;
ucell *va2ttedata = 0;
@@ -41,7 +42,7 @@
static ucell get_heap_top( void )
{
- return (ucell)(TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8));
+ return (ucell)TOP_OF_RAM;
}
ofmem_t* ofmem_arch_get_private(void)
@@ -85,8 +86,7 @@
retain_t *ofmem_arch_get_retained(void)
{
- /* Retained area is at the top of physical RAM */
- return (retain_t *)(qemu_mem_size - sizeof(retain_t));
+ return (&s_retained);
}
int ofmem_arch_get_translation_entry_size(void)
6 years, 1 month
- 1
- 0
[commit] r1243 - trunk/openbios-devel/include/arch/sparc64
by repository service
Author: mcayland
Date: Mon Dec 16 19:06:22 2013
New Revision: 1243
URL: http://tracker.coreboot.org/trac/openbios/changeset/1243
Log:
SPARC64: increase PAGE_SHIFT to 13 (8K page size)
Some bootloaders use the IEEE1275 memory words to allocate blocks of memory
which are less than PAGE_SIZE. With an incorect page size, OFMEM would
allocate entries that were only aligned to 4K. This caused a problem whereby
when memory was reallocated by OpenBIOS, the resulting TLB flush would be
at the wrong address, silently fail, and hence cause a crash when the
reallocated virtual address was first accessed.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/include/arch/sparc64/types.h
Modified: trunk/openbios-devel/include/arch/sparc64/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:19 2013 (r1242)
+++ trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:22 2013 (r1243)
@@ -85,7 +85,7 @@
#define BITS 64
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT 13
/* size named types */
6 years, 1 month
- 1
- 0
[commit] r1242 - trunk/openbios-devel/libopenbios
by repository service
Author: mcayland
Date: Mon Dec 16 19:06:19 2013
New Revision: 1242
URL: http://tracker.coreboot.org/trac/openbios/changeset/1242
Log:
OFMEM: remove remaining page size constants and replace with PAGE_SIZE
Since OFMEM was originally based upon the PPC architecture (with 4K page size),
there are still some places that use hardcoded values to calculate alignment.
Replace these with equivalents that use the current architecture PAGE_SIZE.
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 Mon Dec 16 19:06:16 2013 (r1241)
+++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon Dec 16 19:06:19 2013 (r1242)
@@ -616,7 +616,7 @@
ofmem_t *ofmem = ofmem_arch_get_private();
ucell virt;
phys_addr_t phys;
- ucell offs = addr & 0xfff;
+ ucell offs = addr & (PAGE_SIZE - 1);
OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align );
virt = phys = 0;
@@ -631,8 +631,8 @@
return -1;
}
} else {
- if( align < 0x1000 )
- align = 0x1000;
+ 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 */ );
if( phys == -1 || virt == -1 ) {
@@ -643,13 +643,13 @@
}
/* align */
- if( phys & 0xfff ) {
- size += (phys & 0xfff);
- virt -= (phys & 0xfff);
- phys &= ~0xfff;
+ if( phys & (PAGE_SIZE - 1) ) {
+ size += (phys & (PAGE_SIZE - 1));
+ virt -= (phys & (PAGE_SIZE - 1));
+ phys &= PAGE_MASK;
}
- if( size & 0xfff )
- size = (size + 0xfff) & ~0xfff;
+ if( size & (PAGE_SIZE - 1) )
+ size = (size + (PAGE_SIZE - 1)) & PAGE_MASK;
/* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */
ofmem_map( phys, virt, size, -1 );
@@ -783,15 +783,15 @@
/* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n",
virt, phys, size, mode ); */
- if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) {
+ if( (phys & (PAGE_SIZE - 1)) || (virt & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)) ) {
OFMEM_TRACE("ofmem_map: Bad parameters ("
FMT_plx " " FMT_ucellX " " FMT_ucellX ")\n",
phys, virt, size );
- phys &= ~0xfff;
- virt &= ~0xfff;
- size = (size + 0xfff) & ~0xfff;
+ phys &= PAGE_MASK;
+ virt &= PAGE_MASK;
+ size = (size + (PAGE_SIZE - 1)) & PAGE_MASK;
}
#if defined(OFMEM_FILL_RANGE)
@@ -822,11 +822,11 @@
OFMEM_TRACE("ofmem_unmap " FMT_ucellx " " FMT_ucellx "\n",
virt, size );
- if( (virt & 0xfff) || (size & 0xfff) ) {
+ if( (virt & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)) ) {
/* printk("ofmem_unmap: Bad parameters (%08lX %08lX)\n",
virt, size ); */
- virt &= ~0xfff;
- size = (size + 0xfff) & ~0xfff;
+ virt &= PAGE_MASK;
+ size = (size + (PAGE_SIZE - 1)) & PAGE_MASK;
}
/* remove translations and unmap pages */
6 years, 1 month
- 1
- 0
[commit] r1241 - in trunk/openbios-devel/include: arch/amd64 arch/ppc arch/sparc32 arch/sparc64 arch/x86 libopenbios
by repository service
Author: mcayland
Date: Mon Dec 16 19:06:16 2013
New Revision: 1241
URL: http://tracker.coreboot.org/trac/openbios/changeset/1241
Log:
Move PAGE_SHIFT into architecture-specific header files
This commit moves the declaration of PAGE_SHIFT (the number of bits in a page)
into architecture-specific header files. This is required for a subsequent
commit to ensure that OFMEM can correctly unmap pages on architectures where
PAGE_SHIFT != 12 (4K page size).
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/include/arch/amd64/types.h
trunk/openbios-devel/include/arch/ppc/types.h
trunk/openbios-devel/include/arch/sparc32/types.h
trunk/openbios-devel/include/arch/sparc64/types.h
trunk/openbios-devel/include/arch/x86/types.h
trunk/openbios-devel/include/libopenbios/ofmem.h
Modified: trunk/openbios-devel/include/arch/amd64/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/amd64/types.h Mon Dec 16 19:06:13 2013 (r1240)
+++ trunk/openbios-devel/include/arch/amd64/types.h Mon Dec 16 19:06:16 2013 (r1241)
@@ -50,6 +50,8 @@
#define BITS 64
+#define PAGE_SHIFT 12
+
/* size named types */
typedef unsigned char u8;
Modified: trunk/openbios-devel/include/arch/ppc/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/ppc/types.h Mon Dec 16 19:06:13 2013 (r1240)
+++ trunk/openbios-devel/include/arch/ppc/types.h Mon Dec 16 19:06:16 2013 (r1241)
@@ -79,6 +79,8 @@
#define BITS 32
+#define PAGE_SHIFT 12
+
/* size named types */
typedef unsigned char u8;
Modified: trunk/openbios-devel/include/arch/sparc32/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/sparc32/types.h Mon Dec 16 19:06:13 2013 (r1240)
+++ trunk/openbios-devel/include/arch/sparc32/types.h Mon Dec 16 19:06:16 2013 (r1241)
@@ -76,6 +76,8 @@
#define BITS 32
+#define PAGE_SHIFT 12
+
/* size named types */
typedef unsigned char u8;
Modified: trunk/openbios-devel/include/arch/sparc64/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:13 2013 (r1240)
+++ trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:16 2013 (r1241)
@@ -85,6 +85,8 @@
#define BITS 64
+#define PAGE_SHIFT 12
+
/* size named types */
typedef unsigned char u8;
Modified: trunk/openbios-devel/include/arch/x86/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/x86/types.h Mon Dec 16 19:06:13 2013 (r1240)
+++ trunk/openbios-devel/include/arch/x86/types.h Mon Dec 16 19:06:16 2013 (r1241)
@@ -52,6 +52,8 @@
#define BITS 32
+#define PAGE_SHIFT 12
+
/* size named types */
typedef unsigned char u8;
Modified: trunk/openbios-devel/include/libopenbios/ofmem.h
==============================================================================
--- trunk/openbios-devel/include/libopenbios/ofmem.h Mon Dec 16 19:06:13 2013 (r1240)
+++ trunk/openbios-devel/include/libopenbios/ofmem.h Mon Dec 16 19:06:16 2013 (r1241)
@@ -127,9 +127,6 @@
extern phandle_t s_phandle_memory;
extern phandle_t s_phandle_mmu;
-/* Currently the same for all architectures */
-#define PAGE_SHIFT 12
-
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE - 1))
#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
6 years, 1 month
- 1
- 0
[commit] r1240 - trunk/openbios-devel/arch/sparc64
by repository service
Author: mcayland
Date: Mon Dec 16 19:06:13 2013
New Revision: 1240
URL: http://tracker.coreboot.org/trac/openbios/changeset/1240
Log:
SPARC64: fix stack underflow when no boot device argument is supplied
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/sparc64/boot.c
Modified: trunk/openbios-devel/arch/sparc64/boot.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/boot.c Tue Dec 10 22:01:48 2013 (r1239)
+++ trunk/openbios-devel/arch/sparc64/boot.c Mon Dec 16 19:06:13 2013 (r1240)
@@ -71,6 +71,7 @@
printk("Image returned with return value %#x\n", image_retval);
}
+/* ( path len -- path len ) */
void boot(void)
{
@@ -99,6 +100,8 @@
POP();
fword("get-package-property");
POP();
+ /* Update our local copy of path as well as the one on the stack */
+ fword("2dup");
path = pop_fstr_copy();
}
6 years, 1 month
- 1
- 0
RFC: change default SPARC boot order to "disk:a disk"
by Mark Cave-Ayland
Hi all,
I've had a bug report off-list indicating that r1199 broke booting
Solaris from hard disk. Some investigation shows that the simple reason
is because the boot list in arch/sparc32/openbios.c is missing a slice
letter, and so the boot device in romvec is set incorrectly.
As the disk device in OpenBIOS/QEMU is effectively modelled as
sd(0,0,0), then I believe the correct solution should be this:
diff --git a/openbios-devel/arch/sparc32/openbios.c
b/openbios-devel/arch/sparc32/openbios.c
index abdfe7c..6d1c3dc 100644
--- a/openbios-devel/arch/sparc32/openbios.c
+++ b/openbios-devel/arch/sparc32/openbios.c
@@ -887,7 +887,7 @@ arch_init( void )
push_str("floppy");
break;
case 'c':
- push_str("disk");
+ push_str("disk:a disk");
break;
default:
case 'd':
Unfortunately I only have a couple of SPARC disk images as my main test
suite is ISO based, and so while it works for me (and the original
reporter), I'm a bit nervous about just applying the change as-is.
Can anyone confirm that my understanding of Solaris slices is correct,
and that this is indeed the correct solution to the problem?
Many thanks,
Mark.
6 years, 1 month
- 1
- 1
Zombie messages
by Tarl Neustaedter
Are we having a rash of Zombie messages from several months ago? I
remember several discussions from earlier in the year, and I'm suddenly
seeing a large number of messages that were sent from that timeframe.
If I'm reading the headers correctly, it looks like ra.coresystems.de
had held on to these messages, and forwarded them to mail.coresystems.de
today.
6 years, 1 month
- 2
- 1
Re: [OpenBIOS] [PATCH] Fix cross compiling sparc64 on arm32 host
by Mark Cave-Ayland
On 03/12/13 21:35, Cole Robinson wrote:
> Add arm32 to the whitelist for handling lack of int128 type variants.
> Otherwise we get errors like:
>
> /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’
> typedef __int128_t dcell;
>
> This may introduce issues building on aarch64 but I have no way to test.
> ---
>
> Recently, Fedora's build system had many arm hosts added. Since we always
> cross build openbios, the RPM build is scheduled independent of the
> build machine architecture. So whenever an openbios build was scheduled
> to an arm host, things fell over.
>
> config/scripts/switch-arch | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch
> index 44f2df4..86cab3c 100755
> --- a/config/scripts/switch-arch
> +++ b/config/scripts/switch-arch
> @@ -77,7 +77,7 @@ crosscflags()
> if test "$target" = "sparc64" -o "$target" = "ia64" \
> -o "$target" = "amd64" -o "$target" = "x86_64" \
> -o "$target" = "alpha"; then
> - if test "$host" = "x86"; then
> + if test "$host" = "x86" -o "$host" = "arm"; then
> cflags="$cflags -DNEED_FAKE_INT128_T"
> elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then
> cflags="$cflags -DNEED_FAKE_INT128_T"
Hi Cole,
Thanks for the patch - I don't tend to do much with the build system but
it looks fairly reasonable to me. One minor stylistic nit is that
switch-arch seems to be grouped by arch, so would it be possible to
rework so that the overall result looks like this:
if test "$host" = "x86"; then
if test "$host" = "arm"; then
cflags="$cflags -DNEED_FAKE_INT128_T"
elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then
cflags="$cflags -DNEED_FAKE_INT128_T"
If you can resubmit like this (and also with a SOB) then I'm happy to
apply it.
ATB,
Mark.
6 years, 1 month
- 2
- 2
[commit] r1239 - trunk/openbios-devel/config/scripts
by repository service
Author: mcayland
Date: Tue Dec 10 22:01:48 2013
New Revision: 1239
URL: http://tracker.coreboot.org/trac/openbios/changeset/1239
Log:
Fix cross compiling sparc64 on arm32 host
Add arm32 to the whitelist for handling lack of int128 type variants.
Otherwise we get errors like:
/target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’
typedef __int128_t dcell;
This may introduce issues building on aarch64 but I have no way to test.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/config/scripts/switch-arch
Modified: trunk/openbios-devel/config/scripts/switch-arch
==============================================================================
--- trunk/openbios-devel/config/scripts/switch-arch Tue Dec 10 22:01:46 2013 (r1238)
+++ trunk/openbios-devel/config/scripts/switch-arch Tue Dec 10 22:01:48 2013 (r1239)
@@ -79,6 +79,8 @@
-o "$target" = "alpha"; then
if test "$host" = "x86"; then
cflags="$cflags -DNEED_FAKE_INT128_T"
+ elif test "$host" = "arm"; then
+ cflags="$cflags -DNEED_FAKE_INT128_T"
elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then
cflags="$cflags -DNEED_FAKE_INT128_T"
fi
6 years, 1 month
- 1
- 0
[commit] r1238 - trunk/openbios-devel/arch/sparc32
by repository service
Author: mcayland
Date: Tue Dec 10 22:01:46 2013
New Revision: 1238
URL: http://tracker.coreboot.org/trac/openbios/changeset/1238
Log:
SPARC32: fix NULL pointer reference when booting from device with no arguments
When booting from a device with no arguments (such as "disk"), the resulting
partition id string would be NULL causing an exception when setting up the
romvec slice identifier. In the case where no slice is specified, we simply
set the partition to 0 in order to preserve existing behaviour.
This fixes booting from hard disk on QEMU as reported by Paul Wilhelm and
Aurelien Jarno.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk>
Modified:
trunk/openbios-devel/arch/sparc32/boot.c
Modified: trunk/openbios-devel/arch/sparc32/boot.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/boot.c Tue Dec 10 22:01:42 2013 (r1237)
+++ trunk/openbios-devel/arch/sparc32/boot.c Tue Dec 10 22:01:46 2013 (r1238)
@@ -98,10 +98,15 @@
fword("my-args");
id = pop_fstr_copy();
- snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", target, device, id[0]);
+ if (id != NULL) {
+ snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", target, device, id[0]);
+ obp_arg.dev_partition = id[0] - 'a';
+ } else {
+ snprintf(buf, sizeof(buf), "sd(0,%d,%d)", target, device);
+ obp_arg.dev_partition = 0;
+ }
obp_arg.boot_dev_unit = target;
- obp_arg.dev_partition = id[0] - 'a';
obp_arg.boot_dev[0] = buf[0];
obp_arg.boot_dev[1] = buf[1];
6 years, 1 month
- 1
- 0