[commit] r883 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service
Author: blueswirl
Date: Sun Oct 3 21:18:23 2010
New Revision: 883
URL: http://tracker.coreboot.org/trac/openbios/changeset/883
Log:
sparc32: fix warnings from GCC 4.6.0
Compiling Sparc32 with GCC 4.6.0 20100925 produced a few warnings:
../arch/sparc32/context.c: In function 'start_main':
../arch/sparc32/context.c:49:9: error: variable 'retval' set but not used [-Werror=unused-but-set-variable]
../arch/sparc32/romvec.c: In function 'obp_devwrite':
../arch/sparc32/romvec.c:326:9: error: variable 'ret' set but not used [-Werror=unused-but-set-variable]
../drivers/iommu.c: In function 'iommu_init':
../drivers/iommu.c:102:24: error: variable 'vers' set but not used [-Werror=unused-but-set-variable]
../drivers/iommu.c:102:18: error: variable 'impl' set but not used [-Werror=unused-but-set-variable]
Fix the warnings by avoiding write-only variables.
Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com>
Modified:
trunk/openbios-devel/arch/sparc32/context.c
trunk/openbios-devel/arch/sparc32/romvec.c
trunk/openbios-devel/drivers/iommu.c
Modified: trunk/openbios-devel/arch/sparc32/context.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/context.c Sun Oct 3 18:37:47 2010 (r882)
+++ trunk/openbios-devel/arch/sparc32/context.c Sun Oct 3 21:18:23 2010 (r883)
@@ -46,17 +46,12 @@
*/
static void start_main(void)
{
- int retval;
-
/* Save startup context, so we can refer to it later.
* We have to keep it in physical address since we will relocate. */
__boot_ctx = virt_to_phys(__context);
/* Start the real fun */
- retval = openbios();
-
- /* Pass return value to startup context. Bootloader may see it. */
- //boot_ctx->eax = retval;
+ openbios();
/* Returning from here should jump to __exit_context */
__context = boot_ctx;
Modified: trunk/openbios-devel/arch/sparc32/romvec.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 3 18:37:47 2010 (r882)
+++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 3 21:18:23 2010 (r883)
@@ -323,16 +323,21 @@
static int obp_devwrite(int dev_desc, char *buf, int nbytes)
{
+#ifdef CONFIG_DEBUG_OBP_DEVWRITE /* disabled, makes too much noise */
int ret;
+#endif
PUSH((int)buf);
PUSH(nbytes);
push_str("write");
PUSH(dev_desc);
fword("$call-method");
+#ifdef CONFIG_DEBUG_OBP_DEVWRITE
ret = POP();
-
- //DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret);
+ DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret);
+#else
+ POP();
+#endif
return nbytes;
}
Modified: trunk/openbios-devel/drivers/iommu.c
==============================================================================
--- trunk/openbios-devel/drivers/iommu.c Sun Oct 3 18:37:47 2010 (r882)
+++ trunk/openbios-devel/drivers/iommu.c Sun Oct 3 21:18:23 2010 (r883)
@@ -99,7 +99,9 @@
{
unsigned int *ptab;
int ptsize;
+#ifdef CONFIG_DEBUG_IOMMU
unsigned int impl, vers;
+#endif
unsigned int tmp;
struct iommu_regs *regs;
int ret;
@@ -111,8 +113,10 @@
for (;;) { }
}
t->regs = regs;
+#ifdef CONFIG_DEBUG_IOMMU
impl = (regs->control & IOMMU_CTRL_IMPL) >> 28;
vers = (regs->control & IOMMU_CTRL_VERS) >> 24;
+#endif
tmp = regs->control;
tmp &= ~(IOMMU_CTRL_RNGE);
8 years, 7 months
- 1
- 0
[commit] r882 - in trunk/openbios-devel: arch/sparc64 drivers packages
by repository service
Author: blueswirl
Date: Sun Oct 3 18:37:47 2010
New Revision: 882
URL: http://tracker.coreboot.org/trac/openbios/changeset/882
Log:
Fix warnings from GCC 4.6.0
Compiling Sparc64 with GCC 4.6.0 20100925 produced a few warnings:
../arch/sparc64/context.c: In function 'start_main':
../arch/sparc64/context.c:49:9: error: variable 'retval' set but not used [-Werror=unused-but-set-variable]
../packages/disk-label.c: In function 'dlabel_load':
../packages/disk-label.c:183:8: error: variable 'buf' set but not used [-Werror=unused-but-set-variable]
../drivers/floppy.c: In function 'collect_interrupt':
../drivers/floppy.c:378:13: error: variable 'status' set but not used [-Werror=unused-but-set-variable]
Fix the warnings by avoiding write-only variables.
Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com>
Modified:
trunk/openbios-devel/arch/sparc64/context.c
trunk/openbios-devel/drivers/floppy.c
trunk/openbios-devel/packages/disk-label.c
Modified: trunk/openbios-devel/arch/sparc64/context.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/context.c Sun Oct 3 16:28:12 2010 (r881)
+++ trunk/openbios-devel/arch/sparc64/context.c Sun Oct 3 18:37:47 2010 (r882)
@@ -46,17 +46,12 @@
*/
static void start_main(void)
{
- int retval;
-
/* Save startup context, so we can refer to it later.
* We have to keep it in physical address since we will relocate. */
__boot_ctx = virt_to_phys(__context);
/* Start the real fun */
- retval = openbios();
-
- /* Pass return value to startup context. Bootloader may see it. */
- //boot_ctx->eax = retval;
+ openbios();
/* Returning from here should jump to __exit_context */
__context = boot_ctx;
Modified: trunk/openbios-devel/drivers/floppy.c
==============================================================================
--- trunk/openbios-devel/drivers/floppy.c Sun Oct 3 16:28:12 2010 (r881)
+++ trunk/openbios-devel/drivers/floppy.c Sun Oct 3 18:37:47 2010 (r882)
@@ -375,7 +375,10 @@
{
unsigned char pcn = 0xff;
unsigned char reply_buffer[MAX_REPLIES];
- int nr, i, status;
+ int nr;
+#ifdef CONFIG_DEBUG_FLOPPY
+ int i, status;
+#endif
nr = result(reply_buffer, MAX_REPLIES);
if (nr != 0) {
printk_debug("SENSEI\n");
@@ -393,6 +396,7 @@
}
max_sensei--;
}while(((reply_buffer[0] & 0x83) != FD_DRIVE) && (nr == 2) && max_sensei);
+#ifdef CONFIG_DEBUG_FLOPPY
status = fdc_state.fdc_inb(FD_STATUS);
printk_debug("status = %x, reply_buffer=", status);
for(i = 0; i < nr; i++) {
@@ -400,6 +404,9 @@
reply_buffer[i]);
}
printk_debug("\n");
+#else
+ fdc_state.fdc_inb(FD_STATUS);
+#endif
}
return pcn;
Modified: trunk/openbios-devel/packages/disk-label.c
==============================================================================
--- trunk/openbios-devel/packages/disk-label.c Sun Oct 3 16:28:12 2010 (r881)
+++ trunk/openbios-devel/packages/disk-label.c Sun Oct 3 18:37:47 2010 (r882)
@@ -180,10 +180,16 @@
dlabel_load( __attribute__((unused)) dlabel_info_t *di )
{
/* Try the load method of the part package */
+#ifdef DEBUG_DISK_LABEL
char *buf;
+#endif
xt_t xt;
+#ifdef DEBUG_DISK_LABEL
buf = (char *)POP();
+#else
+ POP();
+#endif
DPRINTF("load invoked with address %p\n", buf);
8 years, 7 months
- 1
- 0
[PATCH] ofmem: Fix and enable ofmem_claim() trace output
by Andreas Färber
A printk statement was commented out and there were format string mismatches for ppc target.
Use OFMEM_TRACE to more easily enable/disable it and use FMT_ucellx as in other trace output.
Note that this changes the alignment from decimal to hexidecimal notation.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
---
libopenbios/ofmem_common.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libopenbios/ofmem_common.c b/libopenbios/ofmem_common.c
index 1e797b3..00a95b8 100644
--- a/libopenbios/ofmem_common.c
+++ b/libopenbios/ofmem_common.c
@@ -477,7 +477,7 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align )
ucell virt, phys;
ucell offs = addr & 0xfff;
- /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */
+ OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align );
virt = phys = 0;
if( !align ) {
if( is_free(addr, size, ofmem->virt_range) &&
--
1.7.3
8 years, 7 months
- 2
- 1
[commit] r881 - trunk/openbios-devel/libopenbios
by repository service
Author: blueswirl
Date: Sun Oct 3 16:28:12 2010
New Revision: 881
URL: http://tracker.coreboot.org/trac/openbios/changeset/881
Log:
ofmem: Fix and enable ofmem_claim() trace output
A printk statement was commented out and there were format string mismatches for ppc target.
Use OFMEM_TRACE to more easily enable/disable it and use FMT_ucellx as in other trace output.
Note that this changes the alignment from decimal to hexidecimal notation.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com>
Modified:
trunk/openbios-devel/libopenbios/ofmem_common.c
Modified: trunk/openbios-devel/libopenbios/ofmem_common.c
==============================================================================
--- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 3 16:28:10 2010 (r880)
+++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 3 16:28:12 2010 (r881)
@@ -477,7 +477,7 @@
ucell virt, phys;
ucell offs = addr & 0xfff;
- /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */
+ OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align );
virt = phys = 0;
if( !align ) {
if( is_free(addr, size, ofmem->virt_range) &&
8 years, 7 months
- 1
- 0
[commit] r880 - trunk/openbios-devel/config/scripts
by repository service
Author: blueswirl
Date: Sun Oct 3 16:28:10 2010
New Revision: 880
URL: http://tracker.coreboot.org/trac/openbios/changeset/880
Log:
switch-arch: Fix recognition of x86_64 target as 64-bit
The comparison would've always been false due to missing $.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com>
Modified:
trunk/openbios-devel/config/scripts/switch-arch
Modified: trunk/openbios-devel/config/scripts/switch-arch
==============================================================================
--- trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 16:23:18 2010 (r879)
+++ trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 16:28:10 2010 (r880)
@@ -51,7 +51,7 @@
# target long bits test
if test "$target" = "sparc64" -o "$target" = "ia64" \
- -o "$target" = "amd64" -o "target" = "x86_64" \
+ -o "$target" = "amd64" -o "$target" = "x86_64" \
-o "$target" = "alpha"; then
targetlongbits="64"
else
8 years, 7 months
- 1
- 0
[PATCH] Darwin/ppc host needs fake int128_t for sparc64
by Andreas Färber
Otherwise it chokes on ducell in include/kernel/stack.h.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
---
It seems I only mentioned this on the list but never sent a proper patch.
http://www.openfirmware.info/pipermail/openbios/2009-November/004192.html
Not sure about Linux/ppc or Darwin/x86, so I've limited it to Darwin/ppc for now.
Regards,
Andreas
config/scripts/switch-arch | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch
index c1158fa..8b6563d 100755
--- a/config/scripts/switch-arch
+++ b/config/scripts/switch-arch
@@ -71,6 +71,8 @@ crosscflags()
if test "$host" = "x86" -a "$targetlongbits" = "64"; then
cflags="$cflags -DNEED_FAKE_INT128_T"
+ elif test "$host" = "ppc" -a "$targetlongbits" = "64" -a `uname -s` = "Darwin"; then
+ cflags="$cflags -DNEED_FAKE_INT128_T"
fi
CROSSCFLAGS=$cflags
--
1.7.0.4
8 years, 7 months
- 2
- 3
[commit] r878 - trunk/openbios-devel/forth/bootstrap
by repository service
Author: mcayland
Date: Sun Oct 3 12:34:50 2010
New Revision: 878
URL: http://tracker.coreboot.org/trac/openbios/changeset/878
Log:
Implement the "to" Forth word for setting defers. This enables OpenSolaris to execute "' kmem64-tte is va>tte-data" for setting
the va>tte-data defer.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk>
Modified:
trunk/openbios-devel/forth/bootstrap/bootstrap.fs
Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs
==============================================================================
--- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 3 11:37:13 2010 (r877)
+++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 3 12:34:50 2010 (r878)
@@ -1043,6 +1043,13 @@
then
; immediate
+: is ( xt "wordname<>" -- )
+ parse-word $find if
+ (to)
+ else
+ s" could not find " type type
+ then
+ ;
\
\ 7.3.4.2 Console Input
8 years, 7 months
- 1
- 0
[commit] r877 - trunk/openbios-devel/arch/sparc64
by repository service
Author: mcayland
Date: Sun Oct 3 11:37:13 2010
New Revision: 877
URL: http://tracker.coreboot.org/trac/openbios/changeset/877
Log:
Implement pgmap@ for SPARC64 since it is required for OpenSolaris.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk>
Modified:
trunk/openbios-devel/arch/sparc64/lib.c
Modified: trunk/openbios-devel/arch/sparc64/lib.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 08:54:04 2010 (r876)
+++ trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 11:37:13 2010 (r877)
@@ -135,6 +135,43 @@
}
}
+/*
+ * D5.3 pgmap@ ( va -- tte )
+ */
+static void
+pgmap_fetch(void)
+{
+ translation_t *t = *g_ofmem_translations;
+ unsigned long va, tte_data;
+
+ va = POP();
+
+ /* Search the ofmem linked list for this virtual address */
+ while (t != NULL) {
+ /* Find the correct range */
+ if (va >= t->virt && va < (t->virt + t->size)) {
+
+ /* valid tte, 8k size */
+ tte_data = 0x8000000000000000UL;
+
+ /* mix in phys address mode */
+ tte_data |= t->mode;
+
+ /* mix in page physical address = t->phys + offset */
+ tte_data |= t->phys + (va - t->virt);
+
+ /* return tte_data */
+ PUSH(tte_data);
+
+ return;
+ }
+ t = t->next;
+ }
+
+ /* If we get here, there was no entry */
+ PUSH(0);
+}
+
static void
dtlb_load2(unsigned long vaddr, unsigned long tte_data)
{
@@ -185,7 +222,6 @@
dtlb_miss_handler(void)
{
unsigned long faultva, tte_data = 0;
- translation_t *t = *g_ofmem_translations;
/* Grab fault address from MMU and round to nearest 8k page */
faultva = dtlb_faultva();
@@ -193,30 +229,17 @@
faultva <<= 13;
/* Search the ofmem linked list for this virtual address */
- while (t != NULL) {
- /* Find the correct range */
- if (faultva >= t->virt && faultva < (t->virt + t->size)) {
-
- /* valid tte, 8k size */
- tte_data = 0x8000000000000000UL;
-
- /* mix in phys address mode */
- tte_data |= t->mode;
-
- /* mix in page physical address = t->phys + offset */
- tte_data |= t->phys + (faultva - t->virt);
-
- /* Update MMU */
- dtlb_load2(faultva, tte_data);
-
- return;
- }
-
- t = t->next;
+ PUSH(faultva);
+ pgmap_fetch();
+ tte_data = POP();
+
+ if (tte_data) {
+ /* Update MMU */
+ dtlb_load2(faultva, tte_data);
+ } else {
+ /* If we got here, there was no translation so fail */
+ bug();
}
-
- /* If we got here, there was no translation so fail */
- bug();
}
static void
@@ -238,6 +261,20 @@
"r" (tte_data), "r" (tte_index << 3), "i" (ASI_ITLB_DATA_ACCESS));
}
+/*
+ ( index tte_data vaddr -- ? )
+*/
+static void
+itlb_load(void)
+{
+ unsigned long vaddr, tte_data, idx;
+
+ vaddr = POP();
+ tte_data = POP();
+ idx = POP();
+ itlb_load3(vaddr, tte_data, idx);
+}
+
static unsigned long
itlb_faultva(void)
{
@@ -255,7 +292,6 @@
itlb_miss_handler(void)
{
unsigned long faultva, tte_data = 0;
- translation_t *t = *g_ofmem_translations;
/* Grab fault address from MMU and round to nearest 8k page */
faultva = itlb_faultva();
@@ -263,45 +299,17 @@
faultva <<= 13;
/* Search the ofmem linked list for this virtual address */
- while (t != NULL) {
- /* Find the correct range */
- if (faultva >= t->virt && faultva < (t->virt + t->size)) {
-
- /* valid tte, 8k size */
- tte_data = 0x8000000000000000UL;
-
- /* mix in phys address mode */
- tte_data |= t->mode;
-
- /* mix in page physical address = t->phys + offset */
- tte_data |= t->phys + (faultva - t->virt);
-
- /* Update MMU */
- itlb_load2(faultva, tte_data);
-
- return;
- }
-
- t = t->next;
+ PUSH(faultva);
+ pgmap_fetch();
+ tte_data = POP();
+
+ if (tte_data) {
+ /* Update MMU */
+ itlb_load2(faultva, tte_data);
+ } else {
+ /* If we got here, there was no translation so fail */
+ bug();
}
-
- /* If we got here, there was no translation so fail */
- bug();
-}
-
-
-/*
- ( index tte_data vaddr -- ? )
-*/
-static void
-itlb_load(void)
-{
- unsigned long vaddr, tte_data, idx;
-
- vaddr = POP();
- tte_data = POP();
- idx = POP();
- itlb_load3(vaddr, tte_data, idx);
}
static void
@@ -604,4 +612,9 @@
fword("find-device");
bind_func("cif-claim", ciface_claim);
bind_func("cif-release", ciface_release);
+
+ /* Other MMU functions */
+ PUSH(0);
+ fword("active-package!");
+ bind_func("pgmap@", pgmap_fetch);
}
8 years, 7 months
- 1
- 0
[commit] r876 - trunk/openbios-devel/config/scripts
by repository service
Author: blueswirl
Date: Sun Oct 3 08:54:04 2010
New Revision: 876
URL: http://tracker.coreboot.org/trac/openbios/changeset/876
Log:
Darwin/ppc host needs fake int128_t for sparc64
Otherwise it chokes on ducell in include/kernel/stack.h.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com>
Modified:
trunk/openbios-devel/config/scripts/switch-arch
Modified: trunk/openbios-devel/config/scripts/switch-arch
==============================================================================
--- trunk/openbios-devel/config/scripts/switch-arch Sat Oct 2 15:28:49 2010 (r875)
+++ trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 08:54:04 2010 (r876)
@@ -71,6 +71,8 @@
if test "$host" = "x86" -a "$targetlongbits" = "64"; then
cflags="$cflags -DNEED_FAKE_INT128_T"
+ elif test "$host" = "ppc" -a "$targetlongbits" = "64" -a `uname -s` = "Darwin"; then
+ cflags="$cflags -DNEED_FAKE_INT128_T"
fi
CROSSCFLAGS=$cflags
8 years, 7 months
- 1
- 0
[commit] r875 - trunk/openbios-devel/arch/sparc64
by repository service
Author: mcayland
Date: Sat Oct 2 15:28:49 2010
New Revision: 875
URL: http://tracker.coreboot.org/trac/openbios/changeset/875
Log:
Solaris 9 kernel needs more memory during startup.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Sat Oct 2 14:10:45 2010 (r874)
+++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat Oct 2 15:28:49 2010 (r875)
@@ -20,7 +20,7 @@
#define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8))
-#define MEMSIZE ((128 + 512 + 512) * 1024)
+#define MEMSIZE ((256 + 512 + 512) * 1024)
static union {
char memory[MEMSIZE];
ofmem_t ofmem;
8 years, 7 months
- 1
- 0